From c8aae0b2a0406b499ec8dea4a1e29b52be9da0d0 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 6 Jun 2010 22:14:58 +0200 Subject: fix allnoconfig Signed-off-by: Denys Vlasenko --- shell/Config.src | 107 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 55 insertions(+), 52 deletions(-) diff --git a/shell/Config.src b/shell/Config.src index 234d05367..12f655375 100644 --- a/shell/Config.src +++ b/shell/Config.src @@ -5,58 +5,6 @@ menu "Shells" -choice - prompt "Choose which shell is aliased to 'sh' name" - default FEATURE_SH_IS_ASH - help - Choose which shell you want to be executed by 'sh' alias. - The ash shell is the most bash compatible and full featured one. - -config FEATURE_SH_IS_ASH - select ASH - bool "ash" - depends on !NOMMU - -config FEATURE_SH_IS_HUSH - select HUSH - bool "hush" - -config FEATURE_SH_IS_NONE - bool "none" - -endchoice - -choice - prompt "Choose which shell is aliased to 'bash' name" - default FEATURE_BASH_IS_NONE - help - Choose which shell you want to be executed by 'bash' alias. - The ash shell is the most bash compatible and full featured one. - - Note that selecting this option does not switch on any bash - compatibility code. It merely makes it possible to install - /bin/bash (sym)link and run scripts which start with - #!/bin/bash line. - - Many systems use it in scripts which use bash-specific features, - even simple ones like $RANDOM. Without this option, busybox - can't be used for running them because it won't recongnize - "bash" as a supported applet name. - -config FEATURE_BASH_IS_ASH - select ASH - bool "ash" - depends on !NOMMU - -config FEATURE_BASH_IS_HUSH - select HUSH - bool "hush" - -config FEATURE_BASH_IS_NONE - bool "none" - -endchoice - config ASH bool "ash" default y @@ -266,6 +214,61 @@ config HUSH_RANDOM_SUPPORT Enable pseudorandom generator and dynamic variable "$RANDOM". Each read of "$RANDOM" will generate a new pseudorandom value. + +choice + prompt "Choose which shell is aliased to 'sh' name" + default FEATURE_SH_IS_ASH + help + Choose which shell you want to be executed by 'sh' alias. + The ash shell is the most bash compatible and full featured one. + +# note: cannot use "select ASH" here, it breaks "amke allnoconfig" +config FEATURE_SH_IS_ASH + depends on ASH + bool "ash" + depends on !NOMMU + +config FEATURE_SH_IS_HUSH + depends on HUSH + bool "hush" + +config FEATURE_SH_IS_NONE + bool "none" + +endchoice + +choice + prompt "Choose which shell is aliased to 'bash' name" + default FEATURE_BASH_IS_NONE + help + Choose which shell you want to be executed by 'bash' alias. + The ash shell is the most bash compatible and full featured one. + + Note that selecting this option does not switch on any bash + compatibility code. It merely makes it possible to install + /bin/bash (sym)link and run scripts which start with + #!/bin/bash line. + + Many systems use it in scripts which use bash-specific features, + even simple ones like $RANDOM. Without this option, busybox + can't be used for running them because it won't recongnize + "bash" as a supported applet name. + +config FEATURE_BASH_IS_ASH + depends on ASH + bool "ash" + depends on !NOMMU + +config FEATURE_BASH_IS_HUSH + depends on HUSH + bool "hush" + +config FEATURE_BASH_IS_NONE + bool "none" + +endchoice + + config LASH bool "lash (deprecated: aliased to hush)" default n -- cgit v1.2.3-55-g6feb From e3657dcdd655ec96fc6bf38c40dd6a6f015a83de Mon Sep 17 00:00:00 2001 From: Maksym Kryzhanovskyy Date: Sun, 6 Jun 2010 22:56:12 +0200 Subject: fuser: code shrink function old new delta fuser_main 918 871 -47 Signed-off-by: Maksym Kryzhanovskyy Signed-off-by: Denys Vlasenko --- procps/fuser.c | 44 +++++++++++++++----------------------------- 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/procps/fuser.c b/procps/fuser.c index 7465d4554..85523c31c 100644 --- a/procps/fuser.c +++ b/procps/fuser.c @@ -40,31 +40,6 @@ struct globals { #define INIT_G() do { } while (0) -static dev_t find_socket_dev(void) -{ - int fd = socket(AF_INET, SOCK_DGRAM, 0); - if (fd >= 0) { - struct stat buf; - int r = fstat(fd, &buf); - close(fd); - if (r == 0) - return buf.st_dev; - } - return 0; -} - -static char *parse_net_arg(const char *arg, unsigned *port) -{ - char path[20], tproto[5]; - - if (sscanf(arg, "%u/%4s", port, tproto) != 2) - return NULL; - sprintf(path, "/proc/net/%s", tproto); - if (access(path, R_OK) != 0) - return NULL; - return xstrdup(path); -} - static void add_pid(const pid_t pid) { pid_list **curr = &G.pid_list_head; @@ -104,8 +79,15 @@ static void scan_proc_net(const char *path, unsigned port) unsigned tmp_port; FILE *f; struct stat st; + int fd; - st.st_dev = find_socket_dev(); + /* find socket dev */ + st.st_dev = 0; + fd = socket(AF_INET, SOCK_DGRAM, 0); + if (fd >= 0) { + fstat(fd, &st); + close(fd); + } f = fopen_for_read(path); if (!f) @@ -284,11 +266,15 @@ Find processes which use FILEs or PORTs pp = argv; while (*pp) { - char *path = parse_net_arg(*pp, &port); - if (path) { /* PORT/PROTO */ + /* parse net arg */ + char path[20], tproto[5]; + if (sscanf(*pp, "%u/%4s", &port, tproto) != 2) + goto file; + sprintf(path, "/proc/net/%s", tproto); + if (access(path, R_OK) != 0) { /* PORT/PROTO */ scan_proc_net(path, port); - free(path); } else { /* FILE */ + file: xstat(*pp, &st); add_inode(&st); } -- cgit v1.2.3-55-g6feb From b82b34e06d0f8b91a1a30a847e0b1dd80ed0a046 Mon Sep 17 00:00:00 2001 From: Pascal Bellard Date: Mon, 7 Jun 2010 01:16:45 +0200 Subject: modprobe: add support for -l and -s. Remove some unsupported options Fixed some goofs in help text function old new delta modprobe_main 494 653 +159 packed_usage 27129 27145 +16 insmod_main 98 95 -3 Signed-off-by: Pascal Bellard Signed-off-by: Denys Vlasenko --- include/usage.src.h | 111 ------------------------------ modutils/insmod.c | 22 ++++++ modutils/modprobe-small.c | 13 ++++ modutils/modprobe.c | 171 +++++++++++++++++++++++++++++++++++++--------- modutils/modutils.h | 41 +++++------ util-linux/losetup.c | 2 +- 6 files changed, 194 insertions(+), 166 deletions(-) diff --git a/include/usage.src.h b/include/usage.src.h index f9f457871..878e7a282 100644 --- a/include/usage.src.h +++ b/include/usage.src.h @@ -2148,28 +2148,6 @@ INSERT "\ninotifyd waits for PROG to exit." \ "\nWhen x event happens for all FILEs, inotifyd exits." \ -/* 2.6 style insmod has no options and required filename - * (not module name - .ko can't be omitted) */ -#define insmod_trivial_usage \ - IF_FEATURE_2_4_MODULES("[OPTIONS] MODULE ") \ - IF_NOT_FEATURE_2_4_MODULES("FILE ") \ - "[symbol=value]..." -#define insmod_full_usage "\n\n" \ - "Load the specified kernel modules into the kernel" \ - IF_FEATURE_2_4_MODULES( "\n" \ - "\nOptions:" \ - "\n -f Force module to load into the wrong kernel version" \ - "\n -k Make module autoclean-able" \ - "\n -v Verbose" \ - "\n -q Quiet" \ - "\n -L Lock to prevent simultaneous loads of a module" \ - IF_FEATURE_INSMOD_LOAD_MAP( \ - "\n -m Output load map to stdout" \ - ) \ - "\n -o NAME Set internal module name to NAME" \ - "\n -x Don't export externs" \ - ) - /* -v, -b, -c are ignored */ #define install_trivial_usage \ "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [SOURCE]... DEST" @@ -2973,95 +2951,6 @@ INSERT "$ ls -la /tmp/temp.mWiLjM\n" \ "-rw------- 1 andersen andersen 0 Apr 25 17:10 /tmp/temp.mWiLjM\n" -#define modprobe_trivial_usage \ - IF_MODPROBE_SMALL("[-qfwrsv] MODULE [symbol=value]...") \ - IF_NOT_MODPROBE_SMALL("[-" \ - IF_FEATURE_2_4_MODULES("k")"nqrsv" \ - IF_FEATURE_MODPROBE_BLACKLIST("b")"] MODULE [symbol=value]...") -#define modprobe_full_usage "\n\n" \ - "Options:" \ - IF_MODPROBE_SMALL( \ - "\n -q Quiet" \ - "\n -f Force" \ - "\n -w Wait for unload" \ - "\n -r Remove module (stacks) or do autoclean" \ - "\n -s Report via syslog instead of stderr" \ - "\n -v Verbose" \ - ) \ - IF_NOT_MODPROBE_SMALL( \ - IF_FEATURE_2_4_MODULES( \ - "\n -k Make module autoclean-able" \ - ) \ - "\n -n Dry run" \ - "\n -q Quiet" \ - "\n -r Remove module (stacks) or do autoclean" \ - "\n -s Report via syslog instead of stderr" \ - "\n -v Verbose" \ - IF_FEATURE_MODPROBE_BLACKLIST( \ - "\n -b Apply blacklist to module names too" \ - ) \ - ) - -#define modprobe_notes_usage \ -"modprobe can (un)load a stack of modules, passing each module options (when\n" \ -"loading). modprobe uses a configuration file to determine what option(s) to\n" \ -"pass each module it loads.\n" \ -"\n" \ -"The configuration file is searched (in this order):\n" \ -"\n" \ -" /etc/modprobe.conf (2.6 only)\n" \ -" /etc/modules.conf\n" \ -" /etc/conf.modules (deprecated)\n" \ -"\n" \ -"They all have the same syntax (see below). If none is present, it is\n" \ -"_not_ an error; each loaded module is then expected to load without\n" \ -"options. Once a file is found, the others are tested for.\n" \ -"\n" \ -"/etc/modules.conf entry format:\n" \ -"\n" \ -" alias \n" \ -" Makes it possible to modprobe alias_name, when there is no such module.\n" \ -" It makes sense if your mod_name is long, or you want a more representative\n" \ -" name for that module (eg. 'scsi' in place of 'aha7xxx').\n" \ -" This makes it also possible to use a different set of options (below) for\n" \ -" the module and the alias.\n" \ -" A module can be aliased more than once.\n" \ -"\n" \ -" options \n" \ -" When loading module mod_name (or the module aliased by alias_name), pass\n" \ -" the \"symbol=value\" pairs as option to that module.\n" \ -"\n" \ -"Sample /etc/modules.conf file:\n" \ -"\n" \ -" options tulip irq=3\n" \ -" alias tulip tulip2\n" \ -" options tulip2 irq=4 io=0x308\n" \ -"\n" \ -"Other functionality offered by 'classic' modprobe is not available in\n" \ -"this implementation.\n" \ -"\n" \ -"If module options are present both in the config file, and on the command line,\n" \ -"then the options from the command line will be passed to the module _after_\n" \ -"the options from the config file. That way, you can have defaults in the config\n" \ -"file, and override them for a specific usage from the command line.\n" -#define modprobe_example_usage \ - "(with the above /etc/modules.conf):\n\n" \ - "$ modprobe tulip\n" \ - " will load the module 'tulip' with default option 'irq=3'\n\n" \ - "$ modprobe tulip irq=5\n" \ - " will load the module 'tulip' with option 'irq=5', thus overriding the default\n\n" \ - "$ modprobe tulip2\n" \ - " will load the module 'tulip' with default options 'irq=4 io=0x308',\n" \ - " which are the default for alias 'tulip2'\n\n" \ - "$ modprobe tulip2 irq=8\n" \ - " will load the module 'tulip' with default options 'irq=4 io=0x308 irq=8',\n" \ - " which are the default for alias 'tulip2' overridden by the option 'irq=8'\n\n" \ - " from the command line\n\n" \ - "$ modprobe tulip2 irq=2 io=0x210\n" \ - " will load the module 'tulip' with default options 'irq=4 io=0x308 irq=4 io=0x210',\n" \ - " which are the default for alias 'tulip2' overridden by the options 'irq=2 io=0x210'\n\n" \ - " from the command line\n" - #define more_trivial_usage \ "[FILE]..." #define more_full_usage "\n\n" \ diff --git a/modutils/insmod.c b/modutils/insmod.c index c4fb9279d..b88446c10 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c @@ -10,6 +10,28 @@ #include "libbb.h" #include "modutils.h" +/* 2.6 style insmod has no options and required filename + * (not module name - .ko can't be omitted) */ + +//usage:#define insmod_trivial_usage +//usage: IF_FEATURE_2_4_MODULES("[OPTIONS] MODULE ") +//usage: IF_NOT_FEATURE_2_4_MODULES("FILE ") +//usage: "[symbol=value]..." +//usage:#define insmod_full_usage "\n\n" +//usage: "Load the specified kernel modules into the kernel" +//usage: IF_FEATURE_2_4_MODULES( "\n" +//usage: "\nOptions:" +//usage: "\n -f Force module to load into the wrong kernel version" +//usage: "\n -k Make module autoclean-able" +//usage: "\n -v Verbose" +//usage: "\n -q Quiet" +//usage: "\n -L Lock: prevent simultaneous loads" +//usage: IF_FEATURE_INSMOD_LOAD_MAP( +//usage: "\n -m Output load map to stdout" +//usage: ) +//usage: "\n -x Don't export externs" +//usage: ) + int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int insmod_main(int argc UNUSED_PARAM, char **argv) { diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c index cf22b9471..0e1874ed4 100644 --- a/modutils/modprobe-small.c +++ b/modutils/modprobe-small.c @@ -685,6 +685,19 @@ The following options are useful for people managing distributions: Use the file instead of the current kernel symbols */ +//usage:#if ENABLE_MODPROBE_SMALL +//usage:#define modprobe_trivial_usage +//usage: "[-qfwrsv] MODULE [symbol=value]..." +//usage:#define modprobe_full_usage "\n\n" +//usage: "Options:" +//usage: "\n -r Remove MODULE (stacks) or do autoclean" +//usage: "\n -q Quiet" +//usage: "\n -v Verbose" +//usage: "\n -f Force" +//usage: "\n -w Wait for unload" +//usage: "\n -s Report via syslog instead of stderr" +//usage:#endif /* ENABLE_MODPROBE_SMALL */ + int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int modprobe_main(int argc UNUSED_PARAM, char **argv) { diff --git a/modutils/modprobe.c b/modutils/modprobe.c index 69b9e4687..b4de65b1f 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c @@ -20,6 +20,104 @@ //#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__) #define DBG(...) ((void)0) +//usage:#if !ENABLE_MODPROBE_SMALL +//usage:#define modprobe_notes_usage +//usage: "modprobe can (un)load a stack of modules, passing each module options (when\n" +//usage: "loading). modprobe uses a configuration file to determine what option(s) to\n" +//usage: "pass each module it loads.\n" +//usage: "\n" +//usage: "The configuration file is searched (in this order):\n" +//usage: "\n" +//usage: " /etc/modprobe.conf (2.6 only)\n" +//usage: " /etc/modules.conf\n" +//usage: " /etc/conf.modules (deprecated)\n" +//usage: "\n" +//usage: "They all have the same syntax (see below). If none is present, it is\n" +//usage: "_not_ an error; each loaded module is then expected to load without\n" +//usage: "options. Once a file is found, the others are tested for.\n" +//usage: "\n" +//usage: "/etc/modules.conf entry format:\n" +//usage: "\n" +//usage: " alias \n" +//usage: " Makes it possible to modprobe alias_name, when there is no such module.\n" +//usage: " It makes sense if your mod_name is long, or you want a more representative\n" +//usage: " name for that module (eg. 'scsi' in place of 'aha7xxx').\n" +//usage: " This makes it also possible to use a different set of options (below) for\n" +//usage: " the module and the alias.\n" +//usage: " A module can be aliased more than once.\n" +//usage: "\n" +//usage: " options \n" +//usage: " When loading module mod_name (or the module aliased by alias_name), pass\n" +//usage: " the \"symbol=value\" pairs as option to that module.\n" +//usage: "\n" +//usage: "Sample /etc/modules.conf file:\n" +//usage: "\n" +//usage: " options tulip irq=3\n" +//usage: " alias tulip tulip2\n" +//usage: " options tulip2 irq=4 io=0x308\n" +//usage: "\n" +//usage: "Other functionality offered by 'classic' modprobe is not available in\n" +//usage: "this implementation.\n" +//usage: "\n" +//usage: "If module options are present both in the config file, and on the command line,\n" +//usage: "then the options from the command line will be passed to the module _after_\n" +//usage: "the options from the config file. That way, you can have defaults in the config\n" +//usage: "file, and override them for a specific usage from the command line.\n" +//usage:#define modprobe_example_usage +//usage: "(with the above /etc/modules.conf):\n\n" +//usage: "$ modprobe tulip\n" +//usage: " will load the module 'tulip' with default option 'irq=3'\n\n" +//usage: "$ modprobe tulip irq=5\n" +//usage: " will load the module 'tulip' with option 'irq=5', thus overriding the default\n\n" +//usage: "$ modprobe tulip2\n" +//usage: " will load the module 'tulip' with default options 'irq=4 io=0x308',\n" +//usage: " which are the default for alias 'tulip2'\n\n" +//usage: "$ modprobe tulip2 irq=8\n" +//usage: " will load the module 'tulip' with default options 'irq=4 io=0x308 irq=8',\n" +//usage: " which are the default for alias 'tulip2' overridden by the option 'irq=8'\n\n" +//usage: " from the command line\n\n" +//usage: "$ modprobe tulip2 irq=2 io=0x210\n" +//usage: " will load the module 'tulip' with default options 'irq=4 io=0x308 irq=4 io=0x210',\n" +//usage: " which are the default for alias 'tulip2' overridden by the options 'irq=2 io=0x210'\n\n" +//usage: " from the command line\n" +//usage: +//usage:#define modprobe_trivial_usage +//usage: "[-alrqvs" +//usage: IF_FEATURE_MODPROBE_BLACKLIST("b") +//usage: "] MODULE [symbol=value]..." +//usage:#define modprobe_full_usage "\n\n" +//usage: "Options:" +//usage: "\n -a Load multiple MODULEs" +//usage: "\n -l List (MODULE is a pattern)" +//usage: "\n -r Remove MODULE (stacks) or do autoclean" +//usage: "\n -q Quiet" +//usage: "\n -v Verbose" +//usage: "\n -s Log to syslog" +//usage: IF_FEATURE_MODPROBE_BLACKLIST( +//usage: "\n -b Apply blacklist to module names too" +//usage: ) +//usage:#endif /* !ENABLE_MODPROBE_SMALL */ + +/* Note that usage text doesn't document various 2.4 options + * we pull in through INSMOD_OPTS define */ + +#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--ar:a--lr:r--al" +#define MODPROBE_OPTS "alr" IF_FEATURE_MODPROBE_BLACKLIST("b") +//#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--acr:a--lr:r--al" +//#define MODPROBE_OPTS "acd:lnrt:C:" IF_FEATURE_MODPROBE_BLACKLIST("b") +enum { + MODPROBE_OPT_INSERT_ALL = (INSMOD_OPT_UNUSED << 0), /* a */ + //MODPROBE_OPT_DUMP_ONLY= (INSMOD_OPT_UNUSED << x), /* c */ + //MODPROBE_OPT_DIRNAME = (INSMOD_OPT_UNUSED << x), /* d */ + MODPROBE_OPT_LIST_ONLY = (INSMOD_OPT_UNUSED << 1), /* l */ + //MODPROBE_OPT_SHOW_ONLY= (INSMOD_OPT_UNUSED << x), /* n */ + MODPROBE_OPT_REMOVE = (INSMOD_OPT_UNUSED << 2), /* r */ + //MODPROBE_OPT_RESTRICT = (INSMOD_OPT_UNUSED << x), /* t */ + //MODPROBE_OPT_VERONLY = (INSMOD_OPT_UNUSED << x), /* V */ + //MODPROBE_OPT_CONFIGFILE=(INSMOD_OPT_UNUSED << x), /* C */ + MODPROBE_OPT_BLACKLIST = (INSMOD_OPT_UNUSED << 3) * ENABLE_FEATURE_MODPROBE_BLACKLIST, +}; + #define MODULE_FLAG_LOADED 0x0001 #define MODULE_FLAG_NEED_DEPS 0x0002 /* "was seen in modules.dep": */ @@ -37,32 +135,6 @@ struct module_entry { /* I'll call it ME. */ llist_t *deps; /* strings. modules we depend on */ }; -/* NB: INSMOD_OPT_SILENT bit suppresses ONLY non-existent modules, - * not deleted ones (those are still listed in modules.dep). - * module-init-tools version 3.4: - * # modprobe bogus - * FATAL: Module bogus not found. [exitcode 1] - * # modprobe -q bogus [silent, exitcode still 1] - * but: - * # rm kernel/drivers/net/dummy.ko - * # modprobe -q dummy - * FATAL: Could not open '/lib/modules/xxx/kernel/drivers/net/dummy.ko': No such file or directory - * [exitcode 1] - */ -#define MODPROBE_OPTS "acdlnrt:VC:" IF_FEATURE_MODPROBE_BLACKLIST("b") -enum { - MODPROBE_OPT_INSERT_ALL = (INSMOD_OPT_UNUSED << 0), /* a */ - MODPROBE_OPT_DUMP_ONLY = (INSMOD_OPT_UNUSED << 1), /* c */ - MODPROBE_OPT_D = (INSMOD_OPT_UNUSED << 2), /* d */ - MODPROBE_OPT_LIST_ONLY = (INSMOD_OPT_UNUSED << 3), /* l */ - MODPROBE_OPT_SHOW_ONLY = (INSMOD_OPT_UNUSED << 4), /* n */ - MODPROBE_OPT_REMOVE = (INSMOD_OPT_UNUSED << 5), /* r */ - MODPROBE_OPT_RESTRICT = (INSMOD_OPT_UNUSED << 6), /* t */ - MODPROBE_OPT_VERONLY = (INSMOD_OPT_UNUSED << 7), /* V */ - MODPROBE_OPT_CONFIGFILE = (INSMOD_OPT_UNUSED << 8), /* C */ - MODPROBE_OPT_BLACKLIST = (INSMOD_OPT_UNUSED << 9) * ENABLE_FEATURE_MODPROBE_BLACKLIST, -}; - struct globals { llist_t *db; /* MEs of all modules ever seen (caching for speed) */ llist_t *probes; /* MEs of module(s) requested on cmdline */ @@ -264,6 +336,18 @@ static char *parse_and_add_kcmdline_module_options(char *options, const char *mo * -errno on open/read error, * errno on init_module() error */ +/* NB: INSMOD_OPT_SILENT bit suppresses ONLY non-existent modules, + * not deleted ones (those are still listed in modules.dep). + * module-init-tools version 3.4: + * # modprobe bogus + * FATAL: Module bogus not found. [exitcode 1] + * # modprobe -q bogus [silent, exitcode still 1] + * but: + * # rm kernel/drivers/net/dummy.ko + * # modprobe -q dummy + * FATAL: Could not open '/lib/modules/xxx/kernel/drivers/net/dummy.ko': No such file or directory + * [exitcode 1] + */ static int do_modprobe(struct module_entry *m) { struct module_entry *m2 = m2; /* for compiler */ @@ -395,13 +479,38 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv) unsigned opt; struct module_entry *me; - opt_complementary = "q-v:v-q"; - opt = getopt32(argv, INSMOD_OPTS MODPROBE_OPTS INSMOD_ARGS, NULL, NULL); + opt_complementary = MODPROBE_COMPLEMENTARY; + opt = getopt32(argv, INSMOD_OPTS MODPROBE_OPTS INSMOD_ARGS); argv += optind; - if (opt & (MODPROBE_OPT_DUMP_ONLY | MODPROBE_OPT_LIST_ONLY | - MODPROBE_OPT_SHOW_ONLY)) - bb_error_msg_and_die("not supported"); + if (opt & MODPROBE_OPT_LIST_ONLY) { + char name[MODULE_NAME_LEN]; + char *colon, *tokens[2]; + parser_t *p = config_open2(CONFIG_DEFAULT_DEPMOD_FILE, xfopen_for_read); + + while (config_read(p, tokens, 2, 1, "# \t", PARSE_NORMAL)) { + colon = last_char_is(tokens[0], ':'); + if (!colon) + continue; + *colon = '\0'; + filename2modname(tokens[0], name); + if (!argv[0]) + puts(tokens[0]); + else { + int i; + for (i = 0; argv[i]; i++) { + if (fnmatch(argv[i], name, 0) == 0) { + puts(tokens[0]); + } + } + } + } + return EXIT_SUCCESS; + } + + /* Yes, for some reason -l ignores -s... */ + if (opt & INSMOD_OPT_SYSLOG) + logmode = LOGMODE_SYSLOG; if (!argv[0]) { if (opt & MODPROBE_OPT_REMOVE) { diff --git a/modutils/modutils.h b/modutils/modutils.h index 131a5087b..d46870ca6 100644 --- a/modutils/modutils.h +++ b/modutils/modutils.h @@ -23,32 +23,27 @@ int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC; char *filename2modname(const char *filename, char *modname) FAST_FUNC; char *parse_cmdline_module_options(char **argv) FAST_FUNC; +/* insmod for 2.4 and modprobe's options (insmod 2.6 has no options at all): */ #define INSMOD_OPTS \ - "vq" \ - IF_FEATURE_2_4_MODULES("sLo:fkx") \ - IF_FEATURE_INSMOD_LOAD_MAP("m") - -#define INSMOD_ARGS IF_FEATURE_2_4_MODULES(, NULL) + "vqs" \ + IF_FEATURE_2_4_MODULES("Lfkx" IF_FEATURE_INSMOD_LOAD_MAP("m")) +#define INSMOD_ARGS /* (was meant to support -o NAME) , NULL */ enum { - INSMOD_OPT_VERBOSE = 0x0001, - INSMOD_OPT_SILENT = 0x0002, - INSMOD_OPT_SYSLOG = 0x0004 * ENABLE_FEATURE_2_4_MODULES, - INSMOD_OPT_LOCK = 0x0008 * ENABLE_FEATURE_2_4_MODULES, - INSMOD_OPT_OUTPUTNAME = 0x0010 * ENABLE_FEATURE_2_4_MODULES, - INSMOD_OPT_FORCE = 0x0020 * ENABLE_FEATURE_2_4_MODULES, - INSMOD_OPT_KERNELD = 0x0040 * ENABLE_FEATURE_2_4_MODULES, - INSMOD_OPT_NO_EXPORT = 0x0080 * ENABLE_FEATURE_2_4_MODULES, - INSMOD_OPT_PRINT_MAP = 0x0100 * ENABLE_FEATURE_INSMOD_LOAD_MAP, -#if ENABLE_FEATURE_2_4_MODULES -# if ENABLE_FEATURE_INSMOD_LOAD_MAP - INSMOD_OPT_UNUSED = 0x0200, -# else - INSMOD_OPT_UNUSED = 0x0100, -# endif -#else - INSMOD_OPT_UNUSED = 0x0004, -#endif + INSMOD_OPT_VERBOSE = (1 << 0), + INSMOD_OPT_SILENT = (1 << 1), + INSMOD_OPT_SYSLOG = (1 << 2), + //INSMOD_OPT_OUTPUTNAME = (1 << x) - not supported yet + INSMOD_OPT_LOCK = (1 << 3) * ENABLE_FEATURE_2_4_MODULES, + INSMOD_OPT_FORCE = (1 << 4) * ENABLE_FEATURE_2_4_MODULES, + INSMOD_OPT_KERNELD = (1 << 5) * ENABLE_FEATURE_2_4_MODULES, + INSMOD_OPT_NO_EXPORT = (1 << 6) * ENABLE_FEATURE_2_4_MODULES, + INSMOD_OPT_PRINT_MAP = (1 << 7) * ENABLE_FEATURE_INSMOD_LOAD_MAP, + INSMOD_OPT_UNUSED = + (INSMOD_OPT_PRINT_MAP ? INSMOD_OPT_PRINT_MAP + : INSMOD_OPT_NO_EXPORT ? INSMOD_OPT_NO_EXPORT + : INSMOD_OPT_SYSLOG + ) << 1 }; #if ENABLE_FEATURE_INSMOD_TRY_MMAP diff --git a/util-linux/losetup.c b/util-linux/losetup.c index e44773a07..0f5914c88 100644 --- a/util-linux/losetup.c +++ b/util-linux/losetup.c @@ -23,7 +23,7 @@ int losetup_main(int argc UNUSED_PARAM, char **argv) }; /* max 2 args, all opts are mutually exclusive */ - opt_complementary = "?2:d--of:o--df:f-do"; + opt_complementary = "?2:d--of:o--df:f--do"; opt = getopt32(argv, "do:f", &opt_o); argv += optind; -- cgit v1.2.3-55-g6feb From c62f229d45d54a5a994f25d52077618a7a58236d Mon Sep 17 00:00:00 2001 From: Pascal Bellard Date: Mon, 7 Jun 2010 01:20:41 +0200 Subject: dpkg: add support for lzma compression Signed-off-by: Pascal Bellard Signed-off-by: Denys Vlasenko --- archival/dpkg_deb.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c index cfbd78420..45a791bba 100644 --- a/archival/dpkg_deb.c +++ b/archival/dpkg_deb.c @@ -32,14 +32,17 @@ int dpkg_deb_main(int argc, char **argv) ar_archive->filter = filter_accept_list_reassign; #if ENABLE_FEATURE_SEAMLESS_GZ - llist_add_to(&(ar_archive->accept), (char*)"data.tar.gz"); + llist_add_to(&ar_archive->accept, (char*)"data.tar.gz"); llist_add_to(&control_tar_llist, (char*)"control.tar.gz"); #endif - #if ENABLE_FEATURE_SEAMLESS_BZ2 - llist_add_to(&(ar_archive->accept), (char*)"data.tar.bz2"); + llist_add_to(&ar_archive->accept, (char*)"data.tar.bz2"); llist_add_to(&control_tar_llist, (char*)"control.tar.bz2"); #endif +#if ENABLE_FEATURE_SEAMLESS_LZMA + llist_add_to(&ar_archive->accept, (char*)"data.tar.lzma"); + llist_add_to(&control_tar_llist, (char*)"control.tar.lzma"); +#endif opt_complementary = "c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX"; opt = getopt32(argv, "cefXx"); -- cgit v1.2.3-55-g6feb From 838e0dbda1578ce96ae7c9d6d09d5d8025072777 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 7 Jun 2010 03:04:46 +0200 Subject: small fix in usage text Signed-off-by: Denys Vlasenko --- include/usage.src.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/usage.src.h b/include/usage.src.h index 878e7a282..bd2e56385 100644 --- a/include/usage.src.h +++ b/include/usage.src.h @@ -5097,7 +5097,7 @@ INSERT #define who_full_usage "\n\n" \ "Show who is logged on\n" \ "\nOptions:" \ - "\n -a show all" \ + "\n -a Show all" \ #define whoami_trivial_usage \ "" -- cgit v1.2.3-55-g6feb From 121fb9506bcade96b6fb8b1dbcbbb7699bfb1a9d Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 7 Jun 2010 13:34:34 +0200 Subject: typo fix Signed-off-by: Denys Vlasenko --- shell/Config.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/Config.src b/shell/Config.src index 12f655375..966fa7012 100644 --- a/shell/Config.src +++ b/shell/Config.src @@ -222,7 +222,7 @@ choice Choose which shell you want to be executed by 'sh' alias. The ash shell is the most bash compatible and full featured one. -# note: cannot use "select ASH" here, it breaks "amke allnoconfig" +# note: cannot use "select ASH" here, it breaks "make allnoconfig" config FEATURE_SH_IS_ASH depends on ASH bool "ash" -- cgit v1.2.3-55-g6feb From 729ecb87bfbbaf9250837d8b8748503c5e97bfd6 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 7 Jun 2010 14:14:26 +0200 Subject: bbconfig: make it independent from printf functions function old new delta full_write2_str - 25 +25 full_write1_str - 25 +25 clear_main 21 20 -1 telnet_main 1488 1477 -11 getty_main 1932 1918 -14 full_write22_str 25 - -25 ------------------------------------------------------------------------------ (add/remove: 2/1 grow/shrink: 0/3 up/down: 50/-51) Total: -1 bytes Signed-off-by: Denys Vlasenko --- TEST_config_noprintf | 16 ++++++++-------- console-tools/clear.c | 6 +----- coreutils/basename.c | 12 +++++------- include/libbb.h | 2 ++ libbb/appletlib.c | 7 ------- libbb/xfuncs.c | 10 ++++++++++ loginutils/getty.c | 3 +-- miscutils/bbconfig.c | 2 +- networking/telnet.c | 4 ++-- scripts/mkconfigs | 3 +-- shell/hush.c | 2 +- 11 files changed, 32 insertions(+), 35 deletions(-) diff --git a/TEST_config_noprintf b/TEST_config_noprintf index f787e7a14..ba003a1fb 100644 --- a/TEST_config_noprintf +++ b/TEST_config_noprintf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.17.0.git -# Sun Jun 6 21:38:58 2010 +# Mon Jun 7 13:37:55 2010 # CONFIG_HAVE_DOT_CONFIG=y @@ -579,7 +579,7 @@ CONFIG_VOLUMEID=y # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set +CONFIG_BBCONFIG=y # CONFIG_BEEP is not set CONFIG_FEATURE_BEEP_FREQ=0 CONFIG_FEATURE_BEEP_LENGTH_MS=0 @@ -872,12 +872,6 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # # Shells # -# CONFIG_FEATURE_SH_IS_ASH is not set -# CONFIG_FEATURE_SH_IS_HUSH is not set -CONFIG_FEATURE_SH_IS_NONE=y -# CONFIG_FEATURE_BASH_IS_ASH is not set -# CONFIG_FEATURE_BASH_IS_HUSH is not set -CONFIG_FEATURE_BASH_IS_NONE=y # CONFIG_ASH is not set # CONFIG_ASH_BASH_COMPAT is not set # CONFIG_ASH_JOB_CONTROL is not set @@ -904,6 +898,12 @@ CONFIG_FEATURE_BASH_IS_NONE=y # CONFIG_HUSH_LOCAL is not set # CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_FEATURE_SH_IS_ASH is not set +# CONFIG_FEATURE_SH_IS_HUSH is not set +CONFIG_FEATURE_SH_IS_NONE=y +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y # CONFIG_LASH is not set # CONFIG_MSH is not set # CONFIG_SH_MATH_SUPPORT is not set diff --git a/console-tools/clear.c b/console-tools/clear.c index b0c6d65d2..cac716394 100644 --- a/console-tools/clear.c +++ b/console-tools/clear.c @@ -5,16 +5,12 @@ * Copyright (C) 1999-2004 by Erik Andersen * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. - * */ - -/* no options, no getopt */ - #include "libbb.h" int clear_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int clear_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) { /* home; clear to the end of screen */ - return printf("\033[H""\033[J") != 6; + return full_write1_str("\033[H""\033[J") != 6; } diff --git a/coreutils/basename.c b/coreutils/basename.c index d1ad91ba1..b79d561c2 100644 --- a/coreutils/basename.c +++ b/coreutils/basename.c @@ -5,13 +5,8 @@ * Copyright (C) 1999-2004 by Erik Andersen * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. - * */ -/* BB_AUDIT SUSv3 compliant */ -/* http://www.opengroup.org/onlinepubs/007904975/utilities/basename.html */ - - /* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) * * Changes: @@ -20,6 +15,9 @@ * 3) Save some space by using strcmp(). Calling strncmp() here was silly. */ +/* BB_AUDIT SUSv3 compliant */ +/* http://www.opengroup.org/onlinepubs/007904975/utilities/basename.html */ + //kbuild:lib-$(CONFIG_BASENAME) += basename.o //config:config BASENAME @@ -40,7 +38,7 @@ int basename_main(int argc, char **argv) size_t m, n; char *s; - if (((unsigned int)(argc-2)) >= 2) { + if ((unsigned)(argc-2) >= 2) { bb_show_usage(); } @@ -50,7 +48,7 @@ int basename_main(int argc, char **argv) m = strlen(s); if (*++argv) { n = strlen(*argv); - if ((m > n) && ((strcmp)(s+m-n, *argv) == 0)) { + if ((m > n) && (strcmp(s+m-n, *argv) == 0)) { m -= n; /*s[m] = '\0'; - redundant */ } diff --git a/include/libbb.h b/include/libbb.h index 3fffa83ed..22c72d9ee 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -674,6 +674,8 @@ extern ssize_t safe_write(int fd, const void *buf, size_t count) FAST_FUNC; extern ssize_t full_write(int fd, const void *buf, size_t count) FAST_FUNC; extern void xwrite(int fd, const void *buf, size_t count) FAST_FUNC; extern void xwrite_str(int fd, const char *str) FAST_FUNC; +extern ssize_t full_write1_str(const char *str) FAST_FUNC; +extern ssize_t full_write2_str(const char *str) FAST_FUNC; extern void xopen_xwrite_close(const char* file, const char *str) FAST_FUNC; /* Close fd, but check for failures (some types of write errors) */ diff --git a/libbb/appletlib.c b/libbb/appletlib.c index 6267f2673..f3d530184 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c @@ -98,13 +98,6 @@ static const char *unpack_usage_messages(void) #endif /* FEATURE_COMPRESS_USAGE */ -static void full_write2_str(const char *str) -{ - // This uses stdio: - //xwrite_str(STDERR_FILENO, str); - write(STDERR_FILENO, str, strlen(str)); -} - void FAST_FUNC bb_show_usage(void) { if (ENABLE_SHOW_USAGE) { diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 6200fc600..1cd8d7c01 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -204,6 +204,16 @@ int FAST_FUNC bb_putchar_stderr(char ch) return write(STDERR_FILENO, &ch, 1); } +ssize_t FAST_FUNC full_write1_str(const char *str) +{ + return full_write(STDOUT_FILENO, str, strlen(str)); +} + +ssize_t FAST_FUNC full_write2_str(const char *str) +{ + return full_write(STDERR_FILENO, str, strlen(str)); +} + static int wh_helper(int value, int def_val, const char *env_name, int *err) { if (value == 0) { diff --git a/loginutils/getty.c b/loginutils/getty.c index 7fb861f9d..a5e8e906a 100644 --- a/loginutils/getty.c +++ b/loginutils/getty.c @@ -673,8 +673,7 @@ int getty_main(int argc UNUSED_PARAM, char **argv) /* Write the modem init string and DON'T flush the buffers */ if (options.flags & F_INITSTRING) { debug("writing init string\n"); - /* todo: use xwrite_str? */ - full_write(STDOUT_FILENO, options.initstring, strlen(options.initstring)); + full_write1_str(options.initstring); } /* Optionally detect the baud rate from the modem status message */ diff --git a/miscutils/bbconfig.c b/miscutils/bbconfig.c index 689052e86..0d649b4e5 100644 --- a/miscutils/bbconfig.c +++ b/miscutils/bbconfig.c @@ -7,6 +7,6 @@ int bbconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int bbconfig_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) { - printf(bbconfig_config); + full_write1_str(bbconfig_config); return 0; } diff --git a/networking/telnet.c b/networking/telnet.c index ec3db0c5e..57997f6b9 100644 --- a/networking/telnet.c +++ b/networking/telnet.c @@ -418,7 +418,7 @@ static void to_echo(void) put_iac2(DONT, TELOPT_ECHO); setConMode(); - write_str(1, "\r\n"); /* sudden modec */ + full_write1_str("\r\n"); /* sudden modec */ } static void to_sga(void) @@ -637,7 +637,7 @@ int telnet_main(int argc UNUSED_PARAM, char **argv) { len = safe_read(netfd, G.buf, DATABUFSIZE); if (len <= 0) { - write_str(1, "Connection closed by foreign host\r\n"); + full_write1_str("Connection closed by foreign host\r\n"); doexit(EXIT_FAILURE); } TRACE(0, ("Read netfd (%d): %d\n", netfd, len)); diff --git a/scripts/mkconfigs b/scripts/mkconfigs index 0d1771a36..ef6ae8aaf 100755 --- a/scripts/mkconfigs +++ b/scripts/mkconfigs @@ -42,9 +42,8 @@ echo "\ * * This file is generated automatically by scripts/mkconfigs. * Do not edit. - * */ -static const char *const bbconfig_config =" +static const char bbconfig_config[] =" sed 's/\"/\\\"/g' $config | grep "^#\? \?CONFIG_" | awk '{print "\"" $0 "\\n\"";}' diff --git a/shell/hush.c b/shell/hush.c index 4cccf31a4..4832e2c48 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -7103,7 +7103,7 @@ int hush_main(int argc, char **argv) break; #if !BB_MMU case '<': /* "big heredoc" support */ - full_write(STDOUT_FILENO, optarg, strlen(optarg)); + full_write1_str(optarg); _exit(0); case '$': { unsigned long long empty_trap_mask; -- cgit v1.2.3-55-g6feb From b68bba56499da8e5079c6dcc9004f1e0b39e8983 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 8 Jun 2010 04:39:30 +0200 Subject: date: use the same code for FEATURE_DATE_NANO for glibc and uclibc Signed-off-by: Denys Vlasenko --- coreutils/date.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/coreutils/date.c b/coreutils/date.c index 3d78a5336..c3478fab1 100644 --- a/coreutils/date.c +++ b/coreutils/date.c @@ -204,11 +204,7 @@ int date_main(int argc UNUSED_PARAM, char **argv) xstat(filename, &statbuf); ts.tv_sec = statbuf.st_mtime; #if ENABLE_FEATURE_DATE_NANO -# if defined __GLIBC__ && !defined __UCLIBC__ ts.tv_nsec = statbuf.st_mtim.tv_nsec; -# else - ts.tv_nsec = statbuf.st_mtimensec; -# endif #endif } else { #if ENABLE_FEATURE_DATE_NANO -- cgit v1.2.3-55-g6feb From d70e0e995e41dc422442acd1eb4b086ff81b1961 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 8 Jun 2010 12:15:11 +0200 Subject: *: add INSERTs to *.src files where appropriate Signed-off-by: Denys Vlasenko --- archival/Config.src | 2 ++ archival/Kbuild.src | 3 +++ archival/libunarchive/Kbuild.src | 2 ++ console-tools/Config.src | 2 ++ console-tools/Kbuild.src | 2 ++ coreutils/Kbuild.src | 1 + coreutils/libcoreutils/Kbuild.src | 2 ++ debianutils/Config.src | 2 ++ debianutils/Kbuild.src | 2 ++ e2fsprogs/Config.src | 2 ++ e2fsprogs/Kbuild.src | 2 ++ e2fsprogs/old_e2fsprogs/Config.src | 2 ++ e2fsprogs/old_e2fsprogs/Kbuild.src | 2 ++ e2fsprogs/old_e2fsprogs/blkid/Kbuild.src | 3 +++ e2fsprogs/old_e2fsprogs/e2p/Kbuild.src | 3 +++ e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src | 3 +++ e2fsprogs/old_e2fsprogs/uuid/Kbuild.src | 2 ++ editors/Config.src | 2 ++ editors/Kbuild.src | 2 ++ init/Config.src | 2 ++ init/Kbuild.src | 2 ++ libbb/Config.src | 2 ++ libbb/Kbuild.src | 2 ++ loginutils/Config.src | 2 ++ loginutils/Kbuild.src | 2 ++ mailutils/Config.src | 2 ++ mailutils/Kbuild.src | 2 ++ miscutils/Config.src | 2 ++ miscutils/Kbuild.src | 2 ++ modutils/Kbuild.src | 1 + networking/Config.src | 2 ++ networking/Kbuild.src | 2 ++ networking/libiproute/Kbuild.src | 2 ++ networking/udhcp/Config.src | 2 ++ networking/udhcp/Kbuild.src | 2 ++ printutils/Config.src | 2 ++ procps/Config.src | 2 ++ procps/Kbuild.src | 2 ++ runit/Config.src | 2 ++ runit/Kbuild.src | 3 +++ selinux/Config.src | 2 ++ selinux/Kbuild.src | 2 ++ shell/Config.src | 2 ++ shell/Kbuild.src | 3 +++ sysklogd/Config.src | 2 ++ sysklogd/Kbuild.src | 2 ++ util-linux/Config.src | 2 ++ util-linux/Kbuild.src | 2 ++ util-linux/volume_id/Kbuild.src | 2 ++ 49 files changed, 102 insertions(+) diff --git a/archival/Config.src b/archival/Config.src index de453bc21..3dbd3aea1 100644 --- a/archival/Config.src +++ b/archival/Config.src @@ -5,6 +5,8 @@ menu "Archival Utilities" +INSERT + config FEATURE_SEAMLESS_XZ bool "Make tar, rpm, modprobe etc understand .xz data" default y diff --git a/archival/Kbuild.src b/archival/Kbuild.src index 3300ea90f..076e58278 100644 --- a/archival/Kbuild.src +++ b/archival/Kbuild.src @@ -7,6 +7,9 @@ libs-y += libunarchive/ lib-y:= + +INSERT + lib-$(CONFIG_AR) += ar.o lib-$(CONFIG_CPIO) += cpio.o lib-$(CONFIG_DPKG) += dpkg.o diff --git a/archival/libunarchive/Kbuild.src b/archival/libunarchive/Kbuild.src index ed8e85793..81854558b 100644 --- a/archival/libunarchive/Kbuild.src +++ b/archival/libunarchive/Kbuild.src @@ -33,6 +33,8 @@ DPKG_FILES:= \ get_header_tar.o \ filter_accept_list_reassign.o +INSERT + lib-$(CONFIG_AR) += get_header_ar.o unpack_ar_archive.o lib-$(CONFIG_BUNZIP2) += decompress_bunzip2.o lib-$(CONFIG_UNLZMA) += decompress_unlzma.o diff --git a/console-tools/Config.src b/console-tools/Config.src index 1a8e2e128..6e3191ada 100644 --- a/console-tools/Config.src +++ b/console-tools/Config.src @@ -5,6 +5,8 @@ menu "Console Utilities" +INSERT + config CHVT bool "chvt" default y diff --git a/console-tools/Kbuild.src b/console-tools/Kbuild.src index ad8b8ce77..17f660638 100644 --- a/console-tools/Kbuild.src +++ b/console-tools/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_CHVT) += chvt.o lib-$(CONFIG_FGCONSOLE) += fgconsole.o lib-$(CONFIG_CLEAR) += clear.o diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src index 57ea7d6c4..1c846a75f 100644 --- a/coreutils/Kbuild.src +++ b/coreutils/Kbuild.src @@ -7,6 +7,7 @@ libs-y += libcoreutils/ lib-y:= + INSERT lib-$(CONFIG_CAL) += cal.o lib-$(CONFIG_CATV) += catv.o diff --git a/coreutils/libcoreutils/Kbuild.src b/coreutils/libcoreutils/Kbuild.src index 755d01f86..981b60628 100644 --- a/coreutils/libcoreutils/Kbuild.src +++ b/coreutils/libcoreutils/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2 or later, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_MKFIFO) += getopt_mk_fifo_nod.o lib-$(CONFIG_MKNOD) += getopt_mk_fifo_nod.o lib-$(CONFIG_INSTALL) += cp_mv_stat.o diff --git a/debianutils/Config.src b/debianutils/Config.src index 9bce0498c..838d8f00c 100644 --- a/debianutils/Config.src +++ b/debianutils/Config.src @@ -5,6 +5,8 @@ menu "Debian Utilities" +INSERT + config MKTEMP bool "mktemp" default y diff --git a/debianutils/Kbuild.src b/debianutils/Kbuild.src index bcf6126ad..da34e4e4f 100644 --- a/debianutils/Kbuild.src +++ b/debianutils/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_MKTEMP) += mktemp.o lib-$(CONFIG_PIPE_PROGRESS) += pipe_progress.o lib-$(CONFIG_RUN_PARTS) += run_parts.o diff --git a/e2fsprogs/Config.src b/e2fsprogs/Config.src index e331ee5ef..f362c6b0a 100644 --- a/e2fsprogs/Config.src +++ b/e2fsprogs/Config.src @@ -5,6 +5,8 @@ menu "Linux Ext2 FS Progs" +INSERT + config CHATTR bool "chattr" default y diff --git a/e2fsprogs/Kbuild.src b/e2fsprogs/Kbuild.src index 0fdc9d215..31c271238 100644 --- a/e2fsprogs/Kbuild.src +++ b/e2fsprogs/Kbuild.src @@ -6,6 +6,8 @@ lib-y:= +INSERT + lib-$(CONFIG_CHATTR) += chattr.o e2fs_lib.o lib-$(CONFIG_LSATTR) += lsattr.o e2fs_lib.o diff --git a/e2fsprogs/old_e2fsprogs/Config.src b/e2fsprogs/old_e2fsprogs/Config.src index 5990f556c..bbec08e7e 100644 --- a/e2fsprogs/old_e2fsprogs/Config.src +++ b/e2fsprogs/old_e2fsprogs/Config.src @@ -5,6 +5,8 @@ menu "Linux Ext2 FS Progs" +INSERT + config CHATTR bool "chattr" default n diff --git a/e2fsprogs/old_e2fsprogs/Kbuild.src b/e2fsprogs/old_e2fsprogs/Kbuild.src index b05bb92e1..07a09ca3d 100644 --- a/e2fsprogs/old_e2fsprogs/Kbuild.src +++ b/e2fsprogs/old_e2fsprogs/Kbuild.src @@ -6,6 +6,8 @@ lib-y:= +INSERT + lib-$(CONFIG_CHATTR) += chattr.o lib-$(CONFIG_E2FSCK) += e2fsck.o util.o lib-$(CONFIG_FSCK) += fsck.o util.o diff --git a/e2fsprogs/old_e2fsprogs/blkid/Kbuild.src b/e2fsprogs/old_e2fsprogs/blkid/Kbuild.src index ddcfdfd9a..bae77fe63 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/Kbuild.src +++ b/e2fsprogs/old_e2fsprogs/blkid/Kbuild.src @@ -10,6 +10,9 @@ NEEDED-$(CONFIG_MKE2FS) = y NEEDED-$(CONFIG_TUNE2FS) = y lib-y:= + +INSERT + lib-$(NEEDED-y) += cache.o dev.o devname.o devno.o blkid_getsize.o \ probe.o read.o resolve.o save.o tag.o list.o diff --git a/e2fsprogs/old_e2fsprogs/e2p/Kbuild.src b/e2fsprogs/old_e2fsprogs/e2p/Kbuild.src index c0ff824e3..194870788 100644 --- a/e2fsprogs/old_e2fsprogs/e2p/Kbuild.src +++ b/e2fsprogs/old_e2fsprogs/e2p/Kbuild.src @@ -10,6 +10,9 @@ NEEDED-$(CONFIG_MKE2FS) = y NEEDED-$(CONFIG_TUNE2FS) = y lib-y:= + +INSERT + lib-$(NEEDED-y) += fgetsetflags.o fgetsetversion.o pf.o iod.o mntopts.o \ feature.o ls.o uuid.o pe.o ostype.o ps.o hashstr.o \ parse_num.o diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src b/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src index 185887a44..8ca65ee90 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src +++ b/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src @@ -10,6 +10,9 @@ NEEDED-$(CONFIG_MKE2FS) = y NEEDED-$(CONFIG_TUNE2FS) = y lib-y:= + +INSERT + lib-$(NEEDED-y) += gen_bitmap.o bitops.o ismounted.o mkjournal.o unix_io.o \ rw_bitmaps.o initialize.o bitmaps.o block.o \ ind_block.o inode.o freefs.o alloc_stats.o closefs.o \ diff --git a/e2fsprogs/old_e2fsprogs/uuid/Kbuild.src b/e2fsprogs/old_e2fsprogs/uuid/Kbuild.src index dde981840..9454faba7 100644 --- a/e2fsprogs/old_e2fsprogs/uuid/Kbuild.src +++ b/e2fsprogs/old_e2fsprogs/uuid/Kbuild.src @@ -10,5 +10,7 @@ NEEDED-$(CONFIG_MKE2FS) = y NEEDED-$(CONFIG_TUNE2FS) = y lib-y:= + +INSERT lib-$(NEEDED-y) += compare.o gen_uuid.o pack.o parse.o unpack.o unparse.o \ uuid_time.o diff --git a/editors/Config.src b/editors/Config.src index 6cf21919c..fc824ccd5 100644 --- a/editors/Config.src +++ b/editors/Config.src @@ -5,6 +5,8 @@ menu "Editors" +INSERT + config AWK bool "awk" default y diff --git a/editors/Kbuild.src b/editors/Kbuild.src index 76302aa76..9d4b9d053 100644 --- a/editors/Kbuild.src +++ b/editors/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_AWK) += awk.o lib-$(CONFIG_CMP) += cmp.o lib-$(CONFIG_DIFF) += diff.o diff --git a/init/Config.src b/init/Config.src index e8121c96a..2e9208150 100644 --- a/init/Config.src +++ b/init/Config.src @@ -5,6 +5,8 @@ menu "Init Utilities" +INSERT + config INIT bool "init" default y diff --git a/init/Kbuild.src b/init/Kbuild.src index ce3f30256..6095a78bb 100644 --- a/init/Kbuild.src +++ b/init/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_HALT) += halt.o lib-$(CONFIG_INIT) += init.o lib-$(CONFIG_MESG) += mesg.o diff --git a/libbb/Config.src b/libbb/Config.src index a0aeb3683..80b1e0d21 100644 --- a/libbb/Config.src +++ b/libbb/Config.src @@ -5,6 +5,8 @@ menu "Busybox Library Tuning" +INSERT + config PASSWORD_MINLEN int "Minimum password length" default 6 diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index 68d04b3bd..29c136ccb 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src @@ -6,6 +6,8 @@ lib-y:= +INSERT + lib-y += appletlib.o lib-y += ask_confirmation.o lib-y += bb_askpass.o diff --git a/loginutils/Config.src b/loginutils/Config.src index 982d5d669..5d497c4dc 100644 --- a/loginutils/Config.src +++ b/loginutils/Config.src @@ -5,6 +5,8 @@ menu "Login/Password Management Utilities" +INSERT + config FEATURE_SHADOWPASSWDS bool "Support for shadow passwords" default y diff --git a/loginutils/Kbuild.src b/loginutils/Kbuild.src index 3d0d777e8..fd1ea06c1 100644 --- a/loginutils/Kbuild.src +++ b/loginutils/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_ADDGROUP) += addgroup.o lib-$(CONFIG_ADDUSER) += adduser.o lib-$(CONFIG_CRYPTPW) += cryptpw.o diff --git a/mailutils/Config.src b/mailutils/Config.src index baa04331a..2a9c5c074 100644 --- a/mailutils/Config.src +++ b/mailutils/Config.src @@ -1,5 +1,7 @@ menu "Mail Utilities" +INSERT + config MAKEMIME bool "makemime" default y diff --git a/mailutils/Kbuild.src b/mailutils/Kbuild.src index 871e87981..b2fb73515 100644 --- a/mailutils/Kbuild.src +++ b/mailutils/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_MAKEMIME) += mime.o mail.o lib-$(CONFIG_POPMAILDIR) += popmaildir.o mail.o lib-$(CONFIG_REFORMIME) += mime.o mail.o diff --git a/miscutils/Config.src b/miscutils/Config.src index a822f2a19..be2b37666 100644 --- a/miscutils/Config.src +++ b/miscutils/Config.src @@ -5,6 +5,8 @@ menu "Miscellaneous Utilities" +INSERT + config ADJTIMEX bool "adjtimex" default y diff --git a/miscutils/Kbuild.src b/miscutils/Kbuild.src index 3c8ce42ba..d9bf14312 100644 --- a/miscutils/Kbuild.src +++ b/miscutils/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_ADJTIMEX) += adjtimex.o lib-$(CONFIG_BBCONFIG) += bbconfig.o lib-$(CONFIG_BEEP) += beep.o diff --git a/modutils/Kbuild.src b/modutils/Kbuild.src index fc0808d7f..a512f6066 100644 --- a/modutils/Kbuild.src +++ b/modutils/Kbuild.src @@ -5,6 +5,7 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + INSERT lib-$(CONFIG_MODPROBE_SMALL) += modprobe-small.o lib-$(CONFIG_DEPMOD) += depmod.o modutils.o diff --git a/networking/Config.src b/networking/Config.src index eb8dc1ce2..51dcb7717 100644 --- a/networking/Config.src +++ b/networking/Config.src @@ -5,6 +5,8 @@ menu "Networking Utilities" +INSERT + config FEATURE_IPV6 bool "Enable IPv6 support" default y diff --git a/networking/Kbuild.src b/networking/Kbuild.src index b0765bcf6..e1a4ebcb3 100644 --- a/networking/Kbuild.src +++ b/networking/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_ARP) += arp.o interface.o lib-$(CONFIG_ARPING) += arping.o lib-$(CONFIG_BRCTL) += brctl.o diff --git a/networking/libiproute/Kbuild.src b/networking/libiproute/Kbuild.src index 5f9dd32b6..b0aa50a97 100644 --- a/networking/libiproute/Kbuild.src +++ b/networking/libiproute/Kbuild.src @@ -7,6 +7,8 @@ lib-y:= +INSERT + lib-$(CONFIG_SLATTACH) += \ utils.o diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src index f5840a945..aac88569b 100644 --- a/networking/udhcp/Config.src +++ b/networking/udhcp/Config.src @@ -3,6 +3,8 @@ # see scripts/kbuild/config-language.txt. # +INSERT + config UDHCPD bool "udhcp server (udhcpd)" default y diff --git a/networking/udhcp/Kbuild.src b/networking/udhcp/Kbuild.src index 1803903f0..f845bc1d9 100644 --- a/networking/udhcp/Kbuild.src +++ b/networking/udhcp/Kbuild.src @@ -7,6 +7,8 @@ lib-y:= +INSERT + lib-$(CONFIG_UDHCPC) += common.o packet.o signalpipe.o socket.o lib-$(CONFIG_UDHCPD) += common.o packet.o signalpipe.o socket.o diff --git a/printutils/Config.src b/printutils/Config.src index 194789660..cc4ab8d28 100644 --- a/printutils/Config.src +++ b/printutils/Config.src @@ -5,6 +5,8 @@ menu "Print Utilities" +INSERT + config LPD bool "lpd" default y diff --git a/procps/Config.src b/procps/Config.src index 01f6b0cf9..e61de5614 100644 --- a/procps/Config.src +++ b/procps/Config.src @@ -5,6 +5,8 @@ menu "Process Utilities" +INSERT + config FREE bool "free" default y diff --git a/procps/Kbuild.src b/procps/Kbuild.src index 8e62fdfa6..c41f12b15 100644 --- a/procps/Kbuild.src +++ b/procps/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_FREE) += free.o lib-$(CONFIG_FUSER) += fuser.o lib-$(CONFIG_KILL) += kill.o diff --git a/runit/Config.src b/runit/Config.src index 53b445101..9db974002 100644 --- a/runit/Config.src +++ b/runit/Config.src @@ -5,6 +5,8 @@ menu "Runit Utilities" +INSERT + config RUNSV bool "runsv" default y diff --git a/runit/Kbuild.src b/runit/Kbuild.src index ab9eef6ff..4d85372df 100644 --- a/runit/Kbuild.src +++ b/runit/Kbuild.src @@ -5,6 +5,9 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT + lib-$(CONFIG_RUNSV) += runsv.o runit_lib.o lib-$(CONFIG_RUNSVDIR) += runsvdir.o runit_lib.o lib-$(CONFIG_SV) += sv.o runit_lib.o diff --git a/selinux/Config.src b/selinux/Config.src index e46030adf..64a99203e 100644 --- a/selinux/Config.src +++ b/selinux/Config.src @@ -6,6 +6,8 @@ menu "SELinux Utilities" depends on SELINUX +INSERT + config CHCON bool "chcon" default n diff --git a/selinux/Kbuild.src b/selinux/Kbuild.src index d0c190ceb..6567e3c07 100644 --- a/selinux/Kbuild.src +++ b/selinux/Kbuild.src @@ -6,6 +6,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_CHCON) += chcon.o lib-$(CONFIG_GETENFORCE) += getenforce.o lib-$(CONFIG_GETSEBOOL) += getsebool.o diff --git a/shell/Config.src b/shell/Config.src index 966fa7012..800911966 100644 --- a/shell/Config.src +++ b/shell/Config.src @@ -5,6 +5,8 @@ menu "Shells" +INSERT + config ASH bool "ash" default y diff --git a/shell/Kbuild.src b/shell/Kbuild.src index 8bdb68b11..d76b35386 100644 --- a/shell/Kbuild.src +++ b/shell/Kbuild.src @@ -5,6 +5,9 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT + lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o lib-$(CONFIG_HUSH) += hush.o match.o shell_common.o lib-$(CONFIG_CTTYHACK) += cttyhack.o diff --git a/sysklogd/Config.src b/sysklogd/Config.src index af00d65bb..6d574abb1 100644 --- a/sysklogd/Config.src +++ b/sysklogd/Config.src @@ -5,6 +5,8 @@ menu "System Logging Utilities" +INSERT + config SYSLOGD bool "syslogd" default y diff --git a/sysklogd/Kbuild.src b/sysklogd/Kbuild.src index d802198e6..faaac110c 100644 --- a/sysklogd/Kbuild.src +++ b/sysklogd/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_KLOGD) += klogd.o lib-$(CONFIG_LOGGER) += syslogd_and_logger.o lib-$(CONFIG_LOGREAD) += logread.o diff --git a/util-linux/Config.src b/util-linux/Config.src index 997cdec83..e97125917 100644 --- a/util-linux/Config.src +++ b/util-linux/Config.src @@ -5,6 +5,8 @@ menu "Linux System Utilities" +INSERT + config ACPID bool "acpid" default y diff --git a/util-linux/Kbuild.src b/util-linux/Kbuild.src index 4fa392398..afc0db50e 100644 --- a/util-linux/Kbuild.src +++ b/util-linux/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_ACPID) += acpid.o lib-$(CONFIG_BLKID) += blkid.o lib-$(CONFIG_DMESG) += dmesg.o diff --git a/util-linux/volume_id/Kbuild.src b/util-linux/volume_id/Kbuild.src index 3520f2480..8af3ccd81 100644 --- a/util-linux/volume_id/Kbuild.src +++ b/util-linux/volume_id/Kbuild.src @@ -6,6 +6,8 @@ lib-y:= +INSERT + lib-$(CONFIG_BLKID) += get_devname.o lib-$(CONFIG_FINDFS) += get_devname.o lib-$(CONFIG_FEATURE_MOUNT_LABEL) += get_devname.o -- cgit v1.2.3-55-g6feb From 7fdf5a88b4aaabb88624e66cd31d589a5b7280f6 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 9 Jun 2010 10:18:35 +0200 Subject: modinfo: needs modutils.o Signed-off-by: Denys Vlasenko --- modutils/modinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modutils/modinfo.c b/modutils/modinfo.c index c68d2e974..321ad78f4 100644 --- a/modutils/modinfo.c +++ b/modutils/modinfo.c @@ -8,7 +8,7 @@ //applet:IF_MODINFO(APPLET(modinfo, _BB_DIR_SBIN, _BB_SUID_DROP)) -//kbuild:lib-$(CONFIG_MODINFO) += modinfo.o +//kbuild:lib-$(CONFIG_MODINFO) += modinfo.o modutils.o //config:config MODINFO //config: bool "modinfo" -- cgit v1.2.3-55-g6feb From ab60cd13828896febb6c5c44046610f2c75a11f5 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 10 Jun 2010 10:54:44 +0200 Subject: utoa: shrink function old new delta itoa_to_buf 20 23 +3 utoa_to_buf 117 101 -16 Signed-off-by: Denys Vlasenko --- libbb/xfuncs.c | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 1cd8d7c01..65437211d 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -49,23 +49,35 @@ char* FAST_FUNC strncpy_IFNAMSIZ(char *dst, const char *src) } -// Convert unsigned integer to ascii, writing into supplied buffer. -// A truncated result contains the first few digits of the result ala strncpy. -// Returns a pointer past last generated digit, does _not_ store NUL. -void BUG_sizeof_unsigned_not_4(void); +/* Convert unsigned integer to ascii, writing into supplied buffer. + * A truncated result contains the first few digits of the result ala strncpy. + * Returns a pointer past last generated digit, does _not_ store NUL. + */ +void BUG_sizeof(void); char* FAST_FUNC utoa_to_buf(unsigned n, char *buf, unsigned buflen) { unsigned i, out, res; - if (sizeof(unsigned) != 4) - BUG_sizeof_unsigned_not_4(); + if (buflen) { out = 0; - for (i = 1000000000; i; i /= 10) { + if (sizeof(n) == 4) + // 2^32-1 = 4294967295 + i = 1000000000; +#if UINT_MAX > 4294967295 /* prevents warning about "const too large" */ + else + if (sizeof(n) == 8) + // 2^64-1 = 18446744073709551615 + i = 10000000000000000000; +#endif + else + BUG_sizeof(); + for (; i; i /= 10) { res = n / i; + n = n % i; if (res || out || i == 1) { - if (!--buflen) break; + if (--buflen == 0) + break; out++; - n -= res*i; *buf++ = '0' + res; } } @@ -76,7 +88,9 @@ char* FAST_FUNC utoa_to_buf(unsigned n, char *buf, unsigned buflen) /* Convert signed integer to ascii, like utoa_to_buf() */ char* FAST_FUNC itoa_to_buf(int n, char *buf, unsigned buflen) { - if (buflen && n < 0) { + if (!buflen) + return buf; + if (n < 0) { n = -n; *buf++ = '-'; buflen--; @@ -87,16 +101,16 @@ char* FAST_FUNC itoa_to_buf(int n, char *buf, unsigned buflen) // The following two functions use a static buffer, so calling either one a // second time will overwrite previous results. // -// The largest 32 bit integer is -2 billion plus null terminator, or 12 bytes. -// It so happens that sizeof(int) * 3 is enough for 32+ bits. +// The largest 32 bit integer is -2 billion plus NUL, or 1+10+1=12 bytes. +// It so happens that sizeof(int) * 3 is enough for 32+ bit ints. // (sizeof(int) * 3 + 2 is correct for any width, even 8-bit) static char local_buf[sizeof(int) * 3]; -// Convert unsigned integer to ascii using a static buffer (returned). +/* Convert unsigned integer to ascii using a static buffer (returned). */ char* FAST_FUNC utoa(unsigned n) { - *(utoa_to_buf(n, local_buf, sizeof(local_buf))) = '\0'; + *(utoa_to_buf(n, local_buf, sizeof(local_buf) - 1)) = '\0'; return local_buf; } @@ -104,7 +118,7 @@ char* FAST_FUNC utoa(unsigned n) /* Convert signed integer to ascii using a static buffer (returned). */ char* FAST_FUNC itoa(int n) { - *(itoa_to_buf(n, local_buf, sizeof(local_buf))) = '\0'; + *(itoa_to_buf(n, local_buf, sizeof(local_buf) - 1)) = '\0'; return local_buf; } -- cgit v1.2.3-55-g6feb From aa30efcc070efb1e818b071a1d00763cb5889c66 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 11 Jun 2010 15:31:54 +0200 Subject: check-lxdialog.sh: fix helptext Signed-off-by: Bernhard Reutner-Fischer --- scripts/kconfig/lxdialog/check-lxdialog.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh index acabe385c..d34dfd46d 100644 --- a/scripts/kconfig/lxdialog/check-lxdialog.sh +++ b/scripts/kconfig/lxdialog/check-lxdialog.sh @@ -56,7 +56,7 @@ EOF } usage() { - printf "Usage: $0 [-check compiler options|-header|-library]\n" + printf "Usage: $0 [-check compiler options|-ccflags|-ldflags compiler options]\n" } if [ $# -eq 0 ]; then -- cgit v1.2.3-55-g6feb From 53e2f38b6963958d9a4fc47bc71d7c1afbdcd9d5 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sat, 12 Jun 2010 03:29:58 +0200 Subject: tftp: make message about 512 byte block less confusing Signed-off-by: Denys Vlasenko --- networking/tftp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/networking/tftp.c b/networking/tftp.c index ab4e25967..f895d19f9 100644 --- a/networking/tftp.c +++ b/networking/tftp.c @@ -582,7 +582,8 @@ static int tftp_protocol( * "An option not acknowledged by the server * must be ignored by the client and server * as if it were never requested." */ - bb_error_msg("server only supports blocksize of 512"); + if (blksize != TFTP_BLKSIZE_DEFAULT) + bb_error_msg("falling back to blocksize "TFTP_BLKSIZE_DEFAULT_STR); blksize = TFTP_BLKSIZE_DEFAULT; io_bufsize = TFTP_BLKSIZE_DEFAULT + 4; } -- cgit v1.2.3-55-g6feb From e2b41cfb4be2486d9f2d50a8d750eed15c29320e Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sat, 12 Jun 2010 03:32:22 +0200 Subject: date: trivial fix - was reading seconds into nanoseconds field! DOH Signed-off-by: Denys Vlasenko --- coreutils/date.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreutils/date.c b/coreutils/date.c index c3478fab1..8f9aff8b0 100644 --- a/coreutils/date.c +++ b/coreutils/date.c @@ -210,7 +210,7 @@ int date_main(int argc UNUSED_PARAM, char **argv) #if ENABLE_FEATURE_DATE_NANO clock_gettime(CLOCK_REALTIME, &ts); #else - time(&ts.tv_nsec); + time(&ts.tv_sec); #endif } localtime_r(&ts.tv_sec, &tm_time); -- cgit v1.2.3-55-g6feb From d2d327db6d38d5a6e8e253c54d3e97466ce3bc79 Mon Sep 17 00:00:00 2001 From: Seb Date: Sat, 12 Jun 2010 21:57:50 +0200 Subject: stat: make output more similar to GNU stat Signed-off-by: Seb Signed-off-by: Denys Vlasenko --- coreutils/stat.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/coreutils/stat.c b/coreutils/stat.c index 57f1f145a..e7c24e642 100644 --- a/coreutils/stat.c +++ b/coreutils/stat.c @@ -216,10 +216,7 @@ static void FAST_FUNC print_stat(char *pformat, const char m, char *linkname = xmalloc_readlink_or_warn(filename); if (linkname == NULL) return; - /*printf("\"%s\" -> \"%s\"", filename, linkname); */ - printf(pformat, filename); - printf(" -> "); - printf(pformat, linkname); + printf("'%s' -> '%s'", filename, linkname); free(linkname); } else { printf(pformat, filename); @@ -320,24 +317,28 @@ static void print_it(const char *masterformat, b = format; while (b) { + /* Each iteration finds next %spec, + * prints preceding string and handles found %spec + */ size_t len; char *p = strchr(b, '%'); if (!p) { - /* coreutils 6.3 always prints at the end */ + /* coreutils 6.3 always prints newline at the end */ /*fputs(b, stdout);*/ puts(b); break; } - *p++ = '\0'; - fputs(b, stdout); /* dest = "%" */ - len = strspn(p, "#-+.I 0123456789"); - dest[0] = '%'; - memcpy(dest + 1, p, len); - dest[1 + len] = '\0'; - p += len; + len = 1 + strspn(p + 1, "#-+.I 0123456789"); + memcpy(dest, p, len); + dest[len] = '\0'; + /* print preceding string */ + *p = '\0'; + fputs(b, stdout); + + p += len; b = p + 1; switch (*p) { case '\0': @@ -508,7 +509,7 @@ static bool do_stat(const char *filename, const char *format) } else { if (S_ISBLK(statbuf.st_mode) || S_ISCHR(statbuf.st_mode)) { format = - " File: \"%N\"\n" + " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" "Device: %Dh/%dd\tInode: %-10i Links: %-5h" " Device type: %t,%T\n" @@ -516,7 +517,7 @@ static bool do_stat(const char *filename, const char *format) "Access: %x\n" "Modify: %y\n" "Change: %z\n"; } else { format = - " File: \"%N\"\n" + " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" "Device: %Dh/%dd\tInode: %-10i Links: %h\n" "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" @@ -531,14 +532,14 @@ static bool do_stat(const char *filename, const char *format) } else { if (S_ISBLK(statbuf.st_mode) || S_ISCHR(statbuf.st_mode)) { format = (option_mask32 & OPT_SELINUX ? - " File: \"%N\"\n" + " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" "Device: %Dh/%dd\tInode: %-10i Links: %-5h" " Device type: %t,%T\n" "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" " S_Context: %C\n" "Access: %x\n" "Modify: %y\n" "Change: %z\n": - " File: \"%N\"\n" + " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" "Device: %Dh/%dd\tInode: %-10i Links: %-5h" " Device type: %t,%T\n" @@ -546,13 +547,13 @@ static bool do_stat(const char *filename, const char *format) "Access: %x\n" "Modify: %y\n" "Change: %z\n"); } else { format = (option_mask32 & OPT_SELINUX ? - " File: \"%N\"\n" + " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" "Device: %Dh/%dd\tInode: %-10i Links: %h\n" "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" "S_Context: %C\n" "Access: %x\n" "Modify: %y\n" "Change: %z\n": - " File: \"%N\"\n" + " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" "Device: %Dh/%dd\tInode: %-10i Links: %h\n" "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" @@ -601,9 +602,9 @@ static bool do_stat(const char *filename, const char *format) if (S_ISLNK(statbuf.st_mode)) linkname = xmalloc_readlink_or_warn(filename); if (linkname) - printf(" File: \"%s\" -> \"%s\"\n", filename, linkname); + printf(" File: '%s' -> '%s'\n", filename, linkname); else - printf(" File: \"%s\"\n", filename); + printf(" File: '%s'\n", filename); printf(" Size: %-10llu\tBlocks: %-10llu IO Block: %-6lu %s\n" "Device: %llxh/%llud\tInode: %-10llu Links: %-5lu", -- cgit v1.2.3-55-g6feb From d5fa1a0f49c4872f614a4674922f4362b114fece Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 13 Jun 2010 03:43:43 +0200 Subject: xargs: code shrink -15 bytes Signed-off-by: Denys Vlasenko --- findutils/xargs.c | 154 ++++++++++++++++++++++++-------------------------- testsuite/xargs.tests | 5 ++ 2 files changed, 79 insertions(+), 80 deletions(-) diff --git a/findutils/xargs.c b/findutils/xargs.c index 9133b8f6c..25a785336 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c @@ -122,53 +122,49 @@ typedef struct xlist_t { char xstr[1]; } xlist_t; -static smallint eof_stdin_detected; - -#define ISBLANK(c) ((c) == ' ' || (c) == '\t') -#define ISSPACE(c) (ISBLANK(c) || (c) == '\n' || (c) == '\r' \ - || (c) == '\f' || (c) == '\v') +/* In POSIX/C locale isspace is only these chars: "\t\n\v\f\r" and space. + * "\t\n\v\f\r" happen to have ASCII codes 9,10,11,12,13. + */ +#define ISSPACE(a) ({ unsigned char xargs__isspace = (a) - 9; xargs__isspace == (' ' - 9) || xargs__isspace <= (13 - 9); }) #if ENABLE_FEATURE_XARGS_SUPPORT_QUOTES -static xlist_t *process_stdin(xlist_t *list_arg, +static xlist_t* process_stdin(xlist_t *list_arg, const char *eof_str, size_t mc, char *buf) { #define NORM 0 #define QUOTE 1 #define BACKSLASH 2 #define SPACE 4 - - char *s = NULL; /* start word */ - char *p = NULL; /* pointer to end word */ + char *s = NULL; /* start of the word */ + char *p = NULL; /* pointer to end of the word */ char q = '\0'; /* quote char */ char state = NORM; char eof_str_detected = 0; - size_t line_l = 0; /* size loaded args line */ - int c; /* current char */ + size_t line_l = 0; /* size of loaded args */ xlist_t *cur; xlist_t *prev; prev = cur = list_arg; - while (1) { - if (!cur) break; + while (cur) { prev = cur; line_l += cur->length; cur = cur->link; } - while (!eof_stdin_detected) { - c = getchar(); + while (1) { + int c = getchar(); if (c == EOF) { - eof_stdin_detected = 1; if (s) goto unexpected_eof; break; } - if (eof_str_detected) + if (eof_str_detected) /* skip till EOF */ continue; if (state == BACKSLASH) { state = NORM; goto set; - } else if (state == QUOTE) { + } + if (state == QUOTE) { if (c != q) goto set; q = '\0'; @@ -202,7 +198,7 @@ static xlist_t *process_stdin(xlist_t *list_arg, bb_error_msg_and_die("unmatched %s quote", q == '\'' ? "single" : "double"); } - /* word loaded */ + /* A full word is loaded */ if (eof_str) { eof_str_detected = (strcmp(s, eof_str) == 0); } @@ -220,10 +216,8 @@ static xlist_t *process_stdin(xlist_t *list_arg, } prev = cur; line_l += length; - if (line_l > mc) { - /* stop memory usage :-) */ + if (line_l > mc) /* limit stop memory usage */ break; - } } s = NULL; state = NORM; @@ -233,33 +227,32 @@ static xlist_t *process_stdin(xlist_t *list_arg, } #else /* The variant does not support single quotes, double quotes or backslash */ -static xlist_t *process_stdin(xlist_t *list_arg, +static xlist_t* process_stdin(xlist_t *list_arg, const char *eof_str, size_t mc, char *buf) { - - int c; /* current char */ char eof_str_detected = 0; - char *s = NULL; /* start word */ - char *p = NULL; /* pointer to end word */ - size_t line_l = 0; /* size loaded args line */ + char *s = NULL; /* start of the word */ + char *p = NULL; /* pointer to end of the word */ + size_t line_l = 0; /* size of loaded args */ xlist_t *cur; xlist_t *prev; prev = cur = list_arg; - while (1) { - if (!cur) break; + while (cur) { prev = cur; line_l += cur->length; cur = cur->link; } - while (!eof_stdin_detected) { - c = getchar(); + while (1) { + int c = getchar(); if (c == EOF) { - eof_stdin_detected = 1; + if (s == NULL) + break; } - if (eof_str_detected) + if (eof_str_detected) { /* skip till EOF */ continue; + } if (c == EOF || ISSPACE(c)) { if (s == NULL) continue; @@ -271,7 +264,7 @@ static xlist_t *process_stdin(xlist_t *list_arg, bb_error_msg_and_die("argument line too long"); *p++ = (c == EOF ? '\0' : c); if (c == EOF) { /* word's delimiter or EOF detected */ - /* word loaded */ + /* A full word is loaded */ if (eof_str) { eof_str_detected = (strcmp(s, eof_str) == 0); } @@ -289,12 +282,10 @@ static xlist_t *process_stdin(xlist_t *list_arg, } prev = cur; line_l += length; - if (line_l > mc) { - /* stop memory usage :-) */ + if (line_l > mc) /* limit stop memory usage */ break; - } - s = NULL; } + s = NULL; } } return list_arg; @@ -325,28 +316,25 @@ static int xargs_ask_confirmation(void) #endif /* FEATURE_XARGS_SUPPORT_CONFIRMATION */ #if ENABLE_FEATURE_XARGS_SUPPORT_ZERO_TERM -static xlist_t *process0_stdin(xlist_t *list_arg, +static xlist_t* process0_stdin(xlist_t *list_arg, const char *eof_str UNUSED_PARAM, size_t mc, char *buf) { - int c; /* current char */ - char *s = NULL; /* start word */ - char *p = NULL; /* pointer to end word */ - size_t line_l = 0; /* size loaded args line */ + char *s = NULL; /* start of the word */ + char *p = NULL; /* pointer to end of the word */ + size_t line_l = 0; /* size of loaded args */ xlist_t *cur; xlist_t *prev; prev = cur = list_arg; - while (1) { - if (!cur) break; + while (cur) { prev = cur; line_l += cur->length; cur = cur->link; } - while (!eof_stdin_detected) { - c = getchar(); + while (1) { + int c = getchar(); if (c == EOF) { - eof_stdin_detected = 1; if (s == NULL) break; c = '\0'; @@ -357,7 +345,7 @@ static xlist_t *process0_stdin(xlist_t *list_arg, bb_error_msg_and_die("argument line too long"); *p++ = c; if (c == '\0') { /* word's delimiter or EOF detected */ - /* word loaded */ + /* A full word is loaded */ size_t length = (p - buf); /* Dont xzalloc - it can be quite big */ cur = xmalloc(offsetof(xlist_t, xstr) + length); @@ -371,10 +359,8 @@ static xlist_t *process0_stdin(xlist_t *list_arg, } prev = cur; line_l += length; - if (line_l > mc) { - /* stop memory usage :-) */ + if (line_l > mc) /* limit stop memory usage */ break; - } s = NULL; } } @@ -412,12 +398,11 @@ enum { int xargs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int xargs_main(int argc, char **argv) { - char **args; - int i, n; xlist_t *list = NULL; - xlist_t *cur; int child_error = 0; - char *max_args, *max_chars; + char *max_args; + char *max_chars; + char *buf; int n_max_arg; const char *eof_str = NULL; unsigned opt; @@ -441,15 +426,12 @@ int xargs_main(int argc, char **argv) argv += optind; argc -= optind; - if (!argc) { + if (!argv[0]) { /* default behavior is to echo all the filenames */ - *argv = (char*)"echo"; + *--argv = (char*)"echo"; argc++; } - n_max_chars = ARG_MAX; /* might be calling sysconf(_SC_ARG_MAX) */ - if (n_max_chars < 4*1024); /* paranoia */ - n_max_chars = LONG_MAX; /* The Open Group Base Specifications Issue 6: * "The xargs utility shall limit the command line length such that * when the command line is invoked, the combined argument @@ -457,27 +439,32 @@ int xargs_main(int argc, char **argv) * in the System Interfaces volume of IEEE Std 1003.1-2001) * shall not exceed {ARG_MAX}-2048 bytes". */ + n_max_chars = ARG_MAX; /* might be calling sysconf(_SC_ARG_MAX) */ + if (n_max_chars < 4*1024); /* paranoia */ + n_max_chars = 4*1024; n_max_chars -= 2048; /* Sanity check for systems with huge ARG_MAX defines (e.g., Suns which - * have it at 1 meg). Things will work fine with a large ARG_MAX but it - * will probably hurt the system more than it needs to; an array of this - * size is allocated. + * have it at 1 meg). Things will work fine with a large ARG_MAX + * but it will probably hurt the system more than it needs to; + * an array of this size is allocated. */ if (n_max_chars > 20 * 1024) n_max_chars = 20 * 1024; if (opt & OPT_UPTO_SIZE) { + int i; size_t n_chars = 0; n_max_chars = xatoul_range(max_chars, 1, n_max_chars); - for (i = 0; i < argc; i++) { - n_chars += strlen(*argv) + 1; + for (i = 0; argv[i]; i++) { + n_chars += strlen(argv[i]) + 1; } - if (n_max_chars <= n_chars) { + n_max_chars -= n_chars; + if ((ssize_t)n_max_chars <= 0) { bb_error_msg_and_die("can't fit single argument within argument list size limit"); } - n_max_chars -= n_chars; } - max_chars = xmalloc(n_max_chars); + + buf = xmalloc(n_max_chars); if (opt & OPT_UPTO_NUMBER) { n_max_arg = xatoul_range(max_args, 1, INT_MAX); @@ -485,10 +472,14 @@ int xargs_main(int argc, char **argv) n_max_arg = n_max_chars; } - while ((list = read_args(list, eof_str, n_max_chars, max_chars)) != NULL || - !(opt & OPT_NO_EMPTY)) - { + while ((list = read_args(list, eof_str, n_max_chars, buf)) != NULL + || !(opt & OPT_NO_EMPTY) + ) { + char **args; + xlist_t *cur; + int i, n; size_t n_chars = 0; + opt |= OPT_NO_EMPTY; n = 0; #if ENABLE_FEATURE_XARGS_SUPPORT_TERMOPT @@ -510,15 +501,14 @@ int xargs_main(int argc, char **argv) break; } } -#endif /* FEATURE_XARGS_SUPPORT_TERMOPT */ +#endif - /* allocate pointers for execvp: - argc*arg, n*arg from stdin, NULL */ - args = xzalloc((n + argc + 1) * sizeof(char *)); + /* allocate pointers for execvp */ + args = xzalloc(sizeof(args[0]) * (argc + n + 1)); /* store the command to be executed - (taken from the command line) */ - for (i = 0; i < argc; i++) + * (taken from the command line) */ + for (i = 0; argv[i]; i++) args[i] = argv[i]; /* (taken from stdin) */ for (cur = list; n; cur = cur->link) { @@ -535,6 +525,7 @@ int xargs_main(int argc, char **argv) if (!(opt & OPT_INTERACTIVE)) bb_putchar_stderr('\n'); } + if (!(opt & OPT_INTERACTIVE) || xargs_ask_confirmation()) { child_error = xargs_exec(args); } @@ -546,12 +537,15 @@ int xargs_main(int argc, char **argv) free(cur); } free(args); + if (child_error > 0 && child_error != 123) { break; } } /* while */ + if (ENABLE_FEATURE_CLEAN_UP) - free(max_chars); + free(buf); + return child_error; } diff --git a/testsuite/xargs.tests b/testsuite/xargs.tests index 17f4e7a1b..c73363038 100755 --- a/testsuite/xargs.tests +++ b/testsuite/xargs.tests @@ -26,4 +26,9 @@ testing "xargs does not stop on underscore ('new' GNU behavior)" \ "a _ b\n" \ "" "a\n_\nb\n" +testing "xargs -s7 can take one-char input" \ + "xargs -s7" \ + "a\n" \ + "" "a\n" + exit $FAILCOUNT -- cgit v1.2.3-55-g6feb From 1613de85d9203fa8628569e8e722899b184b24d8 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 13 Jun 2010 03:44:27 +0200 Subject: xargs: make -s NUM accept practically unlimited range Signed-off-by: Denys Vlasenko --- findutils/xargs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/findutils/xargs.c b/findutils/xargs.c index 25a785336..9ee5833e5 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c @@ -454,7 +454,7 @@ int xargs_main(int argc, char **argv) if (opt & OPT_UPTO_SIZE) { int i; size_t n_chars = 0; - n_max_chars = xatoul_range(max_chars, 1, n_max_chars); + n_max_chars = xatoul_range(max_chars, 1, INT_MAX); for (i = 0; argv[i]; i++) { n_chars += strlen(argv[i]) + 1; } -- cgit v1.2.3-55-g6feb From aaa24e09f98f2694f25abb08cee1a74d7f114b7f Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 13 Jun 2010 12:43:54 +0200 Subject: xargs: fix accounting of -sNUM Signed-off-by: Denys Vlasenko --- findutils/xargs.c | 99 ++++++++++++++++++++++++--------------------------- testsuite/xargs.tests | 12 ++++++- 2 files changed, 57 insertions(+), 54 deletions(-) diff --git a/findutils/xargs.c b/findutils/xargs.c index 9ee5833e5..9988e3dd5 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c @@ -89,9 +89,9 @@ #endif /* - This function has special algorithm. - Don't use fork and include to main! -*/ + * This function has special algorithm. + * Don't use fork and include to main! + */ static int xargs_exec(char **args) { int status; @@ -118,7 +118,7 @@ static int xargs_exec(char **args) typedef struct xlist_t { struct xlist_t *link; - size_t length; + size_t length; /* length of xstr[] including NUL */ char xstr[1]; } xlist_t; @@ -129,7 +129,7 @@ typedef struct xlist_t { #if ENABLE_FEATURE_XARGS_SUPPORT_QUOTES static xlist_t* process_stdin(xlist_t *list_arg, - const char *eof_str, size_t mc, char *buf) + const char *eof_str, size_t n_max_chars, char *buf) { #define NORM 0 #define QUOTE 1 @@ -187,7 +187,7 @@ static xlist_t* process_stdin(xlist_t *list_arg, state = QUOTE; } else { set: - if ((size_t)(p - buf) >= mc) + if ((size_t)(p - buf) >= n_max_chars) bb_error_msg_and_die("argument line too long"); *p++ = c; } @@ -216,7 +216,7 @@ static xlist_t* process_stdin(xlist_t *list_arg, } prev = cur; line_l += length; - if (line_l > mc) /* limit stop memory usage */ + if (line_l >= n_max_chars) /* limit memory usage */ break; } s = NULL; @@ -228,7 +228,7 @@ static xlist_t* process_stdin(xlist_t *list_arg, #else /* The variant does not support single quotes, double quotes or backslash */ static xlist_t* process_stdin(xlist_t *list_arg, - const char *eof_str, size_t mc, char *buf) + const char *eof_str, size_t n_max_chars, char *buf) { char eof_str_detected = 0; char *s = NULL; /* start of the word */ @@ -260,7 +260,7 @@ static xlist_t* process_stdin(xlist_t *list_arg, } if (s == NULL) s = p = buf; - if ((size_t)(p - buf) >= mc) + if ((size_t)(p - buf) >= n_max_chars) bb_error_msg_and_die("argument line too long"); *p++ = (c == EOF ? '\0' : c); if (c == EOF) { /* word's delimiter or EOF detected */ @@ -282,7 +282,7 @@ static xlist_t* process_stdin(xlist_t *list_arg, } prev = cur; line_l += length; - if (line_l > mc) /* limit stop memory usage */ + if (line_l >= n_max_chars) /* limit memory usage */ break; } s = NULL; @@ -292,32 +292,9 @@ static xlist_t* process_stdin(xlist_t *list_arg, } #endif /* FEATURE_XARGS_SUPPORT_QUOTES */ - -#if ENABLE_FEATURE_XARGS_SUPPORT_CONFIRMATION -/* Prompt the user for a response, and - if the user responds affirmatively, return true; - otherwise, return false. Uses "/dev/tty", not stdin. */ -static int xargs_ask_confirmation(void) -{ - FILE *tty_stream; - int c, savec; - - tty_stream = xfopen_for_read(CURRENT_TTY); - fputs(" ?...", stderr); - fflush_all(); - c = savec = getc(tty_stream); - while (c != EOF && c != '\n') - c = getc(tty_stream); - fclose(tty_stream); - return (savec == 'y' || savec == 'Y'); -} -#else -# define xargs_ask_confirmation() 1 -#endif /* FEATURE_XARGS_SUPPORT_CONFIRMATION */ - #if ENABLE_FEATURE_XARGS_SUPPORT_ZERO_TERM static xlist_t* process0_stdin(xlist_t *list_arg, - const char *eof_str UNUSED_PARAM, size_t mc, char *buf) + const char *eof_str UNUSED_PARAM, size_t n_max_chars, char *buf) { char *s = NULL; /* start of the word */ char *p = NULL; /* pointer to end of the word */ @@ -341,7 +318,7 @@ static xlist_t* process0_stdin(xlist_t *list_arg, } if (s == NULL) s = p = buf; - if ((size_t)(p - buf) >= mc) + if ((size_t)(p - buf) >= n_max_chars) bb_error_msg_and_die("argument line too long"); *p++ = c; if (c == '\0') { /* word's delimiter or EOF detected */ @@ -359,7 +336,7 @@ static xlist_t* process0_stdin(xlist_t *list_arg, } prev = cur; line_l += length; - if (line_l > mc) /* limit stop memory usage */ + if (line_l >= n_max_chars) /* limit memory usage */ break; s = NULL; } @@ -368,6 +345,28 @@ static xlist_t* process0_stdin(xlist_t *list_arg, } #endif /* FEATURE_XARGS_SUPPORT_ZERO_TERM */ +#if ENABLE_FEATURE_XARGS_SUPPORT_CONFIRMATION +/* Prompt the user for a response, and + if the user responds affirmatively, return true; + otherwise, return false. Uses "/dev/tty", not stdin. */ +static int xargs_ask_confirmation(void) +{ + FILE *tty_stream; + int c, savec; + + tty_stream = xfopen_for_read(CURRENT_TTY); + fputs(" ?...", stderr); + fflush_all(); + c = savec = getc(tty_stream); + while (c != EOF && c != '\n') + c = getc(tty_stream); + fclose(tty_stream); + return (savec == 'y' || savec == 'Y'); +} +#else +# define xargs_ask_confirmation() 1 +#endif + /* Correct regardless of combination of CONFIG_xxx */ enum { OPTBIT_VERBOSE = 0, @@ -468,9 +467,11 @@ int xargs_main(int argc, char **argv) if (opt & OPT_UPTO_NUMBER) { n_max_arg = xatoul_range(max_args, 1, INT_MAX); - } else { - n_max_arg = n_max_chars; + if (n_max_arg < n_max_chars) + goto skip; } + n_max_arg = n_max_chars; + skip: while ((list = read_args(list, eof_str, n_max_chars, buf)) != NULL || !(opt & OPT_NO_EMPTY) @@ -478,30 +479,22 @@ int xargs_main(int argc, char **argv) char **args; xlist_t *cur; int i, n; - size_t n_chars = 0; + size_t n_chars; opt |= OPT_NO_EMPTY; + + /* take args from list, not exceeding arg and char limits */ + n_chars = 0; n = 0; -#if ENABLE_FEATURE_XARGS_SUPPORT_TERMOPT - for (cur = list; cur;) { + for (cur = list; cur; cur = cur->link) { n_chars += cur->length; - n++; - cur = cur->link; - if (n_chars > n_max_chars || (n == n_max_arg && cur)) { + if (n_chars > n_max_chars || n >= n_max_arg) { if (opt & OPT_TERMINATE) bb_error_msg_and_die("argument list too long"); break; } - } -#else - for (cur = list; cur; cur = cur->link) { - n_chars += cur->length; n++; - if (n_chars > n_max_chars || n == n_max_arg) { - break; - } } -#endif /* allocate pointers for execvp */ args = xzalloc(sizeof(args[0]) * (argc + n + 1)); @@ -530,7 +523,7 @@ int xargs_main(int argc, char **argv) child_error = xargs_exec(args); } - /* clean up */ + /* remove list elements which we consumed */ for (i = argc; args[i]; i++) { cur = list; list = list->link; diff --git a/testsuite/xargs.tests b/testsuite/xargs.tests index c73363038..6463252bf 100755 --- a/testsuite/xargs.tests +++ b/testsuite/xargs.tests @@ -27,8 +27,18 @@ testing "xargs does not stop on underscore ('new' GNU behavior)" \ "" "a\n_\nb\n" testing "xargs -s7 can take one-char input" \ - "xargs -s7" \ + "xargs -s7 echo" \ "a\n" \ "" "a\n" +testing "xargs -sNUM test 1" \ + "xargs -ts25 echo 2>&1 >/dev/null" \ + "echo 1 2 3 4 5 6 7 8 9 0\n""echo 1 2 3 4 5 6 7 8 9\n""echo 00\n" \ + "" "1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 00\n" + +testing "xargs -sNUM test 2" \ + "xargs -ts25 echo 1 2>&1 >/dev/null" \ + "echo 1 2 3 4 5 6 7 8 9 0\n""echo 1 2 3 4 5 6 7 8 9\n""echo 1 00\n" \ + "" "2 3 4 5 6 7 8 9 0 2 3 4 5 6 7 8 9 00\n" + exit $FAILCOUNT -- cgit v1.2.3-55-g6feb From 7a4021debaa1f89c0ee2ad41f446a8234f8261c7 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 14 Jun 2010 00:57:05 +0200 Subject: xargs: simplify logic Removed double-buffering in a linked list. function old new delta store_param - 56 +56 xargs_main 871 840 -31 process_stdin 458 396 -62 process0_stdin 267 143 -124 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/3 up/down: 56/-217) Total: -161 bytes Signed-off-by: Denys Vlasenko --- findutils/xargs.c | 383 ++++++++++++++++++++++++++---------------------------- 1 file changed, 184 insertions(+), 199 deletions(-) diff --git a/findutils/xargs.c b/findutils/xargs.c index 9988e3dd5..857773df9 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c @@ -59,10 +59,6 @@ //config: are not special. #include "libbb.h" - -/* This is a NOEXEC applet. Be very careful! */ - - /* COMPAT: SYSV version defaults size (and has a max value of) to 470. We try to make it as large as possible. */ #if !defined(ARG_MAX) && defined(_SC_ARG_MAX) @@ -72,6 +68,12 @@ # define ARG_MAX 470 #endif +/* This is a NOEXEC applet. Be very careful! */ + + +//#define dbg_msg(...) bb_error_msg(__VA_ARGS__) +#define dbg_msg(...) ((void)0) + #ifdef TEST # ifndef ENABLE_FEATURE_XARGS_SUPPORT_CONFIRMATION @@ -88,26 +90,36 @@ # endif #endif + +struct globals { + char **args; + const char *eof_str; + int idx; +} FIX_ALIASING; +#define G (*(struct globals*)&bb_common_bufsiz1) +#define INIT_G() do { } while (0) + + /* * This function has special algorithm. * Don't use fork and include to main! */ -static int xargs_exec(char **args) +static int xargs_exec(void) { int status; - status = spawn_and_wait(args); + status = spawn_and_wait(G.args); if (status < 0) { - bb_simple_perror_msg(args[0]); + bb_simple_perror_msg(G.args[0]); return errno == ENOENT ? 127 : 126; } if (status == 255) { - bb_error_msg("%s: exited with status 255; aborting", args[0]); + bb_error_msg("%s: exited with status 255; aborting", G.args[0]); return 124; } if (status >= 0x180) { bb_error_msg("%s: terminated by signal %d", - args[0], status - 0x180); + G.args[0], status - 0x180); return 125; } if (status) @@ -115,51 +127,59 @@ static int xargs_exec(char **args) return 0; } - -typedef struct xlist_t { - struct xlist_t *link; - size_t length; /* length of xstr[] including NUL */ - char xstr[1]; -} xlist_t; - /* In POSIX/C locale isspace is only these chars: "\t\n\v\f\r" and space. * "\t\n\v\f\r" happen to have ASCII codes 9,10,11,12,13. */ #define ISSPACE(a) ({ unsigned char xargs__isspace = (a) - 9; xargs__isspace == (' ' - 9) || xargs__isspace <= (13 - 9); }) +static void store_param(char *s) +{ + /* Grow by 256 elements at once */ + if (!(G.idx & 0xff)) { /* G.idx == N*256 */ + /* Enlarge, make G.args[(N+1)*256 - 1] last valid idx */ + G.args = xrealloc(G.args, sizeof(G.args[0]) * (G.idx + 0x100)); + } + G.args[G.idx++] = s; +} + +/* process[0]_stdin: + * Read characters into buf[n_max_chars+1], and when parameter delimiter + * is seen, store the address of a new parameter to args[]. + * If reading discovers that last chars do not form the complete + * parameter, the pointer to the first such "tail character" is returned. + * (buf has extra byte at the end to accomodate terminating NUL + * of "tail characters" string). + * Otherwise, the returned pointer points to NUL byte. + * The args[] vector is NULL-terminated. + * On entry, buf[] may contain some "seed chars" which are to become + * the beginning of the first parameter. + */ + #if ENABLE_FEATURE_XARGS_SUPPORT_QUOTES -static xlist_t* process_stdin(xlist_t *list_arg, - const char *eof_str, size_t n_max_chars, char *buf) +static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf) { #define NORM 0 #define QUOTE 1 #define BACKSLASH 2 #define SPACE 4 - char *s = NULL; /* start of the word */ - char *p = NULL; /* pointer to end of the word */ + char *s; /* start of the word */ + char *p; /* pointer to end of the word */ char q = '\0'; /* quote char */ char state = NORM; - char eof_str_detected = 0; - size_t line_l = 0; /* size of loaded args */ - xlist_t *cur; - xlist_t *prev; - - prev = cur = list_arg; - while (cur) { - prev = cur; - line_l += cur->length; - cur = cur->link; - } + + s = buf; + p = s + strlen(buf); + + /* "goto ret" is used instead of "break" to make control flow + * more obvious: */ while (1) { int c = getchar(); if (c == EOF) { - if (s) - goto unexpected_eof; - break; + if (p != s) + goto close_word; + goto ret; } - if (eof_str_detected) /* skip till EOF */ - continue; if (state == BACKSLASH) { state = NORM; goto set; @@ -171,15 +191,13 @@ static xlist_t* process_stdin(xlist_t *list_arg, state = NORM; } else { /* if (state == NORM) */ if (ISSPACE(c)) { - if (s) { - unexpected_eof: + if (p != s) { + close_word: state = SPACE; c = '\0'; goto set; } } else { - if (s == NULL) - s = p = buf; if (c == '\\') { state = BACKSLASH; } else if (c == '\'' || c == '"') { @@ -187,8 +205,6 @@ static xlist_t* process_stdin(xlist_t *list_arg, state = QUOTE; } else { set: - if ((size_t)(p - buf) >= n_max_chars) - bb_error_msg_and_die("argument line too long"); *p++ = c; } } @@ -199,149 +215,128 @@ static xlist_t* process_stdin(xlist_t *list_arg, q == '\'' ? "single" : "double"); } /* A full word is loaded */ - if (eof_str) { - eof_str_detected = (strcmp(s, eof_str) == 0); - } - if (!eof_str_detected) { - size_t length = (p - buf); - /* Dont xzalloc - it can be quite big */ - cur = xmalloc(offsetof(xlist_t, xstr) + length); - cur->link = NULL; - cur->length = length; - memcpy(cur->xstr, s, length); - if (prev == NULL) { - list_arg = cur; - } else { - prev->link = cur; + if (G.eof_str) { + if (strcmp(s, G.eof_str) == 0) { + while (getchar() != EOF) + continue; + p = s; + goto ret; } - prev = cur; - line_l += length; - if (line_l >= n_max_chars) /* limit memory usage */ - break; } - s = NULL; + n_max_chars -= (p - s); + /* if (n_max_chars < 0) impossible */ + store_param(s); + dbg_msg("args[]:'%s'", s); + s = p; + n_max_arg--; + if (n_max_arg == 0 || n_max_chars == 0) { + goto ret; + } state = NORM; + } else /* state != SPACE */ + if (p - s >= n_max_chars) { + dbg_msg("s:'%s' p-s:%d n_max_chars:%d", s, (int)(p-s), n_max_chars); + goto ret; } } - return list_arg; + ret: + *p = '\0'; + store_param(NULL); + dbg_msg("return:'%s'", s); + return s; } #else /* The variant does not support single quotes, double quotes or backslash */ -static xlist_t* process_stdin(xlist_t *list_arg, - const char *eof_str, size_t n_max_chars, char *buf) +static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf) { - char eof_str_detected = 0; - char *s = NULL; /* start of the word */ - char *p = NULL; /* pointer to end of the word */ - size_t line_l = 0; /* size of loaded args */ - xlist_t *cur; - xlist_t *prev; - - prev = cur = list_arg; - while (cur) { - prev = cur; - line_l += cur->length; - cur = cur->link; - } + char *s; /* start of the word */ + char *p; /* pointer to end of the word */ + + s = buf; + p = s + strlen(buf); while (1) { int c = getchar(); if (c == EOF) { - if (s == NULL) - break; - } - if (eof_str_detected) { /* skip till EOF */ - continue; + if (p == s) + goto ret; } if (c == EOF || ISSPACE(c)) { - if (s == NULL) + if (p == s) continue; c = EOF; } - if (s == NULL) - s = p = buf; - if ((size_t)(p - buf) >= n_max_chars) - bb_error_msg_and_die("argument line too long"); *p++ = (c == EOF ? '\0' : c); if (c == EOF) { /* word's delimiter or EOF detected */ /* A full word is loaded */ - if (eof_str) { - eof_str_detected = (strcmp(s, eof_str) == 0); - } - if (!eof_str_detected) { - size_t length = (p - buf); - /* Dont xzalloc - it can be quite big */ - cur = xmalloc(offsetof(xlist_t, xstr) + length); - cur->link = NULL; - cur->length = length; - memcpy(cur->xstr, s, length); - if (prev == NULL) { - list_arg = cur; - } else { - prev->link = cur; + if (G.eof_str) { + if (strcmp(s, G.eof_str) == 0) { + while (getchar() != EOF) + continue; + p = s; + goto ret; } - prev = cur; - line_l += length; - if (line_l >= n_max_chars) /* limit memory usage */ - break; } - s = NULL; + n_max_chars -= (p - s); + /* if (n_max_chars < 0) impossible */ + store_param(s); + dbg_msg("args[]:'%s'", s); + s = p; + n_max_arg--; + if (n_max_arg == 0 || n_max_chars == 0) { + goto ret; + } + } else /* c != EOF */ + if (p - s >= n_max_chars) { + goto ret; } } - return list_arg; + ret: + *p = '\0'; + store_param(NULL); + dbg_msg("return:'%s'", s); + return s; } #endif /* FEATURE_XARGS_SUPPORT_QUOTES */ #if ENABLE_FEATURE_XARGS_SUPPORT_ZERO_TERM -static xlist_t* process0_stdin(xlist_t *list_arg, - const char *eof_str UNUSED_PARAM, size_t n_max_chars, char *buf) +static char* FAST_FUNC process0_stdin(int n_max_chars, int n_max_arg, char *buf) { - char *s = NULL; /* start of the word */ - char *p = NULL; /* pointer to end of the word */ - size_t line_l = 0; /* size of loaded args */ - xlist_t *cur; - xlist_t *prev; - - prev = cur = list_arg; - while (cur) { - prev = cur; - line_l += cur->length; - cur = cur->link; - } + char *s; /* start of the word */ + char *p; /* pointer to end of the word */ + + s = buf; + p = s + strlen(buf); while (1) { int c = getchar(); if (c == EOF) { - if (s == NULL) - break; + if (p == s) + goto ret; c = '\0'; } - if (s == NULL) - s = p = buf; - if ((size_t)(p - buf) >= n_max_chars) - bb_error_msg_and_die("argument line too long"); *p++ = c; if (c == '\0') { /* word's delimiter or EOF detected */ /* A full word is loaded */ - size_t length = (p - buf); - /* Dont xzalloc - it can be quite big */ - cur = xmalloc(offsetof(xlist_t, xstr) + length); - cur->link = NULL; - cur->length = length; - memcpy(cur->xstr, s, length); - if (prev == NULL) { - list_arg = cur; - } else { - prev->link = cur; + n_max_chars -= (p - s); + /* if (n_max_chars < 0) impossible */ + store_param(s); + dbg_msg("args[]:'%s'", s); + n_max_arg--; + s = p; + if (n_max_arg == 0 || n_max_chars == 0) { + goto ret; } - prev = cur; - line_l += length; - if (line_l >= n_max_chars) /* limit memory usage */ - break; - s = NULL; + } else /* c != '\0' */ + if (p - s >= n_max_chars) { + goto ret; } } - return list_arg; + ret: + *p = '\0'; + store_param(NULL); + dbg_msg("return:'%s'", s); + return s; } #endif /* FEATURE_XARGS_SUPPORT_ZERO_TERM */ @@ -397,28 +392,30 @@ enum { int xargs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int xargs_main(int argc, char **argv) { - xlist_t *list = NULL; + int i; int child_error = 0; char *max_args; char *max_chars; char *buf; - int n_max_arg; - const char *eof_str = NULL; unsigned opt; - size_t n_max_chars; + int n_max_chars; + int n_max_arg; #if ENABLE_FEATURE_XARGS_SUPPORT_ZERO_TERM - xlist_t* (*read_args)(xlist_t*, const char*, size_t, char*) = process_stdin; + char* FAST_FUNC (*read_args)(int, int, char*) = process_stdin; #else #define read_args process_stdin #endif - opt = getopt32(argv, OPTION_STR, &max_args, &max_chars, &eof_str, &eof_str); + INIT_G(); + + G.eof_str = NULL; + opt = getopt32(argv, OPTION_STR, &max_args, &max_chars, &G.eof_str, &G.eof_str); /* -E ""? You may wonder why not just omit -E? * This is used for portability: * old xargs was using "_" as default for -E / -e */ - if ((opt & OPT_EOF_STRING1) && eof_str[0] == '\0') - eof_str = NULL; + if ((opt & OPT_EOF_STRING1) && G.eof_str[0] == '\0') + G.eof_str = NULL; if (opt & OPT_ZEROTERM) IF_FEATURE_XARGS_SUPPORT_ZERO_TERM(read_args = process0_stdin); @@ -451,93 +448,81 @@ int xargs_main(int argc, char **argv) n_max_chars = 20 * 1024; if (opt & OPT_UPTO_SIZE) { - int i; size_t n_chars = 0; - n_max_chars = xatoul_range(max_chars, 1, INT_MAX); + n_max_chars = xatou_range(max_chars, 1, INT_MAX); for (i = 0; argv[i]; i++) { n_chars += strlen(argv[i]) + 1; } n_max_chars -= n_chars; - if ((ssize_t)n_max_chars <= 0) { + if (n_max_chars <= 0) { bb_error_msg_and_die("can't fit single argument within argument list size limit"); } } - buf = xmalloc(n_max_chars); + buf = xzalloc(n_max_chars + 1); if (opt & OPT_UPTO_NUMBER) { - n_max_arg = xatoul_range(max_args, 1, INT_MAX); + n_max_arg = xatou_range(max_args, 1, INT_MAX); if (n_max_arg < n_max_chars) goto skip; } n_max_arg = n_max_chars; skip: - while ((list = read_args(list, eof_str, n_max_chars, buf)) != NULL - || !(opt & OPT_NO_EMPTY) - ) { - char **args; - xlist_t *cur; - int i, n; - size_t n_chars; + /* Allocate pointers for execvp */ + /* We can statically allocate (argc + n_max_arg + 1) elements + * and do not bother with resizing args[], but on 64-bit machines + * this results in args[] vector which is ~8 times bigger + * than n_max_chars! That is, with n_max_chars == 20k, + * args[] will take 160k (!), which will most likely be + * almost entirely unused. + */ + /* See store_param() for matching 256-step growth logic */ + G.args = xmalloc(sizeof(G.args[0]) * ((argc + 0xff) & ~0xff)); - opt |= OPT_NO_EMPTY; + /* Store the command to be executed, part 1 */ + for (i = 0; argv[i]; i++) + G.args[i] = argv[i]; - /* take args from list, not exceeding arg and char limits */ - n_chars = 0; - n = 0; - for (cur = list; cur; cur = cur->link) { - n_chars += cur->length; - if (n_chars > n_max_chars || n >= n_max_arg) { - if (opt & OPT_TERMINATE) - bb_error_msg_and_die("argument list too long"); - break; - } - n++; - } + while (1) { + char *rem; + + G.idx = argc; + rem = read_args(n_max_chars, n_max_arg, buf); - /* allocate pointers for execvp */ - args = xzalloc(sizeof(args[0]) * (argc + n + 1)); - - /* store the command to be executed - * (taken from the command line) */ - for (i = 0; argv[i]; i++) - args[i] = argv[i]; - /* (taken from stdin) */ - for (cur = list; n; cur = cur->link) { - args[i++] = cur->xstr; - n--; + if (!G.args[argc]) { + if (*rem != '\0') + bb_error_msg_and_die("argument line too long"); + if (opt & OPT_NO_EMPTY) + break; } + opt |= OPT_NO_EMPTY; if (opt & (OPT_INTERACTIVE | OPT_VERBOSE)) { - for (i = 0; args[i]; i++) { + for (i = 0; G.args[i]; i++) { if (i) bb_putchar_stderr(' '); - fputs(args[i], stderr); + fputs(G.args[i], stderr); } if (!(opt & OPT_INTERACTIVE)) bb_putchar_stderr('\n'); } if (!(opt & OPT_INTERACTIVE) || xargs_ask_confirmation()) { - child_error = xargs_exec(args); - } - - /* remove list elements which we consumed */ - for (i = argc; args[i]; i++) { - cur = list; - list = list->link; - free(cur); + child_error = xargs_exec(); } - free(args); if (child_error > 0 && child_error != 123) { break; } + + overlapping_strcpy(buf, rem); } /* while */ - if (ENABLE_FEATURE_CLEAN_UP) + if (ENABLE_FEATURE_CLEAN_UP) { + free(G.args); free(buf); + } return child_error; } -- cgit v1.2.3-55-g6feb From c28cafb18d4ecf079d77f15a7b8d9ba6d4241b5a Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 14 Jun 2010 12:38:36 +0200 Subject: xargs: trivial code shrink function old new delta process_stdin 343 336 -7 process0_stdin 124 117 -7 xargs_main 807 787 -20 Signed-off-by: Denys Vlasenko --- findutils/xargs.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/findutils/xargs.c b/findutils/xargs.c index 857773df9..5c2668553 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c @@ -150,7 +150,6 @@ static void store_param(char *s) * (buf has extra byte at the end to accomodate terminating NUL * of "tail characters" string). * Otherwise, the returned pointer points to NUL byte. - * The args[] vector is NULL-terminated. * On entry, buf[] may contain some "seed chars" which are to become * the beginning of the first parameter. */ @@ -241,7 +240,7 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf) } ret: *p = '\0'; - store_param(NULL); + /* store_param(NULL) - caller will do it */ dbg_msg("return:'%s'", s); return s; } @@ -293,7 +292,7 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf) } ret: *p = '\0'; - store_param(NULL); + /* store_param(NULL) - caller will do it */ dbg_msg("return:'%s'", s); return s; } @@ -334,7 +333,7 @@ static char* FAST_FUNC process0_stdin(int n_max_chars, int n_max_arg, char *buf) } ret: *p = '\0'; - store_param(NULL); + /* store_param(NULL) - caller will do it */ dbg_msg("return:'%s'", s); return s; } @@ -461,13 +460,10 @@ int xargs_main(int argc, char **argv) buf = xzalloc(n_max_chars + 1); + n_max_arg = n_max_chars; if (opt & OPT_UPTO_NUMBER) { n_max_arg = xatou_range(max_args, 1, INT_MAX); - if (n_max_arg < n_max_chars) - goto skip; } - n_max_arg = n_max_chars; - skip: /* Allocate pointers for execvp */ /* We can statically allocate (argc + n_max_arg + 1) elements @@ -489,6 +485,7 @@ int xargs_main(int argc, char **argv) G.idx = argc; rem = read_args(n_max_chars, n_max_arg, buf); + store_param(NULL); if (!G.args[argc]) { if (*rem != '\0') @@ -499,10 +496,11 @@ int xargs_main(int argc, char **argv) opt |= OPT_NO_EMPTY; if (opt & (OPT_INTERACTIVE | OPT_VERBOSE)) { - for (i = 0; G.args[i]; i++) { - if (i) - bb_putchar_stderr(' '); - fputs(G.args[i], stderr); + const char *fmt = " %s" + 1; + char **args = G.args; + for (i = 0; args[i]; i++) { + fprintf(stderr, fmt, args[i]); + fmt = " %s"; } if (!(opt & OPT_INTERACTIVE)) bb_putchar_stderr('\n'); -- cgit v1.2.3-55-g6feb From da3a956dda5281c34c9102c90591db223190c2e0 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 14 Jun 2010 14:27:26 +0200 Subject: scripts/echo.c: remove bb-ism Signed-off-by: Denys Vlasenko --- scripts/echo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/echo.c b/scripts/echo.c index 85a8aa913..3c45e339c 100644 --- a/scripts/echo.c +++ b/scripts/echo.c @@ -187,7 +187,7 @@ int main(int argc, char **argv) putchar('\n'); } ret: - return fflush_all(); + return fflush(NULL); } /*- -- cgit v1.2.3-55-g6feb From 1cd769a154b04f4b058beed482a5dd7192437cdc Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 14 Jun 2010 14:28:31 +0200 Subject: rfkill: do not enable by default, it requires new-ish Linux headers Signed-off-by: Denys Vlasenko --- miscutils/Config.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/miscutils/Config.src b/miscutils/Config.src index be2b37666..012132e7b 100644 --- a/miscutils/Config.src +++ b/miscutils/Config.src @@ -549,7 +549,7 @@ config READAHEAD config RFKILL bool "rfkill" - default y + default n help Enable/disable wireless devices. -- cgit v1.2.3-55-g6feb From f7e929e795c433014f76e4be808776e6dc968cbc Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 15 Jun 2010 10:02:04 +0200 Subject: xargs: trivial code shrink function old new delta xargs_main 807 787 -20 Signed-off-by: Denys Vlasenko --- findutils/xargs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/findutils/xargs.c b/findutils/xargs.c index 5c2668553..d9f8a3b18 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c @@ -222,10 +222,10 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf) goto ret; } } - n_max_chars -= (p - s); - /* if (n_max_chars < 0) impossible */ store_param(s); dbg_msg("args[]:'%s'", s); + n_max_chars -= (p - s); + /* if (n_max_chars < 0) impossible */ s = p; n_max_arg--; if (n_max_arg == 0 || n_max_chars == 0) { @@ -276,10 +276,10 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf) goto ret; } } - n_max_chars -= (p - s); - /* if (n_max_chars < 0) impossible */ store_param(s); dbg_msg("args[]:'%s'", s); + n_max_chars -= (p - s); + /* if (n_max_chars < 0) impossible */ s = p; n_max_arg--; if (n_max_arg == 0 || n_max_chars == 0) { @@ -317,12 +317,12 @@ static char* FAST_FUNC process0_stdin(int n_max_chars, int n_max_arg, char *buf) *p++ = c; if (c == '\0') { /* word's delimiter or EOF detected */ /* A full word is loaded */ - n_max_chars -= (p - s); - /* if (n_max_chars < 0) impossible */ store_param(s); dbg_msg("args[]:'%s'", s); - n_max_arg--; + n_max_chars -= (p - s); + /* if (n_max_chars < 0) impossible */ s = p; + n_max_arg--; if (n_max_arg == 0 || n_max_chars == 0) { goto ret; } -- cgit v1.2.3-55-g6feb From 237aecedabb05abb199018c1e08b645b594bbff9 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 15 Jun 2010 10:18:01 +0200 Subject: xargs: another code shrink function old new delta process0_stdin 117 103 -14 process_stdin 336 314 -22 Signed-off-by: Denys Vlasenko --- findutils/xargs.c | 50 ++++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/findutils/xargs.c b/findutils/xargs.c index d9f8a3b18..8caaff91c 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c @@ -18,7 +18,7 @@ */ //kbuild:lib-$(CONFIG_XARGS) += xargs.o -//config: + //config:config XARGS //config: bool "xargs" //config: default y @@ -161,13 +161,12 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf) #define QUOTE 1 #define BACKSLASH 2 #define SPACE 4 - char *s; /* start of the word */ - char *p; /* pointer to end of the word */ - char q = '\0'; /* quote char */ + char q = '\0'; /* quote char */ char state = NORM; + char *s = buf; /* start of the word */ + char *p = s + strlen(buf); /* end of the word */ - s = buf; - p = s + strlen(buf); + buf += n_max_chars; /* past buffer's end */ /* "goto ret" is used instead of "break" to make control flow * more obvious: */ @@ -224,17 +223,14 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf) } store_param(s); dbg_msg("args[]:'%s'", s); - n_max_chars -= (p - s); - /* if (n_max_chars < 0) impossible */ s = p; n_max_arg--; - if (n_max_arg == 0 || n_max_chars == 0) { + if (n_max_arg == 0) { goto ret; } state = NORM; - } else /* state != SPACE */ - if (p - s >= n_max_chars) { - dbg_msg("s:'%s' p-s:%d n_max_chars:%d", s, (int)(p-s), n_max_chars); + } + if (p == buf) { goto ret; } } @@ -248,11 +244,10 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf) /* The variant does not support single quotes, double quotes or backslash */ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf) { - char *s; /* start of the word */ - char *p; /* pointer to end of the word */ + char *s = buf; /* start of the word */ + char *p = s + strlen(buf); /* end of the word */ - s = buf; - p = s + strlen(buf); + buf += n_max_chars; /* past buffer's end */ while (1) { int c = getchar(); @@ -278,15 +273,13 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf) } store_param(s); dbg_msg("args[]:'%s'", s); - n_max_chars -= (p - s); - /* if (n_max_chars < 0) impossible */ s = p; n_max_arg--; - if (n_max_arg == 0 || n_max_chars == 0) { + if (n_max_arg == 0) { goto ret; } - } else /* c != EOF */ - if (p - s >= n_max_chars) { + } + if (p == buf) { goto ret; } } @@ -301,11 +294,10 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf) #if ENABLE_FEATURE_XARGS_SUPPORT_ZERO_TERM static char* FAST_FUNC process0_stdin(int n_max_chars, int n_max_arg, char *buf) { - char *s; /* start of the word */ - char *p; /* pointer to end of the word */ + char *s = buf; /* start of the word */ + char *p = s + strlen(buf); /* end of the word */ - s = buf; - p = s + strlen(buf); + buf += n_max_chars; /* past buffer's end */ while (1) { int c = getchar(); @@ -319,15 +311,13 @@ static char* FAST_FUNC process0_stdin(int n_max_chars, int n_max_arg, char *buf) /* A full word is loaded */ store_param(s); dbg_msg("args[]:'%s'", s); - n_max_chars -= (p - s); - /* if (n_max_chars < 0) impossible */ s = p; n_max_arg--; - if (n_max_arg == 0 || n_max_chars == 0) { + if (n_max_arg == 0) { goto ret; } - } else /* c != '\0' */ - if (p - s >= n_max_chars) { + } + if (p == buf) { goto ret; } } -- cgit v1.2.3-55-g6feb From c37fecb86c52da9e2781ee9eeb90d5d8894f59e0 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 15 Jun 2010 15:15:57 +0200 Subject: file rename: TODO_config_nommu -> TEST_config_nommu Signed-off-by: Denys Vlasenko --- TEST_config_nommu | 928 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ TODO_config_nommu | 928 ------------------------------------------------------ 2 files changed, 928 insertions(+), 928 deletions(-) create mode 100644 TEST_config_nommu delete mode 100644 TODO_config_nommu diff --git a/TEST_config_nommu b/TEST_config_nommu new file mode 100644 index 000000000..911f02f6b --- /dev/null +++ b/TEST_config_nommu @@ -0,0 +1,928 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.16.0 +# Wed Jan 27 21:01:26 2010 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +CONFIG_EXTRA_COMPAT=y +CONFIG_INCLUDE_SUSv2=y +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_FEATURE_COMPRESS_USAGE=y +CONFIG_FEATURE_INSTALLER=y +# CONFIG_LOCALE_SUPPORT is not set +# CONFIG_UNICODE_SUPPORT is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_LONG_OPTS=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_PIDFILE=y +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +CONFIG_FEATURE_SUID_CONFIG_QUIET=y +CONFIG_SELINUX=y +CONFIG_FEATURE_PREFER_APPLETS=y +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +CONFIG_FEATURE_HAVE_RPC=y + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +CONFIG_NOMMU=y +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_EXTRA_CFLAGS="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=2 +CONFIG_FEATURE_FAST_TOP=y +CONFIG_FEATURE_ETC_NETWORKS=y +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +CONFIG_FEATURE_EDITING_VI=y +CONFIG_FEATURE_EDITING_HISTORY=15 +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +CONFIG_FEATURE_TAB_COMPLETION=y +CONFIG_FEATURE_USERNAME_COMPLETION=y +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_EDITING_ASK_TERMINAL=y +CONFIG_FEATURE_NON_POSIX_CP=y +CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y +CONFIG_FEATURE_HWIB=y + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_FEATURE_SEAMLESS_LZMA=y +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y +CONFIG_FEATURE_SEAMLESS_Z=y +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +CONFIG_BUNZIP2=y +CONFIG_BZIP2=y +CONFIG_CPIO=y +CONFIG_FEATURE_CPIO_O=y +CONFIG_FEATURE_CPIO_P=y +CONFIG_DPKG=y +CONFIG_DPKG_DEB=y +CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y +CONFIG_GUNZIP=y +CONFIG_GZIP=y +CONFIG_FEATURE_GZIP_LONG_OPTIONS=y +CONFIG_LZOP=y +CONFIG_LZOP_COMPR_HIGH=y +CONFIG_RPM2CPIO=y +CONFIG_RPM=y +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_AUTODETECT=y +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +CONFIG_FEATURE_TAR_UNAME_GNAME=y +CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y +CONFIG_UNCOMPRESS=y +CONFIG_UNLZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_UNZIP=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAL=y +CONFIG_CAT=y +CONFIG_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y +CONFIG_CHROOT=y +CONFIG_CKSUM=y +CONFIG_COMM=y +CONFIG_CP=y +CONFIG_FEATURE_CP_LONG_OPTIONS=y +CONFIG_CUT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +CONFIG_FEATURE_DATE_COMPAT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_DF=y +CONFIG_FEATURE_DF_FANCY=y +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPAND=y +CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_FSYNC=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_HOSTID=y +CONFIG_ID=y +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LENGTH=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +CONFIG_PRINTENV=y +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_FEATURE_FLOAT_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +CONFIG_STTY=y +CONFIG_SUM=y +CONFIG_SYNC=y +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNEXPAND=y +CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_KBD_MODE=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_RESIZE=y +CONFIG_FEATURE_RESIZE_PRINT=y +CONFIG_SETCONSOLE=y +CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y +CONFIG_SETFONT=y +CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y +CONFIG_DEFAULT_SETFONT_DIR="" +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +CONFIG_SHOWKEY=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_RUN_PARTS=y +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y +CONFIG_FEATURE_RUN_PARTS_FANCY=y +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_LONG_OPTIONS=y +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=4096 +CONFIG_FEATURE_VI_8BIT=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_MAXDEPTH=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_GROUP=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +CONFIG_FEATURE_FIND_DELETE=y +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +CONFIG_FEATURE_FIND_CONTEXT=y +CONFIG_FEATURE_FIND_LINKS=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +CONFIG_INIT=y +CONFIG_FEATURE_USE_INITTAB=y +CONFIG_FEATURE_KILL_REMOVED=y +CONFIG_FEATURE_KILL_DELAY=1 +CONFIG_FEATURE_INIT_SCTTY=y +CONFIG_FEATURE_INIT_SYSLOG=y +CONFIG_FEATURE_EXTRA_QUIET=y +CONFIG_FEATURE_INIT_COREDUMPS=y +CONFIG_FEATURE_INITRD=y +CONFIG_HALT=y +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +CONFIG_MESG=y + +# +# Login/Password Management Utilities +# +CONFIG_FEATURE_SHADOWPASSWDS=y +CONFIG_USE_BB_PWD_GRP=y +CONFIG_USE_BB_SHADOW=y +CONFIG_USE_BB_CRYPT=y +CONFIG_USE_BB_CRYPT_SHA=y +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_FEATURE_CHECK_NAMES=y +CONFIG_ADDUSER=y +CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y +CONFIG_FIRST_SYSTEM_ID=100 +CONFIG_LAST_SYSTEM_ID=999 +CONFIG_DELUSER=y +CONFIG_GETTY=y +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y +CONFIG_LOGIN=y +# CONFIG_PAM is not set +CONFIG_LOGIN_SCRIPTS=y +CONFIG_FEATURE_NOLOGIN=y +CONFIG_FEATURE_SECURETTY=y +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +CONFIG_CRYPTPW=y +CONFIG_CHPASSWD=y +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +CONFIG_SULOGIN=y +CONFIG_VLOCK=y + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_FSCK=y +CONFIG_LSATTR=y + +# +# Linux Module Utilities +# +CONFIG_MODPROBE_SMALL=y +CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y +CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y +# CONFIG_INSMOD is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +# CONFIG_DEPMOD is not set + +# +# Options common to multiple modutils +# +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_INSMOD_TRY_MMAP=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_MODUTILS_ALIAS is not set +# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" + +# +# Linux System Utilities +# +# CONFIG_ACPID is not set +# CONFIG_FEATURE_ACPID_COMPAT is not set +CONFIG_BLKID=y +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +CONFIG_FDFLUSH=y +CONFIG_FDFORMAT=y +CONFIG_FDISK=y +CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +CONFIG_FEATURE_AIX_LABEL=y +CONFIG_FEATURE_SGI_LABEL=y +CONFIG_FEATURE_SUN_LABEL=y +CONFIG_FEATURE_OSF_LABEL=y +CONFIG_FEATURE_FDISK_ADVANCED=y +CONFIG_FINDFS=y +CONFIG_FREERAMDISK=y +CONFIG_FSCK_MINIX=y +CONFIG_MKFS_EXT2=y +CONFIG_MKFS_MINIX=y + +# +# Minix filesystem support +# +CONFIG_FEATURE_MINIX2=y +CONFIG_MKFS_REISER=y +CONFIG_MKFS_VFAT=y +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +CONFIG_FEATURE_HEXDUMP_REVERSE=y +CONFIG_HD=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +CONFIG_IPCRM=y +CONFIG_IPCS=y +CONFIG_LOSETUP=y +CONFIG_LSPCI=y +CONFIG_LSUSB=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_MKSWAP=y +CONFIG_FEATURE_MKSWAP_UUID=y +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_VOLUMEID=y +CONFIG_FEATURE_VOLUMEID_EXT=y +CONFIG_FEATURE_VOLUMEID_BTRFS=y +CONFIG_FEATURE_VOLUMEID_REISERFS=y +CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_JFS=y +CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_NTFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_LUKS=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SYSV=y +CONFIG_FEATURE_VOLUMEID_OCFS2=y +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +CONFIG_FEATURE_MOUNT_VERBOSE=y +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +CONFIG_RDEV=y +CONFIG_READPROFILE=y +CONFIG_RTCWAKE=y +CONFIG_SCRIPT=y +CONFIG_SCRIPTREPLAY=y +CONFIG_SETARCH=y +CONFIG_SWAPONOFF=y +CONFIG_FEATURE_SWAPON_PRI=y +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Miscellaneous Utilities +# +CONFIG_ADJTIMEX=y +CONFIG_BBCONFIG=y +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=4000 +CONFIG_FEATURE_BEEP_LENGTH_MS=30 +CONFIG_CHAT=y +CONFIG_FEATURE_CHAT_NOFAIL=y +CONFIG_FEATURE_CHAT_TTY_HIFI=y +CONFIG_FEATURE_CHAT_IMPLICIT_CR=y +CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y +CONFIG_FEATURE_CHAT_SEND_ESCAPES=y +CONFIG_FEATURE_CHAT_VAR_ABORT_LEN=y +CONFIG_FEATURE_CHAT_CLR_ABORT=y +CONFIG_CHRT=y +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y +CONFIG_FEATURE_CROND_CALL_SENDMAIL=y +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" +CONFIG_CRONTAB=y +CONFIG_DC=y +CONFIG_FEATURE_DC_LIBM=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +CONFIG_DEVMEM=y +CONFIG_EJECT=y +CONFIG_FEATURE_EJECT_SCSI=y +CONFIG_FBSPLASH=y +CONFIG_FLASHCP=y +# CONFIG_FLASH_LOCK is not set +# CONFIG_FLASH_UNLOCK is not set +# CONFIG_FLASH_ERASEALL is not set +CONFIG_IONICE=y +CONFIG_INOTIFYD=y +CONFIG_LAST=y +CONFIG_FEATURE_LAST_SMALL=y +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +CONFIG_FEATURE_LESS_WINCH=y +CONFIG_FEATURE_LESS_DASHCMD=y +CONFIG_FEATURE_LESS_LINENUMS=y +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y +CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +CONFIG_MAN=y +CONFIG_MICROCOM=y +CONFIG_MOUNTPOINT=y +CONFIG_MT=y +CONFIG_RAIDAUTORUN=y +CONFIG_READAHEAD=y +CONFIG_RUNLEVEL=y +CONFIG_RX=y +CONFIG_SETSID=y +CONFIG_STRINGS=y +CONFIG_TASKSET=y +CONFIG_FEATURE_TASKSET_FANCY=y +CONFIG_TIME=y +CONFIG_TIMEOUT=y +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y +CONFIG_WALL=y +CONFIG_WATCHDOG=y + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +CONFIG_FEATURE_UNIX_LOCAL=y +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +CONFIG_VERBOSE_RESOLUTION_ERRORS=y +CONFIG_ARP=y +CONFIG_ARPING=y +CONFIG_BRCTL=y +CONFIG_FEATURE_BRCTL_FANCY=y +CONFIG_FEATURE_BRCTL_SHOW=y +CONFIG_DNSD=y +CONFIG_ETHER_WAKE=y +CONFIG_FAKEIDENTD=y +CONFIG_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FTPGET=y +CONFIG_FTPPUT=y +CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y +CONFIG_HOSTNAME=y +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_RANGES=y +CONFIG_FEATURE_HTTPD_USE_SENDFILE=y +CONFIG_FEATURE_HTTPD_SETUID=y +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y +CONFIG_FEATURE_HTTPD_PROXY=y +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +CONFIG_FEATURE_IFCONFIG_SLIP=y +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +CONFIG_IFENSLAVE=y +CONFIG_IFPLUGD=y +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_FEATURE_IFUPDOWN_IP=y +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y +CONFIG_INETD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y +CONFIG_FEATURE_INETD_RPC=y +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +CONFIG_FEATURE_IP_RARE_PROTOCOLS=y +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y +CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y +CONFIG_NAMEIF=y +CONFIG_FEATURE_NAMEIF_EXTENDED=y +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +CONFIG_NETSTAT=y +CONFIG_FEATURE_NETSTAT_WIDE=y +CONFIG_FEATURE_NETSTAT_PRG=y +CONFIG_NSLOOKUP=y +CONFIG_NTPD=y +CONFIG_FEATURE_NTPD_SERVER=y +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_PSCAN=y +CONFIG_ROUTE=y +CONFIG_SLATTACH=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y +CONFIG_FEATURE_TELNETD_INETD_WAIT=y +CONFIG_TFTP=y +CONFIG_TFTPD=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y +CONFIG_TFTP_DEBUG=y +CONFIG_TRACEROUTE=y +CONFIG_TRACEROUTE6=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y +CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y +CONFIG_UDHCPD=y +CONFIG_DHCPRELAY=y +CONFIG_DUMPLEASES=y +CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y +CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" +CONFIG_UDHCPC=y +CONFIG_FEATURE_UDHCPC_ARPING=y +CONFIG_FEATURE_UDHCP_PORT=y +CONFIG_UDHCP_DEBUG=9 +CONFIG_FEATURE_UDHCP_RFC3397=y +CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_ZCIP=y +CONFIG_TCPSVD=y +CONFIG_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y +CONFIG_UDPSVD=y + +# +# Print Utilities +# +CONFIG_LPD=y +CONFIG_LPR=y +CONFIG_LPQ=y + +# +# Mail Utilities +# +CONFIG_MAKEMIME=y +CONFIG_FEATURE_MIME_CHARSET="us-ascii" +CONFIG_POPMAILDIR=y +CONFIG_FEATURE_POPMAILDIR_DELIVERY=y +CONFIG_REFORMIME=y +CONFIG_FEATURE_REFORMIME_COMPAT=y +CONFIG_SENDMAIL=y + +# +# Process Utilities +# +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_KILLALL5=y +CONFIG_NMETER=y +CONFIG_PGREP=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +CONFIG_PKILL=y +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_FEATURE_PS_TIME=y +CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y +CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS=y +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_DECIMALS=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y +CONFIG_FEATURE_SHOW_THREADS=y +CONFIG_UPTIME=y +CONFIG_WATCH=y + +# +# Runit Utilities +# +CONFIG_RUNSV=y +CONFIG_RUNSVDIR=y +CONFIG_FEATURE_RUNSVDIR_LOG=y +CONFIG_SV=y +CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" +CONFIG_SVLOGD=y +CONFIG_CHPST=y +CONFIG_SETUIDGID=y +CONFIG_ENVUIDGID=y +CONFIG_ENVDIR=y +CONFIG_SOFTLIMIT=y + +# +# SELinux Utilities +# +CONFIG_CHCON=y +CONFIG_FEATURE_CHCON_LONG_OPTIONS=y +CONFIG_GETENFORCE=y +CONFIG_GETSEBOOL=y +CONFIG_LOAD_POLICY=y +CONFIG_MATCHPATHCON=y +CONFIG_RESTORECON=y +CONFIG_RUNCON=y +CONFIG_FEATURE_RUNCON_LONG_OPTIONS=y +CONFIG_SELINUXENABLED=y +CONFIG_SETENFORCE=y +CONFIG_SETFILES=y +CONFIG_FEATURE_SETFILES_CHECK_OPTION=y +CONFIG_SETSEBOOL=y +CONFIG_SESTATUS=y + +# +# Shells +# +# CONFIG_FEATURE_SH_IS_ASH is not set +CONFIG_FEATURE_SH_IS_HUSH=y +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_ASH is not set +# CONFIG_ASH_BASH_COMPAT is not set +# CONFIG_ASH_JOB_CONTROL is not set +# CONFIG_ASH_ALIAS is not set +# CONFIG_ASH_GETOPTS is not set +# CONFIG_ASH_BUILTIN_ECHO is not set +# CONFIG_ASH_BUILTIN_PRINTF is not set +# CONFIG_ASH_BUILTIN_TEST is not set +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set +# CONFIG_ASH_RANDOM_SUPPORT is not set +# CONFIG_ASH_EXPAND_PRMT is not set +CONFIG_HUSH=y +CONFIG_HUSH_BASH_COMPAT=y +CONFIG_HUSH_HELP=y +CONFIG_HUSH_INTERACTIVE=y +CONFIG_HUSH_JOB=y +CONFIG_HUSH_TICK=y +CONFIG_HUSH_IF=y +CONFIG_HUSH_LOOPS=y +CONFIG_HUSH_CASE=y +CONFIG_HUSH_FUNCTIONS=y +CONFIG_HUSH_LOCAL=y +CONFIG_HUSH_EXPORT_N=y +CONFIG_HUSH_RANDOM_SUPPORT=y +CONFIG_LASH=y +CONFIG_MSH=y +CONFIG_SH_MATH_SUPPORT=y +CONFIG_SH_MATH_SUPPORT_64=y +CONFIG_FEATURE_SH_EXTRA_QUIET=y +CONFIG_FEATURE_SH_STANDALONE=y +CONFIG_FEATURE_SH_NOFORK=y +CONFIG_CTTYHACK=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_SYSLOGD_DUP=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_LOGGER=y diff --git a/TODO_config_nommu b/TODO_config_nommu deleted file mode 100644 index 911f02f6b..000000000 --- a/TODO_config_nommu +++ /dev/null @@ -1,928 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.16.0 -# Wed Jan 27 21:01:26 2010 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -CONFIG_DESKTOP=y -CONFIG_EXTRA_COMPAT=y -CONFIG_INCLUDE_SUSv2=y -# CONFIG_USE_PORTABLE_CODE is not set -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -CONFIG_FEATURE_VERBOSE_USAGE=y -CONFIG_FEATURE_COMPRESS_USAGE=y -CONFIG_FEATURE_INSTALLER=y -# CONFIG_LOCALE_SUPPORT is not set -# CONFIG_UNICODE_SUPPORT is not set -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_LONG_OPTS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_PIDFILE=y -CONFIG_FEATURE_SUID=y -CONFIG_FEATURE_SUID_CONFIG=y -CONFIG_FEATURE_SUID_CONFIG_QUIET=y -CONFIG_SELINUX=y -CONFIG_FEATURE_PREFER_APPLETS=y -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_PIE is not set -CONFIG_NOMMU=y -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_EXTRA_CFLAGS="" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 -CONFIG_FEATURE_FAST_TOP=y -CONFIG_FEATURE_ETC_NETWORKS=y -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -CONFIG_FEATURE_EDITING_VI=y -CONFIG_FEATURE_EDITING_HISTORY=15 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -CONFIG_FEATURE_TAB_COMPLETION=y -CONFIG_FEATURE_USERNAME_COMPLETION=y -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_EDITING_ASK_TERMINAL=y -CONFIG_FEATURE_NON_POSIX_CP=y -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -CONFIG_FEATURE_HWIB=y - -# -# Applets -# - -# -# Archival Utilities -# -CONFIG_FEATURE_SEAMLESS_LZMA=y -CONFIG_FEATURE_SEAMLESS_BZ2=y -CONFIG_FEATURE_SEAMLESS_GZ=y -CONFIG_FEATURE_SEAMLESS_Z=y -CONFIG_AR=y -CONFIG_FEATURE_AR_LONG_FILENAMES=y -CONFIG_BUNZIP2=y -CONFIG_BZIP2=y -CONFIG_CPIO=y -CONFIG_FEATURE_CPIO_O=y -CONFIG_FEATURE_CPIO_P=y -CONFIG_DPKG=y -CONFIG_DPKG_DEB=y -CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y -CONFIG_GUNZIP=y -CONFIG_GZIP=y -CONFIG_FEATURE_GZIP_LONG_OPTIONS=y -CONFIG_LZOP=y -CONFIG_LZOP_COMPR_HIGH=y -CONFIG_RPM2CPIO=y -CONFIG_RPM=y -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_AUTODETECT=y -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y -CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y -CONFIG_FEATURE_TAR_UNAME_GNAME=y -CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y -CONFIG_UNCOMPRESS=y -CONFIG_UNLZMA=y -CONFIG_FEATURE_LZMA_FAST=y -CONFIG_UNZIP=y - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAL=y -CONFIG_CAT=y -CONFIG_CATV=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y -CONFIG_CHROOT=y -CONFIG_CKSUM=y -CONFIG_COMM=y -CONFIG_CP=y -CONFIG_FEATURE_CP_LONG_OPTIONS=y -CONFIG_CUT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -CONFIG_FEATURE_DATE_COMPAT=y -CONFIG_DD=y -CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y -CONFIG_FEATURE_DD_IBS_OBS=y -CONFIG_DF=y -CONFIG_FEATURE_DF_FANCY=y -CONFIG_DIRNAME=y -CONFIG_DOS2UNIX=y -CONFIG_UNIX2DOS=y -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y -CONFIG_EXPAND=y -CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y -CONFIG_FALSE=y -CONFIG_FOLD=y -CONFIG_FSYNC=y -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y -CONFIG_ID=y -CONFIG_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LENGTH=y -CONFIG_LN=y -CONFIG_LOGNAME=y -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -CONFIG_NICE=y -CONFIG_NOHUP=y -CONFIG_OD=y -CONFIG_PRINTENV=y -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_REALPATH=y -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y -CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SHA256SUM=y -CONFIG_SHA512SUM=y -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_FEATURE_FLOAT_SLEEP=y -CONFIG_SORT=y -CONFIG_FEATURE_SORT_BIG=y -CONFIG_SPLIT=y -CONFIG_FEATURE_SPLIT_FANCY=y -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -CONFIG_STTY=y -CONFIG_SUM=y -CONFIG_SYNC=y -CONFIG_TAC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -CONFIG_FEATURE_TR_EQUIV=y -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNEXPAND=y -CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y -CONFIG_UNIQ=y -CONFIG_USLEEP=y -CONFIG_UUDECODE=y -CONFIG_UUENCODE=y -CONFIG_WC=y -CONFIG_FEATURE_WC_LARGE=y -CONFIG_WHO=y -CONFIG_WHOAMI=y -CONFIG_YES=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum, sha256sum, sha512sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -CONFIG_KBD_MODE=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -CONFIG_RESIZE=y -CONFIG_FEATURE_RESIZE_PRINT=y -CONFIG_SETCONSOLE=y -CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y -CONFIG_SETFONT=y -CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y -CONFIG_DEFAULT_SETFONT_DIR="" -CONFIG_SETKEYCODES=y -CONFIG_SETLOGCONS=y -CONFIG_SHOWKEY=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -CONFIG_PIPE_PROGRESS=y -CONFIG_RUN_PARTS=y -CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -CONFIG_FEATURE_RUN_PARTS_FANCY=y -CONFIG_START_STOP_DAEMON=y -CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y -CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_LIBM=y -CONFIG_CMP=y -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_LONG_OPTIONS=y -CONFIG_FEATURE_DIFF_DIR=y -CONFIG_ED=y -CONFIG_PATCH=y -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=4096 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -CONFIG_FEATURE_ALLOW_EXEC=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_MMIN=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_MAXDEPTH=y -CONFIG_FEATURE_FIND_NEWER=y -CONFIG_FEATURE_FIND_INUM=y -CONFIG_FEATURE_FIND_EXEC=y -CONFIG_FEATURE_FIND_USER=y -CONFIG_FEATURE_FIND_GROUP=y -CONFIG_FEATURE_FIND_NOT=y -CONFIG_FEATURE_FIND_DEPTH=y -CONFIG_FEATURE_FIND_PAREN=y -CONFIG_FEATURE_FIND_SIZE=y -CONFIG_FEATURE_FIND_PRUNE=y -CONFIG_FEATURE_FIND_DELETE=y -CONFIG_FEATURE_FIND_PATH=y -CONFIG_FEATURE_FIND_REGEX=y -CONFIG_FEATURE_FIND_CONTEXT=y -CONFIG_FEATURE_FIND_LINKS=y -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y - -# -# Init Utilities -# -CONFIG_INIT=y -CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_KILL_REMOVED=y -CONFIG_FEATURE_KILL_DELAY=1 -CONFIG_FEATURE_INIT_SCTTY=y -CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y -CONFIG_FEATURE_INIT_COREDUMPS=y -CONFIG_FEATURE_INITRD=y -CONFIG_HALT=y -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -CONFIG_MESG=y - -# -# Login/Password Management Utilities -# -CONFIG_FEATURE_SHADOWPASSWDS=y -CONFIG_USE_BB_PWD_GRP=y -CONFIG_USE_BB_SHADOW=y -CONFIG_USE_BB_CRYPT=y -CONFIG_USE_BB_CRYPT_SHA=y -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y -CONFIG_DELGROUP=y -CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -CONFIG_FEATURE_CHECK_NAMES=y -CONFIG_ADDUSER=y -CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y -CONFIG_FIRST_SYSTEM_ID=100 -CONFIG_LAST_SYSTEM_ID=999 -CONFIG_DELUSER=y -CONFIG_GETTY=y -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_WTMP=y -CONFIG_LOGIN=y -# CONFIG_PAM is not set -CONFIG_LOGIN_SCRIPTS=y -CONFIG_FEATURE_NOLOGIN=y -CONFIG_FEATURE_SECURETTY=y -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y -CONFIG_CRYPTPW=y -CONFIG_CHPASSWD=y -CONFIG_SU=y -CONFIG_FEATURE_SU_SYSLOG=y -CONFIG_FEATURE_SU_CHECKS_SHELLS=y -CONFIG_SULOGIN=y -CONFIG_VLOCK=y - -# -# Linux Ext2 FS Progs -# -CONFIG_CHATTR=y -CONFIG_FSCK=y -CONFIG_LSATTR=y - -# -# Linux Module Utilities -# -CONFIG_MODPROBE_SMALL=y -CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y -CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y -# CONFIG_INSMOD is not set -# CONFIG_RMMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set -# CONFIG_DEPMOD is not set - -# -# Options common to multiple modutils -# -# CONFIG_FEATURE_2_4_MODULES is not set -CONFIG_FEATURE_INSMOD_TRY_MMAP=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set -# CONFIG_FEATURE_MODUTILS_ALIAS is not set -# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -CONFIG_DEFAULT_MODULES_DIR="/lib/modules" -CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" - -# -# Linux System Utilities -# -# CONFIG_ACPID is not set -# CONFIG_FEATURE_ACPID_COMPAT is not set -CONFIG_BLKID=y -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -CONFIG_FEATURE_FBSET_READMODE=y -CONFIG_FDFLUSH=y -CONFIG_FDFORMAT=y -CONFIG_FDISK=y -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -CONFIG_FEATURE_AIX_LABEL=y -CONFIG_FEATURE_SGI_LABEL=y -CONFIG_FEATURE_SUN_LABEL=y -CONFIG_FEATURE_OSF_LABEL=y -CONFIG_FEATURE_FDISK_ADVANCED=y -CONFIG_FINDFS=y -CONFIG_FREERAMDISK=y -CONFIG_FSCK_MINIX=y -CONFIG_MKFS_EXT2=y -CONFIG_MKFS_MINIX=y - -# -# Minix filesystem support -# -CONFIG_FEATURE_MINIX2=y -CONFIG_MKFS_REISER=y -CONFIG_MKFS_VFAT=y -CONFIG_GETOPT=y -CONFIG_FEATURE_GETOPT_LONG=y -CONFIG_HEXDUMP=y -CONFIG_FEATURE_HEXDUMP_REVERSE=y -CONFIG_HD=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y -CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y -CONFIG_IPCRM=y -CONFIG_IPCS=y -CONFIG_LOSETUP=y -CONFIG_LSPCI=y -CONFIG_LSUSB=y -CONFIG_MDEV=y -CONFIG_FEATURE_MDEV_CONF=y -CONFIG_FEATURE_MDEV_RENAME=y -CONFIG_FEATURE_MDEV_RENAME_REGEXP=y -CONFIG_FEATURE_MDEV_EXEC=y -CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y -CONFIG_MKSWAP=y -CONFIG_FEATURE_MKSWAP_UUID=y -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_VOLUMEID=y -CONFIG_FEATURE_VOLUMEID_EXT=y -CONFIG_FEATURE_VOLUMEID_BTRFS=y -CONFIG_FEATURE_VOLUMEID_REISERFS=y -CONFIG_FEATURE_VOLUMEID_FAT=y -CONFIG_FEATURE_VOLUMEID_HFS=y -CONFIG_FEATURE_VOLUMEID_JFS=y -CONFIG_FEATURE_VOLUMEID_XFS=y -CONFIG_FEATURE_VOLUMEID_NTFS=y -CONFIG_FEATURE_VOLUMEID_ISO9660=y -CONFIG_FEATURE_VOLUMEID_UDF=y -CONFIG_FEATURE_VOLUMEID_LUKS=y -CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y -CONFIG_FEATURE_VOLUMEID_CRAMFS=y -CONFIG_FEATURE_VOLUMEID_ROMFS=y -CONFIG_FEATURE_VOLUMEID_SYSV=y -CONFIG_FEATURE_VOLUMEID_OCFS2=y -CONFIG_FEATURE_VOLUMEID_LINUXRAID=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -CONFIG_FEATURE_MOUNT_VERBOSE=y -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y -CONFIG_RDEV=y -CONFIG_READPROFILE=y -CONFIG_RTCWAKE=y -CONFIG_SCRIPT=y -CONFIG_SCRIPTREPLAY=y -CONFIG_SETARCH=y -CONFIG_SWAPONOFF=y -CONFIG_FEATURE_SWAPON_PRI=y -CONFIG_SWITCH_ROOT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Miscellaneous Utilities -# -CONFIG_ADJTIMEX=y -CONFIG_BBCONFIG=y -CONFIG_BEEP=y -CONFIG_FEATURE_BEEP_FREQ=4000 -CONFIG_FEATURE_BEEP_LENGTH_MS=30 -CONFIG_CHAT=y -CONFIG_FEATURE_CHAT_NOFAIL=y -CONFIG_FEATURE_CHAT_TTY_HIFI=y -CONFIG_FEATURE_CHAT_IMPLICIT_CR=y -CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y -CONFIG_FEATURE_CHAT_SEND_ESCAPES=y -CONFIG_FEATURE_CHAT_VAR_ABORT_LEN=y -CONFIG_FEATURE_CHAT_CLR_ABORT=y -CONFIG_CHRT=y -CONFIG_CROND=y -CONFIG_FEATURE_CROND_D=y -CONFIG_FEATURE_CROND_CALL_SENDMAIL=y -CONFIG_FEATURE_CROND_DIR="/var/spool/cron" -CONFIG_CRONTAB=y -CONFIG_DC=y -CONFIG_FEATURE_DC_LIBM=y -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -CONFIG_DEVMEM=y -CONFIG_EJECT=y -CONFIG_FEATURE_EJECT_SCSI=y -CONFIG_FBSPLASH=y -CONFIG_FLASHCP=y -# CONFIG_FLASH_LOCK is not set -# CONFIG_FLASH_UNLOCK is not set -# CONFIG_FLASH_ERASEALL is not set -CONFIG_IONICE=y -CONFIG_INOTIFYD=y -CONFIG_LAST=y -CONFIG_FEATURE_LAST_SMALL=y -# CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -CONFIG_FEATURE_LESS_MARKS=y -CONFIG_FEATURE_LESS_REGEXP=y -CONFIG_FEATURE_LESS_WINCH=y -CONFIG_FEATURE_LESS_DASHCMD=y -CONFIG_FEATURE_LESS_LINENUMS=y -CONFIG_HDPARM=y -CONFIG_FEATURE_HDPARM_GET_IDENTITY=y -CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y -CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y -CONFIG_MAKEDEVS=y -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -CONFIG_FEATURE_MAKEDEVS_TABLE=y -CONFIG_MAN=y -CONFIG_MICROCOM=y -CONFIG_MOUNTPOINT=y -CONFIG_MT=y -CONFIG_RAIDAUTORUN=y -CONFIG_READAHEAD=y -CONFIG_RUNLEVEL=y -CONFIG_RX=y -CONFIG_SETSID=y -CONFIG_STRINGS=y -CONFIG_TASKSET=y -CONFIG_FEATURE_TASKSET_FANCY=y -CONFIG_TIME=y -CONFIG_TIMEOUT=y -CONFIG_TTYSIZE=y -CONFIG_VOLNAME=y -CONFIG_WALL=y -CONFIG_WATCHDOG=y - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -CONFIG_FEATURE_UNIX_LOCAL=y -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -CONFIG_VERBOSE_RESOLUTION_ERRORS=y -CONFIG_ARP=y -CONFIG_ARPING=y -CONFIG_BRCTL=y -CONFIG_FEATURE_BRCTL_FANCY=y -CONFIG_FEATURE_BRCTL_SHOW=y -CONFIG_DNSD=y -CONFIG_ETHER_WAKE=y -CONFIG_FAKEIDENTD=y -CONFIG_FTPD=y -CONFIG_FEATURE_FTP_WRITE=y -CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y -CONFIG_FTPGET=y -CONFIG_FTPPUT=y -CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y -CONFIG_HOSTNAME=y -CONFIG_HTTPD=y -CONFIG_FEATURE_HTTPD_RANGES=y -CONFIG_FEATURE_HTTPD_USE_SENDFILE=y -CONFIG_FEATURE_HTTPD_SETUID=y -CONFIG_FEATURE_HTTPD_BASIC_AUTH=y -CONFIG_FEATURE_HTTPD_AUTH_MD5=y -CONFIG_FEATURE_HTTPD_CGI=y -CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y -CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y -CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y -CONFIG_FEATURE_HTTPD_ERROR_PAGES=y -CONFIG_FEATURE_HTTPD_PROXY=y -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -CONFIG_IFENSLAVE=y -CONFIG_IFPLUGD=y -CONFIG_IFUPDOWN=y -CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" -CONFIG_FEATURE_IFUPDOWN_IP=y -CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -CONFIG_FEATURE_IFUPDOWN_IPV4=y -CONFIG_FEATURE_IFUPDOWN_IPV6=y -CONFIG_FEATURE_IFUPDOWN_MAPPING=y -CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y -CONFIG_INETD=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y -CONFIG_FEATURE_INETD_RPC=y -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_SHORT_FORMS=y -CONFIG_FEATURE_IP_RARE_PROTOCOLS=y -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y -CONFIG_IPCALC=y -CONFIG_FEATURE_IPCALC_FANCY=y -CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y -CONFIG_NAMEIF=y -CONFIG_FEATURE_NAMEIF_EXTENDED=y -CONFIG_NC=y -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -CONFIG_NETSTAT=y -CONFIG_FEATURE_NETSTAT_WIDE=y -CONFIG_FEATURE_NETSTAT_PRG=y -CONFIG_NSLOOKUP=y -CONFIG_NTPD=y -CONFIG_FEATURE_NTPD_SERVER=y -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -CONFIG_PSCAN=y -CONFIG_ROUTE=y -CONFIG_SLATTACH=y -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -CONFIG_TELNETD=y -CONFIG_FEATURE_TELNETD_STANDALONE=y -CONFIG_FEATURE_TELNETD_INETD_WAIT=y -CONFIG_TFTP=y -CONFIG_TFTPD=y -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y -CONFIG_FEATURE_TFTP_BLOCKSIZE=y -CONFIG_FEATURE_TFTP_PROGRESS_BAR=y -CONFIG_TFTP_DEBUG=y -CONFIG_TRACEROUTE=y -CONFIG_TRACEROUTE6=y -CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y -CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y -CONFIG_UDHCPD=y -CONFIG_DHCPRELAY=y -CONFIG_DUMPLEASES=y -CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y -CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" -CONFIG_UDHCPC=y -CONFIG_FEATURE_UDHCPC_ARPING=y -CONFIG_FEATURE_UDHCP_PORT=y -CONFIG_UDHCP_DEBUG=9 -CONFIG_FEATURE_UDHCP_RFC3397=y -CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" -CONFIG_VCONFIG=y -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_ZCIP=y -CONFIG_TCPSVD=y -CONFIG_TUNCTL=y -CONFIG_FEATURE_TUNCTL_UG=y -CONFIG_UDPSVD=y - -# -# Print Utilities -# -CONFIG_LPD=y -CONFIG_LPR=y -CONFIG_LPQ=y - -# -# Mail Utilities -# -CONFIG_MAKEMIME=y -CONFIG_FEATURE_MIME_CHARSET="us-ascii" -CONFIG_POPMAILDIR=y -CONFIG_FEATURE_POPMAILDIR_DELIVERY=y -CONFIG_REFORMIME=y -CONFIG_FEATURE_REFORMIME_COMPAT=y -CONFIG_SENDMAIL=y - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_FUSER=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_KILLALL5=y -CONFIG_NMETER=y -CONFIG_PGREP=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -CONFIG_PKILL=y -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -CONFIG_FEATURE_PS_TIME=y -CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y -CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS=y -CONFIG_RENICE=y -CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -CONFIG_FEATURE_TOP_SMP_CPU=y -CONFIG_FEATURE_TOP_DECIMALS=y -CONFIG_FEATURE_TOP_SMP_PROCESS=y -CONFIG_FEATURE_TOPMEM=y -CONFIG_FEATURE_SHOW_THREADS=y -CONFIG_UPTIME=y -CONFIG_WATCH=y - -# -# Runit Utilities -# -CONFIG_RUNSV=y -CONFIG_RUNSVDIR=y -CONFIG_FEATURE_RUNSVDIR_LOG=y -CONFIG_SV=y -CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" -CONFIG_SVLOGD=y -CONFIG_CHPST=y -CONFIG_SETUIDGID=y -CONFIG_ENVUIDGID=y -CONFIG_ENVDIR=y -CONFIG_SOFTLIMIT=y - -# -# SELinux Utilities -# -CONFIG_CHCON=y -CONFIG_FEATURE_CHCON_LONG_OPTIONS=y -CONFIG_GETENFORCE=y -CONFIG_GETSEBOOL=y -CONFIG_LOAD_POLICY=y -CONFIG_MATCHPATHCON=y -CONFIG_RESTORECON=y -CONFIG_RUNCON=y -CONFIG_FEATURE_RUNCON_LONG_OPTIONS=y -CONFIG_SELINUXENABLED=y -CONFIG_SETENFORCE=y -CONFIG_SETFILES=y -CONFIG_FEATURE_SETFILES_CHECK_OPTION=y -CONFIG_SETSEBOOL=y -CONFIG_SESTATUS=y - -# -# Shells -# -# CONFIG_FEATURE_SH_IS_ASH is not set -CONFIG_FEATURE_SH_IS_HUSH=y -# CONFIG_FEATURE_SH_IS_NONE is not set -# CONFIG_ASH is not set -# CONFIG_ASH_BASH_COMPAT is not set -# CONFIG_ASH_JOB_CONTROL is not set -# CONFIG_ASH_ALIAS is not set -# CONFIG_ASH_GETOPTS is not set -# CONFIG_ASH_BUILTIN_ECHO is not set -# CONFIG_ASH_BUILTIN_PRINTF is not set -# CONFIG_ASH_BUILTIN_TEST is not set -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_MAIL is not set -# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set -# CONFIG_ASH_RANDOM_SUPPORT is not set -# CONFIG_ASH_EXPAND_PRMT is not set -CONFIG_HUSH=y -CONFIG_HUSH_BASH_COMPAT=y -CONFIG_HUSH_HELP=y -CONFIG_HUSH_INTERACTIVE=y -CONFIG_HUSH_JOB=y -CONFIG_HUSH_TICK=y -CONFIG_HUSH_IF=y -CONFIG_HUSH_LOOPS=y -CONFIG_HUSH_CASE=y -CONFIG_HUSH_FUNCTIONS=y -CONFIG_HUSH_LOCAL=y -CONFIG_HUSH_EXPORT_N=y -CONFIG_HUSH_RANDOM_SUPPORT=y -CONFIG_LASH=y -CONFIG_MSH=y -CONFIG_SH_MATH_SUPPORT=y -CONFIG_SH_MATH_SUPPORT_64=y -CONFIG_FEATURE_SH_EXTRA_QUIET=y -CONFIG_FEATURE_SH_STANDALONE=y -CONFIG_FEATURE_SH_NOFORK=y -CONFIG_CTTYHACK=y - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -CONFIG_FEATURE_REMOTE_LOG=y -CONFIG_FEATURE_SYSLOGD_DUP=y -CONFIG_FEATURE_IPC_SYSLOG=y -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y -CONFIG_KLOGD=y -CONFIG_LOGGER=y -- cgit v1.2.3-55-g6feb From 4f731ce30ec2a9f5e9b231b47aa68f32b75feb35 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 15 Jun 2010 15:40:16 +0200 Subject: findutils/*: move usage and applet bits to *.c files Signed-off-by: Denys Vlasenko --- findutils/find.c | 90 +++++++++++++++++++++++++++++++- findutils/grep.c | 63 +++++++++++++++++++++-- findutils/xargs.c | 27 +++++++++- include/applets.src.h | 5 -- include/usage.src.h | 139 -------------------------------------------------- 5 files changed, 172 insertions(+), 152 deletions(-) diff --git a/findutils/find.c b/findutils/find.c index ca630b6c5..297081489 100644 --- a/findutils/find.c +++ b/findutils/find.c @@ -53,8 +53,10 @@ * diff -u /tmp/std_find /tmp/bb_find && echo Identical */ +//applet:IF_FIND(APPLET_NOEXEC(find, find, _BB_DIR_USR_BIN, _BB_SUID_DROP, find)) + //kbuild:lib-$(CONFIG_FIND) += find.o -//config: + //config:config FIND //config: bool "find" //config: default y @@ -1044,6 +1046,92 @@ static action*** parse_params(char **argv) #undef ALLOC_ACTION } +//usage:#define find_trivial_usage +//usage: "[PATH]... [EXPRESSION]" +//usage:#define find_full_usage "\n\n" +//usage: "Search for files. The default PATH is the current directory,\n" +//usage: "default EXPRESSION is '-print'\n" +//usage: "\nEXPRESSION may consist of:" +//usage: "\n -follow Follow symlinks" +//usage: IF_FEATURE_FIND_XDEV( +//usage: "\n -xdev Don't descend directories on other filesystems" +//usage: ) +//usage: IF_FEATURE_FIND_MAXDEPTH( +//usage: "\n -maxdepth N Descend at most N levels. -maxdepth 0 applies" +//usage: "\n tests/actions to command line arguments only" +//usage: ) +//usage: "\n -mindepth N Don't act on first N levels" +//usage: "\n -name PATTERN File name (w/o directory name) matches PATTERN" +//usage: "\n -iname PATTERN Case insensitive -name" +//usage: IF_FEATURE_FIND_PATH( +//usage: "\n -path PATTERN Path matches PATTERN" +//usage: ) +//usage: IF_FEATURE_FIND_REGEX( +//usage: "\n -regex PATTERN Path matches regex PATTERN" +//usage: ) +//usage: IF_FEATURE_FIND_TYPE( +//usage: "\n -type X File type is X (X is one of: f,d,l,b,c,...)" +//usage: ) +//usage: IF_FEATURE_FIND_PERM( +//usage: "\n -perm NNN Permissions match any of (+NNN), all of (-NNN)," +//usage: "\n or exactly NNN" +//usage: ) +//usage: IF_FEATURE_FIND_MTIME( +//usage: "\n -mtime DAYS Modified time is greater than (+N), less than (-N)," +//usage: "\n or exactly N days" +//usage: ) +//usage: IF_FEATURE_FIND_MMIN( +//usage: "\n -mmin MINS Modified time is greater than (+N), less than (-N)," +//usage: "\n or exactly N minutes" +//usage: ) +//usage: IF_FEATURE_FIND_NEWER( +//usage: "\n -newer FILE Modified time is more recent than FILE's" +//usage: ) +//usage: IF_FEATURE_FIND_INUM( +//usage: "\n -inum N File has inode number N" +//usage: ) +//usage: IF_FEATURE_FIND_USER( +//usage: "\n -user NAME File is owned by user NAME (numeric user ID allowed)" +//usage: ) +//usage: IF_FEATURE_FIND_GROUP( +//usage: "\n -group NAME File belongs to group NAME (numeric group ID allowed)" +//usage: ) +//usage: IF_FEATURE_FIND_DEPTH( +//usage: "\n -depth Process directory name after traversing it" +//usage: ) +//usage: IF_FEATURE_FIND_SIZE( +//usage: "\n -size N[bck] File size is N (c:bytes,k:kbytes,b:512 bytes(def.))" +//usage: "\n +/-N: file size is bigger/smaller than N" +//usage: ) +//usage: IF_FEATURE_FIND_LINKS( +//usage: "\n -links N Number of links is greater than (+N), less than (-N)," +//usage: "\n or exactly N" +//usage: ) +//usage: "\n -print Print (default and assumed)" +//usage: IF_FEATURE_FIND_PRINT0( +//usage: "\n -print0 Delimit output with null characters rather than" +//usage: "\n newlines" +//usage: ) +//usage: IF_FEATURE_FIND_CONTEXT( +//usage: "\n -context File has specified security context" +//usage: ) +//usage: IF_FEATURE_FIND_EXEC( +//usage: "\n -exec CMD ARG ; Run CMD with all instances of {} replaced by the" +//usage: "\n matching files" +//usage: ) +//usage: IF_FEATURE_FIND_PRUNE( +//usage: "\n -prune Stop traversing current subtree" +//usage: ) +//usage: IF_FEATURE_FIND_DELETE( +//usage: "\n -delete Delete files, turns on -depth option" +//usage: ) +//usage: IF_FEATURE_FIND_PAREN( +//usage: "\n (EXPR) Group an expression" +//usage: ) +//usage: +//usage:#define find_example_usage +//usage: "$ find / -name passwd\n" +//usage: "/etc/passwd\n" int find_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int find_main(int argc UNUSED_PARAM, char **argv) diff --git a/findutils/grep.c b/findutils/grep.c index dd1a4efc4..ac290a911 100644 --- a/findutils/grep.c +++ b/findutils/grep.c @@ -14,13 +14,16 @@ * 2004,2006 (C) Vladimir Oleynik - * correction "-e pattern1 -e pattern2" logic and more optimizations. * precompiled regex - */ -/* + * * (C) 2006 Jac Goudsmit added -o option */ +//applet:IF_GREP(APPLET(grep, _BB_DIR_BIN, _BB_SUID_DROP)) +//applet:IF_FEATURE_GREP_EGREP_ALIAS(APPLET_ODDNAME(egrep, grep, _BB_DIR_BIN, _BB_SUID_DROP, egrep)) +//applet:IF_FEATURE_GREP_FGREP_ALIAS(APPLET_ODDNAME(fgrep, grep, _BB_DIR_BIN, _BB_SUID_DROP, fgrep)) + //kbuild:lib-$(CONFIG_GREP) += grep.o -//config: + //config:config GREP //config: bool "grep" //config: default y @@ -57,17 +60,67 @@ #include "libbb.h" #include "xregex.h" + /* options */ +//usage:#define grep_trivial_usage +//usage: "[-HhnlLoqvsriw" +//usage: "F" +//usage: IF_FEATURE_GREP_EGREP_ALIAS("E") +//usage: IF_EXTRA_COMPAT("z") +//usage: "] [-m N] " +//usage: IF_FEATURE_GREP_CONTEXT("[-A/B/C N] ") +//usage: "PATTERN/-e PATTERN.../-f FILE [FILE]..." +//usage:#define grep_full_usage "\n\n" +//usage: "Search for PATTERN in FILEs (or stdin)\n" +//usage: "\nOptions:" +//usage: "\n -H Add 'filename:' prefix" +//usage: "\n -h Do not add 'filename:' prefix" +//usage: "\n -n Add 'line_no:' prefix" +//usage: "\n -l Show only names of files that match" +//usage: "\n -L Show only names of files that don't match" +//usage: "\n -c Show only count of matching lines" +//usage: "\n -o Show only the matching part of line" +//usage: "\n -q Quiet. Return 0 if PATTERN is found, 1 otherwise" +//usage: "\n -v Select non-matching lines" +//usage: "\n -s Suppress open and read errors" +//usage: "\n -r Recurse" +//usage: "\n -i Ignore case" +//usage: "\n -w Match whole words only" +//usage: "\n -F PATTERN is a literal (not regexp)" +//usage: IF_FEATURE_GREP_EGREP_ALIAS( +//usage: "\n -E PATTERN is an extended regexp" +//usage: ) +//usage: IF_EXTRA_COMPAT( +//usage: "\n -z Input is NUL terminated" +//usage: ) +//usage: "\n -m N Match up to N times per file" +//usage: IF_FEATURE_GREP_CONTEXT( +//usage: "\n -A N Print N lines of trailing context" +//usage: "\n -B N Print N lines of leading context" +//usage: "\n -C N Same as '-A N -B N'" +//usage: ) +//usage: "\n -e PTRN Pattern to match" +//usage: "\n -f FILE Read pattern from file" +//usage: +//usage:#define grep_example_usage +//usage: "$ grep root /etc/passwd\n" +//usage: "root:x:0:0:root:/root:/bin/bash\n" +//usage: "$ grep ^[rR]oo. /etc/passwd\n" +//usage: "root:x:0:0:root:/root:/bin/bash\n" +//usage: +//usage:#define egrep_trivial_usage NOUSAGE_STR +//usage:#define egrep_full_usage "" +//usage:#define fgrep_trivial_usage NOUSAGE_STR +//usage:#define fgrep_full_usage "" + #define OPTSTR_GREP \ "lnqvscFiHhe:f:Lorm:w" \ IF_FEATURE_GREP_CONTEXT("A:B:C:") \ IF_FEATURE_GREP_EGREP_ALIAS("E") \ IF_EXTRA_COMPAT("z") \ "aI" - /* ignored: -a "assume all files to be text" */ /* ignored: -I "assume binary files have no matches" */ - enum { OPTBIT_l, /* list matched file names only */ OPTBIT_n, /* print line# */ diff --git a/findutils/xargs.c b/findutils/xargs.c index 8caaff91c..46a62cbf1 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c @@ -1,7 +1,6 @@ /* vi: set sw=4 ts=4: */ /* * Mini xargs implementation for busybox - * Options are supported: "-prtx -n max_arg -s max_chars -e[ouf_str]" * * (C) 2002,2003 by Vladimir Oleynik * @@ -14,9 +13,10 @@ * * xargs is described in the Single Unix Specification v3 at * http://www.opengroup.org/onlinepubs/007904975/utilities/xargs.html - * */ +//applet:IF_XARGS(APPLET_NOEXEC(xargs, xargs, _BB_DIR_USR_BIN, _BB_SUID_DROP, xargs)) + //kbuild:lib-$(CONFIG_XARGS) += xargs.o //config:config XARGS @@ -351,6 +351,29 @@ static int xargs_ask_confirmation(void) # define xargs_ask_confirmation() 1 #endif +//usage:#define xargs_trivial_usage +//usage: "[OPTIONS] [PROG ARGS]" +//usage:#define xargs_full_usage "\n\n" +//usage: "Run PROG on every item given by stdin\n" +//usage: "\nOptions:" +//usage: IF_FEATURE_XARGS_SUPPORT_CONFIRMATION( +//usage: "\n -p Ask user whether to run each command" +//usage: ) +//usage: "\n -r Don't run command if input is empty" +//usage: IF_FEATURE_XARGS_SUPPORT_ZERO_TERM( +//usage: "\n -0 Input is separated by NUL characters" +//usage: ) +//usage: "\n -t Print the command on stderr before execution" +//usage: "\n -e[STR] STR stops input processing" +//usage: "\n -n N Pass no more than N args to PROG" +//usage: "\n -s N Pass command line of no more than N bytes" +//usage: IF_FEATURE_XARGS_SUPPORT_TERMOPT( +//usage: "\n -x Exit if size is exceeded" +//usage: ) +//usage:#define xargs_example_usage +//usage: "$ ls | xargs gzip\n" +//usage: "$ find . -name '*.c' -print | xargs rm\n" + /* Correct regardless of combination of CONFIG_xxx */ enum { OPTBIT_VERBOSE = 0, diff --git a/include/applets.src.h b/include/applets.src.h index 2998a0ea9..9162b66c7 100644 --- a/include/applets.src.h +++ b/include/applets.src.h @@ -136,7 +136,6 @@ IF_DUMPLEASES(APPLET(dumpleases, _BB_DIR_USR_BIN, _BB_SUID_DROP)) //IF_E2LABEL(APPLET_ODDNAME(e2label, tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP, e2label)) IF_ECHO(APPLET_NOFORK(echo, echo, _BB_DIR_BIN, _BB_SUID_DROP, echo)) IF_ED(APPLET(ed, _BB_DIR_BIN, _BB_SUID_DROP)) -IF_FEATURE_GREP_EGREP_ALIAS(APPLET_ODDNAME(egrep, grep, _BB_DIR_BIN, _BB_SUID_DROP, egrep)) IF_EJECT(APPLET(eject, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_ENV(APPLET_NOEXEC(env, env, _BB_DIR_USR_BIN, _BB_SUID_DROP, env)) IF_ENVDIR(APPLET_ODDNAME(envdir, chpst, _BB_DIR_USR_BIN, _BB_SUID_DROP, envdir)) @@ -152,8 +151,6 @@ IF_FDFLUSH(APPLET_ODDNAME(fdflush, freeramdisk, _BB_DIR_BIN, _BB_SUID_DROP, fdfl IF_FDFORMAT(APPLET(fdformat, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_FDISK(APPLET(fdisk, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_FGCONSOLE(APPLET(fgconsole, _BB_DIR_USR_BIN, _BB_SUID_DROP)) -IF_FEATURE_GREP_FGREP_ALIAS(APPLET_ODDNAME(fgrep, grep, _BB_DIR_BIN, _BB_SUID_DROP, fgrep)) -IF_FIND(APPLET_NOEXEC(find, find, _BB_DIR_USR_BIN, _BB_SUID_DROP, find)) IF_FINDFS(APPLET(findfs, _BB_DIR_SBIN, _BB_SUID_MAYBE)) IF_FLASH_ERASEALL(APPLET(flash_eraseall, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, _BB_DIR_USR_SBIN, _BB_SUID_DROP, flash_lock)) @@ -176,7 +173,6 @@ IF_GETENFORCE(APPLET(getenforce, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_GETOPT(APPLET(getopt, _BB_DIR_BIN, _BB_SUID_DROP)) IF_GETSEBOOL(APPLET(getsebool, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_GETTY(APPLET(getty, _BB_DIR_SBIN, _BB_SUID_DROP)) -IF_GREP(APPLET(grep, _BB_DIR_BIN, _BB_SUID_DROP)) IF_GUNZIP(APPLET(gunzip, _BB_DIR_BIN, _BB_SUID_DROP)) IF_GZIP(APPLET(gzip, _BB_DIR_BIN, _BB_SUID_DROP)) IF_HALT(APPLET(halt, _BB_DIR_SBIN, _BB_SUID_DROP)) @@ -433,7 +429,6 @@ IF_WGET(APPLET(wget, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_WHICH(APPLET(which, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_WHO(APPLET(who, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_WHOAMI(APPLET_NOFORK(whoami, whoami, _BB_DIR_USR_BIN, _BB_SUID_DROP, whoami)) -IF_XARGS(APPLET_NOEXEC(xargs, xargs, _BB_DIR_USR_BIN, _BB_SUID_DROP, xargs)) IF_UNXZ(APPLET_ODDNAME(xzcat, unxz, _BB_DIR_USR_BIN, _BB_SUID_DROP, xzcat)) IF_XZ(APPLET_ODDNAME(xz, unxz, _BB_DIR_USR_BIN, _BB_SUID_DROP, xz)) IF_YES(APPLET_NOFORK(yes, yes, _BB_DIR_USR_BIN, _BB_SUID_DROP, yes)) diff --git a/include/usage.src.h b/include/usage.src.h index bd2e56385..f30edbc54 100644 --- a/include/usage.src.h +++ b/include/usage.src.h @@ -1280,72 +1280,6 @@ INSERT #define findfs_example_usage \ "$ findfs LABEL=MyDevice" -#define find_trivial_usage \ - "[PATH]... [EXPRESSION]" -#define find_full_usage "\n\n" \ - "Search for files. The default PATH is the current directory,\n" \ - "default EXPRESSION is '-print'\n" \ - "\nEXPRESSION may consist of:" \ - "\n -follow Follow symlinks" \ - IF_FEATURE_FIND_XDEV( \ - "\n -xdev Don't descend directories on other filesystems") \ - IF_FEATURE_FIND_MAXDEPTH( \ - "\n -maxdepth N Descend at most N levels. -maxdepth 0 applies" \ - "\n tests/actions to command line arguments only") \ - "\n -mindepth N Don't act on first N levels" \ - "\n -name PATTERN File name (w/o directory name) matches PATTERN" \ - "\n -iname PATTERN Case insensitive -name" \ - IF_FEATURE_FIND_PATH( \ - "\n -path PATTERN Path matches PATTERN") \ - IF_FEATURE_FIND_REGEX( \ - "\n -regex PATTERN Path matches regex PATTERN") \ - IF_FEATURE_FIND_TYPE( \ - "\n -type X File type is X (X is one of: f,d,l,b,c,...)") \ - IF_FEATURE_FIND_PERM( \ - "\n -perm NNN Permissions match any of (+NNN), all of (-NNN)," \ - "\n or exactly NNN") \ - IF_FEATURE_FIND_MTIME( \ - "\n -mtime DAYS Modified time is greater than (+N), less than (-N)," \ - "\n or exactly N days") \ - IF_FEATURE_FIND_MMIN( \ - "\n -mmin MINS Modified time is greater than (+N), less than (-N)," \ - "\n or exactly N minutes") \ - IF_FEATURE_FIND_NEWER( \ - "\n -newer FILE Modified time is more recent than FILE's") \ - IF_FEATURE_FIND_INUM( \ - "\n -inum N File has inode number N") \ - IF_FEATURE_FIND_USER( \ - "\n -user NAME File is owned by user NAME (numeric user ID allowed)") \ - IF_FEATURE_FIND_GROUP( \ - "\n -group NAME File belongs to group NAME (numeric group ID allowed)") \ - IF_FEATURE_FIND_DEPTH( \ - "\n -depth Process directory name after traversing it") \ - IF_FEATURE_FIND_SIZE( \ - "\n -size N[bck] File size is N (c:bytes,k:kbytes,b:512 bytes(def.))" \ - "\n +/-N: file size is bigger/smaller than N") \ - IF_FEATURE_FIND_LINKS( \ - "\n -links N Number of links is greater than (+N), less than (-N)," \ - "\n or exactly N") \ - "\n -print Print (default and assumed)" \ - IF_FEATURE_FIND_PRINT0( \ - "\n -print0 Delimit output with null characters rather than" \ - "\n newlines") \ - IF_FEATURE_FIND_CONTEXT ( \ - "\n -context File has specified security context") \ - IF_FEATURE_FIND_EXEC( \ - "\n -exec CMD ARG ; Run CMD with all instances of {} replaced by the" \ - "\n matching files") \ - IF_FEATURE_FIND_PRUNE( \ - "\n -prune Stop traversing current subtree") \ - IF_FEATURE_FIND_DELETE( \ - "\n -delete Delete files, turns on -depth option") \ - IF_FEATURE_FIND_PAREN( \ - "\n (EXPR) Group an expression") \ - -#define find_example_usage \ - "$ find / -name passwd\n" \ - "/etc/passwd\n" - #define flash_lock_trivial_usage \ "MTD_DEVICE OFFSET SECTORS" #define flash_lock_full_usage "\n\n" \ @@ -1575,58 +1509,6 @@ INSERT "\n -I INITSTR Send INITSTR before anything else" \ "\n -H HOST Log HOST into the utmp file as the hostname" \ -#define grep_trivial_usage \ - "[-HhnlLoqvsriw" \ - "F" \ - IF_FEATURE_GREP_EGREP_ALIAS("E") \ - IF_EXTRA_COMPAT("z") \ - "] [-m N] " \ - IF_FEATURE_GREP_CONTEXT("[-A/B/C N] ") \ - "PATTERN/-e PATTERN.../-f FILE [FILE]..." -#define grep_full_usage "\n\n" \ - "Search for PATTERN in FILEs (or stdin)\n" \ - "\nOptions:" \ - "\n -H Add 'filename:' prefix" \ - "\n -h Do not add 'filename:' prefix" \ - "\n -n Add 'line_no:' prefix" \ - "\n -l Show only names of files that match" \ - "\n -L Show only names of files that don't match" \ - "\n -c Show only count of matching lines" \ - "\n -o Show only the matching part of line" \ - "\n -q Quiet. Return 0 if PATTERN is found, 1 otherwise" \ - "\n -v Select non-matching lines" \ - "\n -s Suppress open and read errors" \ - "\n -r Recurse" \ - "\n -i Ignore case" \ - "\n -w Match whole words only" \ - "\n -F PATTERN is a literal (not regexp)" \ - IF_FEATURE_GREP_EGREP_ALIAS( \ - "\n -E PATTERN is an extended regexp" \ - ) \ - IF_EXTRA_COMPAT( \ - "\n -z Input is NUL terminated" \ - ) \ - "\n -m N Match up to N times per file" \ - IF_FEATURE_GREP_CONTEXT( \ - "\n -A N Print N lines of trailing context" \ - "\n -B N Print N lines of leading context" \ - "\n -C N Same as '-A N -B N'" \ - ) \ - "\n -e PTRN Pattern to match" \ - "\n -f FILE Read pattern from file" \ - -#define grep_example_usage \ - "$ grep root /etc/passwd\n" \ - "root:x:0:0:root:/root:/bin/bash\n" \ - "$ grep ^[rR]oo. /etc/passwd\n" \ - "root:x:0:0:root:/root:/bin/bash\n" - -#define egrep_trivial_usage NOUSAGE_STR -#define egrep_full_usage "" - -#define fgrep_trivial_usage NOUSAGE_STR -#define fgrep_full_usage "" - #define gunzip_trivial_usage \ "[OPTIONS] [FILE]..." #define gunzip_full_usage "\n\n" \ @@ -5104,27 +4986,6 @@ INSERT #define whoami_full_usage "\n\n" \ "Print the user name associated with the current effective user id" -#define xargs_trivial_usage \ - "[OPTIONS] [PROG ARGS]" -#define xargs_full_usage "\n\n" \ - "Run PROG on every item given by stdin\n" \ - "\nOptions:" \ - IF_FEATURE_XARGS_SUPPORT_CONFIRMATION( \ - "\n -p Ask user whether to run each command") \ - "\n -r Don't run command if input is empty" \ - IF_FEATURE_XARGS_SUPPORT_ZERO_TERM( \ - "\n -0 Input is separated by NUL characters") \ - "\n -t Print the command on stderr before execution" \ - "\n -e[STR] STR stops input processing" \ - "\n -n N Pass no more than N args to PROG" \ - "\n -s N Pass command line of no more than N bytes" \ - IF_FEATURE_XARGS_SUPPORT_TERMOPT( \ - "\n -x Exit if size is exceeded") \ - -#define xargs_example_usage \ - "$ ls | xargs gzip\n" \ - "$ find . -name '*.c' -print | xargs rm\n" - #define zcat_trivial_usage \ "FILE" #define zcat_full_usage "\n\n" \ -- cgit v1.2.3-55-g6feb From 3324c963352392c00bda9eb77b815f0db9f6bdb7 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 16 Jun 2010 12:22:58 +0200 Subject: ubiattach,ubidetach: new applets function old new delta ubi_attach_detach_main - 175 +175 packed_usage 27056 27136 +80 applet_names 2262 2282 +20 applet_main 1328 1336 +8 applet_nameofs 664 668 +4 applet_install_loc 166 167 +1 ------------------------------------------------------------------------------ (add/remove: 2/0 grow/shrink: 5/0 up/down: 288/0) Total: 288 bytes Signed-off-by: Baruch Siach Signed-off-by: Denys Vlasenko --- miscutils/ubi_attach_detach.c | 88 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 miscutils/ubi_attach_detach.c diff --git a/miscutils/ubi_attach_detach.c b/miscutils/ubi_attach_detach.c new file mode 100644 index 000000000..7b92a8afc --- /dev/null +++ b/miscutils/ubi_attach_detach.c @@ -0,0 +1,88 @@ +/* Ported to busybox from mtd-utils. + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. + */ + +//applet:IF_UBIATTACH(APPLET_ODDNAME(ubiattach, ubi_attach_detach, _BB_DIR_USR_SBIN, _BB_SUID_DROP, ubiattach)) +//applet:IF_UBIDETACH(APPLET_ODDNAME(ubidetach, ubi_attach_detach, _BB_DIR_USR_SBIN, _BB_SUID_DROP, ubidetach)) + +//kbuild:lib-$(CONFIG_UBIATTACH) += ubi_attach_detach.o +//kbuild:lib-$(CONFIG_UBIDETACH) += ubi_attach_detach.o + +//config:config UBIATTACH +//config: bool "ubiattach" +//config: default n +//config: help +//config: Attach MTD device to an UBI device. +//config: +//config:config UBIDETACH +//config: bool "ubidetach" +//config: default n +//config: help +//config: Detach MTD device from an UBI device. + +#include "libbb.h" +#include + +#define OPTION_M (1 << 0) +#define OPTION_D (1 << 1) + +#define do_attach (ENABLE_UBIATTACH && \ + (!ENABLE_UBIDETACH || (applet_name[3] == 'a'))) + +//usage:#define ubiattach_trivial_usage +//usage: "-m MTD_NUM [-d UBI_NUM] UBI_CTRL_DEV" +//usage:#define ubiattach_full_usage "\n\n" +//usage: "Attach MTD device to UBI\n" +//usage: "\nOptions:" +//usage: "\n -m MTD_NUM MTD device number to attach" +//usage: "\n -d UBI_NUM UBI device number to assign" +//usage: +//usage:#define ubidetach_trivial_usage +//usage: "-d UBI_NUM UBI_CTRL_DEV" +//usage:#define ubidetach_full_usage "\n\n" +//usage: "Detach MTD device from UBI\n" +//usage: "\nOptions:" +//usage: "\n -d UBI_NUM UBI device number" + +int ubi_attach_detach_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int ubi_attach_detach_main(int argc UNUSED_PARAM, char **argv) +{ + unsigned opts; + char *ubi_ctrl; + //struct stat st; + struct ubi_attach_req req; + int fd; + int mtd_num; + int dev_num = UBI_DEV_NUM_AUTO; + + opt_complementary = "=1:m+:d+"; + opts = getopt32(argv, "m:d:", &mtd_num, &dev_num); + ubi_ctrl = argv[optind]; + + fd = xopen(ubi_ctrl, O_RDWR); + //fstat(fd, &st); + //if (!S_ISCHR(st.st_mode)) + // bb_error_msg_and_die("'%s' is not a char device", ubi_ctrl); + + if (do_attach) { + if (!(opts & OPTION_M)) + bb_error_msg_and_die("%s device not specified", "MTD"); + + memset(&req, 0, sizeof(req)); + req.mtd_num = mtd_num; + req.ubi_num = dev_num; + + xioctl(fd, UBI_IOCATT, &req); + } else { /* detach */ + if (!(opts & OPTION_D)) + bb_error_msg_and_die("%s device not specified", "UBI"); + + xioctl(fd, UBI_IOCDET, &dev_num); + } + + if (ENABLE_FEATURE_CLEAN_UP) + close(fd); + + return EXIT_SUCCESS; +} -- cgit v1.2.3-55-g6feb From 2f41e7ea5700aab61f32a1db97569f832563fbd8 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 17 Jun 2010 20:20:24 +0200 Subject: fix extra bogus files generation in include/config/* Signed-off-by: Denys Vlasenko --- scripts/basic/fixdep.c | 13 +++++++++---- scripts/basic/split-include.c | 7 ++++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index bbb575cec..1a5b10f84 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -243,22 +243,27 @@ void parse_config_file(char *map, size_t len) if (!memcmp(p, "IF_NOT", 6)) goto conf7; } /* we have at least 3 chars because of p <= end_3 */ - /*if (!memcmp(p, "IF_", 3)) goto conf3;*/ - if (p[0] == 'I' && p[1] == 'F' && p[2] == '_') goto conf3; + /*if (!memcmp(p, "IF_", 3)) ...*/ + if (p[0] == 'I' && p[1] == 'F' && p[2] == '_') { + off = 3; + goto conf; + } /* This identifier is not interesting, skip it */ while (p <= end_3 && (isalnum(*p) || *p == '_')) p++; continue; - conf3: off = 3; conf7: off = 7; + conf: p += off; for (q = p; q < end_3+3; q++) { if (!(isalnum(*q) || *q == '_')) break; } - use_config(p, q-p); + if (q != p) { + use_config(p, q-p); + } } } diff --git a/scripts/basic/split-include.c b/scripts/basic/split-include.c index 60934b5b1..e328788e2 100644 --- a/scripts/basic/split-include.c +++ b/scripts/basic/split-include.c @@ -110,11 +110,12 @@ int main(int argc, const char * argv []) if (line[0] != '#') continue; - if ((str_config = strstr(line, "CONFIG_")) == NULL) + if ((str_config = strstr(line, " CONFIG_")) == NULL) continue; - /* Make the output file name. */ - str_config += sizeof("CONFIG_") - 1; + /* We found #define CONFIG_foo or #undef CONFIG_foo. + * Make the output file name. */ + str_config += sizeof(" CONFIG_") - 1; for (itarget = 0; !isspace(str_config[itarget]); itarget++) { int c = (unsigned char) str_config[itarget]; -- cgit v1.2.3-55-g6feb From 0cc25945d8e6821d967bb97266774f9ee6c07197 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 17 Jun 2010 23:48:59 +0200 Subject: networking/Config.src: make tftp/tftpd-related options less confusing. Closes 2017 Signed-off-by: Denys Vlasenko --- networking/Config.src | 3 +++ 1 file changed, 3 insertions(+) diff --git a/networking/Config.src b/networking/Config.src index 51dcb7717..ebad9e598 100644 --- a/networking/Config.src +++ b/networking/Config.src @@ -861,6 +861,9 @@ config TFTPD In other words: it should be run from inetd in nowait mode, or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR" +comment "Common options for tftp/tftpd" + depends on TFTP || TFTPD + config FEATURE_TFTP_GET bool "Enable 'tftp get' and/or tftpd upload code" default y -- cgit v1.2.3-55-g6feb From d86b4c3907a78ab8785bcd6342ca233d0fe23ed0 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 18 Jun 2010 02:00:55 +0200 Subject: data_extract_all: do not chmod symlink. Closes 2053 Signed-off-by: Denys Vlasenko --- archival/libunarchive/data_extract_all.c | 31 ++++++++++++++----------------- testsuite/cpio.tests | 30 +++++++++++++++++++++--------- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c index 815261036..c4ffe7ef8 100644 --- a/archival/libunarchive/data_extract_all.c +++ b/archival/libunarchive/data_extract_all.c @@ -152,35 +152,32 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) bb_error_msg_and_die("unrecognized file type"); } - if (!(archive_handle->ah_flags & ARCHIVE_DONT_RESTORE_OWNER)) { -#if ENABLE_FEATURE_TAR_UNAME_GNAME - if (!(archive_handle->ah_flags & ARCHIVE_NUMERIC_OWNER)) { + if (!S_ISLNK(file_header->mode)) { + if (!(archive_handle->ah_flags & ARCHIVE_DONT_RESTORE_OWNER)) { uid_t uid = file_header->uid; gid_t gid = file_header->gid; - - if (file_header->tar__uname) { +#if ENABLE_FEATURE_TAR_UNAME_GNAME + if (!(archive_handle->ah_flags & ARCHIVE_NUMERIC_OWNER)) { + if (file_header->tar__uname) { //TODO: cache last name/id pair? - struct passwd *pwd = getpwnam(file_header->tar__uname); - if (pwd) uid = pwd->pw_uid; - } - if (file_header->tar__gname) { - struct group *grp = getgrnam(file_header->tar__gname); - if (grp) gid = grp->gr_gid; + struct passwd *pwd = getpwnam(file_header->tar__uname); + if (pwd) uid = pwd->pw_uid; + } + if (file_header->tar__gname) { + struct group *grp = getgrnam(file_header->tar__gname); + if (grp) gid = grp->gr_gid; + } } +#endif /* GNU tar 1.15.1 uses chown, not lchown */ chown(file_header->name, uid, gid); - } else -#endif - chown(file_header->name, file_header->uid, file_header->gid); - } - if (!S_ISLNK(file_header->mode)) { + } /* uclibc has no lchmod, glibc is even stranger - * it has lchmod which seems to do nothing! * so we use chmod... */ if (!(archive_handle->ah_flags & ARCHIVE_DONT_RESTORE_PERM)) { chmod(file_header->name, file_header->mode); } - /* same for utime */ if (archive_handle->ah_flags & ARCHIVE_RESTORE_DATE) { struct timeval t[2]; diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests index 725e70eab..42e3ff8dc 100755 --- a/testsuite/cpio.tests +++ b/testsuite/cpio.tests @@ -40,8 +40,7 @@ ls -ln cpio.testdir | $FILTER_LS" \ 0 -rw-r--r-- 2 $user $group 0 x -rw-r--r-- 2 $user $group 0 y -" \ - "" "" +" "" "" SKIP= @@ -56,8 +55,7 @@ cpio.testdir/x cpio.testdir/y 1 blocks 0 -" \ - "" "" +" "" "" } @@ -83,11 +81,9 @@ ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \ -rw-r--r-- 2 $user $group 2 nonempty -rw-r--r-- 2 $user $group 2 nonempty1 -rw-r--r-- 1 $user $group 0 solo -" \ - "" "" +" "" "" SKIP= - # Was trying to create "/usr/bin", correct is "usr/bin". rm -rf cpio.testdir optional FEATURE_CPIO_P @@ -98,8 +94,24 @@ ls cpio.testdir" \ 1 blocks 0 usr -" \ - "" "" +" "" "" +SKIP= + +# chown on a link was affecting file, dropping its sgid bits +rm -rf cpio.testdir +optional FEATURE_CPIO_O +mkdir cpio.testdir +touch cpio.testdir/file +chmod 6755 cpio.testdir/file # set the suid/sgid bit +ln -sf file cpio.testdir/link +testing "cpio restores sgid bits" \ +"cd cpio.testdir && { echo file; echo link; } | cpio -ovHnewc >pack.cpio && rm ???? && cpio -idmvu /dev/null; + stat -c '%a %n' file" \ +"\ +file +link +6755 file +" "" "" SKIP= -- cgit v1.2.3-55-g6feb From 3b727ccb70d288b30d3af5d7964e703bc47b33fb Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 18 Jun 2010 02:12:56 +0200 Subject: add a comment about sed and suid bits Signed-off-by: Denys Vlasenko --- editors/sed.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/editors/sed.c b/editors/sed.c index a5ef400fc..28f0c7318 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -1365,6 +1365,8 @@ int sed_main(int argc UNUSED_PARAM, char **argv) /* Set permissions/owner of output file */ fstat(fileno(file), &statbuf); + /* chmod'ing AFTER chown would preserve suid/sgid bits, + * but GNU sed 4.2.1 does not preserve them either */ fchmod(nonstdoutfd, statbuf.st_mode); fchown(nonstdoutfd, statbuf.st_uid, statbuf.st_gid); add_input_file(file); -- cgit v1.2.3-55-g6feb From 5b1dfe609c472b9b311ff3b135f4a5563d12848e Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 18 Jun 2010 02:47:27 +0200 Subject: tftp: increase initial retry timeout from 50 to 100 ms Signed-off-by: Denys Vlasenko --- networking/tftp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/networking/tftp.c b/networking/tftp.c index f895d19f9..43ae13647 100644 --- a/networking/tftp.c +++ b/networking/tftp.c @@ -24,7 +24,8 @@ #define TFTP_BLKSIZE_DEFAULT 512 /* according to RFC 1350, don't change */ #define TFTP_BLKSIZE_DEFAULT_STR "512" -#define TFTP_TIMEOUT_MS 50 +/* Was 50 ms but users asked to bump it up a bit */ +#define TFTP_TIMEOUT_MS 100 #define TFTP_MAXTIMEOUT_MS 2000 #define TFTP_NUM_RETRIES 12 /* number of backed-off retries */ -- cgit v1.2.3-55-g6feb From 4ebdae3777b8c9175d5d07090989f7e498befc42 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 18 Jun 2010 02:55:48 +0200 Subject: date: make %N work without -lrt on glibc Signed-off-by: Denys Vlasenko --- coreutils/date.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/coreutils/date.c b/coreutils/date.c index 8f9aff8b0..c737f09f3 100644 --- a/coreutils/date.c +++ b/coreutils/date.c @@ -93,6 +93,9 @@ //config: MMDDhhmm[[YY]YY][.ss] format. #include "libbb.h" +#if ENABLE_FEATURE_DATE_NANO +# include +#endif enum { OPT_RFC2822 = (1 << 0), /* R */ @@ -208,7 +211,9 @@ int date_main(int argc UNUSED_PARAM, char **argv) #endif } else { #if ENABLE_FEATURE_DATE_NANO - clock_gettime(CLOCK_REALTIME, &ts); + /* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ + syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); #else time(&ts.tv_sec); #endif -- cgit v1.2.3-55-g6feb From 9b814ca6335806a6eb47e22805620ec81d5d849d Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 18 Jun 2010 03:16:27 +0200 Subject: mktemp: be more compatible: bare "mktemp" creates tempfile in /tmp, not cwd function old new delta mktemp_main 171 152 -19 Signed-off-by: Denys Vlasenko --- debianutils/mktemp.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c index 0dcb1e826..c40211476 100644 --- a/debianutils/mktemp.c +++ b/debianutils/mktemp.c @@ -39,23 +39,20 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv) { const char *path; char *chp; - unsigned opt; + unsigned opts; + path = getenv("TMPDIR"); + if (!path || path[0] == '\0') + path = "/tmp"; + + /* -q and -t are ignored */ opt_complementary = "?1"; /* 1 argument max */ - opt = getopt32(argv, "dqtp:", &path); - chp = argv[optind] ? argv[optind] : xstrdup("tmp.XXXXXX"); + opts = getopt32(argv, "dqtp:", &path); - if (opt & (4|8)) { /* -t and/or -p */ - const char *dir = getenv("TMPDIR"); - if (dir && *dir != '\0') - path = dir; - else if (!(opt & 8)) /* no -p */ - path = "/tmp/"; - /* else path comes from -p DIR */ - chp = concat_path_file(path, chp); - } + chp = argv[optind] ? argv[optind] : xstrdup("tmp.XXXXXX"); + chp = concat_path_file(path, chp); - if (opt & 1) { /* -d */ + if (opts & 1) { /* -d */ if (mkdtemp(chp) == NULL) return EXIT_FAILURE; } else { -- cgit v1.2.3-55-g6feb From c2c7aa4b0d16049322ca2ebc69ca1093f6944e3a Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sat, 19 Jun 2010 17:47:46 +0200 Subject: sed: trivial code shrink function old new delta sed_main 685 667 -18 Signed-off-by: Denys Vlasenko --- editors/sed.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/editors/sed.c b/editors/sed.c index 28f0c7318..7af8f867a 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -1333,7 +1333,6 @@ int sed_main(int argc UNUSED_PARAM, char **argv) if (opt & OPT_in_place) bb_error_msg_and_die(bb_msg_requires_arg, "-i"); add_input_file(stdin); - process_files(); } else { int i; FILE *file; @@ -1379,9 +1378,13 @@ int sed_main(int argc UNUSED_PARAM, char **argv) free(G.outname); G.outname = NULL; } - if (G.input_file_count > G.current_input_file) - process_files(); + /* Here, to handle "sed 'cmds' nonexistent_file" case we did: + * if (G.current_input_file >= G.input_file_count) + * return status; + * but it's not needed since process_files() works correctly + * in this case too. */ } + process_files(); return status; } -- cgit v1.2.3-55-g6feb From e329089c62ed813e97344f8c61d7dc34221fd5ee Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sat, 19 Jun 2010 17:50:23 +0200 Subject: Revert "sed: trivial code shrink" This reverts commit c2c7aa4b0d16049322ca2ebc69ca1093f6944e3a. --- editors/sed.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/editors/sed.c b/editors/sed.c index 7af8f867a..28f0c7318 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -1333,6 +1333,7 @@ int sed_main(int argc UNUSED_PARAM, char **argv) if (opt & OPT_in_place) bb_error_msg_and_die(bb_msg_requires_arg, "-i"); add_input_file(stdin); + process_files(); } else { int i; FILE *file; @@ -1378,13 +1379,9 @@ int sed_main(int argc UNUSED_PARAM, char **argv) free(G.outname); G.outname = NULL; } - /* Here, to handle "sed 'cmds' nonexistent_file" case we did: - * if (G.current_input_file >= G.input_file_count) - * return status; - * but it's not needed since process_files() works correctly - * in this case too. */ + if (G.input_file_count > G.current_input_file) + process_files(); } - process_files(); return status; } -- cgit v1.2.3-55-g6feb