hi.

diff to reduce verbosity in disklabel(8) usage. before:

$ /sbin/disklabel -Z
disklabel: unknown option -- Z
usage: disklabel    [-Acdtv] [-h | -p unit] [-T file] disk      (read)
       disklabel -w [-Acdnv] [-T file] disk disktype [packid]   (write)
       disklabel -e [-Acdnv] [-T file] disk                     (edit)
       disklabel -E [-Acdnv] [-F|-f file] [-T file] disk        (simple editor)
       disklabel -R [-nv] [-F|-f file] disk protofile           (restore)

`disk' may be of the form: sd0 or /dev/rsd0c.
`disktype' is an entry from /etc/disktab, see disktab(5) for more info.
`packid' is an identification string for the device.
`protofile' is the output from the read cmd form; -R is powerful.
For procedures specific to this architecture see: fdisk(8), installboot(8)

after:

$ /usr/obj/sbin/disklabel/disklabel -Z
disklabel: unknown option -- Z
usage: disklabel    [-Acdtv] [-h | -p unit] [-T file] disk
       disklabel -w [-Acdnv] [-T file] disk disktype [packid]
       disklabel -e [-Acdnv] [-T file] disk
       disklabel -E [-Acdnv] [-F|-f file] [-T file] disk
       disklabel -R [-nv] [-F|-f file] disk protofile

ok?
jmc

Index: sbin/disklabel/disklabel.c
===================================================================
RCS file: /cvs/src/sbin/disklabel/disklabel.c,v
retrieving revision 1.236
diff -u -p -r1.236 disklabel.c
--- sbin/disklabel/disklabel.c  14 Nov 2020 20:53:31 -0000      1.236
+++ sbin/disklabel/disklabel.c  22 Jun 2021 12:34:14 -0000
@@ -1212,28 +1212,15 @@ void
 usage(void)
 {
        fprintf(stderr,
-           "usage: disklabel    [-Acdtv] [-h | -p unit] [-T file] 
disk\t(read)\n");
+           "usage: disklabel    [-Acdtv] [-h | -p unit] [-T file] disk\n");
        fprintf(stderr,
-           "       disklabel -w [-Acdnv] [-T file] disk disktype 
[packid]\t(write)\n");
+           "       disklabel -w [-Acdnv] [-T file] disk disktype [packid]\n");
        fprintf(stderr,
-           "       disklabel -e [-Acdnv] [-T file] disk\t\t\t(edit)\n");
+           "       disklabel -e [-Acdnv] [-T file] disk\n");
        fprintf(stderr,
-           "       disklabel -E [-Acdnv] [-F|-f file] [-T file] disk\t(simple 
editor)"
-           "\n");
+           "       disklabel -E [-Acdnv] [-F|-f file] [-T file] disk\n");
        fprintf(stderr,
-           "       disklabel -R [-nv] [-F|-f file] disk 
protofile\t\t(restore)\n\n");
-       fprintf(stderr,
-           "`disk' may be of the form: sd0 or /dev/rsd0%c.\n", 'a'+RAW_PART);
-       fprintf(stderr,
-           "`disktype' is an entry from %s, see disktab(5) for more info.\n",
-           DISKTAB);
-       fprintf(stderr,
-           "`packid' is an identification string for the device.\n");
-       fprintf(stderr,
-           "`protofile' is the output from the read cmd form; -R is 
powerful.\n");
-#ifdef SEEALSO
-       fprintf(stderr,
-           "For procedures specific to this architecture see: %s\n", SEEALSO);
-#endif
+           "       disklabel -R [-nv] [-F|-f file] disk protofile\n");
+
        exit(1);
 }

Reply via email to