aboutsummaryrefslogtreecommitdiff
path: root/coreutils/rm.c
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-06-20 09:01:58 +0000
committerEric Andersen <andersen@codepoet.org>2003-06-20 09:01:58 +0000
commit8876fb2f59a0b515b3121d5894933eef88ce566a (patch)
treef67de9320202043aca8ded20fb80d668c3b0c2d8 /coreutils/rm.c
parentdfce3536ace2bcd38bdd3731841998ce344d786e (diff)
downloadbusybox-w32-8876fb2f59a0b515b3121d5894933eef88ce566a.tar.gz
busybox-w32-8876fb2f59a0b515b3121d5894933eef88ce566a.tar.bz2
busybox-w32-8876fb2f59a0b515b3121d5894933eef88ce566a.zip
last_patch89 from vodz:
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
Diffstat (limited to 'coreutils/rm.c')
-rw-r--r--coreutils/rm.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/coreutils/rm.c b/coreutils/rm.c
index 5489350e5..39609e7b8 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -36,22 +36,16 @@ extern int rm_main(int argc, char **argv)
36{ 36{
37 int status = 0; 37 int status = 0;
38 int flags = 0; 38 int flags = 0;
39 int opt; 39 unsigned long opt;
40 40
41 while ((opt = getopt(argc, argv, "fiRr")) > 0) { 41 bb_opt_complementaly = "f-i:i-f";
42 if ((opt == 'r') || (opt == 'R')) { 42 opt = bb_getopt_ulflags(argc, argv, "fiRr");
43 flags |= FILEUTILS_RECUR; 43 if(opt & 1)
44 } else {
45 flags &= ~(FILEUTILS_INTERACTIVE | FILEUTILS_FORCE);
46 if (opt == 'i') {
47 flags |= FILEUTILS_INTERACTIVE;
48 } else if (opt == 'f') {
49 flags |= FILEUTILS_FORCE; 44 flags |= FILEUTILS_FORCE;
50 } else { 45 if(opt & 2)
51 bb_show_usage(); 46 flags |= FILEUTILS_INTERACTIVE;
52 } 47 if(opt & 12)
53 } 48 flags |= FILEUTILS_RECUR;
54 }
55 49
56 if (*(argv += optind) != NULL) { 50 if (*(argv += optind) != NULL) {
57 do { 51 do {