From f6f3d50730cfb0c844f5718fcf14c60a12220839 Mon Sep 17 00:00:00 2001 From: Philippe Charnier Date: Wed, 15 Jul 1998 06:30:38 +0000 Subject: [PATCH] Correct use of .Nm. Remove unused #includes. Short usage() string, see man page for details. --- sbin/newfs_msdos/newfs_msdos.8 | 8 ++++---- sbin/newfs_msdos/newfs_msdos.c | 35 ++++++++-------------------------- 2 files changed, 12 insertions(+), 31 deletions(-) diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8 index 3119b974c93b..e48098b5cdf2 100644 --- a/sbin/newfs_msdos/newfs_msdos.8 +++ b/sbin/newfs_msdos/newfs_msdos.8 @@ -23,7 +23,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Id$ +.\" $Id: newfs_msdos.8,v 1.1.1.1 1998/07/06 20:01:34 rnordier Exp $ .\" .Dd July 6, 1998 .Dt NEWFS_MSDOS 8 @@ -32,7 +32,7 @@ .Nm newfs_msdos .Nd construct a new MS-DOS (FAT) file system .Sh SYNOPSIS -.Nm +.Nm newfs_msdos .Op Fl N .Op Fl B Ar boot .Op Fl F Ar FAT-type @@ -68,7 +68,7 @@ entry to determine geometry, if required. .Pp The options are as follow: -.Bl -tag -width Fl +.Bl -tag -width indent .It Fl N Don't create a file system: just print out parameters. .It Fl B Ar boot @@ -170,4 +170,4 @@ Create a standard 1.44M file system, with volume label "foo", on .Sh DIAGNOSTICS Exit status is 0 on success and 1 on error. .Sh AUTHORS -.An Robert Nordier Aq rnordier@FreeBSD.ORG . +.An Robert Nordier Aq rnordier@FreeBSD.org . diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c index 220cbcf54f50..da0ffd02c1c5 100644 --- a/sbin/newfs_msdos/newfs_msdos.c +++ b/sbin/newfs_msdos/newfs_msdos.c @@ -27,7 +27,7 @@ #ifndef lint static const char rcsid[] = - "$Id$"; + "$Id: newfs_msdos.c,v 1.1.1.1 1998/07/06 20:01:34 rnordier Exp $"; #endif /* not lint */ #include @@ -40,7 +40,6 @@ static const char rcsid[] = #include #include #include -#include #include #include #include @@ -895,30 +894,12 @@ setstr(u_int8_t *dest, const char *src, size_t len) static void usage(void) { - fprintf(stderr, - "usage: newfs_msdos [ -options ] special [disktype]\n"); - fprintf(stderr, "where the options are:\n"); - fprintf(stderr, "\t-N don't create file system: " - "just print out parameters\n"); - fprintf(stderr, "\t-B get bootstrap from file\n"); - fprintf(stderr, "\t-F FAT type (12, 16, or 32)\n"); - fprintf(stderr, "\t-I volume ID\n"); - fprintf(stderr, "\t-L volume label\n"); - fprintf(stderr, "\t-O OEM string\n"); - fprintf(stderr, "\t-S bytes/sector\n"); - fprintf(stderr, "\t-a sectors/FAT\n"); - fprintf(stderr, "\t-b block size\n"); - fprintf(stderr, "\t-c sectors/cluster\n"); - fprintf(stderr, "\t-e root directory entries\n"); - fprintf(stderr, "\t-f standard format\n"); - fprintf(stderr, "\t-h drive heads\n"); - fprintf(stderr, "\t-i file system info sector\n"); - fprintf(stderr, "\t-k backup boot sector\n"); - fprintf(stderr, "\t-m media descriptor\n"); - fprintf(stderr, "\t-n number of FATs\n"); - fprintf(stderr, "\t-o hidden sectors\n"); - fprintf(stderr, "\t-r reserved sectors\n"); - fprintf(stderr, "\t-s file system size (sectors)\n"); - fprintf(stderr, "\t-u sectors/track\n"); + fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n", +"usage: newfs_msdos [-N] [-B boot] [-F FAT-type] [-I volid] [-L label]", +" [-O OEM] [-S sector-size] [-a FAT-size] [-b block-size]", +" [-c cluster-size] [-e dirents] [-f format] [-h heads]", +" [-i info] [-k backup] [-m media] [-n FATs] [-o hidden]", +" [-r reserved] [-s total] [-u track-size]", +" special [disktype]"); exit(1); }