add help text

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

diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index cb5f48fdd1d52c366b157d164f019249f3d2af70..0c230269635f000cb5a510b3b81f09beb798b5ae 100644 (file)
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -2,7 +2,7 @@
 /*
  * Mini run-parts implementation for busybox
  *
- * Copyright (C) 2007 Bernhard Fischer
+ * Copyright (C) 2007 Bernhard Reutner-Fischer
  *
  * Based on a older version that was in busybox which was 1k big..
  *   Copyright (C) 2001 by Emanuele Aina <emanuele.aina@tiscali.it>
@@ -12,7 +12,7 @@
  *   Copyright (C) 1996-1999 Guy Maor <maor@debian.org>
  *
  *
- * Licensed under GPL v2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* This is my first attempt to write a program in C (well, this is my first
@@ -30,13 +30,39 @@
  * -u MASK      umask. Set the umask of the program executed to MASK.
  */
 
+//usage:#define run_parts_trivial_usage
+//usage:       "[-t] "IF_FEATURE_RUN_PARTS_FANCY("[-l] ")"[-a ARG] [-u MASK] DIRECTORY"
+//usage:#define run_parts_full_usage "\n\n"
+//usage:       "Run a bunch of scripts in DIRECTORY\n"
+//usage:     "\nOptions:"
+//usage:     "\n       -t      Print what would be run, but don't actually run anything"
+//usage:     "\n       -a ARG  Pass ARG as argument for every program"
+//usage:     "\n       -u MASK Set the umask to MASK before running every program"
+//usage:       IF_FEATURE_RUN_PARTS_FANCY(
+//usage:     "\n       -l      Print names of all matching files even if they are not executable"
+//usage:       )
+//usage:
+//usage:#define run_parts_example_usage
+//usage:       "$ run-parts -a start /etc/init.d\n"
+//usage:       "$ run-parts -a stop=now /etc/init.d\n\n"
+//usage:       "Let's assume you have a script foo/dosomething:\n"
+//usage:       "#!/bin/sh\n"
+//usage:       "for i in $*; do eval $i; done; unset i\n"
+//usage:       "case \"$1\" in\n"
+//usage:       "start*) echo starting something;;\n"
+//usage:       "stop*) set -x; shutdown -h $stop;;\n"
+//usage:       "esac\n\n"
+//usage:       "Running this yields:\n"
+//usage:       "$run-parts -a stop=+4m foo/\n"
+//usage:       "+ shutdown -h +4m"
+
 #include "libbb.h"
 
 struct globals {
        char **names;
        int    cur;
        char  *cmd[1];
-};
+} FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define names (G.names)
 #define cur   (G.cur  )
@@ -92,7 +118,7 @@ static int FAST_FUNC act(const char *file, struct stat *statbuf, void *args UNUS
 
        names = xrealloc_vector(names, 4, cur);
        names[cur++] = xstrdup(file);
-       names[cur] = NULL;
+       /*names[cur] = NULL; - xrealloc_vector did it */
 
        return TRUE;
 }
@@ -121,10 +147,9 @@ int run_parts_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
        applet_long_options = runparts_longopts;
 #endif
-       /* We require exactly one argument: the directory name */
        /* We require exactly one argument: the directory name */
        opt_complementary = "=1:a::";
-       getopt32(argv, "ra:u:t"USE_FEATURE_RUN_PARTS_FANCY("l"), &arg_list, &umask_p);
+       getopt32(argv, "ra:u:t"IF_FEATURE_RUN_PARTS_FANCY("l"), &arg_list, &umask_p);
 
        umask(xstrtou_range(umask_p, 8, 0, 07777));
 
@@ -159,14 +184,14 @@ int run_parts_main(int argc UNUSED_PARAM, char **argv)
                        continue;
                }
                cmd[0] = name;
-               ret = wait4pid(spawn(cmd));
+               ret = spawn_and_wait(cmd);
                if (ret == 0)
                        continue;
                n = 1;
                if (ret < 0)
-                       bb_perror_msg("can't exec %s", name);
+                       bb_perror_msg("can't execute '%s'", name);
                else /* ret > 0 */
-                       bb_error_msg("%s exited with code %d", name, ret);
+                       bb_error_msg("%s exited with code %d", name, ret & 0xff);
        }
 
        return n;