On Thu, May 27, 2010 at 12:37:23AM +0200, Jilles Tjoelker wrote: > > This change breaks passing variable assignments to regular builtins. > For example, > dash -c 'HOME=/ cd; pwd' > This should print /. (For some reason, this does not work in ksh93 > either.)
Thanks, I have fixed it as follows. commit 1d806ac1fbafb867f6252e184e1be05c0829ab71 Author: Herbert Xu <[email protected]> Date: Thu May 27 11:50:19 2010 +0800 [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 <[email protected]> diff --git a/ChangeLog b/ChangeLog index eb12538..4fc35a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2010-05-27 Herbert Xu <[email protected]> * Fix poplocalvar on abnormal exit from function. + * Do not poplocalvars prematurely on regular utilities. 2010-05-26 Herbert Xu <[email protected]> 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; Cheers, -- Visit Openswan at http://www.openswan.org/ Email: Herbert Xu ~{PmV>HI~} <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line "unsubscribe dash" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
