diff options
author | Jilles Tjoelker <jilles@FreeBSD.org> | 2011-06-16 21:50:28 +0000 |
---|---|---|
committer | Jilles Tjoelker <jilles@FreeBSD.org> | 2011-06-16 21:50:28 +0000 |
commit | c5aef5377cbfc3324cacb13ee94986a5c81f67d9 (patch) | |
tree | 294e1c4d6e3e5c1512b2ca2ccbd4ef4b71e3362f /bin/sh/eval.c | |
parent | 6037f89c810f808d2bfb31f511bdb9bd644f5a8d (diff) | |
download | src-c5aef5377cbfc3324cacb13ee94986a5c81f67d9.tar.gz src-c5aef5377cbfc3324cacb13ee94986a5c81f67d9.zip |
sh: Reduce unnecessary forks with eval.
The eval special builtin now runs the code with EV_EXIT if it was run
with EV_EXIT itself.
In particular, this eliminates one fork when a command substitution contains
an eval command that ends with an external program or a subshell.
This is similar to what r220978 did for functions.
Notes
Notes:
svn path=/head/; revision=223163
Diffstat (limited to 'bin/sh/eval.c')
-rw-r--r-- | bin/sh/eval.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/sh/eval.c b/bin/sh/eval.c index 9d67b9eeaa28..25793c1672b3 100644 --- a/bin/sh/eval.c +++ b/bin/sh/eval.c @@ -140,7 +140,7 @@ evalcmd(int argc, char **argv) STPUTC('\0', concat); p = grabstackstr(concat); } - evalstring(p, builtin_flags & EV_TESTED); + evalstring(p, builtin_flags); } else exitstatus = 0; return exitstatus; @@ -908,6 +908,7 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd) dup2(pip[1], 1); close(pip[1]); } + flags &= ~EV_BACKCMD; } flags |= EV_EXIT; } |