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

which: rewrite

Browse Source 
function                                             old     new   delta
which_main                                           237     212     -25

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Timo Teräs 2014-05-03 16:34:36 +02:00 committed by Denys Vlasenko
parent e765b5ac34
commit 1e3cce6814
1 changed files with 24 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
debianutils/which.c
View File

@ -1,13 +1,9 @@
/* vi: set sw=4 ts=4: */ /* vi: set sw=4 ts=4: */
/* /*
* Which implementation for busybox
*
* Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
* Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu> * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu>
* *
* Licensed under GPLv2 or later, see file LICENSE in this source tree. * Licensed under GPLv2 or later, see file LICENSE in this source tree.
*
* Based on which from debianutils
*/ */
//usage:#define which_trivial_usage //usage:#define which_trivial_usage
@ -24,76 +20,43 @@
int which_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int which_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int which_main(int argc UNUSED_PARAM, char **argv) int which_main(int argc UNUSED_PARAM, char **argv)
{ {
IF_DESKTOP(int opt;) const char *env_path;
int status = EXIT_SUCCESS; int status = 0;
char *path;
char *p; env_path = getenv("PATH");
if (!env_path)
env_path = bb_default_root_path;
opt_complementary = "-1"; /* at least one argument */ opt_complementary = "-1"; /* at least one argument */
IF_DESKTOP(opt =) getopt32(argv, "a"); getopt32(argv, "a");
argv += optind; argv += optind;
/* This matches what is seen on e.g. ubuntu.
* "which" there is a shell script. */
path = getenv("PATH");
if (!path) {
path = (char*)bb_PATH_root_path;
putenv(path);
path += 5; /* skip "PATH=" */
}
do { do {
#if ENABLE_DESKTOP int missing = 1;
/* Much bloat just to support -a */
/* If file contains a slash don't use PATH */
if (strchr(*argv, '/')) { if (strchr(*argv, '/')) {
if (file_is_executable(*argv)) { if (file_is_executable(*argv)) {
missing = 0;
puts(*argv); puts(*argv);
continue;
}
status = EXIT_FAILURE;
} else {
char *path2 = xstrdup(path);
char *tmp = path2;
p = find_executable(*argv, &tmp);
if (!p)
status = EXIT_FAILURE;
else {
print:
puts(p);
free(p);
if (opt) {
/* -a: show matches in all PATH components */
if (tmp) {
p = find_executable(*argv, &tmp);
if (p)
goto print;
}
}
}
free(path2);
}
#else
/* Just ignoring -a */
if (strchr(*argv, '/')) {
if (file_is_executable(*argv)) {
puts(*argv);
continue;
} }
} else { } else {
char *path2 = xstrdup(path); char *path;
char *tmp = path2; char *tmp;
p = find_executable(*argv, &tmp); char *p;
free(path2);
if (p) { path = tmp = xstrdup(env_path);
while ((p = find_executable(*argv, &tmp)) != NULL) {
missing = 0;
puts(p); puts(p);
free(p); free(p);
continue; if (!option_mask32) /* -a not set */
break;
} }
free(path);
} }
status = EXIT_FAILURE; status |= missing;
#endif } while (*++argv);
} while (*(++argv) != NULL);
fflush_stdout_and_exit(status); return status;
} }