2 files changed, 41 insertions, 4 deletions

diff --git a/debianutils/pipe_progress.c b/debianutils/pipe_progress.c
index ab7e2528f..28c4fd70e 100644
--- a/debianutils/pipe_progress.c
+++ b/debianutils/pipe_progress.c
@@ -16,8 +16,11 @@
 
 //kbuild:lib-$(CONFIG_PIPE_PROGRESS) += pipe_progress.o
 
-//usage:#define pipe_progress_trivial_usage NOUSAGE_STR
-//usage:#define pipe_progress_full_usage ""
+//usage:#define pipe_progress_trivial_usage IF_PLATFORM_POSIX(NOUSAGE_STR)
+//usage:        IF_PLATFORM_MINGW32("")
+//usage:#define pipe_progress_full_usage IF_PLATFORM_POSIX("")
+//usage:        IF_PLATFORM_MINGW32("\n\n")
+//usage:        IF_PLATFORM_MINGW32("Display a dot to indicate pipe activity")
 
 #include "libbb.h"
 
diff --git a/debianutils/which.c b/debianutils/which.c
index 98876521f..61f5770c5 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -45,21 +45,55 @@ int which_main(int argc UNUSED_PARAM, char **argv)
 
         do {
                 int missing = 1;
+                char *p;
+
+#if ENABLE_FEATURE_SH_STANDALONE
+                if (strcmp(*argv, "busybox") == 0 &&
+                                is_suffixed_with(bb_busybox_exec_path, "busybox.exe")) {
+                        missing = 0;
+                        puts(bb_busybox_exec_path);
+                        if (!option_mask32) /* -a not set */
+                                break;
+                }
+                else if (find_applet_by_name(*argv) >= 0 ||
+                                is_prefixed_with(*argv, "busybox")) {
+                        missing = 0;
+                        puts(*argv);
+                        if (!option_mask32) /* -a not set */
+                                break;
+                }
+#endif
 
                 /* If file contains a slash don't use PATH */
-                if (strchr(*argv, '/')) {
+                if (strchr(*argv, '/') || (ENABLE_PLATFORM_MINGW32 && strchr(*argv, '\\'))) {
+#if ENABLE_PLATFORM_MINGW32
+                        if ((p=auto_win32_extension(*argv)) != NULL) {
+                                missing = 0;
+                                bs_to_slash(p);
+                                puts(p);
+                        }
+                        else
+#endif
                         if (file_is_executable(*argv)) {
                                 missing = 0;
+#if ENABLE_PLATFORM_MINGW32
+                                p = auto_string(xstrdup(*argv));
+                                bs_to_slash(p);
+                                puts(p);
+#else
                                 puts(*argv);
+#endif
                         }
                 } else {
                         char *path;
-                        char *p;
 
                         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
+                                bs_to_slash(p);
+#endif
                                 puts(p);
                                 free(p);
                                 if (!option_mask32) /* -a not set */