X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=findutils%2Fxargs.c;h=eef7c6909ce4d19e630ae7776bbca7c1cf343d68;hb=d1b6078e5d614993de2a858e85f1dc06cfe5539b;hp=e2e6d3abdbb43406c8ac4c5a6bbf0ffbf9bed94e;hpb=09c295a5bc40f27612cc6375c7c4de3eb16efdf0;p=oweals%2Fbusybox.git diff --git a/findutils/xargs.c b/findutils/xargs.c index e2e6d3abd..eef7c6909 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c @@ -5,7 +5,7 @@ * (C) 2002,2003 by Vladimir Oleynik * * Special thanks - * - Mark Whitley and Glenn McGrath for stimul to rewrote :) + * - Mark Whitley and Glenn McGrath for stimulus to rewrite :) * - Mike Rendell * and David MacKenzie . * @@ -23,6 +23,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * xargs is described in the Single Unix Specification v3 at + * http://www.opengroup.org/onlinepubs/007904975/utilities/xargs.html + * */ #include @@ -89,18 +92,17 @@ static int xargs_exec(char *const *args) return exec_errno == ENOENT ? 127 : 126; } else { if (WEXITSTATUS(status) == 255) { - bb_error_msg("%s: exited with status 255; aborting", - args[0]); + bb_error_msg("%s: exited with status 255; aborting", args[0]); return 124; } if (WIFSTOPPED(status)) { - bb_error_msg("%s: stopped by signal %d", args[0], - WSTOPSIG(status)); + bb_error_msg("%s: stopped by signal %d", + args[0], WSTOPSIG(status)); return 125; } if (WIFSIGNALED(status)) { - bb_error_msg("%s: terminated by signal %d", args[0], - WTERMSIG(status)); + bb_error_msg("%s: terminated by signal %d", + args[0], WTERMSIG(status)); return 125; } if (WEXITSTATUS(status) != 0) @@ -127,8 +129,8 @@ static int eof_stdin_detected; || (c) == '\f' || (c) == '\v') #ifdef CONFIG_FEATURE_XARGS_SUPPORT_QUOTES -static xlist_t *process_stdin(xlist_t * list_arg, const char *eof_str, - size_t mc, char *buf) +static xlist_t *process_stdin(xlist_t * list_arg, + const char *eof_str, size_t mc, char *buf) { #define NORM 0 #define QUOTE 1 @@ -137,11 +139,11 @@ static xlist_t *process_stdin(xlist_t * list_arg, const char *eof_str, char *s = NULL; /* start word */ char *p = NULL; /* pointer to end word */ - char q = 0; /* quote char */ + char q = 0; /* quote char */ char state = NORM; char eof_str_detected = 0; size_t line_l = 0; /* size loaded args line */ - int c; /* current char */ + int c; /* current char */ xlist_t *cur; xlist_t *prev; @@ -171,11 +173,11 @@ static xlist_t *process_stdin(xlist_t * list_arg, const char *eof_str, } else { goto set; } - } else { /* if(state == NORM) */ + } else { /* if(state == NORM) */ if (ISSPACE(c)) { if (s) { - unexpected_eof: +unexpected_eof: state = SPACE; c = 0; goto set; @@ -189,7 +191,7 @@ static xlist_t *process_stdin(xlist_t * list_arg, const char *eof_str, q = c; state = QUOTE; } else { - set: +set: if ((p - buf) >= mc) bb_error_msg_and_die("argument line too long"); *p++ = c; @@ -197,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 (q) + if (q) { bb_error_msg_and_die("unmatched %s quote", - q == '\'' ? "single" : "double"); + q == '\'' ? "single" : "double"); + } /* word loaded */ if (eof_str) { eof_str_detected = strcmp(s, eof_str) == 0; @@ -230,12 +233,12 @@ static xlist_t *process_stdin(xlist_t * list_arg, const char *eof_str, return list_arg; } #else -/* The variant is unsupport single, double quotes and backslash */ -static xlist_t *process_stdin(xlist_t * list_arg, const char *eof_str, - size_t mc, char *buf) +/* The variant does not support single quotes, double quotes or backslash */ +static xlist_t *process_stdin(xlist_t * list_arg, + const char *eof_str, size_t mc, char *buf) { - int c; /* current char */ + int c; /* current char */ int eof_str_detected = 0; char *s = NULL; /* start word */ char *p = NULL; /* pointer to end word */ @@ -295,7 +298,7 @@ static xlist_t *process_stdin(xlist_t * list_arg, const char *eof_str, } return list_arg; } -#endif /* CONFIG_FEATURE_XARGS_SUPPORT_QUOTES */ +#endif /* CONFIG_FEATURE_XARGS_SUPPORT_QUOTES */ #ifdef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION @@ -328,7 +331,7 @@ static int xargs_ask_confirmation(void) #else # define OPT_INC_P 0 # define xargs_ask_confirmation() 1 -#endif /* CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION */ +#endif /* CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION */ #ifdef CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT # define OPT_INC_X 1 @@ -340,7 +343,7 @@ static int xargs_ask_confirmation(void) static xlist_t *process0_stdin(xlist_t * list_arg, const char *eof_str, size_t mc, char *buf) { - int c; /* current char */ + int c; /* current char */ char *s = NULL; /* start word */ char *p = NULL; /* pointer to end word */ size_t line_l = 0; /* size loaded args line */ @@ -396,7 +399,7 @@ static xlist_t *process0_stdin(xlist_t * list_arg, const char *eof_str, #else # define OPT_INC_0 0 /* future use */ # 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) @@ -431,25 +434,24 @@ int xargs_main(int argc, char **argv) size_t n_max_chars; #ifdef CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM - xlist_t *(*read_args) (xlist_t *, const char *, size_t, char *) = - process_stdin; + xlist_t *(*read_args) (xlist_t *, const char *, size_t, char *) = process_stdin; #endif #ifdef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION - bb_opt_complementaly = "pt"; + bb_opt_complementally = "pt"; #endif opt = bb_getopt_ulflags(argc, argv, "+trn:s:e::" #ifdef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION - "p" + "p" #endif #ifdef CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT - "x" + "x" #endif #ifdef CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM - "0" + "0" #endif - , &max_args, &max_chars, &eof_str); + ,&max_args, &max_chars, &eof_str); a = argc - optind; argv += optind; @@ -469,8 +471,7 @@ int xargs_main(int argc, char **argv) n_chars += strlen(*argv) + 1; } if (n_max_chars < n_chars) { - bb_error_msg_and_die - ("can not fit single argument within argument list size limit"); + bb_error_msg_and_die("can not fit single argument within argument list size limit"); } n_max_chars -= n_chars; } else { @@ -495,8 +496,9 @@ int xargs_main(int argc, char **argv) read_args = process0_stdin; #endif - while ((list = READ_ARGS(list, eof_str, n_max_chars, max_chars)) != NULL - || (opt & OPT_NO_EMPTY) == 0) { + while ((list = READ_ARGS(list, eof_str, n_max_chars, max_chars)) != NULL || + (opt & OPT_NO_EMPTY) == 0) + { opt |= OPT_NO_EMPTY; n = 0; n_chars = 0; @@ -519,7 +521,7 @@ int xargs_main(int argc, char **argv) break; } } -#endif /* CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT */ +#endif /* CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT */ /* allocating pointers for execvp: a*arg, n*arg from stdin, NULL */ @@ -572,9 +574,8 @@ const char *bb_applet_name = "debug stuff usage"; void bb_show_usage(void) { - fprintf(stderr, - "Usage: %s [-p] [-r] [-t] -[x] [-n max_arg] [-s max_chars]\n", - bb_applet_name); + fprintf(stderr, "Usage: %s [-p] [-r] [-t] -[x] [-n max_arg] [-s max_chars]\n", + bb_applet_name); exit(1); } @@ -582,4 +583,4 @@ int main(int argc, char **argv) { return xargs_main(argc, argv); } -#endif /* TEST */ +#endif /* TEST */