diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-07 19:24:57 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-07 19:24:57 +0200 |
commit | 80e8e3cc0542ac6242d49eaf223146dcbf2fa0da (patch) | |
tree | 8e5ade097b6c26fd585aa2ffd06a20d943ae4e93 /shell/ash.c | |
parent | c9c1ccc4ed7e7525a2e3c07d855c7a27c3534430 (diff) | |
download | busybox-w32-80e8e3cc0542ac6242d49eaf223146dcbf2fa0da.tar.gz busybox-w32-80e8e3cc0542ac6242d49eaf223146dcbf2fa0da.tar.bz2 busybox-w32-80e8e3cc0542ac6242d49eaf223146dcbf2fa0da.zip |
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/ash.c')
-rw-r--r-- | shell/ash.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/shell/ash.c b/shell/ash.c index bedd27b0d..6dc1cfef7 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -7803,13 +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 | run_noexec_applet_and_exit(applet_no, cmd, argv); |
7807 | //TODO: think pidof, pgrep, pkill! | ||
7808 | //set_task_comm() makes our pidof find NOEXECs (e.g. "yes >/dev/null"), | ||
7809 | //but one from procps-ng-3.3.10 needs more! | ||
7810 | //Rewrite /proc/PID/cmdline? (need to save argv0 and length at init for this to work!) | ||
7811 | set_task_comm(argv[0]); | ||
7812 | run_applet_no_and_exit(applet_no, cmd, argv); | ||
7813 | } | 7807 | } |
7814 | /* re-exec ourselves with the new arguments */ | 7808 | /* re-exec ourselves with the new arguments */ |
7815 | execve(bb_busybox_exec_path, argv, envp); | 7809 | execve(bb_busybox_exec_path, argv, envp); |