diff options
Diffstat (limited to 'debianutils')
| -rw-r--r-- | debianutils/run_parts.c | 234 |
1 files changed, 44 insertions, 190 deletions
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c index 3ec4b9d10..34e702ef8 100644 --- a/debianutils/run_parts.c +++ b/debianutils/run_parts.c @@ -49,203 +49,57 @@ * done - declare run_parts_main() as extern and any other function as static? */ -#include <stdio.h> -#include <stdarg.h> -#include <stdlib.h> -/* #include <sys/types.h> */ -#include <sys/wait.h> -#include <dirent.h> -#include <sys/stat.h> -#include <unistd.h> #include <getopt.h> -#include <string.h> -#include <errno.h> -#include <ctype.h> - -#include "busybox.h" - -static int test_mode = 0; -static int exitstatus = 0; - -static int argcount = 0, argsize = 0; -static char **args = 0; - - -/* set_umask */ -/* 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. - */ - -static void set_umask (void) -{ - int mask, result; - - /*TODO - * We must substitute sscanf, according to bb's style guide? */ - result = sscanf (optarg, "%o", &mask); - if ((result != 1) || (mask > 07777) || (mask < 0)) { - perror_msg_and_die ("bad umask value"); - } - - umask (mask); -} - -/* add_argument */ -/* Add an argument to the commands that we will call. Called once for - every argument. */ -static void add_argument (char *newarg) -{ - if (argcount+1 >= argsize) { - argsize = argsize ? argsize*2 : 4; - /*TODO if we convert to xrealloc we lose the verbose error message */ - args = realloc(args, argsize * (sizeof(char*))); - if (!args) { - perror_msg_and_die ("failed to reallocate memory for arguments"); - } - } - args[argcount++] = newarg; - args[argcount] = 0; -} - -/* valid_name */ -/* True or false? Is this a valid filename (upper/lower alpha, digits, - * underscores, and hyphens only?) - */ - -static int valid_name (const struct dirent *d) -{ - char *c = d->d_name; - while (*c) { - if (!isalnum(*c) && *c!='_' && *c!='-') { - return 0; - } - ++c; - } - return 1; -} - - -/* run_part */ -/* Execute a file */ - -static void run_part (char *progname) -{ - int result; - int pid; - - - if ((pid=fork()) < 0) { - perror_msg_and_die ("failed to fork"); - } - else if (!pid) { - args[0] = progname; - execv (progname, args); - perror_msg_and_die ("failed to exec %s", progname); - } - - if (0) { - - } else { - - waitpid(pid, &result, 0); - } - - if (WIFEXITED (result) && WEXITSTATUS(result)) { - perror_msg ("%s exited with return code %d", progname, WEXITSTATUS(result)); - exitstatus = 1; - } - else if (WIFSIGNALED (result)) { - perror_msg ("%s exited because of uncaught signal %d", progname, - WTERMSIG(result)); - exitstatus = 1; - } -} - -/* run_parts */ -/* Find the parts to run & call run_part() */ - -static void run_parts (char *dir_name) -{ - struct dirent **namelist = 0; - char *filename; - int entries, i; - struct stat st; - - /* -- */ - - /* scandir() isn't POSIX, but it makes things easy. */ - entries = scandir (dir_name, &namelist, valid_name, alphasort); - - if (entries < 0) { - perror_msg_and_die ("failed to open directory %s", dir_name); - } - - for (i = 0; i < entries; i++) { - - /* -- */ +#include <stdlib.h> - filename = concat_path_file (dir_name, namelist[i]->d_name); - - if (stat (filename, &st) < 0) { - perror_msg_and_die ("failed to stat component %s", filename); - } - if (S_ISREG(st.st_mode) && !access (filename, X_OK)) { - if (test_mode) - printf ("run-parts would run %s\n", filename); - else { - run_part (filename); - } - } - - else if (!S_ISDIR(st.st_mode)) { - error_msg ("component %s is not an executable plain file", - filename); - exitstatus = 1; - } - - free (namelist[i]); - free (filename); - } - free (namelist); -} +#include "libbb.h" /* run_parts_main */ /* Process options */ -int run_parts_main (int argc, char *argv[]) +int run_parts_main(int argc, char **argv) { - umask (022); - add_argument(0); - - for (;;) { - int c; + char **args = xmalloc(2 * sizeof(char *)); + unsigned char test_mode = 0; + unsigned short argcount = 1; + int opt; + + umask(022); + + while ((opt = getopt(argc, argv, "tu:a:")) != -1) { + 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(); + } + } - opterr = 0; - c = getopt(argc, argv, "tu:a:"); - - if (c == EOF) - break; - switch (c) { - case 't': /* Enable test mode */ - test_mode = 1; - break; - case 'u': /* Set the umask of the programs executed */ - set_umask (); - break; - case 'a': /* Pass an argument to the programs */ - add_argument (optarg); - break; - default: + /* We require exactly one argument: the directory name */ + if (optind != (argc - 1)) { show_usage(); - } - } - - /* We require exactly one argument: the directory name */ - if (optind != (argc - 1)) { - show_usage(); - } - - run_parts (argv[optind]); + } - return exitstatus; + args[0] = argv[optind]; + return(run_parts(args, test_mode)); } |