Make dump(8) really honor -a. Fix up formatting in man page and remove

duplicate entry.

diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index 2d7f1a4..c4e5f64 100644 (file)
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: dump.8,v 1.4 1997/02/03 11:53:24 deraadt Exp $
+.\"    $OpenBSD: dump.8,v 1.5 1997/02/10 04:19:55 millert Exp $
 .\"    $NetBSD: dump.8,v 1.14 1996/02/05 23:59:37 mrg Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -102,11 +102,7 @@ tells dump to
 copy all files new or modified since the
 last dump of the same or lower level.
 The default level is 9.
-.It Fl B Ar records
-The number of kilobytes per volume, rounded
-down to a multiple of the blocksize.
-This option overrides the calculation of tape size
-.It Cm a
+.It Fl a
 .Dq auto-size .
 Bypass all tape length considerations, and enforce writing
 until an end-of-media indication is returned.  This fits best
@@ -115,7 +111,12 @@ recommended when appending to an existing tape, or using a tape
 drive with hardware compression (where you can never be sure about
 the compression ratio).
 based on length and density.
+.It Fl B Ar records
+The number of kilobytes per volume, rounded
+down to a multiple of the blocksize.
+This option overrides the calculation of tape size
 .It Fl b Ar blocksize
+The number of kilobytes per dump record.
 Since the IO system slices all requests into chunks of MAXBSIZE
 (typically 64KB), it is not possible to use a larger blocksize
 without having problems later with
@@ -123,13 +124,9 @@ without having problems later with
 Therefore
 .Nm
 will constrain writes to MAXBSIZE.
-.It Cm c
+.It Fl c
 Change the defaults for use with a cartridge tape drive, with a density
 of 8000 bpi, and a length of 1700 feet.
-The number of kilobytes per dump record.
-.It Fl c
-Modify the calculation of the default density and tape size to be more
-appropriate for cartridge tapes.
 .It Fl d Ar density
 Set tape density to
 .Ar density .

diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 7fc6941..47013b5 100644 (file)
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: main.c,v 1.13 1997/02/04 10:06:20 deraadt Exp $       */
+/*     $OpenBSD: main.c,v 1.14 1997/02/10 04:19:55 millert Exp $       */
 /*     $NetBSD: main.c,v 1.8 1996/03/15 22:39:32 scottr Exp $  */
 
 /*-
@@ -126,7 +126,7 @@ main(argc, argv)
                usage();
 
        obsolete(&argc, &argv);
-       while ((ch = getopt(argc, argv, "0123456789B:b:cd:f:h:ns:T:uWw")) != -1)
+       while ((ch = getopt(argc, argv, "0123456789aB:b:cd:f:h:ns:T:uWw")) != -1)
                switch (ch) {
                /* dump level */
                case '0': case '1': case '2': case '3': case '4':