Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-02-05 21:30:50 +00:00
Code Issues Projects Releases Wiki Activity

xargs: another code shrink

Browse Source 
function                                             old     new   delta
process0_stdin                                       117     103     -14
process_stdin                                        336     314     -22

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-06-15 10:18:01 +02:00
parent f7e929e795
commit 237aecedab
1 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
findutils/xargs.c
View File

@ -18,7 +18,7 @@
*/ */
//kbuild:lib-$(CONFIG_XARGS) += xargs.o //kbuild:lib-$(CONFIG_XARGS) += xargs.o
//config:
//config:config XARGS //config:config XARGS
//config: bool "xargs" //config: bool "xargs"
//config: default y //config: default y
@ -161,13 +161,12 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf)
#define QUOTE 1 #define QUOTE 1
#define BACKSLASH 2 #define BACKSLASH 2
#define SPACE 4 #define SPACE 4
char *s; /* start of the word */
char *p; /* pointer to end of the word */
char q = '\0'; /* quote char */ char q = '\0'; /* quote char */
char state = NORM; char state = NORM;
char *s = buf; /* start of the word */
char *p = s + strlen(buf); /* end of the word */
s = buf; buf += n_max_chars; /* past buffer's end */
p = s + strlen(buf);
/* "goto ret" is used instead of "break" to make control flow /* "goto ret" is used instead of "break" to make control flow
* more obvious: */ * more obvious: */
@ -224,17 +223,14 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf)
} }
store_param(s); store_param(s);
dbg_msg("args[]:'%s'", s); dbg_msg("args[]:'%s'", s);
n_max_chars -= (p - s);
/* if (n_max_chars < 0) impossible */
s = p; s = p;
n_max_arg--; n_max_arg--;
if (n_max_arg == 0 || n_max_chars == 0) { if (n_max_arg == 0) {
goto ret; goto ret;
} }
state = NORM; state = NORM;
} else /* state != SPACE */ }
if (p - s >= n_max_chars) { if (p == buf) {
dbg_msg("s:'%s' p-s:%d n_max_chars:%d", s, (int)(p-s), n_max_chars);
goto ret; goto ret;
} }
} }
@ -248,11 +244,10 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf)
/* The variant does not support single quotes, double quotes or backslash */ /* The variant does not support single quotes, double quotes or backslash */
static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf) static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf)
{ {
char *s; /* start of the word */ char *s = buf; /* start of the word */
char *p; /* pointer to end of the word */ char *p = s + strlen(buf); /* end of the word */
s = buf; buf += n_max_chars; /* past buffer's end */
p = s + strlen(buf);
while (1) { while (1) {
int c = getchar(); int c = getchar();
@ -278,15 +273,13 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf)
} }
store_param(s); store_param(s);
dbg_msg("args[]:'%s'", s); dbg_msg("args[]:'%s'", s);
n_max_chars -= (p - s);
/* if (n_max_chars < 0) impossible */
s = p; s = p;
n_max_arg--; n_max_arg--;
if (n_max_arg == 0 || n_max_chars == 0) { if (n_max_arg == 0) {
goto ret; goto ret;
} }
} else /* c != EOF */ }
if (p - s >= n_max_chars) { if (p == buf) {
goto ret; goto ret;
} }
} }
@ -301,11 +294,10 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf)
#if ENABLE_FEATURE_XARGS_SUPPORT_ZERO_TERM #if ENABLE_FEATURE_XARGS_SUPPORT_ZERO_TERM
static char* FAST_FUNC process0_stdin(int n_max_chars, int n_max_arg, char *buf) static char* FAST_FUNC process0_stdin(int n_max_chars, int n_max_arg, char *buf)
{ {
char *s; /* start of the word */ char *s = buf; /* start of the word */
char *p; /* pointer to end of the word */ char *p = s + strlen(buf); /* end of the word */
s = buf; buf += n_max_chars; /* past buffer's end */
p = s + strlen(buf);
while (1) { while (1) {
int c = getchar(); int c = getchar();
@ -319,15 +311,13 @@ static char* FAST_FUNC process0_stdin(int n_max_chars, int n_max_arg, char *buf)
/* A full word is loaded */ /* A full word is loaded */
store_param(s); store_param(s);
dbg_msg("args[]:'%s'", s); dbg_msg("args[]:'%s'", s);
n_max_chars -= (p - s);
/* if (n_max_chars < 0) impossible */
s = p; s = p;
n_max_arg--; n_max_arg--;
if (n_max_arg == 0 || n_max_chars == 0) { if (n_max_arg == 0) {
goto ret; goto ret;
} }
} else /* c != '\0' */ }
if (p - s >= n_max_chars) { if (p == buf) {
goto ret; goto ret;
} }
} }