commit cc6c505

Michael Forney  ·  2026-05-02 01:36:29 +0000 UTC
parent 0dba730
rc: Update to latest git
5 files changed,  +41, -14
+4, -4
 1@@ -1,4 +1,4 @@
 2-From 64d1d3403037d9ec1895555b8015825c75815f85 Mon Sep 17 00:00:00 2001
 3+From 39dc3bd751db34f04398b55e1d10a76f522b3d6b Mon Sep 17 00:00:00 2001
 4 From: hovercats <hovercatswithlasereyes@protonmail.com>
 5 Date: Wed, 12 Mar 2025 03:36:44 +0100
 6 Subject: [PATCH] fix return type for main
 7@@ -8,10 +8,10 @@ Subject: [PATCH] fix return type for main
 8  1 file changed, 1 insertion(+), 1 deletion(-)
 9 
10 diff --git a/exec.c b/exec.c
11-index 32e7644..e3d12e5 100644
12+index 28c5797..ce9872a 100644
13 --- a/exec.c
14 +++ b/exec.c
15-@@ -221,7 +221,7 @@ shuffleredir(void)
16+@@ -242,7 +242,7 @@ shuffleredir(void)
17   * fabricate bootstrap code and start it (*=(argv);. -bq /usr/lib/rcmain $*)
18   * start interpreting code
19   */
20@@ -21,5 +21,5 @@ index 32e7644..e3d12e5 100644
21  {
22  	code bootstrap[20];
23 -- 
24-2.45.2
25+2.49.0
26 
+31, -4
 1@@ -1,12 +1,14 @@
 2-From 5f3ce26ce56378ff2bfd7662627a02c1be8da6ce Mon Sep 17 00:00:00 2001
 3+From 0f88ba02c7bbcb91b428bfb294831769e521a81b Mon Sep 17 00:00:00 2001
 4 From: Michael Forney <mforney@mforney.org>
 5 Date: Sun, 19 Apr 2026 14:11:15 -0700
 6 Subject: [PATCH] implement umask builtin on unix
 7 
 8 ---
 9- exec.h |  2 +-
10- unix.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
11- 2 files changed, 47 insertions(+), 1 deletion(-)
12+ exec.h   |  2 +-
13+ fns.h    |  1 +
14+ simple.c |  2 +-
15+ unix.c   | 46 ++++++++++++++++++++++++++++++++++++++++++++++
16+ 4 files changed, 49 insertions(+), 2 deletions(-)
17 
18 diff --git a/exec.h b/exec.h
19 index 69b1004..ee8edab 100644
20@@ -21,6 +23,31 @@ index 69b1004..ee8edab 100644
21  void execfunc(var*), execcmds(io*, char*, var*, redir*);
22  void startfunc(var*, word*, var*, redir*);
23  
24+diff --git a/fns.h b/fns.h
25+index 339f08b..1644d1e 100644
26+--- a/fns.h
27++++ b/fns.h
28+@@ -45,6 +45,7 @@ int	havewaitpid(int);
29+ int	idchr(int);
30+ void	inttoascii(char*, int);
31+ void	kinit(void);
32++int	mapfd(int);
33+ int	match(char*, char*, int);
34+ char*	makepath(char*, char*);
35+ void	panic(char*, int);
36+diff --git a/simple.c b/simple.c
37+index 362b77b..1a9d27d 100644
38+--- a/simple.c
39++++ b/simple.c
40+@@ -287,7 +287,7 @@ execshift(void)
41+ 	poplist();
42+ }
43+ 
44+-static int
45++int
46+ mapfd(int fd)
47+ {
48+ 	redir *rp;
49 diff --git a/unix.c b/unix.c
50 index 05d883c..cbb2054 100644
51 --- a/unix.c
+4, -4
 1@@ -1,4 +1,4 @@
 2-From 4a4ebe30b0b2a46027451bc8b86459961f30bbd1 Mon Sep 17 00:00:00 2001
 3+From bc1444426b57c30af71af6a26fa1674984d414a4 Mon Sep 17 00:00:00 2001
 4 From: hovercats <hovercatswithlasereyes@protonmail.com>
 5 Date: Sat, 25 Apr 2026 16:54:31 +0200
 6 Subject: [PATCH] keep $PATH and $path in sync
 7@@ -11,10 +11,10 @@ Subject: [PATCH] keep $PATH and $path in sync
 8  4 files changed, 99 insertions(+), 8 deletions(-)
 9 
10 diff --git a/exec.c b/exec.c
11-index e499d9f..ba11796 100644
12+index ce9872a..987960d 100644
13 --- a/exec.c
14 +++ b/exec.c
15-@@ -244,6 +244,7 @@ main(int argc, char *argv[])
16+@@ -265,6 +265,7 @@ main(int argc, char *argv[])
17  	Trapinit();
18  	Vinit();
19  	inttoascii(num, mypid = getpid());
20@@ -22,7 +22,7 @@ index e499d9f..ba11796 100644
21  	setvar("pid", newword(num, (word *)0));
22  	setvar("cflag", flag['c']?newword(flag['c'][0], (word *)0)
23  				:(word *)0);
24-@@ -737,16 +738,15 @@ void
25+@@ -758,16 +759,15 @@ void
26  Xassign(void)
27  {
28  	var *v;
+1, -1
1@@ -1 +1 @@
2-Subproject commit 3e907e648d7263c159c604dc51aa8ca5d5fcd7f8
3+Subproject commit 1884d8fe62c22b3bb0676f570c25473faa340c3c
+1, -1
1@@ -1 +1 @@
2-3e907e648d r3
3+1884d8fe62