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

xargs: trivial code shrink

Browse Source 
function                                             old     new   delta
process_stdin                                        343     336      -7
process0_stdin                                       124     117      -7
xargs_main                                           807     787     -20

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-06-14 12:38:36 +02:00
parent 7a4021deba
commit c28cafb18d
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
findutils/xargs.c
View File

@ -150,7 +150,6 @@ static void store_param(char *s)
* (buf has extra byte at the end to accomodate terminating NUL * (buf has extra byte at the end to accomodate terminating NUL
* of "tail characters" string). * of "tail characters" string).
* Otherwise, the returned pointer points to NUL byte. * 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 * On entry, buf[] may contain some "seed chars" which are to become
* the beginning of the first parameter. * 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: ret:
*p = '\0'; *p = '\0';
store_param(NULL); /* store_param(NULL) - caller will do it */
dbg_msg("return:'%s'", s); dbg_msg("return:'%s'", s);
return s; return s;
} }
@ -293,7 +292,7 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf)
} }
ret: ret:
*p = '\0'; *p = '\0';
store_param(NULL); /* store_param(NULL) - caller will do it */
dbg_msg("return:'%s'", s); dbg_msg("return:'%s'", s);
return s; return s;
} }
@ -334,7 +333,7 @@ static char* FAST_FUNC process0_stdin(int n_max_chars, int n_max_arg, char *buf)
} }
ret: ret:
*p = '\0'; *p = '\0';
store_param(NULL); /* store_param(NULL) - caller will do it */
dbg_msg("return:'%s'", s); dbg_msg("return:'%s'", s);
return s; return s;
} }
@ -461,13 +460,10 @@ int xargs_main(int argc, char **argv)
buf = xzalloc(n_max_chars + 1); buf = xzalloc(n_max_chars + 1);
n_max_arg = n_max_chars;
if (opt & OPT_UPTO_NUMBER) { if (opt & OPT_UPTO_NUMBER) {
n_max_arg = xatou_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:
/* Allocate pointers for execvp */ /* Allocate pointers for execvp */
/* We can statically allocate (argc + n_max_arg + 1) elements /* We can statically allocate (argc + n_max_arg + 1) elements
@ -489,6 +485,7 @@ int xargs_main(int argc, char **argv)
G.idx = argc; G.idx = argc;
rem = read_args(n_max_chars, n_max_arg, buf); rem = read_args(n_max_chars, n_max_arg, buf);
store_param(NULL);
if (!G.args[argc]) { if (!G.args[argc]) {
if (*rem != '\0') if (*rem != '\0')
@ -499,10 +496,11 @@ int xargs_main(int argc, char **argv)
opt |= OPT_NO_EMPTY; opt |= OPT_NO_EMPTY;
if (opt & (OPT_INTERACTIVE | OPT_VERBOSE)) { if (opt & (OPT_INTERACTIVE | OPT_VERBOSE)) {
for (i = 0; G.args[i]; i++) { const char *fmt = " %s" + 1;
if (i) char **args = G.args;
bb_putchar_stderr(' '); for (i = 0; args[i]; i++) {
fputs(G.args[i], stderr); fprintf(stderr, fmt, args[i]);
fmt = " %s";
} }
if (!(opt & OPT_INTERACTIVE)) if (!(opt & OPT_INTERACTIVE))
bb_putchar_stderr('\n'); bb_putchar_stderr('\n');