[git commit master 1/1] ash: fix unset in standalone mode
Denys Vlasenko
vda.linux at googlemail.com
Fri Jun 18 12:23:47 UTC 2010
commit: http://git.busybox.net/busybox/commit/?id=7df28bbb8fa3ba2878c288401c898ec477e55df1
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
shell/ash.c | 1 +
.../ash_test/ash-standalone/var_standalone1.right | 1 +
.../ash_test/ash-standalone/var_standalone1.tests | 2 ++
3 files changed, 4 insertions(+), 0 deletions(-)
create mode 100644 shell/ash_test/ash-standalone/var_standalone1.right
create mode 100755 shell/ash_test/ash-standalone/var_standalone1.tests
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: $?
--
1.7.1
More information about the busybox-cvs
mailing list