X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=debianutils%2Fwhich.c;h=15fd598b782f7076ab59dbf27730518affaf3d0c;hb=0bfb9c2cf0e8b711634014e06d39b5f47c5a95c2;hp=583d9461368fe589f4b34ecab5560e170e0960c5;hpb=01c27fc5ac89b07821a5430880d771e3c993c1c1;p=oweals%2Fbusybox.git

diff --git a/debianutils/which.c b/debianutils/which.c
index 583d94613..15fd598b7 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -3,81 +3,97 @@
  * 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 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
  */
 
-#include "busybox.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
+//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"
 
-static int is_executable_file(char *a, struct stat *b)
+int which_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int which_main(int argc UNUSED_PARAM, char **argv)
 {
-	return (!access(a,X_OK) && !stat(a, b) && S_ISREG(b->st_mode));
-}
+	IF_DESKTOP(int opt;)
+	int status = EXIT_SUCCESS;
+	char *path;
+	char *p;
 
-int which_main(int argc, char **argv)
-{
-	int status;
-	size_t i, count;
-	char *path_list, *p;
+	opt_complementary = "-1"; /* at least one argument */
+	IF_DESKTOP(opt =) getopt32(argv, "a");
+	argv += optind;
 
-	if (argc <= 1 || argv[1][0] == '-') {
-		bb_show_usage();
+	/* 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=" */
 	}
-	argc--;
-
-	path_list = getenv("PATH");
-	if (path_list != NULL) {
-		count = 1;
-		p = path_list;
-		while ((p = strchr(p, ':')) != NULL) {
-			*p++ = 0;
-			count++;
-		}
-	} else {
-		path_list = "/bin\0/sbin\0/usr/bin\0/usr/sbin\0/usr/local/bin";
-		count = 5;
-	}
-
-	status = EXIT_SUCCESS;
-	while (argc-- > 0) {
-		struct stat stat_b;
-		char *buf;
-
-		argv++;
-		buf = argv[0];
 
-		/* If filename is either absolute or contains slashes,
-		 * stat it */
-		if (strchr(buf, '/')) {
-			if (is_executable_file(buf, &stat_b)) {
-				puts(buf);
-				goto next;
+	do {
+#if ENABLE_DESKTOP
+/* Much bloat just to support -a */
+		if (strchr(*argv, '/')) {
+			if (execable_file(*argv)) {
+				puts(*argv);
+				continue;
 			}
+			status = EXIT_FAILURE;
 		} else {
-			/* File doesn't contain slashes */
-			p = path_list;
-			for (i = 0; i < count; i++) {
-				/* Empty component in PATH is treated as . */
-				buf = concat_path_file(p[0] ? p : ".", argv[0]);
-				if (is_executable_file(buf, &stat_b)) {
-					puts(buf);
-					free(buf);
-					goto next;
+			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);
-				p += strlen(p) + 1;
+			}
+			free(path2);
+		}
+#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;
- next:		/* nothing */;
-	}
-	bb_fflush_stdout_and_exit(status);
+#endif
+	} while (*(++argv) != NULL);
+
+	fflush_stdout_and_exit(status);
 }