036585a911
FEATURE_GETOPT_LONG made dependent on LONG_OPTS. The folloving options are removed, now LONG_OPTS enables long options for affected applets: FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS They either had a small number of long options, or their long options are essential. Example: upstream addgroup and adduser have ONLY longopts, we should probably go further and get rid of non-standard short options. To this end, make addgroup and adduser "select LONG_OPTS". We had this breakage caused by us even in our own package! #if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP /* We try to use --gid, not -g, because "standard" addgroup * has no short option -g, it has only long --gid. */ argv[1] = (char*)"--gid"; #else /* Breaks if system in fact does NOT use busybox addgroup */ argv[1] = (char*)"-g"; #endif xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS. hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime Shorten help texts by omitting long option when short opt alternative exists. Reduction of size comes from the fact that store of an immediate (an address of longopts) to a fixed address (global variable) is a longer insn than pushing that immediate or passing it in a register. This effect is CPU-agnostic. function old new delta getopt32 1350 22 -1328 vgetopt32 - 1318 +1318 getopt32long - 24 +24 tftpd_main 562 567 +5 scan_recursive 376 380 +4 collect_cpu 545 546 +1 date_main 1096 1095 -1 hostname_main 262 259 -3 uname_main 259 255 -4 setpriv_main 362 358 -4 rmdir_main 191 187 -4 mv_main 562 558 -4 ipcalc_main 548 544 -4 ifenslave_main 641 637 -4 gzip_main 192 188 -4 gunzip_main 77 73 -4 fsfreeze_main 81 77 -4 flock_main 318 314 -4 deluser_main 337 333 -4 cp_main 374 370 -4 chown_main 175 171 -4 applet_long_options 4 - -4 xargs_main 894 889 -5 wget_main 2540 2535 -5 udhcpc_main 2767 2762 -5 touch_main 436 431 -5 tar_main 1014 1009 -5 start_stop_daemon_main 1033 1028 -5 sed_main 682 677 -5 script_main 1082 1077 -5 run_parts_main 330 325 -5 rtcwake_main 459 454 -5 od_main 2169 2164 -5 nl_main 201 196 -5 modprobe_main 773 768 -5 mkdir_main 160 155 -5 ls_main 568 563 -5 install_main 773 768 -5 hwclock_main 411 406 -5 getopt_main 622 617 -5 fstrim_main 256 251 -5 env_main 198 193 -5 dumpleases_main 635 630 -5 dpkg_main 3991 3986 -5 diff_main 1355 1350 -5 cryptpw_main 233 228 -5 cpio_main 593 588 -5 conspy_main 1135 1130 -5 chpasswd_main 313 308 -5 adduser_main 887 882 -5 addgroup_main 416 411 -5 ftpgetput_main 351 345 -6 get_terminal_width_height 242 234 -8 expand_main 690 680 -10 static.expand_longopts 18 - -18 static.unexpand_longopts 27 - -27 mkdir_longopts 28 - -28 env_longopts 30 - -30 static.ifenslave_longopts 34 - -34 mv_longopts 46 - -46 static.rmdir_longopts 48 - -48 packed_usage 31739 31687 -52 ------------------------------------------------------------------------------ (add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes text data bss dec hex filename 915681 485 6880 923046 e15a6 busybox_old 915428 485 6876 922789 e14a5 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
235 lines
6.8 KiB
C
235 lines
6.8 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Mini run-parts implementation for busybox
|
|
*
|
|
* 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>
|
|
*
|
|
* 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>
|
|
*
|
|
* 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
|
|
* 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 the
|
|
* report mode. As the original run-parts support only long options, I've
|
|
* broken compatibility because the BusyBox policy doesn't allow them.
|
|
*/
|
|
//config:config RUN_PARTS
|
|
//config: bool "run-parts (5.6 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: run-parts is a utility designed to run all the scripts in a directory.
|
|
//config:
|
|
//config: It is useful to set up a directory like cron.daily, where you need to
|
|
//config: execute all the scripts in that directory.
|
|
//config:
|
|
//config: In this implementation of run-parts some features (such as report
|
|
//config: mode) are not implemented.
|
|
//config:
|
|
//config: Unless you know that run-parts is used in some of your scripts
|
|
//config: you can safely say N here.
|
|
//config:
|
|
//config:config FEATURE_RUN_PARTS_LONG_OPTIONS
|
|
//config: bool "Enable long options"
|
|
//config: default y
|
|
//config: depends on RUN_PARTS && LONG_OPTS
|
|
//config:
|
|
//config:config FEATURE_RUN_PARTS_FANCY
|
|
//config: bool "Support additional arguments"
|
|
//config: default y
|
|
//config: depends on RUN_PARTS
|
|
//config: help
|
|
//config: Support additional options:
|
|
//config: -l --list print the names of the all matching files (not
|
|
//config: limited to executables), but don't actually run them.
|
|
|
|
//applet:IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_BIN, BB_SUID_DROP, run_parts))
|
|
|
|
//kbuild:lib-$(CONFIG_RUN_PARTS) += run_parts.o
|
|
|
|
//usage:#define run_parts_trivial_usage
|
|
//usage: "[-a ARG]... [-u UMASK] "
|
|
//usage: IF_FEATURE_RUN_PARTS_LONG_OPTIONS("[--reverse] [--test] [--exit-on-error] "IF_FEATURE_RUN_PARTS_FANCY("[--list] "))
|
|
//usage: "DIRECTORY"
|
|
//usage:#define run_parts_full_usage "\n\n"
|
|
//usage: "Run a bunch of scripts in DIRECTORY\n"
|
|
//usage: "\n -a ARG Pass ARG as argument to scripts"
|
|
//usage: "\n -u UMASK Set UMASK before running scripts"
|
|
//usage: IF_FEATURE_RUN_PARTS_LONG_OPTIONS(
|
|
//usage: "\n --reverse Reverse execution order"
|
|
//usage: "\n --test Dry run"
|
|
//usage: "\n --exit-on-error Exit if a script exits with non-zero"
|
|
//usage: IF_FEATURE_RUN_PARTS_FANCY(
|
|
//usage: "\n --list Print names of matching files even if they are not executable"
|
|
//usage: )
|
|
//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"
|
|
#include "common_bufsiz.h"
|
|
|
|
struct globals {
|
|
char **names;
|
|
int cur;
|
|
char *cmd[2 /* using 1 provokes compiler warning */];
|
|
} FIX_ALIASING;
|
|
#define G (*(struct globals*)bb_common_bufsiz1)
|
|
#define names (G.names)
|
|
#define cur (G.cur )
|
|
#define cmd (G.cmd )
|
|
#define INIT_G() do { setup_common_bufsiz(); } while (0)
|
|
|
|
enum { NUM_CMD = (COMMON_BUFSIZE - sizeof(G)) / sizeof(cmd[0]) - 1 };
|
|
|
|
enum {
|
|
OPT_a = (1 << 0),
|
|
OPT_u = (1 << 1),
|
|
OPT_r = (1 << 2) * ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS,
|
|
OPT_t = (1 << 3) * ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS,
|
|
OPT_e = (1 << 4) * ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS,
|
|
OPT_l = (1 << 5) * ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
|
|
* ENABLE_FEATURE_RUN_PARTS_FANCY,
|
|
};
|
|
|
|
/* Is this a valid filename (upper/lower alpha, digits,
|
|
* underscores, and hyphens only?)
|
|
*/
|
|
static bool invalid_name(const char *c)
|
|
{
|
|
c = bb_basename(c);
|
|
|
|
while (*c && (isalnum(*c) || *c == '_' || *c == '-'))
|
|
c++;
|
|
|
|
return *c; /* TRUE (!0) if terminating NUL is not reached */
|
|
}
|
|
|
|
static int bb_alphasort(const void *p1, const void *p2)
|
|
{
|
|
int r = strcmp(*(char **) p1, *(char **) p2);
|
|
return (option_mask32 & OPT_r) ? -r : r;
|
|
}
|
|
|
|
static int FAST_FUNC act(const char *file, struct stat *statbuf, void *args UNUSED_PARAM, int depth)
|
|
{
|
|
if (depth == 1)
|
|
return TRUE;
|
|
|
|
if (depth == 2
|
|
&& ( !(statbuf->st_mode & (S_IFREG | S_IFLNK))
|
|
|| invalid_name(file)
|
|
|| (!(option_mask32 & OPT_l) && access(file, X_OK) != 0))
|
|
) {
|
|
return SKIP;
|
|
}
|
|
|
|
names = xrealloc_vector(names, 4, cur);
|
|
names[cur++] = xstrdup(file);
|
|
/*names[cur] = NULL; - xrealloc_vector did it */
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
|
|
static const char runparts_longopts[] ALIGN1 =
|
|
"arg\0" Required_argument "a"
|
|
"umask\0" Required_argument "u"
|
|
//TODO: "verbose\0" No_argument "v"
|
|
"reverse\0" No_argument "\xf0"
|
|
"test\0" No_argument "\xf1"
|
|
"exit-on-error\0" No_argument "\xf2"
|
|
# if ENABLE_FEATURE_RUN_PARTS_FANCY
|
|
"list\0" No_argument "\xf3"
|
|
# endif
|
|
;
|
|
# define GETOPT32 getopt32long
|
|
# define LONGOPTS ,runparts_longopts
|
|
#else
|
|
# define GETOPT32 getopt32
|
|
# define LONGOPTS
|
|
#endif
|
|
|
|
int run_parts_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int run_parts_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
const char *umask_p = "22";
|
|
llist_t *arg_list = NULL;
|
|
unsigned n;
|
|
int ret;
|
|
|
|
INIT_G();
|
|
|
|
/* We require exactly one argument: the directory name */
|
|
opt_complementary = "=1";
|
|
GETOPT32(argv, "a:*u:" LONGOPTS, &arg_list, &umask_p);
|
|
|
|
umask(xstrtou_range(umask_p, 8, 0, 07777));
|
|
|
|
n = 1;
|
|
while (arg_list && n < NUM_CMD) {
|
|
cmd[n++] = llist_pop(&arg_list);
|
|
}
|
|
/* cmd[n] = NULL; - is already zeroed out */
|
|
|
|
/* run-parts has to sort executables by name before running them */
|
|
|
|
recursive_action(argv[optind],
|
|
ACTION_RECURSE|ACTION_FOLLOWLINKS,
|
|
act, /* file action */
|
|
act, /* dir action */
|
|
NULL, /* user data */
|
|
1 /* depth */
|
|
);
|
|
|
|
if (!names)
|
|
return 0;
|
|
|
|
qsort(names, cur, sizeof(char *), bb_alphasort);
|
|
|
|
n = 0;
|
|
while (1) {
|
|
char *name = *names++;
|
|
if (!name)
|
|
break;
|
|
if (option_mask32 & (OPT_t | OPT_l)) {
|
|
puts(name);
|
|
continue;
|
|
}
|
|
cmd[0] = name;
|
|
ret = spawn_and_wait(cmd);
|
|
if (ret == 0)
|
|
continue;
|
|
n = 1;
|
|
if (ret < 0)
|
|
bb_perror_msg("can't execute '%s'", name);
|
|
else /* ret > 0 */
|
|
bb_error_msg("%s: exit status %u", name, ret & 0xff);
|
|
|
|
if (option_mask32 & OPT_e)
|
|
xfunc_die();
|
|
}
|
|
|
|
return n;
|
|
}
|