diff options
| author | Igor Sobrado <sobrado@cvs.openbsd.org> | 2008-01-21 20:07:12 +0000 |
|---|---|---|
| committer | Igor Sobrado <sobrado@cvs.openbsd.org> | 2008-01-21 20:07:12 +0000 |
| commit | 11f99715f2e5a577ffb299a60cc43fc5fe98a595 (patch) | |
| tree | 6d505a9887ba07e13f37bd088b55b00a225c146f /sbin | |
| parent | e0b8182bfe3cb9da86065acb65d7ce2ab5717b78 (diff) | |
changes to disklabel's usage:
- align usages and their descriptions (text enclosed in brackets);
- blank[], used for padding prior to r1.86, can improve readability
of usage on 80-column displays if NUMBOOT == 2
ok jsing@, krw@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/disklabel/disklabel.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 9ac8c5e4cd8..e25aad48ae1 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.120 2007/10/17 20:02:30 deraadt Exp $ */ +/* $OpenBSD: disklabel.c,v 1.121 2008/01/21 20:07:11 sobrado Exp $ */ /* * Copyright (c) 1987, 1993 @@ -39,7 +39,7 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.120 2007/10/17 20:02:30 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.121 2008/01/21 20:07:11 sobrado Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -1750,37 +1750,36 @@ void usage(void) { char *boot = ""; - char blank[] = " "; + char *blank = " "; #if NUMBOOT == 1 boot = " [-b boot1]"; #elif NUMBOOT == 2 boot = " [-b boot1] [-s boot2]"; + blank = " "; #endif - blank[strlen(boot)] = '\0'; - fprintf(stderr, "usage:\n"); fprintf(stderr, - " disklabel [-c | -d | -r | -t] [-v] [-p unit] disk\t\t(read)\n"); + "usage: disklabel [-c | -d | -r | -t] [-v] [-p unit] disk\t(read)\n"); fprintf(stderr, - " disklabel -w [-c | -d | -r] [-nv] disk disktype [packid]\t(write)\n"); + " disklabel -w [-c | -d | -r] [-nv] disk disktype [packid]\t(write)\n"); fprintf(stderr, - " disklabel -e [-c | -d | -r] [-nv] disk\t\t\t(edit)\n"); + " disklabel -e [-c | -d | -r] [-nv] disk\t\t\t(edit)\n"); fprintf(stderr, - " disklabel -E [-c | -d | -r] [-nv] [-f tempfile] disk\t\t(simple editor)\n"); + " disklabel -E [-c | -d | -r] [-nv] [-f tempfile] disk\t(simple editor)\n"); fprintf(stderr, - " disklabel -R [-nrv] disk protofile\t\t\t\t(restore)\n"); + " disklabel -R [-nrv] disk protofile\t\t\t(restore)\n"); fprintf(stderr, - " disklabel -N | -W [-nv] disk\t\t\t\t\t(protect)\n\n"); + " disklabel -N | -W [-nv] disk\t\t\t\t(protect)\n\n"); fprintf(stderr, - " disklabel -B [-nv]%s disk [disktype]\t (boot)\n", - boot); + "%sdisklabel -B [-nv]%s disk [disktype] (boot)\n", + blank, boot); fprintf(stderr, - " disklabel -Bw [-nv]%s disk disktype [packid] (write)\n", - boot); + "%sdisklabel -Bw [-nv]%s disk disktype [packid] (write)\n", + blank, boot); fprintf(stderr, - " disklabel -BR [-nv]%s disk protofile [disktype] (restore)\n\n", - boot); + "%sdisklabel -BR [-nv]%s disk protofile [disktype] (restore)\n\n", + blank, boot); fprintf(stderr, "`disk' may be of the form: sd0 or /dev/rsd0%c.\n", 'a'+RAW_PART); fprintf(stderr, |