noexec: do GETOPT_RESET() before entering APPLET_main()

hush -c 'yes | head -1' was not happy.

function                                             old     new   delta
tryexec                                              159     169     +10
pseudo_exec_argv                                     328     338     +10

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 546cc9e36ce63f0fbdc5cfbd6564931d39c0bac6..9d3cb9d54f1c689995815931d51d4a26096749df 100644 (file)
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -176,6 +176,7 @@ int FAST_FUNC spawn_and_wait(char **argv)
 
                        /* child */
                        /* reset some state and run without execing */
+                       GETOPT_RESET();
 
                        /* msg_eol = "\n"; - no caller needs this reinited yet */
                        logmode = LOGMODE_STDIO;

diff --git a/shell/ash.c b/shell/ash.c
index 507d15c908e66ce3a062c33d810d20a729202c15..bedd27b0d2d316313908da3830af7c10cc765f8c 100644 (file)
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -7803,6 +7803,7 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) const char *cmd, char **argv, c
                        while (*envp)
                                putenv(*envp++);
                        popredir(/*drop:*/ 1);
+                       GETOPT_RESET();
 //TODO: think pidof, pgrep, pkill!
 //set_task_comm() makes our pidof find NOEXECs (e.g. "yes >/dev/null"),
 //but one from procps-ng-3.3.10 needs more!

diff --git a/shell/hush.c b/shell/hush.c
index 021c1f0ff968927bae68957b80898170faf86a33..b890107a266e37e66758f3c92667c0f6feaed973 100644 (file)
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -7386,12 +7386,13 @@ static NOINLINE void pseudo_exec_argv(nommu_save_t *nommu_save,
 //FIXME: should also close saved redir fds
                                /* Without this, "rm -i FILE" can't be ^C'ed: */
                                switch_off_special_sigs(G.special_sig_mask);
-                               debug_printf_exec("running applet '%s'\n", argv[0]);
+                               GETOPT_RESET();
 //TODO: think pidof, pgrep, pkill!
 //set_task_comm() makes our pidof find NOEXECs (e.g. "yes >/dev/null"),
 //but one from procps-ng-3.3.10 needs more!
 //Rewrite /proc/PID/cmdline? (need to save argv0 and length at init for this to work!)
                                set_task_comm(argv[0]);
+                               debug_printf_exec("running applet '%s'\n", argv[0]);
                                run_applet_no_and_exit(a, argv[0], argv);
                        }
 # endif