summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsoren <soren@NetBSD.org>2001-12-20 20:10:33 +0000
committersoren <soren@NetBSD.org>2001-12-20 20:10:33 +0000
commitdc53bf3cbaf8dbf0ff06a469761b28105a2ae1f0 (patch)
treebfc8df347a3c3b3b84cdd990e8e8b0001af6adbc
parent598b3724c277278d5f7a521a6b367b97ea98ced6 (diff)
Sync getopt() / man page with actual getopt options.
-rw-r--r--bin/ls/util.c6
-rw-r--r--bin/ps/ps.c6
-rw-r--r--bin/rm/rm.c7
-rw-r--r--games/fortune/fortune/fortune.c6
-rw-r--r--games/number/number.65
-rw-r--r--libexec/mail.local/mail.local.c6
-rw-r--r--libexec/rmail/rmail.812
-rw-r--r--sbin/dump/main.c6
-rw-r--r--sbin/fsck/fsck.84
-rw-r--r--sbin/fsck/fsck.c6
-rw-r--r--sbin/mount/mount.c10
-rw-r--r--sbin/mount_nfs/mount_nfs.84
-rw-r--r--sbin/ping/ping.c6
-rw-r--r--sbin/slattach/slattach.c6
14 files changed, 51 insertions, 39 deletions
diff --git a/bin/ls/util.c b/bin/ls/util.c
index ac1dc40f019..5f647ff5aa9 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.20 2000/07/29 03:46:15 lukem Exp $ */
+/* $NetBSD: util.c,v 1.21 2001/12/20 20:10:33 soren Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)util.c 8.5 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: util.c,v 1.20 2000/07/29 03:46:15 lukem Exp $");
+__RCSID("$NetBSD: util.c,v 1.21 2001/12/20 20:10:33 soren Exp $");
#endif
#endif /* not lint */
@@ -75,7 +75,7 @@ void
usage(void)
{
(void)fprintf(stderr,
- "usage: ls [-1ACFLRSTWacdfgiklmnopqrstux] [file ...]\n");
+ "usage: ls [-1ACFLRSTWacdfgiklmnopqrstux1] [file ...]\n");
exit(EXIT_FAILURE);
/* NOTREACHED */
}
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index fd1188f130a..fa7accec831 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ps.c,v 1.45 2001/11/03 13:21:09 lukem Exp $ */
+/* $NetBSD: ps.c,v 1.46 2001/12/20 20:10:34 soren Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: ps.c,v 1.45 2001/11/03 13:21:09 lukem Exp $");
+__RCSID("$NetBSD: ps.c,v 1.46 2001/12/20 20:10:34 soren Exp $");
#endif
#endif /* not lint */
@@ -558,7 +558,7 @@ usage()
(void)fprintf(stderr,
"usage:\t%s\n\t %s\n\t%s\n",
- "ps [-aChjKlmrSTuvwx] [-O|o fmt] [-p pid] [-t tty]",
+ "ps [-acCehjKlmrSTuvwx] [-O|o fmt] [-p pid] [-t tty]",
"[-M core] [-N system] [-W swap] [-U username]",
"ps [-L]");
exit(1);
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 49f207eff37..23076d3fba4 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rm.c,v 1.28 2001/11/22 00:16:07 jmc Exp $ */
+/* $NetBSD: rm.c,v 1.29 2001/12/20 20:10:34 soren Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)rm.c 8.8 (Berkeley) 4/27/95";
#else
-__RCSID("$NetBSD: rm.c,v 1.28 2001/11/22 00:16:07 jmc Exp $");
+__RCSID("$NetBSD: rm.c,v 1.29 2001/12/20 20:10:34 soren Exp $");
#endif
#endif /* not lint */
@@ -430,7 +430,8 @@ checkdot(char **argv)
void
usage(void)
{
- (void)fprintf(stderr, "usage: %s [-dfiPRrW] file ...\n", getprogname());
+ (void)fprintf(stderr, "usage: %s [-f|-i] [-dPRrW] file ...\n",
+ getprogname());
exit(1);
/* NOTREACHED */
}
diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c
index d6d8f867168..60df882d11f 100644
--- a/games/fortune/fortune/fortune.c
+++ b/games/fortune/fortune/fortune.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fortune.c,v 1.32 2001/10/28 19:52:53 wiz Exp $ */
+/* $NetBSD: fortune.c,v 1.33 2001/12/20 20:10:35 soren Exp $ */
/*-
* Copyright (c) 1986, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1986, 1993\n\
#if 0
static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: fortune.c,v 1.32 2001/10/28 19:52:53 wiz Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.33 2001/12/20 20:10:35 soren Exp $");
#endif
#endif /* not lint */
@@ -1398,7 +1398,7 @@ void
usage()
{
- (void) fprintf(stderr, "Usage: %s [-a", getprogname());
+ (void) fprintf(stderr, "Usage: %s [-ae", getprogname());
#ifdef DEBUG
(void) fprintf(stderr, "D");
#endif /* DEBUG */
diff --git a/games/number/number.6 b/games/number/number.6
index 9022ece0dea..5b466c9d3a0 100644
--- a/games/number/number.6
+++ b/games/number/number.6
@@ -1,4 +1,4 @@
-.\" $NetBSD: number.6,v 1.5 1997/10/10 16:41:37 lukem Exp $
+.\" $NetBSD: number.6,v 1.6 2001/12/20 20:10:35 soren Exp $
.\"
.\" Copyright (c) 1989, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -41,7 +41,8 @@
.Nd convert Arabic numerals to English
.Sh SYNOPSIS
.Nm
-.Op #
+.Op Fl l
+.Op Ar number ...
.Sh DESCRIPTION
The
.Nm
diff --git a/libexec/mail.local/mail.local.c b/libexec/mail.local/mail.local.c
index 6ed0a68b1e4..bec3a4c4c17 100644
--- a/libexec/mail.local/mail.local.c
+++ b/libexec/mail.local/mail.local.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mail.local.c,v 1.18 2001/01/04 17:29:05 lukem Exp $ */
+/* $NetBSD: mail.local.c,v 1.19 2001/12/20 20:10:35 soren Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)mail.local.c 8.22 (Berkeley) 6/21/95";
#else
-__RCSID("$NetBSD: mail.local.c,v 1.18 2001/01/04 17:29:05 lukem Exp $");
+__RCSID("$NetBSD: mail.local.c,v 1.19 2001/12/20 20:10:35 soren Exp $");
#endif
#endif /* not lint */
@@ -302,7 +302,7 @@ notifybiff(msg)
void
usage()
{
- err(FATAL, "usage: mail.local [-f from] user ...");
+ err(FATAL, "usage: mail.local [-l] [-f from] user ...");
}
#if __STDC__
diff --git a/libexec/rmail/rmail.8 b/libexec/rmail/rmail.8
index 40c93eac389..8c44e4c715b 100644
--- a/libexec/rmail/rmail.8
+++ b/libexec/rmail/rmail.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: rmail.8,v 1.12 1999/03/22 18:25:46 garbled Exp $
+.\" $NetBSD: rmail.8,v 1.13 2001/12/20 20:10:35 soren Exp $
.\"
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -41,6 +41,8 @@
.Nd handle remote mail received via uucp
.Sh SYNOPSIS
.Nm
+.Op Fl T
+.Op Fl D Ar domain
.Ar user ...
.Sh DESCRIPTION
.Nm
@@ -58,6 +60,14 @@ is explicitly designed for use with
.Xr uucp 1
and
.Xr sendmail 8 .
+.Pp
+The following options can be used.
+.Bl -tag -width indent
+.It Fl T
+Enter debugging mode.
+.It Fl D
+Change domain from default.
+Default is ``UUCP''.
.Sh SEE ALSO
.Xr uucp 1 ,
.Xr mail.local 8 ,
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 67b4e281146..41dd82401cf 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.41 2001/12/14 14:43:33 bouyer Exp $ */
+/* $NetBSD: main.c,v 1.42 2001/12/20 20:10:36 soren Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1991, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: main.c,v 1.41 2001/12/14 14:43:33 bouyer Exp $");
+__RCSID("$NetBSD: main.c,v 1.42 2001/12/20 20:10:36 soren Exp $");
#endif
#endif /* not lint */
@@ -610,7 +610,7 @@ usage(void)
{
(void)fprintf(stderr, "%s\n%s\n%s\n%s\n",
-"usage: dump [-0123456789ceFlntu] [-B records] [-b blocksize] [-d density]",
+"usage: dump [-0123456789ceFlnstu] [-B records] [-b blocksize] [-d density]",
" [-f file] [-h level] [-k read block size] [-L label]",
" [-r read cache size] [-s feet] [-T date] file system",
" dump [-W | -w]");
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index 2518028134c..0ed6ab53713 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: fsck.8,v 1.25 2001/11/16 11:31:30 wiz Exp $
+.\" $NetBSD: fsck.8,v 1.26 2001/12/20 20:10:36 soren Exp $
.\"
.\" Copyright (c) 1996 Christos Zoulas. All rights reserved.
.\"
@@ -35,7 +35,7 @@
.Nd file system consistency check and interactive repair
.Sh SYNOPSIS
.Nm ""
-.Op Fl dvplfyn
+.Op Fl dfnpvy
.Op Fl l Ar maxparallel
.Op Fl t Ar fstype
.Op Fl T Ar fstype:fsoptions
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 2d9c36ec2fb..36b4dbcf56e 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fsck.c,v 1.27 2001/11/01 07:31:22 lukem Exp $ */
+/* $NetBSD: fsck.c,v 1.28 2001/12/20 20:10:36 soren Exp $ */
/*
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fsck.c,v 1.27 2001/11/01 07:31:22 lukem Exp $");
+__RCSID("$NetBSD: fsck.c,v 1.28 2001/12/20 20:10:36 soren Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -522,7 +522,7 @@ static void
usage(void)
{
static const char common[] =
- "[-dpvlyn] [-T fstype:fsoptions] [-t fstype]";
+ "[-dfnpvy] [-T fstype:fsoptions] [-t fstype]";
(void)fprintf(stderr, "Usage: %s %s [special|node]...\n",
getprogname(), common);
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index e8f52e5d0fc..3314c887bfe 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mount.c,v 1.56 2001/02/18 06:15:49 tsutsui Exp $ */
+/* $NetBSD: mount.c,v 1.57 2001/12/20 20:10:37 soren Exp $ */
/*
* Copyright (c) 1980, 1989, 1993, 1994
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1989, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95";
#else
-__RCSID("$NetBSD: mount.c,v 1.56 2001/02/18 06:15:49 tsutsui Exp $");
+__RCSID("$NetBSD: mount.c,v 1.57 2001/12/20 20:10:37 soren Exp $");
#endif
#endif /* not lint */
@@ -647,9 +647,9 @@ usage()
(void)fprintf(stderr,
"usage: mount %s\n mount %s\n mount %s\n",
- "[-dfruvw] [-o options] [-t ffs | external_type] special node",
- "[-adfruvw] [-t ffs | external_type]",
- "[-dfruvw] special | node");
+ "[-Aadfruvw] [-t type]",
+ "[-dfruvw] special | node",
+ "[-dfruvw] [-o options] [-t type] special node");
exit(1);
/* NOTREACHED */
}
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 21324d1e765..22c7a672e76 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: mount_nfs.8,v 1.14 2001/11/16 11:58:59 wiz Exp $
+.\" $NetBSD: mount_nfs.8,v 1.15 2001/12/20 20:10:37 soren Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994, 1995
.\" The Regents of the University of California. All rights reserved.
@@ -42,7 +42,7 @@
.Sh SYNOPSIS
.Nm ""
.Bk -words
-.Op Fl 23KPTUbcCdilqs
+.Op Fl 23bcCdiKlpPqsTUX
.Ek
.Bk -words
.Op Fl D Ar deadthresh
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index c2b9c183824..6e24daf8311 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ping.c,v 1.62 2001/11/01 08:06:57 lukem Exp $ */
+/* $NetBSD: ping.c,v 1.63 2001/12/20 20:10:38 soren Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -62,7 +62,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ping.c,v 1.62 2001/11/01 08:06:57 lukem Exp $");
+__RCSID("$NetBSD: ping.c,v 1.63 2001/12/20 20:10:38 soren Exp $");
#endif
#include <stdio.h>
@@ -1822,7 +1822,7 @@ usage(void)
#endif /*IPSEC*/
(void)fprintf(stderr, "Usage: \n"
- "%s [-dDfLnoPqQrRv] [-c count] [-g gateway] [-h host]"
+ "%s [-adDfLnoPqQrRv] [-c count] [-g gateway] [-h host]"
" [-i interval] [-I addr]\n"
" [-l preload] [-p pattern] [-s size] [-t tos] [-T ttl]"
" [-w maxwait] " IPSECOPT "host\n",
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index ead4cbe04da..607526392e4 100644
--- a/sbin/slattach/slattach.c
+++ b/sbin/slattach/slattach.c
@@ -1,4 +1,4 @@
-/* $NetBSD: slattach.c,v 1.24 2001/02/19 22:56:23 cgd Exp $ */
+/* $NetBSD: slattach.c,v 1.25 2001/12/20 20:10:38 soren Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)slattach.c 8.2 (Berkeley) 1/7/94";
#else
-__RCSID("$NetBSD: slattach.c,v 1.24 2001/02/19 22:56:23 cgd Exp $");
+__RCSID("$NetBSD: slattach.c,v 1.25 2001/12/20 20:10:38 soren Exp $");
#endif
#endif /* not lint */
@@ -174,7 +174,7 @@ usage()
{
(void)fprintf(stderr,
- "Usage: %s [-t ldisc] [-hHlm] [-s baudrate] ttyname\n",
+ "Usage: %s [-t ldisc] [-hHlmn] [-s baudrate] ttyname\n",
getprogname());
exit(1);
}