Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/debianutils/which.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/debianutils/which.c (modified) (1 diff)

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

@@ -4 +4 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu>
  *
- * Licensed under the GPL v2, see the file LICENSE in this tarball.
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  *
  * Based on which from debianutils
  */
 
-#include "busybox.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
+#include "libbb.h"
 
-
-static int is_executable_file(const char const * a, struct stat *b)
-{
-    return (!access(a,X_OK) && !stat(a, b) && S_ISREG(b->st_mode));
-}
-
+int which_main(int argc, char **argv);
 int which_main(int argc, char **argv)
 {
-    int status;
-    size_t i, count;
-    char *path_list;
+    int status = EXIT_SUCCESS;
+    char *p;
 
-    if (argc <= 1 || **(argv + 1) == '-') {
+    if (argc <= 1 || argv[1][0] == '-') {
         bb_show_usage();
     }
-    argc--;
 
-    path_list = getenv("PATH");
-    if (path_list != NULL) {
-        size_t path_len = strlen(path_list);
-        char *new_list = NULL;
-        count = 1;
+/* We shouldn't do this. Ever. Not our business.
+    if (!getenv("PATH")) {
+        putenv((char*)bb_PATH_root_path);
+    }
+*/
 
-        for (i = 0; i <= path_len; i++) {
-            char *this_i = &path_list[i];
-            if (*this_i == ':') {
-                /* ^::[^:] == \.: */
-                if (!i && (*(this_i + 1) == ':')) {
-                    *this_i = '.';
-                    continue;
-                }
-                *this_i = 0;
-                count++;
-                /* ^:[^:] == \.0 and [^:]::[^:] == 0\.0 and [^:]:$ == 0\.0 */
-                if (!i || (*(this_i + 1) == ':') || (i == path_len-1)) {
-                    new_list = xrealloc(new_list, path_len += 1);
-                    if (i) {
-                        memmove(&new_list[i+2], &path_list[i+1], path_len-i);
-                        new_list[i+1] = '.';
-                        memmove(new_list, path_list, i);
-                    } else {
-                        memmove(&new_list[i+1], &path_list[i], path_len-i);
-                        new_list[i] = '.';
-                    }
-                    path_list = new_list;
-                }
+    while (--argc > 0) {
+        argv++;
+        if (strchr(*argv, '/')) {
+            if (execable_file(*argv)) {
+                puts(*argv);
+                continue;
+            }
+        } else {
+            p = find_execable(*argv);
+            if (p) {
+                puts(p);
+                free(p);
+                continue;
             }
         }
-    } else {
-        path_list = "/bin\0/sbin\0/usr/bin\0/usr/sbin\0/usr/local/bin";
-        count = 5;
+        status = EXIT_FAILURE;
     }
 
-    status = EXIT_SUCCESS;
-    while (argc-- > 0) {
-        struct stat stat_b;
-        char *buf;
-        char *path_n;
-        int found = 0;
-
-        argv++;
-        path_n = path_list;
-        buf = *argv;
-
-        /* if filename is either absolute or contains slashes,
-         * stat it */
-        if (strchr(buf, '/') != NULL && is_executable_file(buf, &stat_b)) {
-            found++;
-        } else {
-            /* Couldn't access file and file doesn't contain slashes */
-            for (i = 0; i < count; i++) {
-                buf = concat_path_file(path_n, *argv);
-                if (is_executable_file(buf, &stat_b)) {
-                    found++;
-                    break;
-                }
-                free(buf);
-                path_n += (strlen(path_n) + 1);
-            }
-        }
-        if (found) {
-            puts(buf);
-        } else {
-            status = EXIT_FAILURE;
-        }
-    }
-    bb_fflush_stdout_and_exit(status);
+    fflush_stdout_and_exit(status);
 }