diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2006-04-19 16:09:06 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2006-04-19 16:09:06 +0000 |
| commit | b7474e065b82d930f8da472440282ea7654d491d (patch) | |
| tree | 07ae2866628b6fd4f180824d566de06be94796ed /Src/exec.c | |
| parent | 5c2d5b013e1d8cab43ca19507bf669693c95cd95 (diff) | |
| download | zsh-b7474e065b82d930f8da472440282ea7654d491d.tar.gz zsh-b7474e065b82d930f8da472440282ea7654d491d.tar.xz zsh-b7474e065b82d930f8da472440282ea7654d491d.zip | |
22416, tweaked: math functions via shell functions
unposted: add styles to pick-web-browser
Diffstat (limited to 'Src/exec.c')
| -rw-r--r-- | Src/exec.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Src/exec.c b/Src/exec.c index bb0e4161e..4612c9c1e 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -142,7 +142,6 @@ mod_export Funcstack funcstack; #define execerr() if (!forked) { lastval = 1; goto done; } else _exit(1) -static LinkList args; static int doneps4; static char *STTYval; @@ -464,7 +463,7 @@ isgooderr(int e, char *dir) /**/ void -execute(UNUSED(Cmdnam cmdname), int dash, int defpath) +execute(LinkList args, int dash, int defpath) { Cmdnam cn; char buf[MAXCMDLEN], buf2[MAXCMDLEN]; @@ -482,15 +481,12 @@ execute(UNUSED(Cmdnam cmdname), int dash, int defpath) * we first run the stty command with the value of this * * parameter as it arguments. */ if ((s = STTYval) && isatty(0) && (GETPGRP() == getpid())) { - LinkList exargs = args; char *t = tricat("stty", " ", s); STTYval = 0; /* this prevents infinite recursion */ zsfree(s); - args = NULL; execstring(t, 1, 0); zsfree(t); - args = exargs; } else if (s) { STTYval = 0; zsfree(s); @@ -1827,6 +1823,7 @@ static void execcmd(Estate state, int input, int output, int how, int last1) { HashNode hn = NULL; + LinkList args; LinkNode node; Redir fn; struct multio *mfds[10]; @@ -2638,7 +2635,7 @@ execcmd(Estate state, int input, int output, int how, int last1) zsfree(STTYval); STTYval = 0; } - execute((Cmdnam) hn, cflags & BINF_DASH, use_defpath); + execute(args, cflags & BINF_DASH, use_defpath); } else { /* ( ... ) */ DPUTS(varspc, "BUG: assignment before complex command"); @@ -4094,7 +4091,6 @@ execsave(void) struct execstack *es; es = (struct execstack *) malloc(sizeof(struct execstack)); - es->args = args; es->list_pipe_pid = list_pipe_pid; es->nowait = nowait; es->pline_level = pline_level; @@ -4122,7 +4118,6 @@ execrestore(void) struct execstack *en; DPUTS(!exstack, "BUG: execrestore() without execsave()"); - args = exstack->args; list_pipe_pid = exstack->list_pipe_pid; nowait = exstack->nowait; pline_level = exstack->pline_level; |