JehanneOS/jehanne
JehanneOS
/
jehanne
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

rc: rename $cflag in $rccmd

This commit is contained in:
Giacomo Tesio 2017-10-20 00:14:43 +02:00
parent a70f27680a
commit 65d37f432f
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/rc/lib/rcmain
View File

@ -12,13 +12,13 @@ if(~ $rcname ?.out) prompt=('broken! ' ' ')
if(flag p) path=/cmd if(flag p) path=/cmd
if not{ if not{
finit finit
if(~ $#path 0) path=(. /cmd) if(~ $#path 0) path=(/cmd .)
} }
fn sigexit fn sigexit
if(! ~ $#cflag 0){ if(! ~ $#rccmd 0){
if(flag l && /cmd/test -r $home/lib/profile) . $home/lib/profile if(flag l && /cmd/test -r $home/lib/profile) . $home/lib/profile
status='' status=''
eval $cflag eval $rccmd
} }
if not if(flag i){ if not if(flag i){
if(flag l && /cmd/test -r $home/lib/profile) . $home/lib/profile if(flag l && /cmd/test -r $home/lib/profile) . $home/lib/profile

4
sys/src/cmd/rc/exec.c
View File

@ -177,9 +177,9 @@ main(int argc, char *argv[])
Vinit(); Vinit();
inttoascii(num, mypid = getpid()); inttoascii(num, mypid = getpid());
setvar(ENV_PID, newword(num, (word *)0)); setvar(ENV_PID, newword(num, (word *)0));
setvar("cflag", flag['c']?newword(flag['c'][0], (word *)0) setvar(ENV_RCCMD, flag['c']?newword(flag['c'][0], (word *)0)
:(word *)0); :(word *)0);
setvar("rcname", newword(argv[0], (word *)0)); setvar(ENV_RCNAME, newword(argv[0], (word *)0));
i = 0; i = 0;
bootstrap[i++].i = 1; bootstrap[i++].i = 1;
bootstrap[i++].f = Xmark; bootstrap[i++].f = Xmark;

2
sys/src/cmd/rc/rc.h
View File

@ -18,6 +18,8 @@
#define ENV_PROMPT "prompt" #define ENV_PROMPT "prompt"
#define ENV_STATUS "status" #define ENV_STATUS "status"
#define ENV_CDPATH "cdpath" #define ENV_CDPATH "cdpath"
#define ENV_RCNAME "rcname"
#define ENV_RCCMD "rccmd"
#define NSIG 32 #define NSIG 32
#define SIGINT 2 #define SIGINT 2