diff options
author | Ron Yorston <rmy@pobox.com> | 2018-04-05 20:41:06 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2018-04-05 20:41:06 +0100 |
commit | eda6f28c793db7d5a61ec4d8d801dfcb6def17b7 (patch) | |
tree | f0b2edea7bc9b4c795956b4297baae186ab04a21 /shell | |
parent | f7c592f6d832602a628008d598a3aa130d89de4d (diff) | |
download | busybox-w32-eda6f28c793db7d5a61ec4d8d801dfcb6def17b7.tar.gz busybox-w32-eda6f28c793db7d5a61ec4d8d801dfcb6def17b7.tar.bz2 busybox-w32-eda6f28c793db7d5a61ec4d8d801dfcb6def17b7.zip |
ps: indicate forkshell processes in listing
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ash.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c index 6d24fb55a..ba05f073f 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -14725,11 +14725,12 @@ int ash_main(int argc UNUSED_PARAM, char **argv) | |||
14725 | hSIGINT = CreateEvent(NULL, TRUE, FALSE, NULL); | 14725 | hSIGINT = CreateEvent(NULL, TRUE, FALSE, NULL); |
14726 | SetConsoleCtrlHandler(ctrl_handler, TRUE); | 14726 | SetConsoleCtrlHandler(ctrl_handler, TRUE); |
14727 | 14727 | ||
14728 | if (argc == 3 && !strcmp(argv[1], "--forkshell")) { | 14728 | if (argc == 3 && !strcmp(argv[1], "--fs")) { |
14729 | strcpy(bb_applet_name, "[sh]"); | ||
14729 | forkshell_init(argv[2]); | 14730 | forkshell_init(argv[2]); |
14730 | 14731 | ||
14731 | /* NOTREACHED */ | 14732 | /* NOTREACHED */ |
14732 | bb_error_msg_and_die("subshell ended unexpectedly"); | 14733 | bb_error_msg_and_die("forkshell failed"); |
14733 | } | 14734 | } |
14734 | #endif | 14735 | #endif |
14735 | login_sh = procargs(argv); | 14736 | login_sh = procargs(argv); |
@@ -14983,7 +14984,7 @@ spawn_forkshell(struct job *jp, struct forkshell *fs, int mode) | |||
14983 | { | 14984 | { |
14984 | struct forkshell *new; | 14985 | struct forkshell *new; |
14985 | char buf[32]; | 14986 | char buf[32]; |
14986 | const char *argv[] = { "sh", "--forkshell", NULL, NULL }; | 14987 | const char *argv[] = { "sh", "--fs", NULL, NULL }; |
14987 | intptr_t ret; | 14988 | intptr_t ret; |
14988 | 14989 | ||
14989 | new = forkshell_prepare(fs); | 14990 | new = forkshell_prepare(fs); |