From 1ae26218b9700756ff723a065f011e88f5d3ef81 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Tue, 6 May 2014 20:50:48 +0100 Subject: MinGW: rename execable -> executable --- coreutils/test.c | 2 +- debianutils/which.c | 2 +- include/mingw.h | 2 +- libbb/executable.c | 2 +- win32/mingw.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coreutils/test.c b/coreutils/test.c index 139f1db75..ba1dbaa2f 100644 --- a/coreutils/test.c +++ b/coreutils/test.c @@ -653,7 +653,7 @@ static int filstat(char *nm, enum token mode) if (file_is_executable(nm)) { return 1; } - else if ((p=win32_execable_file(nm))) { + else if ((p=file_is_win32_executable(nm))) { free(p); return 1; } diff --git a/debianutils/which.c b/debianutils/which.c index fe6cf2f78..ace5b82dd 100644 --- a/debianutils/which.c +++ b/debianutils/which.c @@ -51,7 +51,7 @@ int which_main(int argc UNUSED_PARAM, char **argv) puts(*argv); } #if ENABLE_PLATFORM_MINGW32 - else if ((p=win32_execable_file(*argv)) != NULL) { + else if ((p=file_is_win32_executable(*argv)) != NULL) { missing = 0; puts(p); free(p); diff --git a/include/mingw.h b/include/mingw.h index bcf61dbac..7caedd063 100644 --- a/include/mingw.h +++ b/include/mingw.h @@ -433,4 +433,4 @@ char **env_setenv(char **env, const char *name); const char *get_busybox_exec_path(void); void init_winsock(void); -char *win32_execable_file(const char *p); +char *file_is_win32_executable(const char *p); diff --git a/libbb/executable.c b/libbb/executable.c index 2e5f6a1b7..12a48cea3 100644 --- a/libbb/executable.c +++ b/libbb/executable.c @@ -61,7 +61,7 @@ char* FAST_FUNC find_executable(const char *filename, char **PATHp) return p; } #if ENABLE_PLATFORM_MINGW32 - else if ((w=win32_execable_file(p))) { + else if ((w=file_is_win32_executable(p))) { *PATHp = n; free(p); return w; diff --git a/win32/mingw.c b/win32/mingw.c index 044d5c50f..9f225e88f 100644 --- a/win32/mingw.c +++ b/win32/mingw.c @@ -930,7 +930,7 @@ int mingw_access(const char *name, int mode) * * if path already has a suffix don't even bother trying */ -char *win32_execable_file(const char *p) +char *file_is_win32_executable(const char *p) { char *path; int len = strlen(p); -- cgit v1.2.3-55-g6feb