diff options
-rw-r--r-- | libbb/executable.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libbb/executable.c b/libbb/executable.c index bd3022b13..e20bf89e4 100644 --- a/libbb/executable.c +++ b/libbb/executable.c | |||
@@ -39,9 +39,6 @@ char* FAST_FUNC find_executable(const char *filename, char **PATHp) | |||
39 | * following the rest of the list. | 39 | * following the rest of the list. |
40 | */ | 40 | */ |
41 | char *p, *n; | 41 | char *p, *n; |
42 | #if ENABLE_PLATFORM_MINGW32 | ||
43 | char *w; | ||
44 | #endif | ||
45 | 42 | ||
46 | p = *PATHp; | 43 | p = *PATHp; |
47 | while (p) { | 44 | while (p) { |
@@ -53,14 +50,16 @@ char* FAST_FUNC find_executable(const char *filename, char **PATHp) | |||
53 | p[0] ? p : ".", /* handle "::" case */ | 50 | p[0] ? p : ".", /* handle "::" case */ |
54 | filename | 51 | filename |
55 | ); | 52 | ); |
56 | if (n) *n++ = PATH_SEP; | ||
57 | #if ENABLE_PLATFORM_MINGW32 | 53 | #if ENABLE_PLATFORM_MINGW32 |
58 | w = alloc_system_drive(p); | 54 | { |
59 | add_win32_extension(w); | 55 | char *w = alloc_system_drive(p); |
60 | free(p); | 56 | add_win32_extension(w); |
61 | p = w; | 57 | free(p); |
58 | p = w; | ||
59 | } | ||
62 | #endif | 60 | #endif |
63 | ex = file_is_executable(p); | 61 | ex = file_is_executable(p); |
62 | if (n) *n++ = PATH_SEP; | ||
64 | if (ex) { | 63 | if (ex) { |
65 | *PATHp = n; | 64 | *PATHp = n; |
66 | return p; | 65 | return p; |