diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-27 11:50:19 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-27 11:50:19 +0800 |
| commit | 1d806ac1fbafb867f6252e184e1be05c0829ab71 (patch) | |
| tree | b53f7fc72f3d535437421c57653196a8b0d40663 | |
| parent | [VAR] Document local command behaviour change (diff) | |
| download | dash-1d806ac1fbafb867f6252e184e1be05c0829ab71.tar.gz dash-1d806ac1fbafb867f6252e184e1be05c0829ab71.zip | |
[VAR] Do not poplocalvars prematurely on regular utilities
The recent cmdenviron removal broke regular utilities by calling poplocalvars too early. This patch fixes that by postponing the poplocalvars for regular utilities until they have completed. In order to ensure that local still works, it is now a special built-in. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -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; |