ps: indicate forkshell processes in listing

2 files changed, 5 insertions, 4 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)
         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);
diff --git a/win32/process.c b/win32/process.c
index 3219fcad4..b9168ba1d 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -471,7 +471,7 @@ static char *get_applet_name(DWORD pid, char *exe)
 
         /* check that the string really is an applet name */
         buffer[31] = '\0';
-        if (find_applet_by_name(buffer) >= 0) {
+        if (find_applet_by_name(buffer) >= 0 || !strcmp(buffer, "[sh]")) {
                 name = auto_string(xstrdup(buffer));
         }