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

22
coreutils/rm.c
View File

@@ -36,22 +36,16 @@ extern int rm_main(int argc, char **argv)
{
int status = 0;
int flags = 0;
int opt;
unsigned long opt;
while ((opt = getopt(argc, argv, "fiRr")) > 0) {
if ((opt == 'r') || (opt == 'R')) {
flags |= FILEUTILS_RECUR;
} else {
flags &= ~(FILEUTILS_INTERACTIVE | FILEUTILS_FORCE);
if (opt == 'i') {
flags |= FILEUTILS_INTERACTIVE;
} else if (opt == 'f') {
bb_opt_complementaly = "f-i:i-f";
opt = bb_getopt_ulflags(argc, argv, "fiRr");
if(opt & 1)
flags |= FILEUTILS_FORCE;
} else {
bb_show_usage();
}
}
}
if(opt & 2)
flags |= FILEUTILS_INTERACTIVE;
if(opt & 12)
flags |= FILEUTILS_RECUR;
if (*(argv += optind) != NULL) {
do {