X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=debianutils%2Fwhich.c;h=15fd598b782f7076ab59dbf27730518affaf3d0c;hb=577235dee826eed86d76b0d4ef866297a20ecd55;hp=8838130596d58e6e859fe01e038c6dd84d6343e4;hpb=9b49a5ed8551e46892af3f676e5d96d21b540e3c;p=oweals%2Fbusybox.git

diff --git a/debianutils/which.c b/debianutils/which.c
index 883813059..15fd598b7 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -5,38 +5,86 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  * 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
  */
 
+//usage:#define which_trivial_usage
+//usage:       "[COMMAND]..."
+//usage:#define which_full_usage "\n\n"
+//usage:       "Locate a COMMAND"
+//usage:
+//usage:#define which_example_usage
+//usage:       "$ which login\n"
+//usage:       "/bin/login\n"
+
 #include "libbb.h"
 
 int which_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int which_main(int argc, char **argv)
+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;
 
-/* We shouldn't do this. Ever. Not our business.
-	if (!getenv("PATH")) {
-		putenv((char*)bb_PATH_root_path);
+	/* 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) {
-		argv++;
+	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;
+
+			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)) {
 				puts(*argv);
 				continue;
 			}
 		} else {
-			p = find_execable(*argv);
+			char *path2 = xstrdup(path);
+			char *tmp = path2;
+			p = find_execable(*argv, &tmp);
+			free(path2);
 			if (p) {
 				puts(p);
 				free(p);
@@ -44,7 +92,8 @@ int which_main(int argc, char **argv)
 			}
 		}
 		status = EXIT_FAILURE;
-	}
+#endif
+	} while (*(++argv) != NULL);
 
 	fflush_stdout_and_exit(status);
 }