1 files changed, 48 insertions, 1 deletions

diff --git a/debianutils/which.c b/debianutils/which.c
index a7d55a215..5d564e01d 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -12,7 +12,11 @@
 //config:       which is used to find programs in your PATH and
 //config:       print out their pathnames.
 
-//applet:IF_WHICH(APPLET_NOFORK(which, which, BB_DIR_USR_BIN, BB_SUID_DROP, which))
+// NOTE: For WIN32 this applet is NOEXEC as file_is_win32_exe() and
+//       find_executable() both allocate memory.
+
+//applet:IF_PLATFORM_MINGW32(IF_WHICH(APPLET_NOEXEC(which, which, BB_DIR_USR_BIN, BB_SUID_DROP, which)))
+//applet:IF_PLATFORM_POSIX(IF_WHICH(APPLET_NOFORK(which, which, BB_DIR_USR_BIN, BB_SUID_DROP, which)))
 
 //kbuild:lib-$(CONFIG_WHICH) += which.o
 
@@ -33,6 +37,10 @@ int which_main(int argc UNUSED_PARAM, char **argv)
 {
         const char *env_path;
         int status = 0;
+#if ENABLE_PLATFORM_MINGW32 && ENABLE_FEATURE_SH_STANDALONE
+        /* 'Which' in argv[0] indicates we were run from a standalone shell */
+        int sh_standalone = argv[0][0] == 'W';
+#endif
 
         env_path = getenv("PATH");
         if (!env_path)
@@ -44,21 +52,60 @@ int which_main(int argc UNUSED_PARAM, char **argv)
         do {
                 int missing = 1;
 
+#if ENABLE_PLATFORM_MINGW32 && ENABLE_FEATURE_SH_STANDALONE
+                if (sh_standalone && find_applet_by_name(*argv) >= 0) {
+                        missing = 0;
+                        puts(applet_to_exe(*argv));
+                        if (!option_mask32) /* -a not set */
+                                break;
+                }
+#endif
+
+#if !ENABLE_PLATFORM_MINGW32
                 /* If file contains a slash don't use PATH */
                 if (strchr(*argv, '/')) {
                         if (file_is_executable(*argv)) {
                                 missing = 0;
                                 puts(*argv);
                         }
+#else
+                if (has_path(*argv)) {
+                        char *path = file_is_win32_exe(*argv);
+
+                        if (path) {
+                                missing = 0;
+                                puts(bs_to_slash(path));
+                        }
+                        else if (unix_path(*argv)) {
+                                const char *name = bb_basename(*argv);
+# if ENABLE_FEATURE_SH_STANDALONE
+                                if (sh_standalone && find_applet_by_name(name) >= 0) {
+                                        missing = 0;
+                                        puts(name);
+                                } else
+# endif
+                                {
+                                        argv[0] = (char *)name;
+                                        goto try_PATH;
+                                }
+                        }
+#endif
                 } else {
                         const char *path;
                         char *p;
 
+#if ENABLE_PLATFORM_MINGW32
+ try_PATH:
+#endif
                         path = env_path;
                         /* NOFORK NB: xmalloc inside find_executable(), must have no allocs above! */
                         while ((p = find_executable(*argv, &path)) != NULL) {
                                 missing = 0;
+#if ENABLE_PLATFORM_MINGW32
+                                puts(bs_to_slash(p));
+#else
                                 puts(p);
+#endif
                                 free(p);
                                 if (!option_mask32) /* -a not set */
                                         break;