Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/debianutils/which.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/debianutils/which.c (modified) (2 diffs)

branches/3.3/mindi-busybox/debianutils/which.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Which implementation for busybox
- *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- *
- * Based on which from debianutils
  */
+//config:config WHICH
+//config:   bool "which"
+//config:   default y
+//config:   help
+//config:     which is used to find programs in your PATH and
+//config:     print out their pathnames.
+
+//applet:IF_WHICH(APPLET(which, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_WHICH) += which.o
 
 //usage:#define which_trivial_usage
@@ -25 +31 @@
 int which_main(int argc UNUSED_PARAM, char **argv)
 {
-    IF_DESKTOP(int opt;)
-    int status = EXIT_SUCCESS;
-    char *path;
-    char *p;
+    const char *env_path;
+    int status = 0;
+
+    env_path = getenv("PATH");
+    if (!env_path)
+        env_path = bb_default_root_path;
 
     opt_complementary = "-1"; /* at least one argument */
-    IF_DESKTOP(opt =) getopt32(argv, "a");
+    getopt32(argv, "a");
     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 {
+        int missing = 1;
 
-    do {
-#if ENABLE_DESKTOP
-/* Much bloat just to support -a */
+        /* If file contains a slash don't use PATH */
         if (strchr(*argv, '/')) {
-            if (execable_file(*argv)) {
+            if (file_is_executable(*argv)) {
+                missing = 0;
                 puts(*argv);
-                continue;
             }
-            status = EXIT_FAILURE;
         } else {
-            char *path2 = xstrdup(path);
-            char *tmp = path2;
+            char *path;
+            char *tmp;
+            char *p;
 
-            p = find_execable(*argv, &tmp);
-            if (!p)
-                status = EXIT_FAILURE;
-            else {
- print:
+            path = tmp = xstrdup(env_path);
+            while ((p = find_executable(*argv, &tmp)) != NULL) {
+                missing = 0;
                 puts(p);
                 free(p);
-                if (opt) {
-                    /* -a: show matches in all PATH components */
-                    if (tmp) {
-                        p = find_execable(*argv, &tmp);
-                        if (p)
-                            goto print;
-                    }
-                }
+                if (!option_mask32) /* -a not set */
+                    break;
             }
-            free(path2);
+            free(path);
         }
-#else
-/* Just ignoring -a */
-        if (strchr(*argv, '/')) {
-            if (execable_file(*argv)) {
-                puts(*argv);
-                continue;
-            }
-        } else {
-            char *path2 = xstrdup(path);
-            char *tmp = path2;
-            p = find_execable(*argv, &tmp);
-            free(path2);
-            if (p) {
-                puts(p);
-                free(p);
-                continue;
-            }
-        }
-        status = EXIT_FAILURE;
-#endif
-    } while (*(++argv) != NULL);
+        status |= missing;
+    } while (*++argv);
 
-    fflush_stdout_and_exit(status);
+    return status;
 }