summaryrefslogtreecommitdiff
path: root/shell/ash.c
diff options
context:
space:
mode:
Diffstat (limited to 'shell/ash.c')
-rw-r--r--shell/ash.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c
index d63acc2c8..492c77edd 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -6964,8 +6964,11 @@ tryexec(USE_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char *
6964 6964
6965#if ENABLE_FEATURE_SH_STANDALONE 6965#if ENABLE_FEATURE_SH_STANDALONE
6966 if (applet_no >= 0) { 6966 if (applet_no >= 0) {
6967 if (APPLET_IS_NOEXEC(applet_no)) 6967 if (APPLET_IS_NOEXEC(applet_no)) {
6968 while (*envp)
6969 putenv(*envp++);
6968 run_applet_no_and_exit(applet_no, argv); 6970 run_applet_no_and_exit(applet_no, argv);
6971 }
6969 /* re-exec ourselves with the new arguments */ 6972 /* re-exec ourselves with the new arguments */
6970 execve(bb_busybox_exec_path, argv, envp); 6973 execve(bb_busybox_exec_path, argv, envp);
6971 /* If they called chroot or otherwise made the binary no longer 6974 /* If they called chroot or otherwise made the binary no longer
@@ -12014,7 +12017,7 @@ exportcmd(int argc UNUSED_PARAM, char **argv)
12014 char *name; 12017 char *name;
12015 const char *p; 12018 const char *p;
12016 char **aptr; 12019 char **aptr;
12017 int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT; 12020 int flag = argv[0][0] == 'r' ? VREADONLY : VEXPORT;
12018 12021
12019 if (nextopt("p") != 'p') { 12022 if (nextopt("p") != 'p') {
12020 aptr = argptr; 12023 aptr = argptr;