Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/debianutils/which.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/debianutils/which.c (modified) (4 diffs)

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

@@ -6 +6 @@
  * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Based on which from debianutils
@@ -13 +13 @@
 #include "libbb.h"
 
-int which_main(int argc, char **argv);
-int which_main(int argc, char **argv)
+int which_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int which_main(int argc UNUSED_PARAM, char **argv)
 {
+    IF_DESKTOP(int opt;)
     int status = EXIT_SUCCESS;
+    char *path;
     char *p;
 
-    if (argc <= 1 || argv[1][0] == '-') {
-        bb_show_usage();
+    opt_complementary = "-1"; /* at least one argument */
+    IF_DESKTOP(opt =) 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=" */
     }
 
-/* We shouldn't do this. Ever. Not our business.
-    if (!getenv("PATH")) {
-        putenv((char*)bb_PATH_root_path);
-    }
-*/
+    do {
+#if ENABLE_DESKTOP
+/* Much bloat just to support -a */
+        if (strchr(*argv, '/')) {
+            if (execable_file(*argv)) {
+                puts(*argv);
+                continue;
+            }
+            status = EXIT_FAILURE;
+        } else {
+            char *path2 = xstrdup(path);
+            char *tmp = path2;
 
-    while (--argc > 0) {
-        argv++;
+            p = find_execable(*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_execable(*argv, &tmp);
+                        if (p)
+                            goto print;
+                    }
+                }
+            }
+            free(path2);
+        }
+#else
+/* Just ignoring -a */
         if (strchr(*argv, '/')) {
             if (execable_file(*argv)) {
@@ -37 +73 @@
             }
         } else {
-            p = find_execable(*argv);
+            char *path2 = xstrdup(path);
+            char *tmp = path2;
+            p = find_execable(*argv, &tmp);
+            free(path2);
             if (p) {
                 puts(p);
@@ -45 +84 @@
         }
         status = EXIT_FAILURE;
-    }
+#endif
+    } while (*(++argv) != NULL);
 
     fflush_stdout_and_exit(status);