Merge branch 'busybox' into merge

1 files changed, 4 insertions, 3 deletions

diff --git a/debianutils/which.c b/debianutils/which.c
index 23a481438..fbfd19cdc 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -12,7 +12,7 @@
 //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))
+//applet:IF_WHICH(APPLET_NOFORK(which, which, BB_DIR_USR_BIN, BB_SUID_DROP, which))
 
 //kbuild:lib-$(CONFIG_WHICH) += which.o
 
@@ -37,8 +37,7 @@ int which_main(int argc UNUSED_PARAM, char **argv)
         if (!env_path)
                 env_path = bb_default_root_path;
 
-        opt_complementary = "-1"; /* at least one argument */
-        getopt32(argv, "a");
+        getopt32(argv, "^" "a" "\0" "-1"/*at least one arg*/);
         argv += optind;
 
         do {
@@ -73,6 +72,8 @@ int which_main(int argc UNUSED_PARAM, char **argv)
                         char *tmp;
 
                         path = tmp = xstrdup(env_path);
+//NOFORK FIXME: nested xmallocs (one is inside find_executable())
+//can leak memory on failure
                         while ((p = find_executable(*argv, &tmp)) != NULL) {
                                 missing = 0;
                                 puts(p);