6 files changed, 104 insertions, 42 deletions

diff --git a/Makefile.flags b/Makefile.flags
index 6bb6a8fb1..86ab0a0ec 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -126,7 +126,7 @@ endif
 ifeq ($(CONFIG_PLATFORM_MINGW32),y)
 CFLAGS += -Iwin32 -DHAVE_STRING_H=1 -DHAVE_CONFIG_H=0 -fno-builtin-stpcpy -fno-ident
 EXEEXT = .exe
-LDLIBS += userenv ws2_32
+LDLIBS += userenv psapi ws2_32
 endif
 
 # Android has no separate crypt library
diff --git a/applets/applet_tables.c b/applets/applet_tables.c
index 9a2aa5329..858429ac2 100644
--- a/applets/applet_tables.c
+++ b/applets/applet_tables.c
@@ -61,6 +61,7 @@ static int str_isalnum_(const char *s)
 int main(int argc, char **argv)
 {
         int i, j;
+        unsigned MAX_APPLET_NAME_LEN = 1;
 
         // In find_applet_by_name(), before linear search, narrow it down
         // by looking at N "equidistant" names. With ~350 applets:
@@ -124,8 +125,8 @@ int main(int argc, char **argv)
         printf("const char applet_names[] ALIGN1 = \"\"\n");
         for (i = 0; i < NUM_APPLETS; i++) {
                 printf("\"%s\" \"\\0\"\n", applets[i].name);
-//              if (MAX_APPLET_NAME_LEN < strlen(applets[i].name))
-//                      MAX_APPLET_NAME_LEN = strlen(applets[i].name);
+                if (MAX_APPLET_NAME_LEN < strlen(applets[i].name))
+                        MAX_APPLET_NAME_LEN = strlen(applets[i].name);
         }
         printf(";\n\n");
 
@@ -193,8 +194,8 @@ int main(int argc, char **argv)
 #endif
         //printf("#endif /* SKIP_definitions */\n");
 
-//      printf("\n");
-//      printf("#define MAX_APPLET_NAME_LEN %u\n", MAX_APPLET_NAME_LEN);
+        printf("\n");
+        printf("#define MAX_APPLET_NAME_LEN %u\n", MAX_APPLET_NAME_LEN);
 
         if (argv[2]) {
                 FILE *fp;
diff --git a/include/libbb.h b/include/libbb.h
index da3459224..d948f88f3 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -2075,7 +2075,7 @@ extern const char bb_path_wtmp_file[] ALIGN1;
 #define bb_dev_null "/dev/null"
 #if ENABLE_PLATFORM_MINGW32
 #define bb_busybox_exec_path get_busybox_exec_path()
-extern char *bb_applet_pid(void);
+extern char bb_applet_name[];
 #else
 extern const char bb_busybox_exec_path[] ALIGN1;
 #endif
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 1488d4bd6..3e740363a 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -796,13 +796,6 @@ static void install_links(const char *busybox UNUSED_PARAM,
 
 static void run_applet_and_exit(const char *name, char **argv) NORETURN;
 
-#if ENABLE_PLATFORM_MINGW32
-char *bb_applet_pid(void)
-{
-        return auto_string(xasprintf("BB_APPLET_%d=%s", getpid(), applet_name));
-}
-#endif
-
 # if ENABLE_BUSYBOX
 #  if ENABLE_FEATURE_SH_STANDALONE && ENABLE_FEATURE_TAB_COMPLETION
     /*
@@ -979,6 +972,11 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
 # endif
 
 # if NUM_APPLETS > 0
+
+#  if ENABLE_PLATFORM_MINGW32
+char bb_applet_name[MAX_APPLET_NAME_LEN+1];
+#  endif
+
 void FAST_FUNC run_applet_no_and_exit(int applet_no, const char *name, char **argv)
 {
         int argc = string_array_len(argv);
@@ -988,6 +986,9 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, const char *name, char **ar
          * "-/sbin/halt" -> "halt", for example.
          */
         applet_name = name;
+#if ENABLE_PLATFORM_MINGW32
+        strcpy(bb_applet_name, applet_name);
+#endif
 
         /* Special case. POSIX says "test --help"
          * should be no different from e.g. "test --foo".
@@ -1014,10 +1015,6 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, const char *name, char **ar
         if (ENABLE_FEATURE_SUID)
                 check_suid(applet_no);
 
-#if ENABLE_PLATFORM_MINGW32
-        putenv(bb_applet_pid());
-#endif
-
         xfunc_error_retval = applet_main[applet_no](argc, argv);
         /* Note: applet_main() may also not return (die on a xfunc or such) */
         xfunc_die();
diff --git a/shell/ash.c b/shell/ash.c
index 2a1ddac39..6d24fb55a 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -14975,13 +14975,6 @@ reinitvar(void)
                 varinit[i].var_func = varinit_data[i].var_func;
         }
         vlineno.var_text = linenovar;
-
-        /*
-         * BB_APPLET_<pid> was correct when 'sh --forkshell' was started
-         * but has now been overwritten by the environment from the forkshell
-         * data block.  Reinstate it.
-         */
-        setvareq(bb_applet_pid(), VEXPORT);
 }
 
 /* FIXME: should consider running forkparent() and forkchild() */
diff --git a/win32/process.c b/win32/process.c
index d6176ca23..3219fcad4 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -1,5 +1,6 @@
 #include "libbb.h"
 #include <tlhelp32.h>
+#include <psapi.h>
 
 int waitpid(pid_t pid, int *status, int options)
 {
@@ -406,6 +407,79 @@ static inline long long filetime_to_ticks(const FILETIME *ft)
                                 HNSEC_PER_TICK;
 }
 
+/*
+ * Attempt to get the applet name from another instance of busybox.exe.
+ * This will only work if the other process is using the same binary
+ * as the current process.  If anything goes wrong just give up.
+ */
+static char *get_applet_name(DWORD pid, char *exe)
+{
+        HANDLE proc;
+        HMODULE mlist[32];
+        DWORD needed;
+        void *address;
+        char *my_base;
+        char buffer[128];
+        char *name = NULL;
+        int i;
+
+        if (!(proc=OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_VM_READ,
+                                                        FALSE, pid))) {
+                return NULL;
+        }
+
+        /*
+         * Search for the module that matches the name of the executable.
+         * The values returned in mlist are actually the base address of
+         * the module in the other process (as noted in the documentation
+         * for the MODULEINFO structure).
+         */
+        if (!EnumProcessModules(proc, mlist, sizeof(mlist), &needed)) {
+                goto finish;
+        }
+
+        for (i=0; i<needed/sizeof(HMODULE); ++i) {
+                char modname[MAX_PATH];
+                if (GetModuleFileNameEx(proc, mlist[i], modname, sizeof(modname))) {
+                        if (strcasecmp(bb_basename(modname), exe) == 0) {
+                                break;
+                        }
+                }
+        }
+
+        if (i == needed/sizeof(HMODULE)) {
+                goto finish;
+        }
+
+        /* attempt to read the BusyBox version string */
+        my_base = (char *)GetModuleHandle(NULL);
+        address = (char *)mlist[i] + ((char *)bb_banner - my_base);
+        if (!ReadProcessMemory(proc, address, buffer, 128, NULL)) {
+                goto finish;
+        }
+
+        if (memcmp(buffer, bb_banner, strlen(bb_banner)) != 0) {
+                /* version mismatch (or not BusyBox at all) */
+                goto finish;
+        }
+
+        /* attempt to read the applet name */
+        address = (char *)mlist[i] + ((char *)bb_applet_name - my_base);
+        if (!ReadProcessMemory(proc, address, buffer, 128, NULL)) {
+                goto finish;
+        }
+
+        /* check that the string really is an applet name */
+        buffer[31] = '\0';
+        if (find_applet_by_name(buffer) >= 0) {
+                name = auto_string(xstrdup(buffer));
+        }
+
+ finish:
+        CloseHandle(proc);
+        return name;
+}
+
 /* POSIX version in libbb/procps.c */
 procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags
 #if !ENABLE_FEATURE_PS_TIME && !ENABLE_FEATURE_PS_LONG
@@ -414,7 +488,8 @@ UNUSED_PARAM
 )
 {
         PROCESSENTRY32 pe;
-        const char *comm;
+        const char *comm, *name;
+        BOOL ret;
 
         pe.dwSize = sizeof(pe);
         if (!sp) {
@@ -424,18 +499,16 @@ UNUSED_PARAM
                         free(sp);
                         return NULL;
                 }
-                if (!Process32First(sp->snapshot, &pe)) {
-                        CloseHandle(sp->snapshot);
-                        free(sp);
-                        return NULL;
-                }
+                ret = Process32First(sp->snapshot, &pe);
         }
         else {
-                if (!Process32Next(sp->snapshot, &pe)) {
-                        CloseHandle(sp->snapshot);
-                        free(sp);
-                        return NULL;
-                }
+                ret = Process32Next(sp->snapshot, &pe);
+        }
+
+        if (!ret) {
+                CloseHandle(sp->snapshot);
+                free(sp);
+                return NULL;
         }
 
         memset(&sp->vsz, 0, sizeof(*sp) - offsetof(procps_status_t, vsz));
@@ -478,19 +551,17 @@ UNUSED_PARAM
         sp->pid = pe.th32ProcessID;
         sp->ppid = pe.th32ParentProcessID;
 
-        comm = pe.szExeFile;
         if (sp->pid == GetProcessId(GetCurrentProcess())) {
                 comm = applet_name;
         }
+        else if ((name=get_applet_name(pe.th32ProcessID, pe.szExeFile)) != NULL) {
+                comm = name;
+        }
         else {
-                char name[32], *value;
-
-                sprintf(name, "BB_APPLET_%d", sp->pid);
-                if ((value=getenv(name)) != NULL) {
-                        comm = value;
-                }
+                comm = pe.szExeFile;
         }
         safe_strncpy(sp->comm, comm, COMM_LEN);
+
         return sp;
 }