diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-06-18 14:23:47 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-06-18 14:23:47 +0200 |
| commit | 7df28bbb8fa3ba2878c288401c898ec477e55df1 (patch) | |
| tree | 0fb82bf1302e387ea08e0dc5a5733dae683f5acc /shell | |
| parent | 1ed2fb40c919a25fe6920680cf898d0b4870c60e (diff) | |
| download | busybox-7df28bbb8fa3ba2878c288401c898ec477e55df1.tar.gz | |
ash: fix unset in standalone mode
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 1 | ||||
| -rw-r--r-- | shell/ash_test/ash-standalone/var_standalone1.right | 1 | ||||
| -rwxr-xr-x | shell/ash_test/ash-standalone/var_standalone1.tests | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/shell/ash.c b/shell/ash.c index fcaa7b18e..74fe8617b 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -7252,6 +7252,7 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char ** #if ENABLE_FEATURE_SH_STANDALONE if (applet_no >= 0) { if (APPLET_IS_NOEXEC(applet_no)) { + clearenv(); while (*envp) putenv(*envp++); run_applet_no_and_exit(applet_no, argv); diff --git a/shell/ash_test/ash-standalone/var_standalone1.right b/shell/ash_test/ash-standalone/var_standalone1.right new file mode 100644 index 000000000..37457fd74 --- /dev/null +++ b/shell/ash_test/ash-standalone/var_standalone1.right @@ -0,0 +1 @@ +Done: 1 diff --git a/shell/ash_test/ash-standalone/var_standalone1.tests b/shell/ash_test/ash-standalone/var_standalone1.tests new file mode 100755 index 000000000..1e905ba75 --- /dev/null +++ b/shell/ash_test/ash-standalone/var_standalone1.tests @@ -0,0 +1,2 @@ +VAR=42 $THIS_SH -c 'unset VAR; env | grep ^VAR' +echo Done: $? |