diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 1999-08-30 16:51:14 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-08-30 16:51:14 +0000 |
| commit | 585e059c1841f9e7bab298df9aceec7174f4bbfd (patch) | |
| tree | 0d19725571a73efbdc3bfa898fe9dde0efb12d41 /Src | |
| parent | 2a47366459bf5a52d701c241a04d4e83f6a56260 (diff) | |
| download | zsh-585e059c1841f9e7bab298df9aceec7174f4bbfd.tar.gz zsh-585e059c1841f9e7bab298df9aceec7174f4bbfd.tar.xz zsh-585e059c1841f9e7bab298df9aceec7174f4bbfd.zip | |
zsh-3.1.6-pws-2 zsh-3.1.6-pws-2
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/Makefile.in | 2 | ||||
| -rw-r--r-- | Src/exec.c | 5 | ||||
| -rw-r--r-- | Src/zsh.export | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Src/Makefile.in b/Src/Makefile.in index 7ec130c2b..764b8619b 100644 --- a/Src/Makefile.in +++ b/Src/Makefile.in @@ -167,7 +167,7 @@ install.bin-here: zsh install.bin-@L@ $(LN) $(DESTDIR)$(bindir)/zsh $(DESTDIR)$(bindir)/zsh.old; \ else :; fi rm -f $(DESTDIR)$(bindir)/zsh.new - $(LN) $(DESTDIR)$(bindir)/zsh-$(VERSION) $(DESTDIR)$(bindir)/zsh.new + $(LN) $(DESTDIR)$(bindir)/zsh-$(VERSION) $(DESTDIR)(bindir)/zsh.new mv $(DESTDIR)$(bindir)/zsh.new $(DESTDIR)$(bindir)/zsh install.bin-N: diff --git a/Src/exec.c b/Src/exec.c index 5ee161fff..97e8f4912 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -1528,7 +1528,7 @@ execcmd(Cmd cmd, int input, int output, int how, int last1) /* Current shell should not fork unless the * * exec occurs at the end of a pipeline. */ - if ((cflags & BINF_EXEC) && last1) + if ((cflags & BINF_EXEC) && last1 == 2) flags |= CFLAG_EXEC; /* Empty command */ @@ -2062,9 +2062,8 @@ execcmd(Cmd cmd, int input, int output, int how, int last1) restore_params(restorelist, removelist); } else { - if (!forked) - setiparam("SHLVL", --shlvl); if (flags & CFLAG_EXEC) { + setiparam("SHLVL", --shlvl); /* If we are exec'ing a command, and we are not * * in a subshell, then save the history file. */ if (!subsh && isset(RCS) && interact && !nohistsave) diff --git a/Src/zsh.export b/Src/zsh.export index 68d93d161..e3d7bc567 100644 --- a/Src/zsh.export +++ b/Src/zsh.export @@ -100,6 +100,7 @@ global_heapalloc global_permalloc globlist gotwordptr +has_token hasam hashcmd hasher |