diff options
Diffstat (limited to 'shell/ash.c')
-rw-r--r-- | shell/ash.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index 70b7ae32a..81ac563fb 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -7008,8 +7008,11 @@ tryexec(USE_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char * | |||
7008 | 7008 | ||
7009 | #if ENABLE_FEATURE_SH_STANDALONE | 7009 | #if ENABLE_FEATURE_SH_STANDALONE |
7010 | if (applet_no >= 0) { | 7010 | if (applet_no >= 0) { |
7011 | if (APPLET_IS_NOEXEC(applet_no)) | 7011 | if (APPLET_IS_NOEXEC(applet_no)) { |
7012 | while (*envp) | ||
7013 | putenv(*envp++); | ||
7012 | run_applet_no_and_exit(applet_no, argv); | 7014 | run_applet_no_and_exit(applet_no, argv); |
7015 | } | ||
7013 | /* re-exec ourselves with the new arguments */ | 7016 | /* re-exec ourselves with the new arguments */ |
7014 | execve(bb_busybox_exec_path, argv, envp); | 7017 | execve(bb_busybox_exec_path, argv, envp); |
7015 | /* If they called chroot or otherwise made the binary no longer | 7018 | /* If they called chroot or otherwise made the binary no longer |
@@ -12094,7 +12097,7 @@ exportcmd(int argc UNUSED_PARAM, char **argv) | |||
12094 | char *name; | 12097 | char *name; |
12095 | const char *p; | 12098 | const char *p; |
12096 | char **aptr; | 12099 | char **aptr; |
12097 | int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT; | 12100 | int flag = argv[0][0] == 'r' ? VREADONLY : VEXPORT; |
12098 | 12101 | ||
12099 | if (nextopt("p") != 'p') { | 12102 | if (nextopt("p") != 'p') { |
12100 | aptr = argptr; | 12103 | aptr = argptr; |