emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

last_patch89 from vodz:

Browse Source 
Manuel,

    I rewrite bb_getopt_ulflags() function for more universal usage.
    My version support now:
    - options with arguments (optional arg as GNU extension also)
    - complementaly and/or incomplementaly and/or incongruously and/or list
    options
    - long_opt (all applets may have long option, add supporting is trivial)
    This realisation full compatibile from your version.
    Code size grow 480 bytes, but only coreutils/* over compensate this size
    after using new function. Last patch reduced over 800 bytes and not full
    applied to all. "mkdir" and "mv" applets have long_opt now for demonstrate
    trivial addition support long_opt with usage new bb_getopt_ulflags().
    Complementaly and/or incomplementaly and/or incongruously and/or list options
    logic is not trivial, but new "cut" and "grep" applets using this logic
    for examples with full demostrating. New "grep" applet reduced over 300
    bytes.

    Mark,
    Also. I removed bug from "grep" applet.
    $ echo a b | busybox grep -e a b
    a b
    a b
    But right is printing one only.

    --w
    vodz
This commit is contained in:
Eric Andersen
2003-06-20 09:01:58 +00:00
parent dfce3536ac
commit 8876fb2f59
19 changed files with 592 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
coreutils/mkdir.c
View File

@@ -31,27 +31,33 @@
#include <stdlib.h>
#include <unistd.h>
#include <getopt.h>
#include "busybox.h"
static const struct option mkdir_long_options[] = {
{ "mode", 1, NULL, 'm' },
{ "parents", 0, NULL, 'p' },
{ 0, 0, 0, 0 }
};
extern int mkdir_main (int argc, char **argv)
{
mode_t mode = (mode_t)(-1);
int status = EXIT_SUCCESS;
int flags = 0;
int opt;
unsigned long opt;
char *smode;
while ((opt = getopt (argc, argv, "m:p")) > 0) {
if (opt == 'm') {
bb_applet_long_options = mkdir_long_options;
opt = bb_getopt_ulflags(argc, argv, "m:p", &smode);
if(opt & 1) {
mode = 0777;
if (!bb_parse_mode (optarg, &mode)) {
bb_error_msg_and_die ("invalid mode `%s'", optarg);
}
} else if (opt == 'p') {
flags |= FILEUTILS_RECUR;
} else {
bb_show_usage();
if (!bb_parse_mode (smode, &mode)) {
bb_error_msg_and_die ("invalid mode `%s'", smode);
}
}
if(opt & 2)
flags |= FILEUTILS_RECUR;
if (optind == argc) {
bb_show_usage();