diff options
| author | Igor Sobrado <sobrado@cvs.openbsd.org> | 2008-05-28 20:05:00 +0000 |
|---|---|---|
| committer | Igor Sobrado <sobrado@cvs.openbsd.org> | 2008-05-28 20:05:00 +0000 |
| commit | 1c479d93f79e35aa5d8a8f9cf04a1c6727bcba68 (patch) | |
| tree | 1829e3a9d3ef19bba1fe40a739f4747fef301e47 /bin/pax | |
| parent | b3f1f226d00f1ef0f1689957d2b0edcd69c24616 (diff) | |
write cpio_usage() in a way consistent with pax_usage() and tar_usage();
wrap options around to fill out the 80 columns; spacing.
tweaked by jsing@, thank you very much!
ok jsing@
Diffstat (limited to 'bin/pax')
| -rw-r--r-- | bin/pax/options.c | 25 | ||||
| -rw-r--r-- | bin/pax/tar.1 | 7 |
2 files changed, 16 insertions, 16 deletions
diff --git a/bin/pax/options.c b/bin/pax/options.c index 6e91d797462..24d7f5ad744 100644 --- a/bin/pax/options.c +++ b/bin/pax/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.68 2008/05/17 23:31:52 sobrado Exp $ */ +/* $OpenBSD: options.c,v 1.69 2008/05/28 20:04:59 sobrado 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.68 2008/05/17 23:31:52 sobrado Exp $"; +static const char rcsid[] = "$OpenBSD: options.c,v 1.69 2008/05/28 20:04:59 sobrado Exp $"; #endif #endif /* not lint */ @@ -1538,12 +1538,11 @@ pax_usage(void) (void)fputs( "usage: pax [-0cdnOvz] [-E limit] [-f archive] [-G group] [-s replstr]\n" " [-T range] [-U user] [pattern ...]\n" - " pax -r [-0cDdiknOuvYZz] [-E limit] [-f archive] [-G group]\n" - " [-o options] [-p string] [-s replstr] [-T range]\n" - " [-U user] [pattern ...]\n" + " pax -r [-0cDdiknOuvYZz] [-E limit] [-f archive] [-G group] [-o options]\n" + " [-p string] [-s replstr] [-T range] [-U user] [pattern ...]\n" " pax -w [-0adHiLOPtuvXz] [-B bytes] [-b blocksize] [-f archive]\n" - " [-G group] [-o options] [-s replstr]\n" - " [-T range] [-U user] [-x format] [file ...]\n" + " [-G group] [-o options] [-s replstr] [-T range] [-U user]\n" + " [-x format] [file ...]\n" " pax -rw [-0DdHikLlnOPtuvXYZ] [-G group] [-p string] [-s replstr]\n" " [-T range] [-U user] [file ...] directory\n", stderr); @@ -1576,10 +1575,12 @@ tar_usage(void) void cpio_usage(void) { - (void)fputs("usage: cpio -o [-AaBcLvZz] [-C bytes] [-F archive] [-H format]\n", stderr); - (void)fputs(" [-O archive] < name-list [> archive]\n", stderr); - (void)fputs(" cpio -i [-6BbcdfmrSstuvZz] [-C bytes] [-E file] [-F archive]\n", stderr); - (void)fputs(" [-H format] [-I archive] [pattern...] [< archive]\n", stderr); - (void)fputs(" cpio -p [-adLlmuv] destination-directory < name-list\n", stderr); + (void)fputs( + "usage: cpio -o [-AaBcLvZz] [-C bytes] [-F archive] [-H format]\n" + " [-O archive] < name-list [> archive]\n" + " cpio -i [-6BbcdfmrSstuvZz] [-C bytes] [-E file] [-F archive] [-H format]\n" + " [-I archive] [pattern ...] [< archive]\n" + " cpio -p [-adLlmuv] destination-directory < name-list\n", + stderr); exit(1); } diff --git a/bin/pax/tar.1 b/bin/pax/tar.1 index 24d9eb272e4..a439066ee1a 100644 --- a/bin/pax/tar.1 +++ b/bin/pax/tar.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tar.1,v 1.48 2007/05/31 19:19:15 jmc Exp $ +.\" $OpenBSD: tar.1,v 1.49 2008/05/28 20:04:59 sobrado Exp $ .\" .\" Copyright (c) 1996 SigmaSoft, Th. Lockert .\" All rights reserved. @@ -23,9 +23,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: tar.1,v 1.48 2007/05/31 19:19:15 jmc Exp $ +.\" $OpenBSD: tar.1,v 1.49 2008/05/28 20:04:59 sobrado Exp $ .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: May 28 2008 $ .Dt TAR 1 .Os .Sh NAME @@ -42,7 +42,6 @@ .Op Fl I Ar file .Op Ar file ... .Ek -.Pp .Nm tar .No { Ns Fl crtux Ns } .Op Fl 014578eHhLmOoPpqvwXZz |