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

diff --git a/debianutils/which.c b/debianutils/which.c
index ccfd16344..c0f897809 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -1,96 +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>
  *
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
- *
- * 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
- *
- * 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.
 
+//applet:IF_WHICH(APPLET(which, BB_DIR_USR_BIN, BB_SUID_DROP))
 
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+//kbuild:lib-$(CONFIG_WHICH) += which.o
 
-#include "busybox.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"
 
-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;
+	const char *env_path;
+	int status = 0;
 
-	if (argc <= 1 || **(argv + 1) == '-') {
-		bb_show_usage();
-	}
-	argc--;
+	env_path = getenv("PATH");
+	if (!env_path)
+		env_path = bb_default_root_path;
 
-	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;
-	}
+	opt_complementary = "-1"; /* at least one argument */
+	getopt32(argv, "a");
+	argv += optind;
 
-	while (argc-- > 0) { 
-		char *buf;
-		char *path_n;
-		char found = 0;
-		argv++;
+	do {
+		int missing = 1;
 
-		/*
-		 * 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;
+		/* If file contains a slash don't use PATH */
+		if (strchr(*argv, '/')) {
+			if (file_is_executable(*argv)) {
+				missing = 0;
+				puts(*argv);
+			}
 		} else {
-			for (i = 0; i < count; i++) {
-				buf = concat_path_file(path_n, *argv);
-				if (access(buf, X_OK) == 0) {
-					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 += (strlen(path_n) + 1);
 			}
+			free(path);
 		}
-		if (found) {
-			puts(buf);
-		} else {
-			status = EXIT_FAILURE;
-		}
-	}
+		status |= missing;
+	} while (*++argv);
+
 	return status;
 }
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/