emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

noexec: do GETOPT_RESET() before entering APPLET_main()

Browse Source 
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>
This commit is contained in:
Denys Vlasenko 2017-08-07 18:59:35 +02:00
parent f2cf1cc716
commit c9c1ccc4ed
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libbb/vfork_daemon_rexec.c
View File

@ -176,6 +176,7 @@ int FAST_FUNC spawn_and_wait(char **argv)
/* child */ /* child */
/* reset some state and run without execing */ /* reset some state and run without execing */
GETOPT_RESET();
/* msg_eol = "\n"; - no caller needs this reinited yet */ /* msg_eol = "\n"; - no caller needs this reinited yet */
logmode = LOGMODE_STDIO; logmode = LOGMODE_STDIO;

1
shell/ash.c
View File

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

3
shell/hush.c
View File

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