Apply post-1.17.3 fixes, bump version to 1.17.4

[oweals/busybox.git] / debianutils / which.c

diff --git a/debianutils/which.c b/debianutils/which.c
index 1e9d276fd831f28db18af64dd38793663fdf107c..1558e5c6daa03760e5514f1a516e6da15151529a 100644 (file)
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -2,95 +2,89 @@
 /*
  * Which implementation for busybox
  *
- * Copyright (C) 1999-2003 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>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  *
  * Based on which from debianutils
  */
 
+#include "libbb.h"
 
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "busybox.h"
-
-
-extern 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)
 {
-       char *path_list;
-       int i, count=1, status = EXIT_SUCCESS;
+       IF_DESKTOP(int opt;)
+       int status = EXIT_SUCCESS;
+       char *path;
+       char *p;
 
-       if (argc <= 1 || **(argv + 1) == '-') {
-               bb_show_usage();
-       }
-       argc--;
+       opt_complementary = "-1"; /* at least one argument */
+       IF_DESKTOP(opt =) getopt32(argv, "a");
+       argv += optind;
 
-       path_list = getenv("PATH");
-       if (path_list != NULL) {
-               for (i=strlen(path_list); i > 0; i--) {
-                       if (path_list[i]==':') {
-                               path_list[i]=0;
-                               count++;
-                       }
-               }
-       } else {
-               path_list = "/bin\0/sbin\0/usr/bin\0/usr/sbin\0/usr/local/bin";
-               count = 5;
+       /* 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=" */
        }
 
-       while (argc-- > 0) { 
-               char *buf;
-               char *path_n;
-               argv++;
-               char found = 0;
-
-               /*
-                * Check if we were given the full path, first.
-                * Otherwise see if the file exists in our $PATH.
-                */
-               path_n = path_list;
-               buf = *argv;
-               if (access(buf, X_OK) == 0) {
-                       found = 1;
+       do {
+#if ENABLE_DESKTOP
+/* Much bloat just to support -a */
+               if (strchr(*argv, '/')) {
+                       if (execable_file(*argv)) {
+                               puts(*argv);
+                               continue;
+                       }
+                       status = EXIT_FAILURE;
                } else {
-                       for (i = 0; i < count; i++) {
-                               buf = concat_path_file(path_n, *argv);
-                               if (access(buf, X_OK) == 0) {
-                                       found = 1;
-                                       break;
+                       char *path2 = xstrdup(path);
+                       char *tmp = path2;
+
+                       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(buf);
-                               path_n += (strlen(path_n) + 1);
                        }
+                       free(path2);
                }
-               if (found) {
-                       puts(buf);
+#else
+/* Just ignoring -a */
+               if (strchr(*argv, '/')) {
+                       if (execable_file(*argv)) {
+                               puts(*argv);
+                               continue;
+                       }
                } else {
-                       status = EXIT_FAILURE;
+                       char *path2 = xstrdup(path);
+                       char *tmp = path2;
+                       p = find_execable(*argv, &tmp);
+                       free(path2);
+                       if (p) {
+                               puts(p);
+                               free(p);
+                               continue;
+                       }
                }
-       }
-       return status;
-}
+               status = EXIT_FAILURE;
+#endif
+       } while (*(++argv) != NULL);
 
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+       fflush_stdout_and_exit(status);
+}