Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/debianutils/run_parts.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/debianutils/run_parts.c (modified) (3 diffs)

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

@@ -3 +3 @@
  * Mini run-parts implementation for busybox
  *
+ * Copyright (C) 2007 Bernhard Fischer
  *
- * Copyright (C) 2001 by Emanuele Aina <emanuele.aina@tiscali.it>
+ * Based on a older version that was in busybox which was 1k big..
+ *   Copyright (C) 2001 by Emanuele Aina <emanuele.aina@tiscali.it>
  *
  * Based on the Debian run-parts program, version 1.15
@@ -11 +13 @@
  *
  *
- * Licensed under GPL v2, see file LICENSE in this tarball for details.
+ * Licensed under GPL v2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -26 +28 @@
  * -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. */
-
-/* TODO
- * done - convert calls to error in perror... and remove error()
- * done - convert malloc/realloc to their x... counterparts
- * done - remove catch_sigchld
- * done - use bb's concat_path_file()
- * done - declare run_parts_main() as extern and any other function as static?
+ * -u MASK      umask. Set the umask of the program executed to MASK.
  */
 
-#include "busybox.h"
 #include <getopt.h>
-#include <stdlib.h>
 
+#include "libbb.h"
 
-static const struct option runparts_long_options[] = {
-    { "test",       0,      NULL,       't' },
-    { "umask",      1,      NULL,       'u' },
-    { "arg",        1,      NULL,       'a' },
-    { 0,            0,      0,          0 }
+#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
+static const char runparts_longopts[] ALIGN1 =
+    "arg\0"     Required_argument "a"
+    "umask\0"   Required_argument "u"
+    "test\0"    No_argument       "t"
+#if ENABLE_FEATURE_RUN_PARTS_FANCY
+    "list\0"    No_argument       "l"
+//TODO: "reverse\0" No_argument       "r"
+//TODO: "verbose\0" No_argument       "v"
+#endif
+    ;
+#endif
+
+struct globals {
+    smalluint mode;
+    char *cmd[10]; /* merely arbitrary arg count */
 };
+#define G (*(struct globals*)&bb_common_bufsiz1)
 
-extern char **environ;
+/* valid_name */
+/* True or false? Is this a valid filename (upper/lower alpha, digits,
+ * underscores, and hyphens only?)
+ */
+static bool invalid_name(const char *c)
+{
+    c = bb_basename(c);
 
-/* run_parts_main */
-/* Process options */
+    while (*c && (isalnum(*c) || *c == '_' || *c == '-'))
+        c++;
+
+    return *c; /* TRUE (!0) if terminating NUL is not reached */
+}
+
+#define RUN_PARTS_OPT_a (1<<0)
+#define RUN_PARTS_OPT_u (1<<1)
+#define RUN_PARTS_OPT_t (1<<2)
+#if ENABLE_FEATURE_RUN_PARTS_FANCY
+#define RUN_PARTS_OPT_l (1<<3)
+#endif
+
+#define test_mode (G.mode & RUN_PARTS_OPT_t)
+#if ENABLE_FEATURE_RUN_PARTS_FANCY
+#define list_mode (G.mode & RUN_PARTS_OPT_l)
+#else
+#define list_mode (0)
+#endif
+
+static int act(const char *file, struct stat *statbuf, void *args, int depth)
+{
+    int ret;
+
+    if (depth == 1)
+        return TRUE;
+
+    if (depth == 2 &&
+        ((!list_mode && access(file, X_OK)) ||
+         invalid_name(file) ||
+         !(statbuf->st_mode & (S_IFREG | S_IFLNK))) )
+        return SKIP;
+
+    if (test_mode || list_mode) {
+        puts(file);
+        return TRUE;
+    }
+    G.cmd[0] = (char*)file;
+    ret = wait4pid(spawn(G.cmd));
+    if (ret < 0) {
+        bb_perror_msg("failed to exec %s", file);
+    } else if (ret > 0) {
+        bb_error_msg("%s exited with return code %d", file, ret);
+    }
+    return !ret;
+}
+
+int run_parts_main(int argc, char **argv);
 int run_parts_main(int argc, char **argv)
 {
-    char **args = xmalloc(2 * sizeof(char *));
-    unsigned char test_mode = 0;
-    unsigned short argcount = 1;
-    int opt;
+    char *umask_p;
+    llist_t *arg_list = NULL;
+    unsigned tmp;
 
     umask(022);
-
-    while ((opt = getopt_long (argc, argv, "tu:a:",
-                    runparts_long_options, NULL)) > 0)
-    {
-        switch (opt) {
-            /* Enable test mode */
-            case 't':
-                test_mode++;
-                break;
-            /* Set the umask of the programs executed */
-            case 'u':
-                /* Check and set the umask of the program executed. As stated in the original
-                 * run-parts, the octal conversion in libc is not foolproof; it will take the
-                 * 8 and 9 digits under some circumstances. We'll just have to live with it.
-                 */
-                umask(bb_xgetlarg(optarg, 8, 0, 07777));
-                break;
-            /* Pass an argument to the programs */
-            case 'a':
-                /* Add an argument to the commands that we will call.
-                 * Called once for every argument. */
-                args = xrealloc(args, (argcount + 2) * (sizeof(char *)));
-                args[argcount++] = optarg;
-                break;
-            default:
-                bb_show_usage();
-        }
+    /* We require exactly one argument: the directory name */
+    opt_complementary = "=1:a::";
+#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
+    applet_long_options = runparts_longopts;
+#endif
+    tmp = getopt32(argv, "a:u:t"USE_FEATURE_RUN_PARTS_FANCY("l"), &arg_list, &umask_p);
+    G.mode = tmp &~ (RUN_PARTS_OPT_a|RUN_PARTS_OPT_u);
+    if (tmp & RUN_PARTS_OPT_u) {
+        /* Check and set the umask of the program executed.
+         * As stated in the original run-parts, the octal conversion in
+         * libc is not foolproof; it will take the 8 and 9 digits under
+         * some circumstances. We'll just have to live with it.
+         */
+        umask(xstrtoul_range(umask_p, 8, 0, 07777));
     }
-
-    /* We require exactly one argument: the directory name */
-    if (optind != (argc - 1)) {
-        bb_show_usage();
-    }
-
-    args[0] = argv[optind];
-    args[argcount] = 0;
-
-    return(run_parts(args, test_mode, environ));
+    for (tmp = 1; arg_list; arg_list = arg_list->link, tmp++)
+        G.cmd[tmp] = arg_list->data;
+    /* G.cmd[tmp] = NULL; - G is already zeroed out */
+    if (!recursive_action(argv[argc - 1],
+            ACTION_RECURSE|ACTION_FOLLOWLINKS,
+            act,        /* file action */
+            act,        /* dir action */
+            NULL,       /* user data */
+            1           /* depth */
+            ))
+            return EXIT_FAILURE;
+    return EXIT_SUCCESS;
 }