Module Name:    src
Committed By:   bouyer
Date:           Wed Feb 16 21:17:51 UTC 2011

Modified Files:
        src/usr.bin/xargs [netbsd-5]: xargs.1

Log Message:
Pull up following revision(s) (requested by dholland in ticket #1552):
        usr.bin/xargs/xargs.1: revision 1.21
        usr.bin/xargs/xargs.1: revision 1.22
PR/44259: Aleksey Cheusov: xargs: -r option is supported but not documented
Synced with the FreeBSD doc.
Talk more about NetBSD and less about FreeBSD. Sort sections.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.12.1 src/usr.bin/xargs/xargs.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/xargs/xargs.1
diff -u src/usr.bin/xargs/xargs.1:1.20 src/usr.bin/xargs/xargs.1:1.20.12.1
--- src/usr.bin/xargs/xargs.1:1.20	Sun Dec  2 19:47:56 2007
+++ src/usr.bin/xargs/xargs.1	Wed Feb 16 21:17:51 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: xargs.1,v 1.20 2007/12/02 19:47:56 wiz Exp $
+.\" $NetBSD: xargs.1,v 1.20.12.1 2011/02/16 21:17:51 bouyer Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,10 +32,10 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)xargs.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/xargs/xargs.1,v 1.37 2006/09/29 15:20:48 ru Exp $
+.\" $FreeBSD: src/usr.bin/xargs/xargs.1,v 1.40 2010/12/11 08:32:16 joel Exp $
 .\" $xMach: xargs.1,v 1.2 2002/02/23 05:23:37 tim Exp $
 .\"
-.Dd April 18, 2007
+.Dd December 21, 2010
 .Dt XARGS 1
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@
 .Nd "construct argument list(s) and execute utility"
 .Sh SYNOPSIS
 .Nm
-.Op Fl 0opt
+.Op Fl 0oprt
 .Op Fl E Ar eofstr
 .Oo
 .Fl I Ar replstr
@@ -219,6 +219,34 @@
 causes the command to be executed, any other response causes it to be
 skipped.
 No commands are executed if the process is not attached to a terminal.
+.It Fl r
+Compatibility with GNU
+.Nm .
+The GNU version of
+.Nm
+runs the
+.Ar utility
+argument at least once, even if
+.Nm
+input is empty, and it supports a
+.Fl r
+option to inhibit this behavior.
+The
+.Nx
+version of
+.Nm
+does not run the
+.Ar utility
+argument on empty input, but it supports the
+.Fl r
+option for command-line compatibility with GNU
+.Nm ;
+but the
+.Fl r
+option does nothing in the
+.Nx
+version of
+.Nm .
 .It Fl R Ar replacements
 Specify the maximum number of arguments that
 .Fl I
@@ -279,6 +307,11 @@
 or an invocation of
 .Ar utility
 exits with a value of 255.
+.Sh FILES
+.Bl -tag -width /dev/tty -compact
+.It Pa /dev/tty
+used to read responses in prompt mode
+.El
 .Sh EXIT STATUS
 .Nm
 exits with one of the following values:
@@ -310,11 +343,6 @@
 .It 1
 Some other error occurred.
 .El
-.Sh FILES
-.Bl -tag -width /dev/tty -compact
-.It Pa /dev/tty
-used to read responses in prompt mode
-.El
 .Sh SEE ALSO
 .Xr echo 1 ,
 .Xr find 1 ,

Reply via email to