Merge branch 'busybox' into merge

Conflicts:
	debianutils/which.c
	editors/vi.c
	libbb/executable.c

2 files changed, 5 insertions, 5 deletions

diff --git a/win32/mingw.c b/win32/mingw.c
index 501c886e0..044d5c50f 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -943,11 +943,11 @@ char *win32_execable_file(const char *p)
         if ( (path=malloc(len+5)) != NULL ) {
                 memcpy(path, p, len);
                 memcpy(path+len, ".exe", 5);
-                if (execable_file(path)) {
+                if (file_is_executable(path)) {
                         return path;
                 }
                 memcpy(path+len, ".com", 5);
-                if (execable_file(path)) {
+                if (file_is_executable(path)) {
                         return path;
                 }
                 free(path);
diff --git a/win32/process.c b/win32/process.c
index e2e81c793..462731a2d 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -238,7 +238,7 @@ mingw_spawn_interpreter(int mode, const char *prog, const char *const *argv, con
         else {
                 char *path = xstrdup(getenv("PATH"));
                 char *tmp = path;
-                char *iprog = find_execable(interpr, &tmp);
+                char *iprog = find_executable(interpr, &tmp);
                 free(path);
                 if (!iprog) {
                         free(new_argv);
@@ -273,9 +273,9 @@ mingw_spawn_1(int mode, const char *cmd, const char *const *argv, const char *co
                         return -1;
                 }
 
-                /* exists_execable() does not return new file name */
+                /* executable_exists() does not return new file name */
                 tmp = path = xstrdup(path);
-                prog = find_execable(cmd, &tmp);
+                prog = find_executable(cmd, &tmp);
                 free(path);
                 if (!prog) {
                         errno = ENOENT;