diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/builtins.def.in | 2 | ||||
| -rw-r--r-- | src/eval.c | 8 |
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index eb12538..4fc35a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2010-05-27 Herbert Xu <herbert@gondor.apana.org.au> * Fix poplocalvar on abnormal exit from function. + * Do not poplocalvars prematurely on regular utilities. 2010-05-26 Herbert Xu <herbert@gondor.apana.org.au> diff --git a/src/builtins.def.in b/src/builtins.def.in index 266d0ec..4441fe4 100644 --- a/src/builtins.def.in +++ b/src/builtins.def.in @@ -71,7 +71,7 @@ falsecmd -u false getoptscmd -u getopts hashcmd hash jobscmd -u jobs -localcmd -a local +localcmd -as local printfcmd printf pwdcmd pwd readcmd -u read diff --git a/src/eval.c b/src/eval.c index 2cd931b..337667f 100644 --- a/src/eval.c +++ b/src/eval.c @@ -847,9 +847,11 @@ bail: /* NOTREACHED */ case CMDBUILTIN: - poplocalvars(spclbltin > 0 || argc == 0); - if (execcmd && argc > 1) - listsetvar(varlist.list, VEXPORT); + if (spclbltin > 0 || argc == 0) { + poplocalvars(1); + if (execcmd && argc > 1) + listsetvar(varlist.list, VEXPORT); + } if (evalbltin(cmdentry.u.cmd, argc, argv, flags)) { int status; int i; |