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

diff --git a/debianutils/which.c b/debianutils/which.c
index 583d94613..c0f897809 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -1,83 +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 or later, 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 "busybox.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
+//applet:IF_WHICH(APPLET(which, BB_DIR_USR_BIN, BB_SUID_DROP))
 
+//kbuild:lib-$(CONFIG_WHICH) += which.o
 
-static int is_executable_file(char *a, struct stat *b)
-{
-	return (!access(a,X_OK) && !stat(a, b) && S_ISREG(b->st_mode));
-}
+//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"
 
-int which_main(int argc, char **argv)
-{
-	int status;
-	size_t i, count;
-	char *path_list, *p;
+#include "libbb.h"
 
-	if (argc <= 1 || argv[1][0] == '-') {
-		bb_show_usage();
-	}
-	argc--;
+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;
 
-	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;
-	}
+	env_path = getenv("PATH");
+	if (!env_path)
+		env_path = bb_default_root_path;
 
-	status = EXIT_SUCCESS;
-	while (argc-- > 0) {
-		struct stat stat_b;
-		char *buf;
+	opt_complementary = "-1"; /* at least one argument */
+	getopt32(argv, "a");
+	argv += optind;
 
-		argv++;
-		buf = argv[0];
+	do {
+		int missing = 1;
 
-		/* If filename is either absolute or contains slashes,
-		 * stat it */
-		if (strchr(buf, '/')) {
-			if (is_executable_file(buf, &stat_b)) {
-				puts(buf);
-				goto next;
+		/* If file contains a slash don't use PATH */
+		if (strchr(*argv, '/')) {
+			if (file_is_executable(*argv)) {
+				missing = 0;
+				puts(*argv);
 			}
 		} 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;
-				}
-				free(buf);
-				p += strlen(p) + 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(path);
 		}
-		status = EXIT_FAILURE;
- next:		/* nothing */;
-	}
-	bb_fflush_stdout_and_exit(status);
+		status |= missing;
+	} while (*++argv);
+
+	return status;
 }