diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2014-05-02 17:15:58 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2014-05-02 17:15:58 +0200 |
| commit | e765b5ac349a8f9305e52b3ab2c3ac78c17bf283 (patch) | |
| tree | 2dec8a3b34450b7088ae7c3a4b374e953c0a4a73 /debianutils | |
| parent | 15a357e5962634c94ee322fee4da897312090a89 (diff) | |
| download | busybox-w32-e765b5ac349a8f9305e52b3ab2c3ac78c17bf283.tar.gz busybox-w32-e765b5ac349a8f9305e52b3ab2c3ac78c17bf283.tar.bz2 busybox-w32-e765b5ac349a8f9305e52b3ab2c3ac78c17bf283.zip | |
libbb: rename execable -> executable. No code changes
English speakers complained that it sounded awfully broken.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'debianutils')
| -rw-r--r-- | debianutils/which.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debianutils/which.c b/debianutils/which.c index 15fd598b7..760bcdcad 100644 --- a/debianutils/which.c +++ b/debianutils/which.c | |||
| @@ -46,7 +46,7 @@ int which_main(int argc UNUSED_PARAM, char **argv) | |||
| 46 | #if ENABLE_DESKTOP | 46 | #if ENABLE_DESKTOP |
| 47 | /* Much bloat just to support -a */ | 47 | /* Much bloat just to support -a */ |
| 48 | if (strchr(*argv, '/')) { | 48 | if (strchr(*argv, '/')) { |
| 49 | if (execable_file(*argv)) { | 49 | if (file_is_executable(*argv)) { |
| 50 | puts(*argv); | 50 | puts(*argv); |
| 51 | continue; | 51 | continue; |
| 52 | } | 52 | } |
| @@ -55,7 +55,7 @@ int which_main(int argc UNUSED_PARAM, char **argv) | |||
| 55 | char *path2 = xstrdup(path); | 55 | char *path2 = xstrdup(path); |
| 56 | char *tmp = path2; | 56 | char *tmp = path2; |
| 57 | 57 | ||
| 58 | p = find_execable(*argv, &tmp); | 58 | p = find_executable(*argv, &tmp); |
| 59 | if (!p) | 59 | if (!p) |
| 60 | status = EXIT_FAILURE; | 60 | status = EXIT_FAILURE; |
| 61 | else { | 61 | else { |
| @@ -65,7 +65,7 @@ int which_main(int argc UNUSED_PARAM, char **argv) | |||
| 65 | if (opt) { | 65 | if (opt) { |
| 66 | /* -a: show matches in all PATH components */ | 66 | /* -a: show matches in all PATH components */ |
| 67 | if (tmp) { | 67 | if (tmp) { |
| 68 | p = find_execable(*argv, &tmp); | 68 | p = find_executable(*argv, &tmp); |
| 69 | if (p) | 69 | if (p) |
| 70 | goto print; | 70 | goto print; |
| 71 | } | 71 | } |
| @@ -76,14 +76,14 @@ int which_main(int argc UNUSED_PARAM, char **argv) | |||
| 76 | #else | 76 | #else |
| 77 | /* Just ignoring -a */ | 77 | /* Just ignoring -a */ |
| 78 | if (strchr(*argv, '/')) { | 78 | if (strchr(*argv, '/')) { |
| 79 | if (execable_file(*argv)) { | 79 | if (file_is_executable(*argv)) { |
| 80 | puts(*argv); | 80 | puts(*argv); |
| 81 | continue; | 81 | continue; |
| 82 | } | 82 | } |
| 83 | } else { | 83 | } else { |
| 84 | char *path2 = xstrdup(path); | 84 | char *path2 = xstrdup(path); |
| 85 | char *tmp = path2; | 85 | char *tmp = path2; |
| 86 | p = find_execable(*argv, &tmp); | 86 | p = find_executable(*argv, &tmp); |
| 87 | free(path2); | 87 | free(path2); |
| 88 | if (p) { | 88 | if (p) { |
| 89 | puts(p); | 89 | puts(p); |