summaryrefslogtreecommitdiff
path: root/debianutils
diff options
context:
space:
mode:
authorDenys Vlasenko2014-05-02 17:15:58 +0200
committerDenys Vlasenko2014-05-02 17:15:58 +0200
commite765b5ac349a8f9305e52b3ab2c3ac78c17bf283 (patch)
tree2dec8a3b34450b7088ae7c3a4b374e953c0a4a73 /debianutils
parent15a357e5962634c94ee322fee4da897312090a89 (diff)
downloadbusybox-e765b5ac349a8f9305e52b3ab2c3ac78c17bf283.zip
busybox-e765b5ac349a8f9305e52b3ab2c3ac78c17bf283.tar.gz
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.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/debianutils/which.c b/debianutils/which.c
index 15fd598..760bcdc 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -46,7 +46,7 @@ int which_main(int argc UNUSED_PARAM, char **argv)
#if ENABLE_DESKTOP
/* Much bloat just to support -a */
if (strchr(*argv, '/')) {
- if (execable_file(*argv)) {
+ if (file_is_executable(*argv)) {
puts(*argv);
continue;
}
@@ -55,7 +55,7 @@ int which_main(int argc UNUSED_PARAM, char **argv)
char *path2 = xstrdup(path);
char *tmp = path2;
- p = find_execable(*argv, &tmp);
+ p = find_executable(*argv, &tmp);
if (!p)
status = EXIT_FAILURE;
else {
@@ -65,7 +65,7 @@ int which_main(int argc UNUSED_PARAM, char **argv)
if (opt) {
/* -a: show matches in all PATH components */
if (tmp) {
- p = find_execable(*argv, &tmp);
+ p = find_executable(*argv, &tmp);
if (p)
goto print;
}
@@ -76,14 +76,14 @@ int which_main(int argc UNUSED_PARAM, char **argv)
#else
/* Just ignoring -a */
if (strchr(*argv, '/')) {
- if (execable_file(*argv)) {
+ if (file_is_executable(*argv)) {
puts(*argv);
continue;
}
} else {
char *path2 = xstrdup(path);
char *tmp = path2;
- p = find_execable(*argv, &tmp);
+ p = find_executable(*argv, &tmp);
free(path2);
if (p) {
puts(p);