aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2024-12-31 08:21:12 +0000
committerRon Yorston <rmy@pobox.com>2024-12-31 08:21:12 +0000
commit0e8bc6527c9d4b9af17e9b0f759b1ad12ae1bc35 (patch)
treec07010a56828af6c8dcd4f4313063c1a86635541
parent370ce52cca8e7e8a341d5e238a79fd67f6048bb6 (diff)
downloadbusybox-w32-0e8bc6527c9d4b9af17e9b0f759b1ad12ae1bc35.tar.gz
busybox-w32-0e8bc6527c9d4b9af17e9b0f759b1ad12ae1bc35.tar.bz2
busybox-w32-0e8bc6527c9d4b9af17e9b0f759b1ad12ae1bc35.zip
win32: fix compilation with FEATURE_SH_NOFORK disabled
Compiling with FEATURE_SH_NOFORK disabled resulted in an error and a warning. Fixing these doesn't change the default build.
-rw-r--r--findutils/xargs.c6
-rw-r--r--win32/process.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/findutils/xargs.c b/findutils/xargs.c
index f0abf1a23..83af75521 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -846,11 +846,11 @@ int xargs_main(int argc UNUSED_PARAM, char **argv)
846 * arguments, but not if the command is a NOFORK applet. If the rules 846 * arguments, but not if the command is a NOFORK applet. If the rules
847 * to detect this situation change xargs_exec() above will also need 847 * to detect this situation change xargs_exec() above will also need
848 * to be updated. */ 848 * to be updated. */
849# if ENABLE_FEATURE_XARGS_SUPPORT_PARALLEL 849# if ENABLE_FEATURE_PREFER_APPLETS && (NUM_APPLETS > 1)
850# if ENABLE_FEATURE_XARGS_SUPPORT_PARALLEL
850 if (G.max_procs == 1) 851 if (G.max_procs == 1)
851# endif 852# endif
852 { 853 {
853# if ENABLE_FEATURE_PREFER_APPLETS && (NUM_APPLETS > 1)
854 int applet = find_applet_by_name(argv[0]); 854 int applet = find_applet_by_name(argv[0]);
855 if (applet >= 0 && APPLET_IS_NOFORK(applet)) { 855 if (applet >= 0 && APPLET_IS_NOFORK(applet)) {
856 quote = FALSE; 856 quote = FALSE;
diff --git a/win32/process.c b/win32/process.c
index e7c9ca187..fd89707ca 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -331,7 +331,9 @@ mingw_spawn_interpreter(int mode, const char *prog, char *const *argv,
331 } else { 331 } else {
332 errno = ENOENT; 332 errno = ENOENT;
333 } 333 }
334#if ENABLE_FEATURE_PREFER_APPLETS && NUM_APPLETS > 1
334 done: 335 done:
336#endif
335 free(path); 337 free(path);
336 free(new_argv); 338 free(new_argv);
337 return ret; 339 return ret;