Tweak usage and man page into agreement.

There's nothing special about -c and -d requiring them to be
separated from other flags or specified as mutually exclusive. So
just show a single block of flags. Some flag combos are silly
but harmless.

Move all -B options inside NUMBOOT #if, eliminating confusing
duplication of -w and -R usage lines. And some string
declaration dancing.

Since we only have NUMBOOT = 1, no need to try and finesse
output for different values of NUMBOOT.

Line shit up.

2 files changed, 19 insertions, 32 deletions

diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 92a60c3e39a..dc70318aef4 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: disklabel.8,v 1.105 2012/01/02 00:59:33 krw Exp $
+.\"	$OpenBSD: disklabel.8,v 1.106 2012/01/02 03:40:31 krw Exp $
 .\"	$NetBSD: disklabel.8,v 1.9 1995/03/18 14:54:38 cgd Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1991, 1993
@@ -41,25 +41,21 @@
 .Nd read and write disk pack label
 .Sh SYNOPSIS
 .Nm disklabel
-.Op Fl c | d | t
-.Op Fl Av
+.Op Fl Acdtv
 .Op Fl h | p Ar unit
 .Ar disk
 .Nm disklabel
 .Fl w
-.Op Fl c | d
-.Op Fl Anv
+.Op Fl Acdnv
 .Ar disk Ar disktype
 .Op Ar packid
 .Nm disklabel
 .Fl e
-.Op Fl c | d
-.Op Fl Anv
+.Op Fl Acdnv
 .Ar disk
 .Nm disklabel
 .Fl E
-.Op Fl c | d
-.Op Fl Anv
+.Op Fl Acdnv
 .Op Fl F Ns | Ns Fl f Ar file
 .Ar disk
 .Nm disklabel
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 5f640de3346..761bdd2807f 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.c,v 1.182 2012/01/02 00:59:33 krw Exp $	*/
+/*	$OpenBSD: disklabel.c,v 1.183 2012/01/02 03:40:31 krw Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -1442,36 +1442,27 @@ cmplabel(struct disklabel *lp1, struct disklabel *lp2)
 void
 usage(void)
 {
-	char *boot = "";
-	char *blank = "       ";
-	char *Bflag = "";
-
-#if NUMBOOT == 1
-	Bflag = "B";
-	boot = " [-b boot1]";
-#endif
-
 	fprintf(stderr,
-	    "usage: disklabel [-c | -d | -t] [-Av] [-h | -p unit] disk\t(read)\n");
+	    "usage: disklabel    [-Acdtv] [-h | -p unit] disk\t(read)\n");
 	fprintf(stderr,
-	    "       disklabel -w [-c | -d] [-Anv] disk disktype [packid]\t(write)\n");
+	    "       disklabel -w [-Acdnv] disk disktype [packid]\t(write)\n");
 	fprintf(stderr,
-	    "       disklabel -e [-c | -d] [-Anv] disk\t\t\t(edit)\n");
+	    "       disklabel -e [-Acdnv] disk\t\t\t(edit)\n");
 	fprintf(stderr,
-	    "       disklabel -E [-c | -d] [-Anv] [-F|-f file] disk\t(simple editor)\n");
+	    "       disklabel -E [-Acdnv] [-F|-f file] disk\t\t(simple editor)"
+	    "\n");
 	fprintf(stderr,
-	    "       disklabel -R [-nv] disk protofile\t\t\t(restore)\n");
+	    "       disklabel -R [-nv] disk protofile\t\t(restore)\n\n");
 #if NUMBOOT > 0
 	fprintf(stderr,
-	    "%sdisklabel -B  [-nv]%s disk [disktype]           (boot)\n",
-	    blank, boot);
-#endif
-	fprintf(stderr,
-	    "%sdisklabel -%sw [-nv]%s disk disktype [packid]    (write)\n",
-	    blank, Bflag, boot);
+	    "       disklabel -B  [-nv] [-b boot1] disk [disktype]\t\t(boot)\n");
+ 	fprintf(stderr,
+	    "       disklabel -Bw [-nv] [-b boot1] disk disktype [packid]\t"
+	    "(boot+write)\n");
 	fprintf(stderr,
-	    "%sdisklabel -%sR [-nv]%s disk protofile [disktype] (restore)\n\n",
-	    blank, Bflag, boot);
+	    "       disklabel -BR [-nv] [-b boot1] disk protofile\t\t"
+	    "(boot+restore)\n\n");
+#endif
 	fprintf(stderr,
 	    "`disk' may be of the form: sd0 or /dev/rsd0%c.\n", 'a'+RAW_PART);
 	fprintf(stderr,