Cleanup patch from Tito.

[oweals/busybox.git] / debianutils / run_parts.c

diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index 34e702ef83f98901eb3f2e8596e4911a3158af6f..6205595bf892c417eb5d0dec6b261069581fe627 100644 (file)
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -8,7 +8,7 @@
  * Based on the Debian run-parts program, version 1.15
  *   Copyright (C) 1996 Jeff Noxon <jeff@router.patch.net>,
  *   Copyright (C) 1996-1999 Guy Maor <maor@debian.org>
- *   
+ *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,21 +31,21 @@
  * attempt to write a program! :-) . */
 
 /* This piece of code is heavily based on the original version of run-parts,
- * taken from debian-utils. I've only removed the long options and a the 
+ * taken from debian-utils. I've only removed the long options and a the
  * 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: 
+ * 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 
+ * -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 
+/* TODO
  * done - convert calls to error in perror... and remove error()
- * done - convert malloc/realloc to their x... counterparts 
+ * done - convert malloc/realloc to their x... counterparts
  * done - remove catch_sigchld
- * done - use bb's concat_path_file() 
+ * done - use bb's concat_path_file()
  * done - declare run_parts_main() as extern and any other function as static?
  */
 
@@ -54,6 +54,15 @@
 
 #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 }
+};
+
+extern char **environ;
+
 /* run_parts_main */
 /* Process options */
 int run_parts_main(int argc, char **argv)
@@ -65,41 +74,41 @@ int run_parts_main(int argc, char **argv)
 
        umask(022);
 
-       while ((opt = getopt(argc, argv, "tu:a:")) != -1) {
+       while ((opt = getopt_long (argc, argv, "tu:a:",
+                                       runparts_long_options, NULL)) > 0)
+       {
                switch (opt) {
-               case 't':               /* Enable test mode */
-                       test_mode = 1;
-                       break;
-               case 'u':               /* Set the umask of the programs executed */
-                       /* 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.
-                        */
-                       {
-                               const unsigned int mask = (unsigned int) strtol(optarg, NULL, 8);
-                               if (mask > 07777) {
-                                       perror_msg_and_die("bad umask value");
-                               }
-                               umask(mask);
-                       }
-                       break;
-               case 'a':               /* Pass an argument to the programs */
-                       /* 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;
-                       args[argcount] = 0;
-                       break;
-               default:
-                       show_usage();
+                       /* 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 */
        if (optind != (argc - 1)) {
-               show_usage();
+               bb_show_usage();
        }
 
        args[0] = argv[optind];
-       return(run_parts(args, test_mode));
+       args[argcount] = 0;
+
+       return(run_parts(args, test_mode, environ));
 }