diff options
author | Ron Yorston <rmy@pobox.com> | 2014-05-06 20:50:48 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2014-05-06 20:50:48 +0100 |
commit | 1ae26218b9700756ff723a065f011e88f5d3ef81 (patch) | |
tree | 2a89d40cbe3390fb7a0dce4e5ebc1d354a4380a8 | |
parent | f6bd266ea88ba0b071ff727fe655b3d9de3db4ec (diff) | |
download | busybox-w32-1ae26218b9700756ff723a065f011e88f5d3ef81.tar.gz busybox-w32-1ae26218b9700756ff723a065f011e88f5d3ef81.tar.bz2 busybox-w32-1ae26218b9700756ff723a065f011e88f5d3ef81.zip |
MinGW: rename execable -> executable
-rw-r--r-- | coreutils/test.c | 2 | ||||
-rw-r--r-- | debianutils/which.c | 2 | ||||
-rw-r--r-- | include/mingw.h | 2 | ||||
-rw-r--r-- | libbb/executable.c | 2 | ||||
-rw-r--r-- | 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) | |||
653 | if (file_is_executable(nm)) { | 653 | if (file_is_executable(nm)) { |
654 | return 1; | 654 | return 1; |
655 | } | 655 | } |
656 | else if ((p=win32_execable_file(nm))) { | 656 | else if ((p=file_is_win32_executable(nm))) { |
657 | free(p); | 657 | free(p); |
658 | return 1; | 658 | return 1; |
659 | } | 659 | } |
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) | |||
51 | puts(*argv); | 51 | puts(*argv); |
52 | } | 52 | } |
53 | #if ENABLE_PLATFORM_MINGW32 | 53 | #if ENABLE_PLATFORM_MINGW32 |
54 | else if ((p=win32_execable_file(*argv)) != NULL) { | 54 | else if ((p=file_is_win32_executable(*argv)) != NULL) { |
55 | missing = 0; | 55 | missing = 0; |
56 | puts(p); | 56 | puts(p); |
57 | free(p); | 57 | 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); | |||
433 | const char *get_busybox_exec_path(void); | 433 | const char *get_busybox_exec_path(void); |
434 | void init_winsock(void); | 434 | void init_winsock(void); |
435 | 435 | ||
436 | char *win32_execable_file(const char *p); | 436 | 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) | |||
61 | return p; | 61 | return p; |
62 | } | 62 | } |
63 | #if ENABLE_PLATFORM_MINGW32 | 63 | #if ENABLE_PLATFORM_MINGW32 |
64 | else if ((w=win32_execable_file(p))) { | 64 | else if ((w=file_is_win32_executable(p))) { |
65 | *PATHp = n; | 65 | *PATHp = n; |
66 | free(p); | 66 | free(p); |
67 | return w; | 67 | 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) | |||
930 | * | 930 | * |
931 | * if path already has a suffix don't even bother trying | 931 | * if path already has a suffix don't even bother trying |
932 | */ | 932 | */ |
933 | char *win32_execable_file(const char *p) | 933 | char *file_is_win32_executable(const char *p) |
934 | { | 934 | { |
935 | char *path; | 935 | char *path; |
936 | int len = strlen(p); | 936 | int len = strlen(p); |