sort options; sync usage(); from Igor Sobrado

2 files changed, 23 insertions, 24 deletions

diff --git a/bin/pax/options.c b/bin/pax/options.c
index d0682535a48..df7b1f1684f 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.66 2007/02/24 09:29:55 jmc Exp $	*/
+/*	$OpenBSD: options.c,v 1.67 2007/02/24 09:50:55 jmc Exp $	*/
 /*	$NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static const char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #else
-static const char rcsid[] = "$OpenBSD: options.c,v 1.66 2007/02/24 09:29:55 jmc Exp $";
+static const char rcsid[] = "$OpenBSD: options.c,v 1.67 2007/02/24 09:50:55 jmc Exp $";
 #endif
 #endif /* not lint */
 
@@ -1536,16 +1536,16 @@ void
 pax_usage(void)
 {
 	(void)fputs(
-	    "usage: pax [-0cdOnvz] [-E limit] [-f archive] [-G group] [-s replstr]\n"
-	    "\t  [-T [from_date][,to_date][/[c][m]]] [-U user] [pattern ...]\n"
-	    "       pax -r [-0cDdikOnuvzYZz] [-E limit] [-f archive] [-G group]\n"
-	    "\t  [-o options] [-p string] [-s replstr] [-T [from_date][,to_date]]\n"
+	    "usage: pax [-0cdnOvz] [-E limit] [-f archive] [-G group] [-s replstr]\n"
+	    "\t  [-T range] [-U user] [pattern ...]\n"
+	    "       pax -r [-0cDdiknOuvYZz] [-E limit] [-f archive] [-G group]\n"
+	    "\t  [-o options] [-p string] [-s replstr] [-T range]\n"
 	    "\t  [-U user] [pattern ...]\n"
 	    "       pax -w [-0adHiLOPtuvXz] [-B bytes] [-b blocksize] [-f archive]\n"
 	    "\t  [-G group] [-o options] [-s replstr]\n"
-	    "\t  [-T [from_date][,to_date][/[c][m]]] [-U user] [-x format] [file ...]\n"
-	    "       pax -r -w [-0DdHikLlnOPtuvXYZ] [-G group] [-p string] [-s replstr]\n"
-	    "\t  [-T [from_date][,to_date][/[c][m]]] [-U user] [file ...] directory\n",
+	    "\t  [-T range] [-U user] [-x format] [file ...]\n"
+	    "       pax -rw [-0DdHikLlnOPtuvXYZ] [-G group] [-p string] [-s replstr]\n"
+	    "\t  [-T range] [-U user] [file ...] directory\n",
 	    stderr);
 	exit(1);
 }
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 5b57761c6ed..b3367670cd0 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pax.1,v 1.48 2006/05/12 11:55:58 jmc Exp $
+.\"	$OpenBSD: pax.1,v 1.49 2007/02/24 09:50:55 jmc Exp $
 .\"	$NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $
 .\"
 .\" Copyright (c) 1992 Keith Muller.
@@ -43,7 +43,7 @@
 .Sh SYNOPSIS
 .Bk -words
 .Nm pax
-.Op Fl 0cdOnvz
+.Op Fl 0cdnOvz
 .Op Fl E Ar limit
 .Op Fl f Ar archive
 .Op Fl G Ar group
@@ -53,7 +53,7 @@
 .Op Ar pattern ...
 .Nm pax
 .Fl r
-.Op Fl 0cDdikOnuvYZz
+.Op Fl 0cDdiknOuvYZz
 .Op Fl E Ar limit
 .Op Fl f Ar archive
 .Op Fl G Ar group
@@ -77,8 +77,7 @@
 .Op Fl x Ar format
 .Op Ar file ...
 .Nm pax
-.Fl r
-.Fl w
+.Fl rw
 .Op Fl 0DdHikLlnOPtuvXYZ
 .Op Fl G Ar group
 .Op Fl p Ar string
@@ -150,7 +149,7 @@ When a
 .Ar file
 operand is also a directory, the entire file hierarchy rooted
 at that directory will be included.
-.It Fl r Fl w
+.It Fl rw
 .Em Copy .
 .Nm
 copies the
@@ -655,7 +654,7 @@ The optional trailing
 will cause the final result of a successful substitution to be written to
 standard error in the following format:
 .Pp
-.D1 Em original-pathname No >> Em new-pathname
+.D1 Em original-pathname No \*(Gt\*(Gt Em new-pathname
 .Pp
 File or archive member names that substitute to the empty string
 are not selected and will be skipped.
@@ -857,20 +856,20 @@ Specify the output archive format, with the default format being
 .Nm
 currently supports the following formats:
 .Bl -tag -width "sv4cpio"
-.It Cm cpio
-The extended cpio interchange format specified in the
-.St -p1003.2
-standard.
+.It Cm bcpio
+The old binary cpio format.
 The default blocksize for this format is 5120 bytes.
+This format is not very portable and should not be used when other formats
+are available.
 Inode and device information about a file (used for detecting file hard links
 by this format), which may be truncated by this format, is detected by
 .Nm
 and is repaired.
-.It Cm bcpio
-The old binary cpio format.
+.It Cm cpio
+The extended cpio interchange format specified in the
+.St -p1003.2
+standard.
 The default blocksize for this format is 5120 bytes.
-This format is not very portable and should not be used when other formats
-are available.
 Inode and device information about a file (used for detecting file hard links
 by this format), which may be truncated by this format, is detected by
 .Nm