1 files changed, 18 insertions, 2 deletions

diff --git a/debianutils/which.c b/debianutils/which.c
index c0f897809..af33ba72e 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -43,17 +43,33 @@ int which_main(int argc UNUSED_PARAM, char **argv)
 
         do {
                 int missing = 1;
+                char *p;
+
+#if ENABLE_FEATURE_PREFER_APPLETS
+                if (find_applet_by_name(*argv) >= 0 || strcmp(*argv, "busybox") == 0) {
+                        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 (file_is_executable(*argv)) {
                                 missing = 0;
                                 puts(*argv);
                         }
+#if ENABLE_PLATFORM_MINGW32
+                        else if ((p=file_is_win32_executable(*argv)) != NULL) {
+                                missing = 0;
+                                puts(p);
+                                free(p);
+                        }
+#endif
                 } else {
                         char *path;
                         char *tmp;
-                        char *p;
 
                         path = tmp = xstrdup(env_path);
                         while ((p = find_executable(*argv, &tmp)) != NULL) {