diff options
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ash.c | 1 | ||||
-rw-r--r-- | shell/hush.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c index 507d15c90..bedd27b0d 100644 --- 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 | |||
7803 | while (*envp) | 7803 | while (*envp) |
7804 | putenv(*envp++); | 7804 | putenv(*envp++); |
7805 | popredir(/*drop:*/ 1); | 7805 | popredir(/*drop:*/ 1); |
7806 | GETOPT_RESET(); | ||
7806 | //TODO: think pidof, pgrep, pkill! | 7807 | //TODO: think pidof, pgrep, pkill! |
7807 | //set_task_comm() makes our pidof find NOEXECs (e.g. "yes >/dev/null"), | 7808 | //set_task_comm() makes our pidof find NOEXECs (e.g. "yes >/dev/null"), |
7808 | //but one from procps-ng-3.3.10 needs more! | 7809 | //but one from procps-ng-3.3.10 needs more! |
diff --git a/shell/hush.c b/shell/hush.c index 021c1f0ff..b890107a2 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -7386,12 +7386,13 @@ static NOINLINE void pseudo_exec_argv(nommu_save_t *nommu_save, | |||
7386 | //FIXME: should also close saved redir fds | 7386 | //FIXME: should also close saved redir fds |
7387 | /* Without this, "rm -i FILE" can't be ^C'ed: */ | 7387 | /* Without this, "rm -i FILE" can't be ^C'ed: */ |
7388 | switch_off_special_sigs(G.special_sig_mask); | 7388 | switch_off_special_sigs(G.special_sig_mask); |
7389 | debug_printf_exec("running applet '%s'\n", argv[0]); | 7389 | GETOPT_RESET(); |
7390 | //TODO: think pidof, pgrep, pkill! | 7390 | //TODO: think pidof, pgrep, pkill! |
7391 | //set_task_comm() makes our pidof find NOEXECs (e.g. "yes >/dev/null"), | 7391 | //set_task_comm() makes our pidof find NOEXECs (e.g. "yes >/dev/null"), |
7392 | //but one from procps-ng-3.3.10 needs more! | 7392 | //but one from procps-ng-3.3.10 needs more! |
7393 | //Rewrite /proc/PID/cmdline? (need to save argv0 and length at init for this to work!) | 7393 | //Rewrite /proc/PID/cmdline? (need to save argv0 and length at init for this to work!) |
7394 | set_task_comm(argv[0]); | 7394 | set_task_comm(argv[0]); |
7395 | debug_printf_exec("running applet '%s'\n", argv[0]); | ||
7395 | run_applet_no_and_exit(a, argv[0], argv); | 7396 | run_applet_no_and_exit(a, argv[0], argv); |
7396 | } | 7397 | } |
7397 | # endif | 7398 | # endif |