emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb: rename execable -> executable. No code changes

Browse Source 
English speakers complained that it sounded awfully broken.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2014-05-02 17:15:58 +02:00
parent 15a357e596
commit e765b5ac34
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
debianutils/which.c
View File

@@ -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);