summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-02-18 18:22:55 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-02-18 18:22:55 +0000
commit4f53bd80fdb50c2a872ae4bf3e37468627ccfed0 (patch)
treee576e3fd8ce527b6a8ac650cd7708c80293bac98
parente5e6b1e15c093fa4cd1b02aa7a8d8b20c344f570 (diff)
Don't require the -n flag if -x is specified. This is consistent with
the manual page as well as xargs on other operating systems.
-rw-r--r--usr.bin/xargs/xargs.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index 1b54bf03ce1..c51ef86ef39 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xargs.c,v 1.10 2002/02/16 21:27:59 millert Exp $ */
+/* $OpenBSD: xargs.c,v 1.11 2002/02/18 18:22:54 millert Exp $ */
/* $NetBSD: xargs.c,v 1.7 1994/11/14 06:51:41 jtc Exp $ */
/*-
@@ -47,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: xargs.c,v 1.10 2002/02/16 21:27:59 millert Exp $";
+static char rcsid[] = "$OpenBSD: xargs.c,v 1.11 2002/02/18 18:22:54 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -126,9 +126,6 @@ main(argc, argv)
argc -= optind;
argv += optind;
- if (xflag && !nflag)
- usage();
-
/*
* Allocate pointers for the utility name, the utility arguments,
* the maximum arguments to be read from stdin and the trailing