X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=debianutils%2Fwhich.c;h=b556a9fd96392f5f5c96a691909b91405295be98;hb=ebeaea04dc2b2e75048262355fbfb970e5c92595;hp=db28f78032976443a3508db97fd219e1321c8aa4;hpb=7fee0c4357aa8c218acdfe0f1eda0a157dad9f29;p=oweals%2Fbusybox.git

diff --git a/debianutils/which.c b/debianutils/which.c
index db28f7803..b556a9fd9 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -3,104 +3,48 @@
  * 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
  */
 
-#include "busybox.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
-
-static int is_executable_file(char *a, struct stat *b)
-{
-	return (!access(a,X_OK) && !stat(a, b) && S_ISREG(b->st_mode));
-}
+#include "libbb.h"
 
+int which_main(int argc, char **argv);
 int which_main(int argc, char **argv)
 {
-	int status;
-	size_t i, count;
-	char *path_list;
+	int status = EXIT_SUCCESS;
+	char *p;
 
-	if (argc <= 1 || **(argv + 1) == '-') {
+	if (argc <= 1 || argv[1][0] == '-') {
 		bb_show_usage();
 	}
-	argc--;
 
-	path_list = getenv("PATH");
-	if (path_list != NULL) {
-		size_t path_len = strlen(path_list);
-		char *new_list = NULL;
-		count = 1;
-
-		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;
+/* We shouldn't do this. Ever. Not our business.
+	if (!getenv("PATH")) {
+		putenv((char*)bb_PATH_root_path);
 	}
+*/
 
-	status = EXIT_SUCCESS;
-	while (argc-- > 0) {
-		struct stat stat_b;
-		char *buf;
-		char *path_n;
-		int found = 0;
-
+	while (--argc > 0) {
 		argv++;
-		path_n = path_list;
-		buf = *argv;
-
-		/* if filename is either absolute or contains slashes,
-		 * stat it */
-		if (strchr(buf, '/') != NULL && is_executable_file(buf, &stat_b)) {
-			found++;
-		} 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++;
-					break;
-				}
-				free(buf);
-				path_n += (strlen(path_n) + 1);
+		if (strchr(*argv, '/')) {
+			if (execable_file(*argv)) {
+				puts(*argv);
+				continue;
 			}
-		}
-		if (found) {
-			puts(buf);
 		} else {
-			status = EXIT_FAILURE;
+			p = find_execable(*argv);
+			if (p) {
+				puts(p);
+				free(p);
+				continue;
+			}
 		}
+		status = EXIT_FAILURE;
 	}
-	bb_fflush_stdout_and_exit(status);
+
+	fflush_stdout_and_exit(status);
 }