From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Sat, 3 Jan 2015 13:58:15 +0100
Subject: patch to Vanilla Tomato 1.28

---
 release/src/router/busybox/debianutils/which.c | 136 +++++++++++++------------
 1 file changed, 73 insertions(+), 63 deletions(-)

(limited to 'release/src/router/busybox/debianutils/which.c')

diff --git a/release/src/router/busybox/debianutils/which.c b/release/src/router/busybox/debianutils/which.c
index 79a89c4e..748e6dc2 100644
--- a/release/src/router/busybox/debianutils/which.c
+++ b/release/src/router/busybox/debianutils/which.c
@@ -2,79 +2,89 @@
 /*
  * Which implementation for busybox
  *
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu>
  *
- * 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
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  *
+ * Based on which from debianutils
  */
 
-/* getopt not needed */
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "busybox.h"
+#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, *path_n;
-	struct stat filestat;
-	int i, count=1, found, status = EXIT_SUCCESS;
+	USE_DESKTOP(int opt;)
+	int status = EXIT_SUCCESS;
+	char *path;
+	char *p;
 
-	if (argc <= 1 || **(argv + 1) == '-')
-		bb_show_usage();
-	argc--;
+	opt_complementary = "-1"; /* at least one argument */
+	USE_DESKTOP(opt =) getopt32(argv, "a");
+	argv += optind;
 
-	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;
+	/* 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=" */
 	}
 
-	while(argc-- > 0) { 
-		path_n = path_list;
-		argv++;
-		found = 0;
-		for (i = 0; i < count; i++) {
-			char *buf;
-			buf = concat_path_file(path_n, *argv);
-			if (stat (buf, &filestat) == 0
-			    && filestat.st_mode & S_IXUSR)
-			{
-				puts(buf);
-				found = 1;
-				break;
+	do {
+#if ENABLE_DESKTOP
+/* Much bloat just to support -a */
+		if (strchr(*argv, '/')) {
+			if (execable_file(*argv)) {
+				puts(*argv);
+				continue;
 			}
-			free(buf);
-			path_n += (strlen(path_n) + 1);
-		}
-		if (!found)
 			status = EXIT_FAILURE;
-	}
-	return status;
-}
+		} else {
+			char *path2 = xstrdup(path);
+			char *tmp = path2;
 
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+			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(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;
+#endif
+	} while (*(++argv) != NULL);
+
+	fflush_stdout_and_exit(status);
+}
-- 
cgit v1.2.3-54-g00ecf