win32: which: look for .exe files too

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>

1 files changed, 22 insertions, 2 deletions

diff --git a/debianutils/which.c b/debianutils/which.c
index 1558e5c6d..10ddb008c 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -36,11 +36,21 @@ int which_main(int argc UNUSED_PARAM, char **argv)
         do {
 #if ENABLE_DESKTOP
 /* Much bloat just to support -a */
-                if (strchr(*argv, '/')) {
+                if (strchr(*argv, '/') || (ENABLE_PLATFORM_MINGW32 && strchr(*argv, '\\'))) {
                         if (execable_file(*argv)) {
                                 puts(*argv);
                                 continue;
                         }
+                        else if (ENABLE_PLATFORM_MINGW32) {
+                                char path[PATH_MAX];
+                                int len = strlen(*argv);
+                                memcpy(path, *argv, len);
+                                memcpy(path+len, ".exe", 5);
+                                if (execable_file(path)) {
+                                        puts(path);
+                                        continue;
+                                }
+                        }
                         status = EXIT_FAILURE;
                 } else {
                         char *path2 = xstrdup(path);
@@ -66,11 +76,21 @@ int which_main(int argc UNUSED_PARAM, char **argv)
                 }
 #else
 /* Just ignoring -a */
-                if (strchr(*argv, '/')) {
+                if (strchr(*argv, '/') || (ENABLE_PLATFORM_MINGW32 && strchr(*argv, '\\'))) {
                         if (execable_file(*argv)) {
                                 puts(*argv);
                                 continue;
                         }
+                        else if (ENABLE_PLATFORM_MINGW32) {
+                                char path[PATH_MAX];
+                                int len = strlen(*argv);
+                                memcpy(path, *argv, len);
+                                memcpy(path+len, ".exe", 5);
+                                if (execable_file(path)) {
+                                        puts(path);
+                                        continue;
+                                }
+                        }
                 } else {
                         char *path2 = xstrdup(path);
                         char *tmp = path2;