Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/debianutils/run_parts.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/debianutils/run_parts.c (modified) (6 diffs)

branches/3.3/mindi-busybox/debianutils/run_parts.c

@@ -22 +22 @@
  * report mode. As the original run-parts support only long options, I've
  * broken compatibility because the BusyBox policy doesn't allow them.
- * The supported options are:
- * -t           test. Print the name of the files to be executed, without
- *              execute them.
- * -a ARG       argument. Pass ARG as an argument the program executed. It can
- *              be repeated to pass multiple arguments.
- * -u MASK      umask. Set the umask of the program executed to MASK.
  */
+//config:config RUN_PARTS
+//config:   bool "run-parts"
+//config:   default y
+//config:   help
+//config:     run-parts is a utility designed to run all the scripts in a directory.
+//config:
+//config:     It is useful to set up a directory like cron.daily, where you need to
+//config:     execute all the scripts in that directory.
+//config:
+//config:     In this implementation of run-parts some features (such as report
+//config:     mode) are not implemented.
+//config:
+//config:     Unless you know that run-parts is used in some of your scripts
+//config:     you can safely say N here.
+//config:
+//config:config FEATURE_RUN_PARTS_LONG_OPTIONS
+//config:   bool "Enable long options"
+//config:   default y
+//config:   depends on RUN_PARTS && LONG_OPTS
+//config:   help
+//config:     Support long options for the run-parts applet.
+//config:
+//config:config FEATURE_RUN_PARTS_FANCY
+//config:   bool "Support additional arguments"
+//config:   default y
+//config:   depends on RUN_PARTS
+//config:   help
+//config:     Support additional options:
+//config:     -l --list print the names of the all matching files (not
+//config:               limited to executables), but don't actually run them.
+
+//applet:IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_BIN, BB_SUID_DROP, run_parts))
+
+//kbuild:lib-$(CONFIG_RUN_PARTS) += run_parts.o
 
 //usage:#define run_parts_trivial_usage
-//usage:       "[-t"IF_FEATURE_RUN_PARTS_FANCY("l")"] [-a ARG]... [-u MASK] DIRECTORY"
+//usage:       "[-a ARG]... [-u UMASK] "
+//usage:       IF_FEATURE_RUN_PARTS_LONG_OPTIONS("[--reverse] [--test] [--exit-on-error] "IF_FEATURE_RUN_PARTS_FANCY("[--list] "))
+//usage:       "DIRECTORY"
 //usage:#define run_parts_full_usage "\n\n"
 //usage:       "Run a bunch of scripts in DIRECTORY\n"
-//usage:     "\n    -t  Dry run"
+//usage:     "\n    -a ARG      Pass ARG as argument to scripts"
+//usage:     "\n    -u UMASK    Set UMASK before running scripts"
+//usage:    IF_FEATURE_RUN_PARTS_LONG_OPTIONS(
+//usage:     "\n    --reverse   Reverse execution order"
+//usage:     "\n    --test      Dry run"
+//usage:     "\n    --exit-on-error Exit if a script exits with non-zero"
 //usage:    IF_FEATURE_RUN_PARTS_FANCY(
-//usage:     "\n    -l  Print names of matching files even if they are not executable"
+//usage:     "\n    --list      Print names of matching files even if they are not executable"
 //usage:    )
-//usage:     "\n    -a ARG  Pass ARG as argument to programs"
-//usage:     "\n    -u MASK Set umask to MASK before running programs"
+//usage:    )
 //usage:
 //usage:#define run_parts_example_usage
@@ -56 +90 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 struct globals {
     char **names;
     int    cur;
-    char  *cmd[1];
+    char  *cmd[2 /* using 1 provokes compiler warning */];
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define names (G.names)
 #define cur   (G.cur  )
 #define cmd   (G.cmd  )
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 enum { NUM_CMD = (COMMON_BUFSIZE - sizeof(G)) / sizeof(cmd[0]) - 1 };
 
 enum {
-    OPT_r = (1 << 0),
-    OPT_a = (1 << 1),
-    OPT_u = (1 << 2),
-    OPT_t = (1 << 3),
-    OPT_l = (1 << 4) * ENABLE_FEATURE_RUN_PARTS_FANCY,
+    OPT_a = (1 << 0),
+    OPT_u = (1 << 1),
+    OPT_r = (1 << 2) * ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS,
+    OPT_t = (1 << 3) * ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS,
+    OPT_e = (1 << 4) * ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS,
+    OPT_l = (1 << 5) * ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
+            * ENABLE_FEATURE_RUN_PARTS_FANCY,
 };
-
-#if ENABLE_FEATURE_RUN_PARTS_FANCY
-#define list_mode (option_mask32 & OPT_l)
-#else
-#define list_mode 0
-#endif
 
 /* Is this a valid filename (upper/lower alpha, digits,
@@ -111 +142 @@
      && (  !(statbuf->st_mode & (S_IFREG | S_IFLNK))
         || invalid_name(file)
-        || (!list_mode && access(file, X_OK) != 0))
+        || (!(option_mask32 & OPT_l) && access(file, X_OK) != 0))
     ) {
         return SKIP;
@@ -127 +158 @@
     "arg\0"     Required_argument "a"
     "umask\0"   Required_argument "u"
-    "test\0"    No_argument       "t"
+//TODO: "verbose\0" No_argument       "v"
+    "reverse\0" No_argument       "\xf0"
+    "test\0"    No_argument       "\xf1"
+    "exit-on-error\0" No_argument "\xf2"
 #if ENABLE_FEATURE_RUN_PARTS_FANCY
-    "list\0"    No_argument       "l"
-    "reverse\0" No_argument       "r"
-//TODO: "verbose\0" No_argument       "v"
+    "list\0"    No_argument       "\xf3"
 #endif
     ;
@@ -151 +183 @@
     /* We require exactly one argument: the directory name */
     opt_complementary = "=1:a::";
-    getopt32(argv, "ra:u:t"IF_FEATURE_RUN_PARTS_FANCY("l"), &arg_list, &umask_p);
+    getopt32(argv, "a:u:", &arg_list, &umask_p);
 
     umask(xstrtou_range(umask_p, 8, 0, 07777));
@@ -193 +225 @@
             bb_perror_msg("can't execute '%s'", name);
         else /* ret > 0 */
-            bb_error_msg("%s exited with code %d", name, ret & 0xff);
+            bb_error_msg("%s: exit status %u", name, ret & 0xff);
+
+        if (option_mask32 & OPT_e)
+            xfunc_die();
     }