summaryrefslogtreecommitdiff
path: root/shell/hush.c
diff options
context:
space:
mode:
authorDenys Vlasenko2017-08-07 19:24:57 +0200
committerDenys Vlasenko2017-08-07 19:24:57 +0200
commit80e8e3cc0542ac6242d49eaf223146dcbf2fa0da (patch)
tree8e5ade097b6c26fd585aa2ffd06a20d943ae4e93 /shell/hush.c
parentc9c1ccc4ed7e7525a2e3c07d855c7a27c3534430 (diff)
downloadbusybox-80e8e3cc0542ac6242d49eaf223146dcbf2fa0da.zip
busybox-80e8e3cc0542ac6242d49eaf223146dcbf2fa0da.tar.gz
noexec: consolidate code
function old new delta run_noexec_applet_and_exit - 61 +61 find_applet_by_name 128 124 -4 run_applet_no_and_exit 441 434 -7 tryexec 169 152 -17 pseudo_exec_argv 338 321 -17 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/6 up/down: 61/-48) Total: 13 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush.c')
-rw-r--r--shell/hush.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/shell/hush.c b/shell/hush.c
index b890107..8dc5316 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -7386,14 +7386,8 @@ 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);
- 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);
+ run_noexec_applet_and_exit(a, argv[0], argv);
}
# endif
/* Re-exec ourselves */