From cc0d931682835347316144a3889fbf35e6d6459b Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Mon, 8 Oct 2001 08:13:11 +0000 Subject: 15931: EXIT traps from exit in subshell; 15965: glob -> zglob --- Src/exec.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Src/exec.c') diff --git a/Src/exec.c b/Src/exec.c index c55494b96..7bc341116 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -1757,7 +1757,7 @@ execcmd(Estate state, int input, int output, int how, int last1) if (!(cflags & BINF_NOGLOB)) while (!checked && !errflag && args && nonempty(args) && has_token((char *) peekfirst(args))) - glob(args, firstnode(args), 0); + zglob(args, firstnode(args), 0); else if (!unglobbed) { for (node = firstnode(args); node; incnode(node)) untokenize((char *) getdata(node)); @@ -2489,6 +2489,10 @@ fixfds(int *save) errno = old_errno; } +/**/ +int +forklevel; + /**/ static void entersubsh(int how, int cl, int fake) @@ -2557,6 +2561,7 @@ entersubsh(int how, int cl, int fake) if (cl) clearjobtab(); times(&shtms); + forklevel = locallevel; } /* close internal shell fds */ -- cgit v1.2.3