Index: head/usr.bin/xargs/xargs.1 =================================================================== --- head/usr.bin/xargs/xargs.1 (revision 95904) +++ head/usr.bin/xargs/xargs.1 (revision 95905) @@ -1,274 +1,285 @@ .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" .\" This code is derived from software contributed to Berkeley by .\" John B. Roll Jr. and the Institute of Electrical and Electronics .\" Engineers, Inc. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. All advertising materials mentioning features or use of this software .\" must display the following acknowledgement: .\" This product includes software developed by the University of .\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" @(#)xargs.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" $xMach: xargs.1,v 1.2 2002/02/23 05:23:37 tim Exp $ .\" .Dd May 7, 2001 .Dt XARGS 1 .Os .Sh NAME .Nm xargs .Nd "construct argument list(s) and execute utility" .Sh SYNOPSIS .Nm .Op Fl 0pt .Op Fl E Ar eofstr -.Op Fl I Ar replstr +.Oo +.Fl I Ar replstr +.Op Fl R Ar replacements +.Oc .Op Fl J Ar replstr .Op Fl L Ar number .Oo .Fl n Ar number .Op Fl x .Oc .Op Fl s Ar size .Op Ar utility Op Ar argument ... .Sh DESCRIPTION The .Nm utility reads space, tab, newline and end-of-file delimited arguments from the standard input and executes the specified .Ar utility with them as arguments. .Pp The utility and any arguments specified on the command line are given to the .Ar utility upon each invocation, followed by some number of the arguments read from standard input. The .Ar utility is repeatedly executed until standard input is exhausted. .Pp Spaces, tabs and newlines may be embedded in arguments using single (``\ '\ '') or double (``"'') quotes or backslashes (``\e''). Single quotes escape all non-single quote characters, excluding newlines, up to the matching single quote. Double quotes escape all non-double quote characters, excluding newlines, up to the matching double quote. Any single character, including newlines, may be escaped by a backslash. .Pp The options are as follows: .Bl -tag -width indent .It Fl 0 Change .Nm to expect NUL (``\\0'') characters as separators, instead of spaces and newlines. This is expected to be used in concert with the .Fl print0 function in .Xr find 1 . .It Fl E Ar eofstr Use .Ar eofstr as a logical EOF marker. .It Fl I Ar replstr Execute .Ar utility for each input line, replacing one or more occurences of .Ar replstr -in up to 5 arguments to +in up to +.Ar replacements +(or 5 if no +.Op R +flag is specified) arguments to .Ar utility with the entire line of input. The resulting arguments after replacement is done will not be allowed to grow beyond 255 bytes, this is implemented by concatenating as much of the argument containing .Ar replstr as possible to the constructed arguments to .Ar utility up to 255 bytes. The 255 byte limit does not apply to arguments to .Ar utility which do not contain .Ar replstr , and furthermore no replacement will be done on .Ar utility itself. Implies .Fl x . .It Fl J Ar replstr If this option is specified, .Nm will use the data read from standard input to replace the first occurrence of .Ar replstr instead of appending that data after all other arguments. This option will not effect how many arguments will be read from input .Pq Fl n , or the size of the command(s) .Nm will generate .Pq Fl s . The option just moves where those arguments will be placed in the command(s) that are executed. The .Ar replstr must show up as a distinct .Ar argument to .Nm . It will not be recognized if, for instance, it is in the middle of a quoted string. Furthermore, only the first occurrence of the .Ar replstr will be replaced. For example, the following command will copy the list of files and directories which start with an uppercase letter in the current directory to .Pa destdir : .Pp .Dl /bin/ls -1d [A-Z]* | xargs -J [] cp -rp [] destdir .Pp .It Fl L Ar number Calls .Ar utility for every .Ar number lines read. If EOF is reached and fewer lines have been read than .Ar number then .Ar utility will be called with the available lines. .It Fl n Ar number Set the maximum number of arguments taken from standard input for each invocation of the utility. An invocation of .Ar utility will use less than .Ar number standard input arguments if the number of bytes accumulated (see the .Fl s option) exceeds the specified .Ar size or there are fewer than .Ar number arguments remaining for the last invocation of .Ar utility . The current default value for .Ar number is 5000. .It Fl p Echo each command to be executed and ask the user whether it should be executed. A response of .Ql y causes the command to be executed, any other response causes it to be skipped. +.It Fl R Ar replacements +This option specifies the maximum number of arguments that +.Op I +will do replacement in. .It Fl s Ar size Set the maximum number of bytes for the command line length provided to .Ar utility . The sum of the length of the utility name, the arguments passed to .Ar utility (including .Dv NULL terminators) and the current environment will be less than or equal to this number. The current default value for .Ar size is .Dv ARG_MAX - 4096. .It Fl t Echo the command to be executed to standard error immediately before it is executed. .It Fl x Force .Nm to terminate immediately if a command line containing .Ar number arguments will not fit in the specified (or default) command line length. .El .Pp If no .Ar utility is specified, .Xr echo 1 is used. .Pp Undefined behavior may occur if .Ar utility reads from the standard input. .Pp The .Nm utility exits immediately (without processing any further input) if a command line cannot be assembled, .Ar utility cannot be invoked, an invocation of the utility is terminated by a signal or an invocation of the utility exits with a value of 255. .Sh DIAGNOSTICS The .Nm utility exits with a value of 0 if no error occurs. If .Ar utility cannot be found, .Nm exits with a value of 127, otherwise if .Ar utility cannot be executed, .Nm exits with a value of 126. If any other error occurs, .Nm exits with a value of 1. .Sh SEE ALSO .Xr echo 1 , .Xr find 1 , .Xr execvp 3 .Sh STANDARDS The .Nm utility is expected to be .St -p1003.2 compliant. The .Fl J option is a non-standard .Fx extension which may not be available on other operating systems. .Sh BUGS If .Ar utility attempts to invoke another command such that the number of arguments or the size of the environment is increased, it risks .Xr execvp 3 failing with .Er E2BIG . Index: head/usr.bin/xargs/xargs.c =================================================================== --- head/usr.bin/xargs/xargs.c (revision 95904) +++ head/usr.bin/xargs/xargs.c (revision 95905) @@ -1,430 +1,439 @@ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * John B. Roll Jr. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $xMach: xargs.c,v 1.6 2002/02/23 05:27:47 tim Exp $ */ #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1990, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #if 0 #ifndef lint static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #endif #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include #include "pathnames.h" static void run(char **); static void usage(void); void strnsubst(char **, const char *, const char *, size_t); static char echo[] = _PATH_ECHO; static int pflag, tflag, rval, zflag; extern char *environ[]; int main(int argc, char **argv) { long arg_max; - int ch, cnt, count, Iflag, indouble, insingle, jfound, lflag; - int nargs, nflag, nline, wasquoted, foundeof, xflag; + int ch, cnt, count, Iflag, indouble, insingle, Jflag, jfound, lflag; + int nargs, nflag, nline, Rflag, wasquoted, foundeof, xflag; size_t linelen; const char *eofstr; char **av, **avj, **bxp, **ep, **exp, **xp; char *argp, *bbp, *ebp, *inpline, *p, *replstr; ep = environ; inpline = replstr = NULL; eofstr = ""; - cnt = count = Iflag = jfound = lflag = nflag = xflag = wasquoted = 0; + cnt = count = Iflag = Jflag = jfound = lflag = nflag = Rflag = xflag = + wasquoted = 0; /* * POSIX.2 limits the exec line length to ARG_MAX - 2K. Running that * caused some E2BIG errors, so it was changed to ARG_MAX - 4K. Given * that the smallest argument is 2 bytes in length, this means that * the number of arguments is limited to: * * (ARG_MAX - 4K - LENGTH(utility + arguments)) / 2. * * We arbitrarily limit the number of arguments to 5000. This is * allowed by POSIX.2 as long as the resulting minimum exec line is * at least LINE_MAX. Realloc'ing as necessary is possible, but * probably not worthwhile. */ nargs = 5000; if ((arg_max = sysconf(_SC_ARG_MAX)) == -1) errx(1, "sysconf(_SC_ARG_MAX) failed"); nline = arg_max - 4 * 1024; while (*ep) { /* 1 byte for each '\0' */ nline -= strlen(*ep++) + 1 + sizeof(*ep); } - while ((ch = getopt(argc, argv, "0E:I:J:L:n:ps:tx")) != -1) + while ((ch = getopt(argc, argv, "0E:I:J:L:n:pR:s:tx")) != -1) switch(ch) { case 'E': eofstr = optarg; break; case 'I': Iflag = 1; lflag = 1; + Rflag = 5; replstr = optarg; break; case 'J': + Jflag = 1; replstr = optarg; break; case 'L': lflag = atoi(optarg); break; case 'n': nflag = 1; if ((nargs = atoi(optarg)) <= 0) errx(1, "illegal argument count"); break; case 'p': pflag = 1; break; + case 'R': + if (!Iflag) + usage(); + if ((Rflag = atoi(optarg)) <= 0) + errx(1, "illegal number of replacements"); + break; case 's': nline = atoi(optarg); break; case 't': tflag = 1; break; case 'x': xflag = 1; break; case '0': zflag = 1; break; case '?': default: usage(); } argc -= optind; argv += optind; if (xflag && !nflag) usage(); if (Iflag || lflag) xflag = 1; if (replstr != NULL && *replstr == '\0') errx(1, "replstr may not be empty"); /* * Allocate pointers for the utility name, the utility arguments, * the maximum arguments to be read from stdin and the trailing * NULL. */ linelen = 1 + argc + nargs + 1; if ((av = bxp = malloc(linelen * sizeof(char **))) == NULL) err(1, "malloc"); /* * Use the user's name for the utility as argv[0], just like the * shell. Echo is the default. Set up pointers for the user's * arguments. */ if (!*argv) cnt = strlen((*bxp++ = echo)); else { do { - if (!Iflag && replstr && strcmp(*argv, replstr) == 0) { + if (Jflag && strcmp(*argv, replstr) == 0) { jfound = 1; argv++; for (avj = argv; *avj; avj++) cnt += strlen(*avj) + 1; break; } cnt += strlen(*bxp++ = *argv) + 1; } while (*++argv); } /* * Set up begin/end/traversing pointers into the array. The -n * count doesn't include the trailing NULL pointer, so the malloc * added in an extra slot. */ exp = (xp = bxp) + nargs; /* * Allocate buffer space for the arguments read from stdin and the * trailing NULL. Buffer space is defined as the default or specified * space, minus the length of the utility name and arguments. Set up * begin/end/traversing pointers into the array. The -s count does * include the trailing NULL, so the malloc didn't add in an extra * slot. */ nline -= cnt; if (nline <= 0) errx(1, "insufficient space for command"); if ((bbp = malloc((u_int)nline + 1)) == NULL) err(1, "malloc"); ebp = (argp = p = bbp) + nline - 1; for (insingle = indouble = 0;;) switch(ch = getchar()) { case EOF: /* No arguments since last exec. */ if (p == bbp) exit(rval); goto arg1; case ' ': case '\t': /* Quotes escape tabs and spaces. */ if (insingle || indouble || zflag) goto addch; goto arg2; case '\0': if (zflag) goto arg2; goto addch; case '\n': count++; if (zflag) goto addch; /* Quotes do not escape newlines. */ arg1: if (insingle || indouble) errx(1, "unterminated quote"); arg2: foundeof = *eofstr != '\0' && strcmp(argp, eofstr) == 0; /* Do not make empty args unless they are quoted */ if ((argp != p || wasquoted) && !foundeof) { *p++ = '\0'; *xp++ = argp; if (Iflag) { char *realloc_holder; size_t curlen; realloc_holder = inpline; if (realloc_holder == NULL) curlen = 0; else { curlen = strlen(realloc_holder); if (curlen) strcat(inpline, " "); } curlen++; inpline = realloc(realloc_holder, strlen(argp) + curlen + 2); if (inpline == NULL) err(1, "realloc"); if (curlen == 1) strcpy(inpline, argp); else strcat(inpline, argp); } } /* * If max'd out on args or buffer, or reached EOF, * run the command. If xflag and max'd out on buffer * but not on args, object. */ if (xp == exp || p > ebp || ch == EOF || (lflag <= count && xflag) || foundeof) { if (xflag && xp != exp && p > ebp) errx(1, "insufficient space for arguments"); if (jfound) { for (avj = argv; *avj; avj++) *xp++ = *avj; } if (Iflag) { char **tmp, **tmp2; size_t repls; int iter; tmp = malloc(linelen * sizeof(char **)); if (tmp == NULL) err(1, "malloc"); tmp2 = tmp; - repls = 5; + repls = Rflag; for (avj = av, iter = argc; iter; avj++, iter--) { *tmp = *avj; if (avj != av && repls > 0 && strstr(*tmp, replstr) != NULL) { strnsubst(tmp, replstr, inpline, 255); repls--; } else { *tmp = strdup(*avj); if (*tmp == NULL) err(1, "strdup"); } tmp++; } *tmp = *xp = NULL; run(tmp2); for (; tmp2 != tmp; tmp--) free(*tmp); free(tmp2); free(inpline); inpline = strdup(""); } else { *xp = NULL; run(av); } if (ch == EOF || foundeof) exit(rval); p = bbp; xp = bxp; count = 0; } argp = p; wasquoted = 0; break; case '\'': if (indouble || zflag) goto addch; insingle = !insingle; wasquoted = 1; break; case '"': if (insingle || zflag) goto addch; indouble = !indouble; wasquoted = 1; break; case '\\': if (zflag) goto addch; /* Backslash escapes anything, is escaped by quotes. */ if (!insingle && !indouble && (ch = getchar()) == EOF) errx(1, "backslash at EOF"); /* FALLTHROUGH */ default: addch: if (p < ebp) { *p++ = ch; break; } /* If only one argument, not enough buffer space. */ if (bxp == xp) errx(1, "insufficient space for argument"); /* Didn't hit argument limit, so if xflag object. */ if (xflag) errx(1, "insufficient space for arguments"); if (jfound) { for (avj = argv; *avj; avj++) *xp++ = *avj; } *xp = NULL; run(av); xp = bxp; cnt = ebp - argp; memcpy(bbp, argp, (size_t)cnt); p = (argp = bbp) + cnt; *p++ = ch; break; } /* NOTREACHED */ } static void run(char **argv) { volatile int childerr; char **p; FILE *ttyfp; pid_t pid; int ch, status; if (tflag || pflag) { (void)fprintf(stderr, "%s", *argv); for (p = argv + 1; *p; ++p) (void)fprintf(stderr, " %s", *p); if (pflag && (ttyfp = fopen("/dev/tty", "r")) != NULL) { (void)fprintf(stderr, "?"); (void)fflush(stderr); ch = getc(ttyfp); fclose(ttyfp); if (ch != 'y') return; } else { (void)fprintf(stderr, "\n"); (void)fflush(stderr); } } childerr = 0; switch(pid = vfork()) { case -1: err(1, "vfork"); case 0: execvp(argv[0], argv); childerr = errno; _exit(1); } pid = waitpid(pid, &status, 0); if (pid == -1) err(1, "waitpid"); /* If we couldn't invoke the utility, exit. */ if (childerr != 0) err(childerr == ENOENT ? 127 : 126, "%s", *argv); /* If utility signaled or exited with a value of 255, exit 1-125. */ if (WIFSIGNALED(status) || WEXITSTATUS(status) == 255) exit(1); if (WEXITSTATUS(status)) rval = 1; } static void usage(void) { fprintf(stderr, -"usage: xargs [-0pt] [-E eofstr] [-I replstr] [-J replstr] [-L number]\n" -" [-n number [-x] [-s size] [utility [argument ...]]\n"); +"usage: xargs [-0pt] [-E eofstr] [-I replstr [-R replacements]] [-J replstr]\n" +" [-L number] [-n number [-x] [-s size] [utility [argument ...]]\n"); exit(1); }