aboutsummaryrefslogtreecommitdiff
path: root/findutils/xargs.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 /findutils/xargs.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 'findutils/xargs.c')
-rw-r--r--findutils/xargs.c25
1 files changed, 7 insertions, 18 deletions
diff --git a/findutils/xargs.c b/findutils/xargs.c
index d4bed57f0..2b18f8f28 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -66,24 +66,13 @@ int xargs_main(int argc, char **argv)
66 char *file_to_act_on; 66 char *file_to_act_on;
67 char **args; 67 char **args;
68 int i, a; 68 int i, a;
69 char flg_vi = 0; /* verbose |& interactive */ 69 char flg_vi; /* verbose |& interactive */
70 char flg_no_empty = 0; 70 char flg_no_empty;
71 71
72 while ((a = getopt(argc, argv, "prt")) > 0) { 72 bb_opt_complementaly = "pt";
73 switch(a) { 73 a = bb_getopt_ulflags(argc, argv, "tpr");
74 case 'p': 74 flg_vi = a & 3;
75 flg_vi |= 3; 75 flg_no_empty = a & 4;
76 break;
77 case 't':
78 flg_vi |= 1;
79 break;
80 case 'r':
81 flg_no_empty = 1;
82 break;
83 default:
84 bb_show_usage();
85 }
86 }
87 76
88 a = argc - optind; 77 a = argc - optind;
89 argv += optind; 78 argv += optind;
@@ -110,7 +99,7 @@ int xargs_main(int argc, char **argv)
110 fputc(' ', stderr); 99 fputc(' ', stderr);
111 fputs(args[i], stderr); 100 fputs(args[i], stderr);
112 } 101 }
113 fprintf(stderr, "%s", ((flg_vi & 2) ? " ?..." : "\n")); 102 fputs(((flg_vi & 2) ? " ?..." : "\n"), stderr);
114 } 103 }
115 if((flg_vi & 2) == 0 || bb_ask_confirmation() != 0 ) { 104 if((flg_vi & 2) == 0 || bb_ask_confirmation() != 0 ) {
116 xargs_exec(args); 105 xargs_exec(args);