Cleanup patch from Tito.

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

diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index 98fd588870f302caf0d096b92d0819f0075f4cf5..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?
  */
 
@@ -61,6 +61,8 @@ static const struct option runparts_long_options[] = {
        { 0,                    0,              0,                      0 }
 };
 
+extern char **environ;
+
 /* run_parts_main */
 /* Process options */
 int run_parts_main(int argc, char **argv)
@@ -83,7 +85,7 @@ int run_parts_main(int argc, char **argv)
                        /* 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 
+                                * 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));
@@ -108,5 +110,5 @@ int run_parts_main(int argc, char **argv)
        args[0] = argv[optind];
        args[argcount] = 0;
 
-       return(run_parts(args, test_mode));
+       return(run_parts(args, test_mode, environ));
 }