From eda6f28c793db7d5a61ec4d8d801dfcb6def17b7 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Thu, 5 Apr 2018 20:41:06 +0100 Subject: ps: indicate forkshell processes in listing --- shell/ash.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'shell') 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) hSIGINT = CreateEvent(NULL, TRUE, FALSE, NULL); SetConsoleCtrlHandler(ctrl_handler, TRUE); - if (argc == 3 && !strcmp(argv[1], "--forkshell")) { + if (argc == 3 && !strcmp(argv[1], "--fs")) { + strcpy(bb_applet_name, "[sh]"); forkshell_init(argv[2]); /* NOTREACHED */ - bb_error_msg_and_die("subshell ended unexpectedly"); + bb_error_msg_and_die("forkshell failed"); } #endif login_sh = procargs(argv); @@ -14983,7 +14984,7 @@ spawn_forkshell(struct job *jp, struct forkshell *fs, int mode) { struct forkshell *new; char buf[32]; - const char *argv[] = { "sh", "--forkshell", NULL, NULL }; + const char *argv[] = { "sh", "--fs", NULL, NULL }; intptr_t ret; new = forkshell_prepare(fs); -- cgit v1.2.3-55-g6feb