X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=debianutils%2Fwhich.c;h=c0f897809825a9ad725b88e09b5b5af113e7ed42;hb=2b1559056cf32c42675ecd937796e1455bcb5c2c;hp=deb036aa0fb5920d58a1e46f57f016e9b7ee3016;hpb=db485cf7bce5cccaa9516377279aeee9f87c391b;p=oweals%2Fbusybox.git

diff --git a/debianutils/which.c b/debianutils/which.c
index deb036aa0..c0f897809 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -1,109 +1,72 @@
 /* vi: set sw=4 ts=4: */
 /*
- * 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, see the file LICENSE in this tarball.
- *
- * Based on which from debianutils
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+//config:config WHICH
+//config:	bool "which"
+//config:	default y
+//config:	help
+//config:	  which is used to find programs in your PATH and
+//config:	  print out their pathnames.
 
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include "busybox.h"
+//applet:IF_WHICH(APPLET(which, BB_DIR_USR_BIN, BB_SUID_DROP))
 
-extern int which_main(int argc, char **argv)
-{
-	int status = EXIT_SUCCESS;
-	size_t i, count;
-	char *path_list;
+//kbuild:lib-$(CONFIG_WHICH) += which.o
 
-	if (argc <= 1 || **(argv + 1) == '-') {
-		bb_show_usage();
-	}
-	argc--;
+//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"
 
-	path_list = getenv("PATH");
-	if (path_list != NULL) {
-		size_t path_len = bb_strlen(path_list);
-		char *new_list = NULL;
-		count = 1;
+#include "libbb.h"
 
-		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;
-				}
-			}
-		}
-	} else {
-		path_list = "/bin\0/sbin\0/usr/bin\0/usr/sbin\0/usr/local/bin";
-		count = 5;
-	}
+int which_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int which_main(int argc UNUSED_PARAM, char **argv)
+{
+	const char *env_path;
+	int status = 0;
+
+	env_path = getenv("PATH");
+	if (!env_path)
+		env_path = bb_default_root_path;
 
-	while (argc-- > 0) {
-		struct stat stat_b;
-		char *buf;
-		char *path_n;
-		char found = 0;
-#define is_executable_file(a, b) (!access(a,X_OK) && !stat(a, &b) && \
-		S_ISREG(b.st_mode))
+	opt_complementary = "-1"; /* at least one argument */
+	getopt32(argv, "a");
+	argv += optind;
 
-		argv++;
-		path_n = path_list;
-		buf = *argv;
+	do {
+		int missing = 1;
 
-		/* if filename is either absolute or contains slashes,
-		 * stat it */
-		if (strchr(buf, '/') != NULL && is_executable_file(buf, stat_b)) {
-			found = 1;
+		/* If file contains a slash don't use PATH */
+		if (strchr(*argv, '/')) {
+			if (file_is_executable(*argv)) {
+				missing = 0;
+				puts(*argv);
+			}
 		} 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 = 1;
+			char *path;
+			char *tmp;
+			char *p;
+
+			path = tmp = xstrdup(env_path);
+			while ((p = find_executable(*argv, &tmp)) != NULL) {
+				missing = 0;
+				puts(p);
+				free(p);
+				if (!option_mask32) /* -a not set */
 					break;
-				}
-				free(buf);
-				path_n += (bb_strlen(path_n) + 1);
 			}
+			free(path);
 		}
-		if (found) {
-			puts(buf);
-		} else {
-			status = EXIT_FAILURE;
-		}
-	}
-	bb_fflush_stdout_and_exit(status);
-}
+		status |= missing;
+	} while (*++argv);
 
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+	return status;
+}