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

Try to make indent formatting less horrible

Browse Source
This commit is contained in:
Eric Andersen
2003-10-31 08:19:44 +00:00
parent e64bf409dd
commit 252183e3f5
1 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
findutils/xargs.c
View File

@@ -92,18 +92,17 @@ static int xargs_exec(char *const *args)
return exec_errno == ENOENT ? 127 : 126; return exec_errno == ENOENT ? 127 : 126;
} else { } else {
if (WEXITSTATUS(status) == 255) { if (WEXITSTATUS(status) == 255) {
bb_error_msg("%s: exited with status 255; aborting", bb_error_msg("%s: exited with status 255; aborting", args[0]);
args[0]);
return 124; return 124;
} }
if (WIFSTOPPED(status)) { if (WIFSTOPPED(status)) {
bb_error_msg("%s: stopped by signal %d", args[0], bb_error_msg("%s: stopped by signal %d",
WSTOPSIG(status)); args[0], WSTOPSIG(status));
return 125; return 125;
} }
if (WIFSIGNALED(status)) { if (WIFSIGNALED(status)) {
bb_error_msg("%s: terminated by signal %d", args[0], bb_error_msg("%s: terminated by signal %d",
WTERMSIG(status)); args[0], WTERMSIG(status));
return 125; return 125;
} }
if (WEXITSTATUS(status) != 0) if (WEXITSTATUS(status) != 0)
@@ -130,8 +129,8 @@ static int eof_stdin_detected;
|| (c) == '\f' || (c) == '\v') || (c) == '\f' || (c) == '\v')
#ifdef CONFIG_FEATURE_XARGS_SUPPORT_QUOTES #ifdef CONFIG_FEATURE_XARGS_SUPPORT_QUOTES
static xlist_t *process_stdin(xlist_t * list_arg, const char *eof_str, static xlist_t *process_stdin(xlist_t * list_arg,
size_t mc, char *buf) const char *eof_str, size_t mc, char *buf)
{ {
#define NORM 0 #define NORM 0
#define QUOTE 1 #define QUOTE 1
@@ -140,11 +139,11 @@ static xlist_t *process_stdin(xlist_t * list_arg, const char *eof_str,
char *s = NULL; /* start word */ char *s = NULL; /* start word */
char *p = NULL; /* pointer to end word */ char *p = NULL; /* pointer to end word */
char q = 0; /* quote char */ char q = 0; /* quote char */
char state = NORM; char state = NORM;
char eof_str_detected = 0; char eof_str_detected = 0;
size_t line_l = 0; /* size loaded args line */ size_t line_l = 0; /* size loaded args line */
int c; /* current char */ int c; /* current char */
xlist_t *cur; xlist_t *cur;
xlist_t *prev; xlist_t *prev;
@@ -174,11 +173,11 @@ static xlist_t *process_stdin(xlist_t * list_arg, const char *eof_str,
} else { } else {
goto set; goto set;
} }
} else { /* if(state == NORM) */ } else { /* if(state == NORM) */
if (ISSPACE(c)) { if (ISSPACE(c)) {
if (s) { if (s) {
unexpected_eof: unexpected_eof:
state = SPACE; state = SPACE;
c = 0; c = 0;
goto set; goto set;
@@ -192,7 +191,7 @@ static xlist_t *process_stdin(xlist_t * list_arg, const char *eof_str,
q = c; q = c;
state = QUOTE; state = QUOTE;
} else { } else {
set: set:
if ((p - buf) >= mc) if ((p - buf) >= mc)
bb_error_msg_and_die("argument line too long"); bb_error_msg_and_die("argument line too long");
*p++ = c; *p++ = c;
@@ -200,9 +199,10 @@ static xlist_t *process_stdin(xlist_t * list_arg, const char *eof_str,
} }
} }
if (state == SPACE) { /* word's delimiter or EOF detected */ if (state == SPACE) { /* word's delimiter or EOF detected */
if (q) if (q) {
bb_error_msg_and_die("unmatched %s quote", bb_error_msg_and_die("unmatched %s quote",
q == '\'' ? "single" : "double"); q == '\'' ? "single" : "double");
}
/* word loaded */ /* word loaded */
if (eof_str) { if (eof_str) {
eof_str_detected = strcmp(s, eof_str) == 0; eof_str_detected = strcmp(s, eof_str) == 0;
@@ -233,12 +233,12 @@ static xlist_t *process_stdin(xlist_t * list_arg, const char *eof_str,
return list_arg; return list_arg;
} }
#else #else
/* The variant is unsupport single, double quotes and backslash */ /* The variant does not support single quotes, double quotes or backslash */
static xlist_t *process_stdin(xlist_t * list_arg, const char *eof_str, static xlist_t *process_stdin(xlist_t * list_arg,
size_t mc, char *buf) const char *eof_str, size_t mc, char *buf)
{ {
int c; /* current char */ int c; /* current char */
int eof_str_detected = 0; int eof_str_detected = 0;
char *s = NULL; /* start word */ char *s = NULL; /* start word */
char *p = NULL; /* pointer to end word */ char *p = NULL; /* pointer to end word */
@@ -298,7 +298,7 @@ static xlist_t *process_stdin(xlist_t * list_arg, const char *eof_str,
} }
return list_arg; return list_arg;
} }
#endif /* CONFIG_FEATURE_XARGS_SUPPORT_QUOTES */ #endif /* CONFIG_FEATURE_XARGS_SUPPORT_QUOTES */
#ifdef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION #ifdef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION
@@ -331,7 +331,7 @@ static int xargs_ask_confirmation(void)
#else #else
# define OPT_INC_P 0 # define OPT_INC_P 0
# define xargs_ask_confirmation() 1 # define xargs_ask_confirmation() 1
#endif /* CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION */ #endif /* CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION */
#ifdef CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT #ifdef CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT
# define OPT_INC_X 1 # define OPT_INC_X 1
@@ -343,7 +343,7 @@ static int xargs_ask_confirmation(void)
static xlist_t *process0_stdin(xlist_t * list_arg, const char *eof_str, static xlist_t *process0_stdin(xlist_t * list_arg, const char *eof_str,
size_t mc, char *buf) size_t mc, char *buf)
{ {
int c; /* current char */ int c; /* current char */
char *s = NULL; /* start word */ char *s = NULL; /* start word */
char *p = NULL; /* pointer to end word */ char *p = NULL; /* pointer to end word */
size_t line_l = 0; /* size loaded args line */ size_t line_l = 0; /* size loaded args line */
@@ -399,7 +399,7 @@ static xlist_t *process0_stdin(xlist_t * list_arg, const char *eof_str,
#else #else
# define OPT_INC_0 0 /* future use */ # define OPT_INC_0 0 /* future use */
# define READ_ARGS(l, e, nmc, mc) process_stdin(l, e, nmc, mc) # define READ_ARGS(l, e, nmc, mc) process_stdin(l, e, nmc, mc)
#endif /* CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM */ #endif /* CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM */
#define OPT_VERBOSE (1<<0) #define OPT_VERBOSE (1<<0)
@@ -434,8 +434,7 @@ int xargs_main(int argc, char **argv)
size_t n_max_chars; size_t n_max_chars;
#ifdef CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM #ifdef CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM
xlist_t *(*read_args) (xlist_t *, const char *, size_t, char *) = xlist_t *(*read_args) (xlist_t *, const char *, size_t, char *) = process_stdin;
process_stdin;
#endif #endif
#ifdef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION #ifdef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION
@@ -444,15 +443,15 @@ int xargs_main(int argc, char **argv)
opt = bb_getopt_ulflags(argc, argv, "+trn:s:e::" opt = bb_getopt_ulflags(argc, argv, "+trn:s:e::"
#ifdef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION #ifdef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION
"p" "p"
#endif #endif
#ifdef CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT #ifdef CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT
"x" "x"
#endif #endif
#ifdef CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM #ifdef CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM
"0" "0"
#endif #endif
, &max_args, &max_chars, &eof_str); ,&max_args, &max_chars, &eof_str);
a = argc - optind; a = argc - optind;
argv += optind; argv += optind;
@@ -472,8 +471,7 @@ int xargs_main(int argc, char **argv)
n_chars += strlen(*argv) + 1; n_chars += strlen(*argv) + 1;
} }
if (n_max_chars < n_chars) { if (n_max_chars < n_chars) {
bb_error_msg_and_die bb_error_msg_and_die("can not fit single argument within argument list size limit");
("can not fit single argument within argument list size limit");
} }
n_max_chars -= n_chars; n_max_chars -= n_chars;
} else { } else {
@@ -498,8 +496,9 @@ int xargs_main(int argc, char **argv)
read_args = process0_stdin; read_args = process0_stdin;
#endif #endif
while ((list = READ_ARGS(list, eof_str, n_max_chars, max_chars)) != NULL while ((list = READ_ARGS(list, eof_str, n_max_chars, max_chars)) != NULL ||
|| (opt & OPT_NO_EMPTY) == 0) { (opt & OPT_NO_EMPTY) == 0)
{
opt |= OPT_NO_EMPTY; opt |= OPT_NO_EMPTY;
n = 0; n = 0;
n_chars = 0; n_chars = 0;
@@ -522,7 +521,7 @@ int xargs_main(int argc, char **argv)
break; break;
} }
} }
#endif /* CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT */ #endif /* CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT */
/* allocating pointers for execvp: /* allocating pointers for execvp:
a*arg, n*arg from stdin, NULL */ a*arg, n*arg from stdin, NULL */
@@ -575,9 +574,8 @@ const char *bb_applet_name = "debug stuff usage";
void bb_show_usage(void) void bb_show_usage(void)
{ {
fprintf(stderr, fprintf(stderr, "Usage: %s [-p] [-r] [-t] -[x] [-n max_arg] [-s max_chars]\n",
"Usage: %s [-p] [-r] [-t] -[x] [-n max_arg] [-s max_chars]\n", bb_applet_name);
bb_applet_name);
exit(1); exit(1);
} }
@@ -585,4 +583,4 @@ int main(int argc, char **argv)
{ {
return xargs_main(argc, argv); return xargs_main(argc, argv);
} }
#endif /* TEST */ #endif /* TEST */