mirror of
https://github.com/sheumann/hush.git
synced 2024-12-22 14:30:31 +00:00
2a186890ee
this patch fixes run_parts when it's called by ifupdown. 1) argv has to be a NULL terminated char* array, not just a string. 2) run_parts now explicitly sets the environment. this environment is populated from the /etc/network/interfaces config file and is needed by the scripts in /etc/network/if-pre-up.d/. when run-parts is called from the command line the environment is taken from the current process. Vladimir Oleynik then wrote: You can simplify this if use: + bb_xasprintf(&buf[0], "/etc/network/if-%s.d", opt); + buf[1] = NULL; + + run_parts(&buf, 2, environ); + free(buf[0]); --w vodz
115 lines
3.5 KiB
C
115 lines
3.5 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Mini run-parts implementation for busybox
|
|
*
|
|
*
|
|
* Copyright (C) 2001 by Emanuele Aina <emanuele.aina@tiscali.it>
|
|
*
|
|
* 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
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
* 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
/* This is my first attempt to write a program in C (well, this is my first
|
|
* 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
|
|
* 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:
|
|
* -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
|
|
* 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?
|
|
*/
|
|
|
|
#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 }
|
|
};
|
|
|
|
extern char **environ;
|
|
|
|
/* run_parts_main */
|
|
/* Process options */
|
|
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;
|
|
|
|
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 */
|
|
if (optind != (argc - 1)) {
|
|
bb_show_usage();
|
|
}
|
|
|
|
args[0] = argv[optind];
|
|
args[argcount] = 0;
|
|
|
|
return(run_parts(args, test_mode, environ));
|
|
}
|