diff options
| author | jilles <jilles@FreeBSD.org> | 2011-06-18 23:58:59 +0000 |
|---|---|---|
| committer | jilles <jilles@FreeBSD.org> | 2011-06-18 23:58:59 +0000 |
| commit | f78ebc168ba76cc9de70590c71fceac20b9d63b8 (patch) | |
| tree | 203de2f5972056cab9e1245f24b6d07cbb27e265 /bin | |
| parent | a380f591f1e9bc535b187c9602563f4fb3d543a1 (diff) | |
| download | FreeBSD-src-f78ebc168ba76cc9de70590c71fceac20b9d63b8.zip FreeBSD-src-f78ebc168ba76cc9de70590c71fceac20b9d63b8.tar.gz | |
sh: Remove special support for background simple commands.
It expands the arguments in the parent shell process, which is incorrect.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sh/eval.c | 8 | ||||
| -rw-r--r-- | bin/sh/nodetypes | 1 | ||||
| -rw-r--r-- | bin/sh/parser.c | 5 |
3 files changed, 5 insertions, 9 deletions
diff --git a/bin/sh/eval.c b/bin/sh/eval.c index a22d4b1..d5da7d3 100644 --- a/bin/sh/eval.c +++ b/bin/sh/eval.c @@ -894,14 +894,13 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd) } /* Fork off a child process if necessary. */ - if (cmd->ncmd.backgnd - || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN) + if (((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN) && ((flags & EV_EXIT) == 0 || have_traps())) || ((flags & EV_BACKCMD) != 0 && (cmdentry.cmdtype != CMDBUILTIN || !safe_builtin(cmdentry.u.index, argc, argv)))) { jp = makejob(cmd, 1); - mode = cmd->ncmd.backgnd; + mode = FORK_FG; if (flags & EV_BACKCMD) { mode = FORK_NOJOB; if (pipe(pip) < 0) @@ -1068,8 +1067,7 @@ parent: /* parent process gets here (if we forked) */ backcmd->fd = pip[0]; close(pip[1]); backcmd->jp = jp; - } else - exitstatus = 0; + } out: if (lastarg) diff --git a/bin/sh/nodetypes b/bin/sh/nodetypes index f705827..ae4bc4a 100644 --- a/bin/sh/nodetypes +++ b/bin/sh/nodetypes @@ -56,7 +56,6 @@ NSEMI nbinary # two commands separated by a semicolon NCMD ncmd # a simple command type int - backgnd int # set to run command in background args nodeptr # the arguments redirect nodeptr # list of file redirections diff --git a/bin/sh/parser.c b/bin/sh/parser.c index 61be512..ef1aa36 100644 --- a/bin/sh/parser.c +++ b/bin/sh/parser.c @@ -240,8 +240,8 @@ list(int nlflag, int erflag) n2 = andor(); tok = readtoken(); if (tok == TBACKGND) { - if (n2->type == NCMD || n2->type == NPIPE) { - n2->ncmd.backgnd = 1; + if (n2->type == NPIPE) { + n2->npipe.backgnd = 1; } else if (n2->type == NREDIR) { n2->type = NBACKGND; } else { @@ -689,7 +689,6 @@ simplecmd(union node **rpp, union node *redir) *rpp = NULL; n = (union node *)stalloc(sizeof (struct ncmd)); n->type = NCMD; - n->ncmd.backgnd = 0; n->ncmd.args = args; n->ncmd.redirect = redir; return n; |
