diff options
| author | Eric Andersen <andersen@codepoet.org> | 2002-10-22 11:58:59 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2002-10-22 11:58:59 +0000 |
| commit | 1887b0478f2743ce7808e8b37462e18d584611e1 (patch) | |
| tree | f95c04d377b7ec7bac90b41ee91c78fab333135a | |
| parent | 5956028f6f438131e8995af029de448a21ea8d8c (diff) | |
Apply last_patch51_3 from vodz
| -rw-r--r-- | shell/ash.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c index 216780c9d..f0729ed4d 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -2418,9 +2418,23 @@ static void evalcommand(union node *cmd, int flags) for (argp = cmd->ncmd.assign; argp; argp = argp->narg.next) { expandarg(argp, &varlist, EXP_VARTILDE); } - for (argp = cmd->ncmd.args; argp; argp = argp->narg.next) { + for (argp = cmd->ncmd.args; argp && !arglist.list; argp = argp->narg.next) { expandarg(argp, &arglist, EXP_FULL | EXP_TILDE); } + if (argp) { + struct builtincmd *bcmd; + int pseudovarflag; + + bcmd = find_builtin(arglist.list->text); + pseudovarflag = bcmd && IS_BUILTIN_ASSIGN(bcmd); + for (; argp; argp = argp->narg.next) { + if (pseudovarflag && isassignment(argp->narg.text)) { + expandarg(argp, &arglist, EXP_VARTILDE); + continue; + } + expandarg(argp, &arglist, EXP_FULL | EXP_TILDE); + } + } *arglist.lastp = NULL; *varlist.lastp = NULL; expredir(cmd->ncmd.redirect); |