mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-21 23:18:00 -08:00
Code

-o[arg] must not have spaces between option and argument; OK jmc

Browse Source 
getopt(3) says so and, e.g. 'mrouted -d 1' must be 'mrouted -d1' to work.
dhcpd(8) and sed(1) got this right, our multicast programs did not.
This commit is contained in:
kn 2024-12-01 09:58:15 +00:00
parent 8e650cf52b
commit 347b73737b
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/map-mbone/map-mbone.8
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: map-mbone.8,v 1.15 2014/09/08 01:27:55 schwarze Exp $
.\" $OpenBSD: map-mbone.8,v 1.16 2024/12/01 09:58:15 kn Exp $
.\" $NetBSD: map-mbone.8,v 1.2 1995/10/03 23:16:53 thorpej Exp $
.\"
.\" Mapper for connections between MRouteD multicast routers.
@ -32,7 +32,7 @@
.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
.\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd $Mdocdate: September 8 2014 $
.Dd $Mdocdate: December 1 2024 $
.Dt MAP-MBONE 8
.Os
.Sh NAME
@ -41,7 +41,7 @@
.Sh SYNOPSIS
.Nm map-mbone
.Op Fl fgn
.Op Fl d Ar level
.Op Fl d Ns Op Ar level
.Op Fl r Ar count
.Op Fl t Ar seconds
.Op Ar starting_router
@ -82,10 +82,10 @@ continues the process until no new multicast routers are reported.
.Pp
The options are as follows:
.Bl -tag -width "-t seconds"
.It Fl d Ar level
.It Fl d Ns Op Ar level
Sets the debug level to
.Ar level .
When the debug level is greater than
When the debug level is greater than the default value of
0, additional debugging messages are printed to stderr.
Regardless of
the debug level, an error condition will always write an error message and will

4
usr.sbin/map-mbone/mapper.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mapper.c,v 1.26 2021/06/26 15:42:58 deraadt Exp $ */
/* $OpenBSD: mapper.c,v 1.27 2024/12/01 09:58:15 kn Exp $ */
/* $NetBSD: mapper.c,v 1.3 1995/12/10 11:12:04 mycroft Exp $ */
/* Mapper for connections between MRouteD multicast routers.
@ -787,7 +787,7 @@ void usage(void)
extern char *__progname;
fprintf(stderr,
"usage: %s [-fgn] [-d level] [-r count] [-t seconds] "
"usage: %s [-fgn] [-d[level]] [-r count] [-t seconds] "
"[starting_router]\n\n", __progname);
exit(1);

8
usr.sbin/mrinfo/mrinfo.8
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: mrinfo.8,v 1.12 2007/05/31 19:20:25 jmc Exp $
.\" $OpenBSD: mrinfo.8,v 1.13 2024/12/01 09:58:15 kn Exp $
.\" $NetBSD: mrinfo.8,v 1.2 1995/10/03 23:20:39 thorpej Exp $
.\"
.\" Written Wed Mar 24 1993 by Van Jacobson (adapted from the
@ -68,7 +68,7 @@
.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
.\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd $Mdocdate: May 31 2007 $
.Dd $Mdocdate: December 1 2024 $
.Dt MRINFO 8
.Os
.Sh NAME
@ -76,7 +76,7 @@
.Nd displays configuration info from a multicast router
.Sh SYNOPSIS
.Nm mrinfo
.Op Fl d Ar debug_level
.Op Fl d Ns Op Ar debug_level
.Op Fl r Ar retry_count
.Op Fl t Ar timeout_count
.Ar multicast_router
@ -99,7 +99,7 @@ the configuration is displayed to the standard output.
.Pp
The options are as follows:
.Bl -tag -width timeout_levelxyz
.It Fl d Ar debug_level
.It Fl d Ns Op Ar debug_level
sets the debug level.
When the debug level is greater than the default value of 0,
additional debugging messages are printed.

2
usr.sbin/mrinfo/mrinfo.c
View File

@ -271,7 +271,7 @@ void
usage()
{
fprintf(stderr,
"Usage: mrinfo [-d [debug_level]] [-n] [-t timeout] [-r retries] [router]\n");
"Usage: mrinfo [-d[debug_level]] [-n] [-t timeout] [-r retries] [router]\n");
exit(1);
}

2
usr.sbin/mrouted/main.c
View File

@ -118,7 +118,7 @@ main(int argc, char *argv[])
if (argc > 0) {
usage: fprintf(stderr,
"usage: mrouted [-p] [-c config_file] [-d [debug_level]]\n");
"usage: mrouted [-p] [-c config_file] [-d[debug_level]]\n");
exit(1);
}

8
usr.sbin/mrouted/mrouted.8
View File

@ -1,11 +1,11 @@
.\" $OpenBSD: mrouted.8,v 1.27 2020/02/10 13:18:21 schwarze Exp $
.\" $OpenBSD: mrouted.8,v 1.28 2024/12/01 09:58:15 kn Exp $
.\" The mrouted program is covered by the license in the accompanying file
.\" named "LICENSE". Use of the mrouted program represents acceptance of
.\" the terms and conditions listed in that file.
.\"
.\" The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
.\" Leland Stanford Junior University.
.Dd $Mdocdate: February 10 2020 $
.Dd $Mdocdate: December 1 2024 $
.Dt MROUTED 8
.Os
.Sh NAME
@ -15,7 +15,7 @@
.Nm mrouted
.Op Fl p
.Op Fl c Ar config_file
.Op Fl d Op Ar debug_level
.Op Fl d Ns Op Ar debug_level
.Sh DESCRIPTION
.Nm
is an implementation of the Distance-Vector Multicast Routing
@ -82,7 +82,7 @@ The options are as follows:
Specify an alternative configuration file,
instead of the default
.Pa mrouted.conf .
.It Fl d Op Ar debug_level
.It Fl d Ns Op Ar debug_level
By default,
.Nm
detaches from the invoking terminal.