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

rc: replace forgotten ENV_RCARGLIST

This commit is contained in:
Giacomo Tesio 2017-10-19 00:16:19 +02:00
parent d33221de34
commit a5c14e60d7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,8 @@ main(int argc, char *argv[])
flag['l'] = flagset; flag['l'] = flagset;
if(flag['I']) if(flag['I'])
flag['i'] = 0; flag['i'] = 0;
else if(flag['i']==0 && argc==1 && Isatty(0)) flag['i'] = flagset; else if(flag['i']==0 && argc==1 && Isatty(0))
flag['i'] = flagset;
rcmain = flag['m']?flag['m'][0]:Rcmain; rcmain = flag['m']?flag['m'][0]:Rcmain;
err = openfd(2); err = openfd(2);
kinit(); kinit();
@ -332,7 +333,7 @@ Xexit(void)
--runq->pc; --runq->pc;
starval = vlook(ENV_RCARGLIST)->val; starval = vlook(ENV_RCARGLIST)->val;
start(trapreq->fn, trapreq->pc, (struct var *)0); start(trapreq->fn, trapreq->pc, (struct var *)0);
runq->local = newvar("*", runq->local); runq->local = newvar(ENV_RCARGLIST, runq->local);
runq->local->val = copywords(starval, (struct word *)0); runq->local->val = copywords(starval, (struct word *)0);
runq->local->changed = 1; runq->local->changed = 1;
runq->redir = runq->startredir = 0; runq->redir = runq->startredir = 0;

2
sys/src/cmd/rc/simple.c
View File

@ -139,7 +139,7 @@ execfunc(var *func)
runq->argv->words = 0; runq->argv->words = 0;
poplist(); poplist();
start(func->fn, func->pc, runq->local); start(func->fn, func->pc, runq->local);
runq->local = newvar("*", runq->local); runq->local = newvar(ENV_RCARGLIST, runq->local);
runq->local->val = starval; runq->local->val = starval;
runq->local->changed = 1; runq->local->changed = 1;
} }