diff options
| author | Juli Mallett <jmallett@FreeBSD.org> | 2002-05-30 19:34:31 +0000 |
|---|---|---|
| committer | Juli Mallett <jmallett@FreeBSD.org> | 2002-05-30 19:34:31 +0000 |
| commit | 6ea89183fc66d5310120c9155686f68dd21b2505 (patch) | |
| tree | 7f72b4550973a22ac2e3656c59aca4304bac46fb | |
| parent | 986d829b8fa29b653a40f382466c0b16ffdc63cd (diff) | |
Notes
| -rw-r--r-- | usr.bin/xargs/xargs.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index 832e999687e5..3616249bee5d 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -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) |