aboutsummaryrefslogtreecommitdiff
path: root/debianutils
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2017-07-27 10:48:30 +0100
committerRon Yorston <rmy@pobox.com>2017-07-27 11:00:31 +0100
commitb30c60a9786a1608211a96755996bd6c02951a27 (patch)
tree8b736bca278d245b8d4ddecba98a72347a689e1f /debianutils
parent1f01a34ecb0e0fbe01ec6e8ab04256a9a05a3c46 (diff)
downloadbusybox-w32-b30c60a9786a1608211a96755996bd6c02951a27.tar.gz
busybox-w32-b30c60a9786a1608211a96755996bd6c02951a27.tar.bz2
busybox-w32-b30c60a9786a1608211a96755996bd6c02951a27.zip
Allow PREFER_APPLETS and SH_STANDALONE to be set separately
Upstream BusyBox allows PREFER_APPLETS and SH_STANDALONE to be set independently. Allow such configurations to work in busybox-w32.
Diffstat (limited to 'debianutils')
-rw-r--r--debianutils/which.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/debianutils/which.c b/debianutils/which.c
index 491557167..23a481438 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -45,8 +45,9 @@ int which_main(int argc UNUSED_PARAM, char **argv)
45 int missing = 1; 45 int missing = 1;
46 char *p; 46 char *p;
47 47
48#if ENABLE_FEATURE_PREFER_APPLETS 48#if ENABLE_FEATURE_SH_STANDALONE
49 if (find_applet_by_name(*argv) >= 0 || strcmp(*argv, "busybox") == 0) { 49 if (find_applet_by_name(*argv) >= 0 ||
50 is_prefixed_with(*argv, "busybox")) {
50 missing = 0; 51 missing = 0;
51 puts(*argv); 52 puts(*argv);
52 if (!option_mask32) /* -a not set */ 53 if (!option_mask32) /* -a not set */