*
*/
-#include "busybox.h"
+//kbuild:lib-$(CONFIG_XARGS) += xargs.o
+//config:
+//config:config XARGS
+//config: bool "xargs"
+//config: default y
+//config: help
+//config: xargs is used to execute a specified command for
+//config: every item from standard input.
+//config:
+//config:config FEATURE_XARGS_SUPPORT_CONFIRMATION
+//config: bool "Enable -p: prompt and confirmation"
+//config: default y
+//config: depends on XARGS
+//config: help
+//config: Support -p: prompt the user whether to run each command
+//config: line and read a line from the terminal.
+//config:
+//config:config FEATURE_XARGS_SUPPORT_QUOTES
+//config: bool "Enable single and double quotes and backslash"
+//config: default y
+//config: depends on XARGS
+//config: help
+//config: Support quoting in the input.
+//config:
+//config:config FEATURE_XARGS_SUPPORT_TERMOPT
+//config: bool "Enable -x: exit if -s or -n is exceeded"
+//config: default y
+//config: depends on XARGS
+//config: help
+//config: Support -x: exit if the command size (see the -s or -n option)
+//config: is exceeded.
+//config:
+//config:config FEATURE_XARGS_SUPPORT_ZERO_TERM
+//config: bool "Enable -0: NUL-terminated input"
+//config: default y
+//config: depends on XARGS
+//config: help
+//config: Support -0: input items are terminated by a NUL character
+//config: instead of whitespace, and the quotes and backslash
+//config: are not special.
+
+#include "libbb.h"
+
+/* This is a NOEXEC applet. Be very careful! */
+
/* COMPAT: SYSV version defaults size (and has a max value of) to 470.
We try to make it as large as possible. */
#if !defined(ARG_MAX) && defined(_SC_ARG_MAX)
-#define ARG_MAX sysconf (_SC_ARG_MAX)
+# define ARG_MAX sysconf(_SC_ARG_MAX)
#endif
-#ifndef ARG_MAX
-#define ARG_MAX 470
+#if !defined(ARG_MAX)
+# define ARG_MAX 470
#endif
#ifdef TEST
-# ifndef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION
-# define CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION
+# ifndef ENABLE_FEATURE_XARGS_SUPPORT_CONFIRMATION
+# define ENABLE_FEATURE_XARGS_SUPPORT_CONFIRMATION 1
# endif
-# ifndef CONFIG_FEATURE_XARGS_SUPPORT_QUOTES
-# define CONFIG_FEATURE_XARGS_SUPPORT_QUOTES
+# ifndef ENABLE_FEATURE_XARGS_SUPPORT_QUOTES
+# define ENABLE_FEATURE_XARGS_SUPPORT_QUOTES 1
# endif
-# ifndef CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT
-# define CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT
+# ifndef ENABLE_FEATURE_XARGS_SUPPORT_TERMOPT
+# define ENABLE_FEATURE_XARGS_SUPPORT_TERMOPT 1
# endif
-# ifndef CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM
-# define CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM
+# ifndef ENABLE_FEATURE_XARGS_SUPPORT_ZERO_TERM
+# define ENABLE_FEATURE_XARGS_SUPPORT_ZERO_TERM 1
# endif
#endif
This function has special algorithm.
Don't use fork and include to main!
*/
-static int xargs_exec(char *const *args)
+static int xargs_exec(char **args)
{
- pid_t p;
- volatile int exec_errno = 0; /* shared vfork stack */
int status;
- p = vfork();
- if (p < 0)
- bb_perror_msg_and_die("vfork");
-
- if (p == 0) {
- /* vfork -- child */
- execvp(args[0], args);
- exec_errno = errno; /* set error to shared stack */
- _exit(1);
- }
-
- /* vfork -- parent */
- while (wait(&status) == (pid_t) -1)
- if (errno != EINTR)
- break;
- if (exec_errno) {
- errno = exec_errno;
- bb_perror_msg("%s", args[0]);
- return exec_errno == ENOENT ? 127 : 126;
+ status = spawn_and_wait(args);
+ if (status < 0) {
+ bb_simple_perror_msg(args[0]);
+ return errno == ENOENT ? 127 : 126;
}
- if (WEXITSTATUS(status) == 255) {
+ if (status == 255) {
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));
- return 125;
- }
- if (WIFSIGNALED(status)) {
+ if (status >= 0x180) {
bb_error_msg("%s: terminated by signal %d",
- args[0], WTERMSIG(status));
+ args[0], status - 0x180);
return 125;
}
- if (WEXITSTATUS(status))
+ if (status)
return 123;
return 0;
}
-typedef struct xlist_s {
- char *data;
- size_t lenght;
- struct xlist_s *link;
+typedef struct xlist_t {
+ struct xlist_t *link;
+ size_t length;
+ char xstr[1];
} xlist_t;
-static int eof_stdin_detected;
-
-#define ISBLANK(c) ((c) == ' ' || (c) == '\t')
-#define ISSPACE(c) (ISBLANK(c) || (c) == '\n' || (c) == '\r' \
- || (c) == '\f' || (c) == '\v')
+/* In POSIX/C locale isspace is only these chars: "\t\n\v\f\r" and space.
+ * "\t\n\v\f\r" happen to have ASCII codes 9,10,11,12,13.
+ */
+#define ISSPACE(a) ({ unsigned char xargs__isspace = (a) - 9; xargs__isspace == (' ' - 9) || xargs__isspace <= (13 - 9); })
-#ifdef CONFIG_FEATURE_XARGS_SUPPORT_QUOTES
-static xlist_t *process_stdin(xlist_t * list_arg,
+#if ENABLE_FEATURE_XARGS_SUPPORT_QUOTES
+static xlist_t* process_stdin(xlist_t *list_arg,
const char *eof_str, size_t mc, char *buf)
{
#define NORM 0
#define QUOTE 1
#define BACKSLASH 2
#define SPACE 4
-
- char *s = NULL; /* start word */
- char *p = NULL; /* pointer to end word */
- char q = 0; /* quote char */
+ char *s = NULL; /* start of the word */
+ char *p = NULL; /* pointer to end of the word */
+ 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 */
+ size_t line_l = 0; /* size of loaded args */
xlist_t *cur;
xlist_t *prev;
- for (prev = cur = list_arg; cur; cur = cur->link) {
- line_l += cur->lenght; /* previous allocated */
- if (prev != cur)
- prev = prev->link;
+ prev = cur = list_arg;
+ while (cur) {
+ prev = cur;
+ line_l += cur->length;
+ cur = cur->link;
}
- while (!eof_stdin_detected) {
- c = getchar();
+ while (1) {
+ int c = getchar();
if (c == EOF) {
- eof_stdin_detected++;
if (s)
goto unexpected_eof;
break;
}
- if (eof_str_detected)
+ if (eof_str_detected) /* skip till EOF */
continue;
if (state == BACKSLASH) {
state = NORM;
goto set;
- } else if (state == QUOTE) {
- if (c == q) {
- q = 0;
- state = NORM;
- } else {
+ }
+ if (state == QUOTE) {
+ if (c != q)
goto set;
- }
- } else { /* if(state == NORM) */
-
+ q = '\0';
+ state = NORM;
+ } else { /* if (state == NORM) */
if (ISSPACE(c)) {
if (s) {
-unexpected_eof:
+ unexpected_eof:
state = SPACE;
- c = 0;
+ c = '\0';
goto set;
}
} else {
q = c;
state = QUOTE;
} else {
-set:
+ set:
if ((size_t)(p - buf) >= mc)
bb_error_msg_and_die("argument line too long");
*p++ = c;
bb_error_msg_and_die("unmatched %s quote",
q == '\'' ? "single" : "double");
}
- /* word loaded */
+ /* A full word is loaded */
if (eof_str) {
- eof_str_detected = strcmp(s, eof_str) == 0;
+ eof_str_detected = (strcmp(s, eof_str) == 0);
}
if (!eof_str_detected) {
- size_t lenght = (p - buf);
-
- cur = xmalloc(sizeof(xlist_t) + lenght);
- cur->data = memcpy(cur + 1, s, lenght);
- cur->lenght = lenght;
+ size_t length = (p - buf);
+ /* Dont xzalloc - it can be quite big */
+ cur = xmalloc(offsetof(xlist_t, xstr) + length);
cur->link = NULL;
+ cur->length = length;
+ memcpy(cur->xstr, s, length);
if (prev == NULL) {
list_arg = cur;
} else {
prev->link = cur;
}
prev = cur;
- line_l += lenght;
- if (line_l > mc) {
- /* stop memory usage :-) */
+ line_l += length;
+ if (line_l > mc) /* limit stop memory usage */
break;
- }
}
s = NULL;
state = NORM;
}
#else
/* 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)
+static xlist_t* process_stdin(xlist_t *list_arg,
+ const char *eof_str, size_t mc, char *buf)
{
-
- int c; /* current char */
- int eof_str_detected = 0;
- char *s = NULL; /* start word */
- char *p = NULL; /* pointer to end word */
- size_t line_l = 0; /* size loaded args line */
+ char eof_str_detected = 0;
+ char *s = NULL; /* start of the word */
+ char *p = NULL; /* pointer to end of the word */
+ size_t line_l = 0; /* size of loaded args */
xlist_t *cur;
xlist_t *prev;
- for (prev = cur = list_arg; cur; cur = cur->link) {
- line_l += cur->lenght; /* previous allocated */
- if (prev != cur)
- prev = prev->link;
+ prev = cur = list_arg;
+ while (cur) {
+ prev = cur;
+ line_l += cur->length;
+ cur = cur->link;
}
- while (!eof_stdin_detected) {
- c = getchar();
+ while (1) {
+ int c = getchar();
if (c == EOF) {
- eof_stdin_detected++;
+ if (s == NULL)
+ break;
}
- if (eof_str_detected)
+ if (eof_str_detected) { /* skip till EOF */
continue;
+ }
if (c == EOF || ISSPACE(c)) {
if (s == NULL)
continue;
}
if (s == NULL)
s = p = buf;
- if ((p - buf) >= mc)
+ if ((size_t)(p - buf) >= mc)
bb_error_msg_and_die("argument line too long");
- *p++ = c == EOF ? 0 : c;
+ *p++ = (c == EOF ? '\0' : c);
if (c == EOF) { /* word's delimiter or EOF detected */
- /* word loaded */
+ /* A full word is loaded */
if (eof_str) {
- eof_str_detected = strcmp(s, eof_str) == 0;
+ eof_str_detected = (strcmp(s, eof_str) == 0);
}
if (!eof_str_detected) {
- size_t lenght = (p - buf);
-
- cur = xmalloc(sizeof(xlist_t) + lenght);
- cur->data = memcpy(cur + 1, s, lenght);
- cur->lenght = lenght;
+ size_t length = (p - buf);
+ /* Dont xzalloc - it can be quite big */
+ cur = xmalloc(offsetof(xlist_t, xstr) + length);
cur->link = NULL;
+ cur->length = length;
+ memcpy(cur->xstr, s, length);
if (prev == NULL) {
list_arg = cur;
} else {
prev->link = cur;
}
prev = cur;
- line_l += lenght;
- if (line_l > mc) {
- /* stop memory usage :-) */
+ line_l += length;
+ if (line_l > mc) /* limit stop memory usage */
break;
- }
- s = NULL;
}
+ s = NULL;
}
}
return list_arg;
}
-#endif /* CONFIG_FEATURE_XARGS_SUPPORT_QUOTES */
+#endif /* FEATURE_XARGS_SUPPORT_QUOTES */
-#ifdef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION
+#if ENABLE_FEATURE_XARGS_SUPPORT_CONFIRMATION
/* Prompt the user for a response, and
if the user responds affirmatively, return true;
- otherwise, return false. Used "/dev/tty", not stdin. */
+ otherwise, return false. Uses "/dev/tty", not stdin. */
static int xargs_ask_confirmation(void)
{
- static FILE *tty_stream;
+ FILE *tty_stream;
int c, savec;
- if (!tty_stream) {
- tty_stream = xfopen(CURRENT_TTY, "r");
- /* pranoidal security by vodz */
- fcntl(fileno(tty_stream), F_SETFD, FD_CLOEXEC);
- }
+ tty_stream = xfopen_for_read(CURRENT_TTY);
fputs(" ?...", stderr);
- fflush(stderr);
+ fflush_all();
c = savec = getc(tty_stream);
while (c != EOF && c != '\n')
c = getc(tty_stream);
- if (savec == 'y' || savec == 'Y')
- return 1;
- return 0;
+ fclose(tty_stream);
+ return (savec == 'y' || savec == 'Y');
}
#else
# define xargs_ask_confirmation() 1
-#endif /* CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION */
+#endif /* FEATURE_XARGS_SUPPORT_CONFIRMATION */
-#ifdef CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM
-static xlist_t *process0_stdin(xlist_t * list_arg, const char *eof_str ATTRIBUTE_UNUSED,
- size_t mc, char *buf)
+#if ENABLE_FEATURE_XARGS_SUPPORT_ZERO_TERM
+static xlist_t* process0_stdin(xlist_t *list_arg,
+ const char *eof_str UNUSED_PARAM, size_t mc, char *buf)
{
- 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 */
+ char *s = NULL; /* start of the word */
+ char *p = NULL; /* pointer to end of the word */
+ size_t line_l = 0; /* size of loaded args */
xlist_t *cur;
xlist_t *prev;
- for (prev = cur = list_arg; cur; cur = cur->link) {
- line_l += cur->lenght; /* previous allocated */
- if (prev != cur)
- prev = prev->link;
+ prev = cur = list_arg;
+ while (cur) {
+ prev = cur;
+ line_l += cur->length;
+ cur = cur->link;
}
- while (!eof_stdin_detected) {
- c = getchar();
+ while (1) {
+ int c = getchar();
if (c == EOF) {
- eof_stdin_detected++;
if (s == NULL)
break;
- c = 0;
+ c = '\0';
}
if (s == NULL)
s = p = buf;
if ((size_t)(p - buf) >= mc)
bb_error_msg_and_die("argument line too long");
*p++ = c;
- if (c == 0) { /* word's delimiter or EOF detected */
- /* word loaded */
- size_t lenght = (p - buf);
-
- cur = xmalloc(sizeof(xlist_t) + lenght);
- cur->data = memcpy(cur + 1, s, lenght);
- cur->lenght = lenght;
+ if (c == '\0') { /* word's delimiter or EOF detected */
+ /* A full word is loaded */
+ size_t length = (p - buf);
+ /* Dont xzalloc - it can be quite big */
+ cur = xmalloc(offsetof(xlist_t, xstr) + length);
cur->link = NULL;
+ cur->length = length;
+ memcpy(cur->xstr, s, length);
if (prev == NULL) {
list_arg = cur;
} else {
prev->link = cur;
}
prev = cur;
- line_l += lenght;
- if (line_l > mc) {
- /* stop memory usage :-) */
+ line_l += length;
+ if (line_l > mc) /* limit stop memory usage */
break;
- }
s = NULL;
}
}
return list_arg;
}
-#endif /* CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM */
+#endif /* FEATURE_XARGS_SUPPORT_ZERO_TERM */
/* Correct regardless of combination of CONFIG_xxx */
enum {
OPTBIT_UPTO_NUMBER,
OPTBIT_UPTO_SIZE,
OPTBIT_EOF_STRING,
- USE_FEATURE_XARGS_SUPPORT_CONFIRMATION(OPTBIT_INTERACTIVE,)
- USE_FEATURE_XARGS_SUPPORT_TERMOPT( OPTBIT_TERMINATE ,)
- USE_FEATURE_XARGS_SUPPORT_ZERO_TERM( OPTBIT_ZEROTERM ,)
-
- OPT_VERBOSE = 1<<OPTBIT_VERBOSE ,
- OPT_NO_EMPTY = 1<<OPTBIT_NO_EMPTY ,
- OPT_UPTO_NUMBER = 1<<OPTBIT_UPTO_NUMBER,
- OPT_UPTO_SIZE = 1<<OPTBIT_UPTO_SIZE ,
- OPT_EOF_STRING = 1<<OPTBIT_EOF_STRING ,
- OPT_INTERACTIVE = USE_FEATURE_XARGS_SUPPORT_CONFIRMATION((1<<OPTBIT_INTERACTIVE)) + 0,
- OPT_TERMINATE = USE_FEATURE_XARGS_SUPPORT_TERMOPT( (1<<OPTBIT_TERMINATE )) + 0,
- OPT_ZEROTERM = USE_FEATURE_XARGS_SUPPORT_ZERO_TERM( (1<<OPTBIT_ZEROTERM )) + 0,
+ OPTBIT_EOF_STRING1,
+ IF_FEATURE_XARGS_SUPPORT_CONFIRMATION(OPTBIT_INTERACTIVE,)
+ IF_FEATURE_XARGS_SUPPORT_TERMOPT( OPTBIT_TERMINATE ,)
+ IF_FEATURE_XARGS_SUPPORT_ZERO_TERM( OPTBIT_ZEROTERM ,)
+
+ OPT_VERBOSE = 1 << OPTBIT_VERBOSE ,
+ OPT_NO_EMPTY = 1 << OPTBIT_NO_EMPTY ,
+ OPT_UPTO_NUMBER = 1 << OPTBIT_UPTO_NUMBER,
+ OPT_UPTO_SIZE = 1 << OPTBIT_UPTO_SIZE ,
+ OPT_EOF_STRING = 1 << OPTBIT_EOF_STRING , /* GNU: -e[<param>] */
+ OPT_EOF_STRING1 = 1 << OPTBIT_EOF_STRING1, /* SUS: -E<param> */
+ OPT_INTERACTIVE = IF_FEATURE_XARGS_SUPPORT_CONFIRMATION((1 << OPTBIT_INTERACTIVE)) + 0,
+ OPT_TERMINATE = IF_FEATURE_XARGS_SUPPORT_TERMOPT( (1 << OPTBIT_TERMINATE )) + 0,
+ OPT_ZEROTERM = IF_FEATURE_XARGS_SUPPORT_ZERO_TERM( (1 << OPTBIT_ZEROTERM )) + 0,
};
-#define OPTION_STR "+trn:s:e::" \
- USE_FEATURE_XARGS_SUPPORT_CONFIRMATION("p") \
- USE_FEATURE_XARGS_SUPPORT_TERMOPT( "x") \
- USE_FEATURE_XARGS_SUPPORT_ZERO_TERM( "0")
+#define OPTION_STR "+trn:s:e::E:" \
+ IF_FEATURE_XARGS_SUPPORT_CONFIRMATION("p") \
+ IF_FEATURE_XARGS_SUPPORT_TERMOPT( "x") \
+ IF_FEATURE_XARGS_SUPPORT_ZERO_TERM( "0")
+int xargs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int xargs_main(int argc, char **argv)
{
- char **args;
- int i, n;
xlist_t *list = NULL;
- xlist_t *cur;
int child_error = 0;
- char *max_args, *max_chars;
+ char *max_args;
+ char *max_chars;
+ char *buf;
int n_max_arg;
- size_t n_chars = 0;
- long orig_arg_max;
- const char *eof_str = "_";
+ const char *eof_str = NULL;
unsigned opt;
size_t n_max_chars;
#if ENABLE_FEATURE_XARGS_SUPPORT_ZERO_TERM
#define read_args process_stdin
#endif
- opt = getopt32(argc, argv, OPTION_STR, &max_args, &max_chars, &eof_str);
+ opt = getopt32(argv, OPTION_STR, &max_args, &max_chars, &eof_str, &eof_str);
+
+ /* -E ""? You may wonder why not just omit -E?
+ * This is used for portability:
+ * old xargs was using "_" as default for -E / -e */
+ if ((opt & OPT_EOF_STRING1) && eof_str[0] == '\0')
+ eof_str = NULL;
if (opt & OPT_ZEROTERM)
- USE_FEATURE_XARGS_SUPPORT_ZERO_TERM(read_args = process0_stdin);
+ IF_FEATURE_XARGS_SUPPORT_ZERO_TERM(read_args = process0_stdin);
- argc -= optind;
argv += optind;
- if (!argc) {
+ argc -= optind;
+ if (!argv[0]) {
/* default behavior is to echo all the filenames */
- *argv = "echo";
+ *--argv = (char*)"echo";
argc++;
}
- orig_arg_max = ARG_MAX;
- if (orig_arg_max == -1)
- orig_arg_max = LONG_MAX;
- orig_arg_max -= 2048; /* POSIX.2 requires subtracting 2048 */
+ /* The Open Group Base Specifications Issue 6:
+ * "The xargs utility shall limit the command line length such that
+ * when the command line is invoked, the combined argument
+ * and environment lists (see the exec family of functions
+ * in the System Interfaces volume of IEEE Std 1003.1-2001)
+ * shall not exceed {ARG_MAX}-2048 bytes".
+ */
+ n_max_chars = ARG_MAX; /* might be calling sysconf(_SC_ARG_MAX) */
+ if (n_max_chars < 4*1024); /* paranoia */
+ n_max_chars = 4*1024;
+ n_max_chars -= 2048;
+ /* Sanity check for systems with huge ARG_MAX defines (e.g., Suns which
+ * have it at 1 meg). Things will work fine with a large ARG_MAX
+ * but it will probably hurt the system more than it needs to;
+ * an array of this size is allocated.
+ */
+ if (n_max_chars > 20 * 1024)
+ n_max_chars = 20 * 1024;
if (opt & OPT_UPTO_SIZE) {
- n_max_chars = bb_xgetularg10_bnd(max_chars, 1, orig_arg_max);
- for (i = 0; i < argc; i++) {
- 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");
+ int i;
+ size_t n_chars = 0;
+ n_max_chars = xatoul_range(max_chars, 1, n_max_chars);
+ for (i = 0; argv[i]; i++) {
+ n_chars += strlen(argv[i]) + 1;
}
n_max_chars -= n_chars;
- } else {
- /* Sanity check for systems with huge ARG_MAX defines (e.g., Suns which
- have it at 1 meg). Things will work fine with a large ARG_MAX but it
- will probably hurt the system more than it needs to; an array of this
- size is allocated. */
- if (orig_arg_max > 20 * 1024)
- orig_arg_max = 20 * 1024;
- n_max_chars = orig_arg_max;
+ if ((ssize_t)n_max_chars <= 0) {
+ bb_error_msg_and_die("can't fit single argument within argument list size limit");
+ }
}
- max_chars = xmalloc(n_max_chars);
+
+ buf = xmalloc(n_max_chars);
if (opt & OPT_UPTO_NUMBER) {
- n_max_arg = bb_xgetularg10_bnd(max_args, 1, INT_MAX);
+ n_max_arg = xatoul_range(max_args, 1, INT_MAX);
} else {
n_max_arg = n_max_chars;
}
- while ((list = read_args(list, eof_str, n_max_chars, max_chars)) != NULL ||
- !(opt & OPT_NO_EMPTY))
- {
+ while ((list = read_args(list, eof_str, n_max_chars, buf)) != NULL
+ || !(opt & OPT_NO_EMPTY)
+ ) {
+ char **args;
+ xlist_t *cur;
+ int i, n;
+ size_t n_chars = 0;
+
opt |= OPT_NO_EMPTY;
n = 0;
- n_chars = 0;
-#ifdef CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT
+#if ENABLE_FEATURE_XARGS_SUPPORT_TERMOPT
for (cur = list; cur;) {
- n_chars += cur->lenght;
+ n_chars += cur->length;
n++;
cur = cur->link;
if (n_chars > n_max_chars || (n == n_max_arg && cur)) {
}
#else
for (cur = list; cur; cur = cur->link) {
- n_chars += cur->lenght;
+ n_chars += cur->length;
n++;
if (n_chars > n_max_chars || n == n_max_arg) {
break;
}
}
-#endif /* CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT */
+#endif
- /* allocate pointers for execvp:
- argc*arg, n*arg from stdin, NULL */
- args = xzalloc((n + argc + 1) * sizeof(char *));
+ /* allocate pointers for execvp */
+ args = xzalloc(sizeof(args[0]) * (argc + n + 1));
/* store the command to be executed
- (taken from the command line) */
- for (i = 0; i < argc; i++)
+ * (taken from the command line) */
+ for (i = 0; argv[i]; i++)
args[i] = argv[i];
/* (taken from stdin) */
for (cur = list; n; cur = cur->link) {
- args[i++] = cur->data;
+ args[i++] = cur->xstr;
n--;
}
if (opt & (OPT_INTERACTIVE | OPT_VERBOSE)) {
for (i = 0; args[i]; i++) {
if (i)
- fputc(' ', stderr);
+ bb_putchar_stderr(' ');
fputs(args[i], stderr);
}
if (!(opt & OPT_INTERACTIVE))
- fputc('\n', stderr);
+ bb_putchar_stderr('\n');
}
+
if (!(opt & OPT_INTERACTIVE) || xargs_ask_confirmation()) {
child_error = xargs_exec(args);
}
free(cur);
}
free(args);
+
if (child_error > 0 && child_error != 123) {
break;
}
- }
- if (ENABLE_FEATURE_CLEAN_UP) free(max_chars);
+ } /* while */
+
+ if (ENABLE_FEATURE_CLEAN_UP)
+ free(buf);
+
return child_error;
}
#ifdef TEST
-const char *bb_applet_name = "debug stuff usage";
+const char *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);
- exit(1);
+ applet_name);
+ exit(EXIT_FAILURE);
}
int main(int argc, char **argv)
projects / oweals / busybox.git / blobdiff