d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restructure sanity checks so that -I and -J just override eachother, rather

Browse Source 
than triggering a usage().  Allow -R and -I to be specified in any order, and
thus change how -R checks for -I not being given and triggering a usage().

Partially requested by:	gad
This commit is contained in:
jmallett 2002-05-30 19:34:31 +00:00
parent a2f7c4e9ca
commit d0bc9fa06e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/xargs/xargs.c
View File

@ -126,12 +126,13 @@ main(int argc, char **argv)
eofstr = optarg;
break;
case 'I':
Jflag = 0;
Iflag = 1;
Lflag = 1;
Rflag = 5;
replstr = optarg;
break;
case 'J':
Iflag = 0;
Jflag = 1;
replstr = optarg;
break;
@ -147,8 +148,6 @@ main(int argc, char **argv)
pflag = 1;
break;
case 'R':
if (!Iflag)
usage();
if ((Rflag = atoi(optarg)) <= 0)
errx(1, "illegal number of replacements");
break;
@ -171,8 +170,10 @@ main(int argc, char **argv)
argc -= optind;
argv += optind;
if (Iflag && Jflag)
errx(1, "the -I and -J options may not be used together");
if (!Iflag && Rflag)
usage();
if (Iflag && !Rflag)
Rflag = 5;
if (xflag && !nflag)
usage();
if (Iflag || Lflag)