emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply last_patch51_3 from vodz

Browse Source
This commit is contained in:
Eric Andersen 2002-10-22 11:58:59 +00:00
parent 5956028f6f
commit 1887b0478f
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
shell/ash.c
View File

@ -2418,9 +2418,23 @@ static void evalcommand(union node *cmd, int flags)
for (argp = cmd->ncmd.assign; argp; argp = argp->narg.next) { for (argp = cmd->ncmd.assign; argp; argp = argp->narg.next) {
expandarg(argp, &varlist, EXP_VARTILDE); 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); 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; *arglist.lastp = NULL;
*varlist.lastp = NULL; *varlist.lastp = NULL;
expredir(cmd->ncmd.redirect); expredir(cmd->ncmd.redirect);