Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/findutils/xargs.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/findutils/xargs.c (modified) (5 diffs)

branches/3.2/mindi-busybox/findutils/xargs.c

@@ -15 +15 @@
  * http://www.opengroup.org/onlinepubs/007904975/utilities/xargs.html
  */
-
-//applet:IF_XARGS(APPLET_NOEXEC(xargs, xargs, _BB_DIR_USR_BIN, _BB_SUID_DROP, xargs))
-
-//kbuild:lib-$(CONFIG_XARGS) += xargs.o
 
 //config:config XARGS
@@ -59 +55 @@
 //config:     are not special.
 
+//applet:IF_XARGS(APPLET_NOEXEC(xargs, xargs, BB_DIR_USR_BIN, BB_SUID_DROP, xargs))
+
+//kbuild:lib-$(CONFIG_XARGS) += xargs.o
+
 #include "libbb.h"
 
@@ -90 +90 @@
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define INIT_G() do { \
+    G.eof_str = NULL; /* need to clear by hand because we are NOEXEC applet */ \
+} while (0)
 
 
@@ -348 +350 @@
 //usage:#define xargs_full_usage "\n\n"
 //usage:       "Run PROG on every item given by stdin\n"
-//usage:     "\nOptions:"
 //usage:    IF_FEATURE_XARGS_SUPPORT_CONFIRMATION(
 //usage:     "\n    -p  Ask user whether to run each command"
@@ -413 +414 @@
     INIT_G();
 
-    G.eof_str = NULL;
+#if ENABLE_DESKTOP && ENABLE_LONG_OPTS
+    /* For example, Fedora's build system uses --no-run-if-empty */
+    applet_long_options =
+        "no-run-if-empty\0" No_argument "r"
+        ;
+#endif
     opt = getopt32(argv, OPTION_STR, &max_args, &max_chars, &G.eof_str, &G.eof_str);