summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-06-18 12:23:47 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-06-18 12:23:47 (GMT)
commit7df28bbb8fa3ba2878c288401c898ec477e55df1 (patch)
tree0fb82bf1302e387ea08e0dc5a5733dae683f5acc
parent1ed2fb40c919a25fe6920680cf898d0b4870c60e (diff)
downloadbusybox-7df28bbb8fa3ba2878c288401c898ec477e55df1.tar.gz
busybox-7df28bbb8fa3ba2878c288401c898ec477e55df1.tar.bz2
ash: fix unset in standalone mode
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/ash.c1
-rw-r--r--shell/ash_test/ash-standalone/var_standalone1.right1
-rwxr-xr-xshell/ash_test/ash-standalone/var_standalone1.tests2
3 files changed, 4 insertions, 0 deletions
diff --git a/shell/ash.c b/shell/ash.c
index fcaa7b1..74fe861 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 0000000..37457fd
--- /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 0000000..1e905ba
--- /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: $?