synchronize the synopsis and usage of mopa.out(1); mopchk(1) can handle

more than one filename at a time; add a description for -3 and -4
in mopd(8), and document -v; remove a duplicate flag in mopprobe(1);
use a better style for synopses; sort flags and arguments.

written with help by jmc@

ok jmc@

9 files changed, 59 insertions, 73 deletions

diff --git a/usr.sbin/mopd/mopa.out/mopa.out.c b/usr.sbin/mopd/mopa.out/mopa.out.c
index b3e2191dfcb..a0d6d2f2d11 100644
--- a/usr.sbin/mopd/mopa.out/mopa.out.c
+++ b/usr.sbin/mopd/mopa.out/mopa.out.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopa.out.c,v 1.8 2006/04/29 16:26:56 maja Exp $ */
+/*	$OpenBSD: mopa.out.c,v 1.9 2009/07/11 13:42:32 sobrado Exp $ */
 
 /* mopa.out - Convert a Unix format kernel into something that
  * can be transferred via MOP.
@@ -48,7 +48,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: mopa.out.c,v 1.8 2006/04/29 16:26:56 maja Exp $";
+static const char rcsid[] = "$OpenBSD: mopa.out.c,v 1.9 2009/07/11 13:42:32 sobrado Exp $";
 #endif
 
 #include "os.h"
@@ -85,7 +85,7 @@ main (int argc, char **argv)
 #endif	
 
 	if (argc != 3) {
-		fprintf (stderr, "usage: %s kernel-in sys-out\n", argv[0]);
+		fprintf (stderr, "usage: %s infile outfile\n", argv[0]);
 		return (1);
 	}
 	
diff --git a/usr.sbin/mopd/mopchk/mopchk.1 b/usr.sbin/mopd/mopchk/mopchk.1
index 67b58fccdb3..a02c33f49e1 100644
--- a/usr.sbin/mopd/mopchk/mopchk.1
+++ b/usr.sbin/mopd/mopchk/mopchk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopchk.1,v 1.11 2008/09/06 11:11:02 maja Exp $
+.\"	$OpenBSD: mopchk.1,v 1.12 2009/07/11 13:42:32 sobrado Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -22,9 +22,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $OpenBSD: mopchk.1,v 1.11 2008/09/06 11:11:02 maja Exp $
+.\" @(#) $OpenBSD: mopchk.1,v 1.12 2009/07/11 13:42:32 sobrado Exp $
 .\"
-.Dd $Mdocdate: September 6 2008 $
+.Dd $Mdocdate: July 11 2009 $
 .Dt MOPCHK 1
 .Os
 .Sh NAME
@@ -32,16 +32,15 @@
 .Nd MOP check utility
 .Sh SYNOPSIS
 .Nm mopchk
-.Op Fl a
-.Op Fl v
-.Op Ar filename
+.Op Fl av
+.Op Ar
 .Sh DESCRIPTION
 .Nm
 shows information about which devices are known, version of mopd suite or
 information about a MOP-image.
 .Pp
 If
-.Ar filename
+.Ar file
 is given, information about the MOP-image is read from the header of the
 file.
 .Pp
@@ -50,7 +49,8 @@ The options are as follows:
 .It Fl a
 Show all the Ethernets attached to the system.
 .It Fl v
-Show version of mopchk.
+Show version of
+.Nm .
 .El
 .Sh SEE ALSO
 .Xr mopa.out 1 ,
diff --git a/usr.sbin/mopd/mopchk/mopchk.c b/usr.sbin/mopd/mopchk/mopchk.c
index 4f5811b1710..85b529c0dda 100644
--- a/usr.sbin/mopd/mopchk/mopchk.c
+++ b/usr.sbin/mopd/mopchk/mopchk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopchk.c,v 1.12 2006/04/29 16:26:56 maja Exp $	*/
+/*	$OpenBSD: mopchk.c,v 1.13 2009/07/11 13:42:32 sobrado Exp $	*/
 
 /*
  * Copyright (c) 1995-96 Mats O Jansson.  All rights reserved.
@@ -25,13 +25,13 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: mopchk.c,v 1.12 2006/04/29 16:26:56 maja Exp $";
+static const char rcsid[] = "$OpenBSD: mopchk.c,v 1.13 2009/07/11 13:42:32 sobrado Exp $";
 #endif
 
 /*
  * mopchk - MOP Check Utility
  *
- * Usage:	mopchk [-a] [-v] [filename...]
+ * Usage:	mopchk [-av] [file ...]
  */
 
 #include "os.h"
@@ -149,7 +149,7 @@ main(argc, argv)
 void
 Usage()
 {
-	fprintf(stderr, "usage: %s [-a] [-v] [filename...]\n", __progname);
+	fprintf(stderr, "usage: %s [-av] [file ...]\n", __progname);
 	exit(1);
 }
 
diff --git a/usr.sbin/mopd/mopd/mopd.8 b/usr.sbin/mopd/mopd/mopd.8
index 1211957573d..f0882e140dd 100644
--- a/usr.sbin/mopd/mopd/mopd.8
+++ b/usr.sbin/mopd/mopd/mopd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopd.8,v 1.13 2007/05/31 19:20:25 jmc Exp $
+.\"	$OpenBSD: mopd.8,v 1.14 2009/07/11 13:42:32 sobrado Exp $
 .\"
 .\" Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
 .\"
@@ -22,9 +22,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $OpenBSD: mopd.8,v 1.13 2007/05/31 19:20:25 jmc Exp $
+.\" @(#) $OpenBSD: mopd.8,v 1.14 2009/07/11 13:42:32 sobrado Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 11 2009 $
 .Dt MOPD 8
 .Os
 .Sh NAME
@@ -32,8 +32,9 @@
 .Nd MOP loader daemon
 .Sh SYNOPSIS
 .Nm mopd
-.Op Fl adf
-.Op Ar interface
+.Op Fl 3 | 4
+.Op Fl adfv
+.Ar interface
 .Sh DESCRIPTION
 .Nm
 services MOP Load requests on the Ethernet connected to
@@ -76,6 +77,10 @@ Anomalies and errors are reported via
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
+.It Fl 3
+Ignore MOP V3 messages (Ethernet II).
+.It Fl 4
+Ignore MOP V4 messages (Ethernet 802.3).
 .It Fl a
 Listen on all the Ethernets attached to the system.
 If
@@ -86,6 +91,9 @@ Run in debug mode, with all the output to stdout.
 The process will run in the foreground.
 .It Fl f
 Run in the foreground.
+.It Fl v
+Show version of
+.Nm .
 .El
 .Sh FILES
 .Bl -tag -width Pa -compact
diff --git a/usr.sbin/mopd/mopd/mopd.c b/usr.sbin/mopd/mopd/mopd.c
index 60723621099..4d5684ccb48 100644
--- a/usr.sbin/mopd/mopd/mopd.c
+++ b/usr.sbin/mopd/mopd/mopd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopd.c,v 1.15 2006/04/17 18:55:36 maja Exp $ */
+/*	$OpenBSD: mopd.c,v 1.16 2009/07/11 13:42:32 sobrado Exp $ */
 
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
@@ -26,14 +26,13 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "$OpenBSD: mopd.c,v 1.15 2006/04/17 18:55:36 maja Exp $";
+    "$OpenBSD: mopd.c,v 1.16 2009/07/11 13:42:32 sobrado Exp $";
 #endif
 
 /*
  * mopd - MOP Dump/Load Daemon
  *
- * Usage:	mopd -a [ -d -f -v ] [ -3 | -4 ]
- *		mopd [ -d -f -v ] [ -3 | -4 ] interface
+ * Usage:	mopd [-3 | -4] [-adfv] interface
  */
 
 #include "os.h"
@@ -160,8 +159,7 @@ main(int argc, char *argv[])
 void
 Usage()
 {
-	fprintf(stderr, "usage: %s -a [ -d -f -v ] [ -3 | -4 ]\n", __progname);
-	fprintf(stderr, "       %s [ -d -f -v ] [ -3 | -4 ] interface\n",
+	fprintf(stderr, "usage: %s [-3 | -4] [-adfv] interface\n",
 	    __progname);
 	exit(1);
 }
diff --git a/usr.sbin/mopd/mopprobe/mopprobe.1 b/usr.sbin/mopd/mopprobe/mopprobe.1
index 64fd3ecade0..1c5cb398dd7 100644
--- a/usr.sbin/mopd/mopprobe/mopprobe.1
+++ b/usr.sbin/mopd/mopprobe/mopprobe.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopprobe.1,v 1.13 2007/05/31 19:20:25 jmc Exp $
+.\"	$OpenBSD: mopprobe.1,v 1.14 2009/07/11 13:42:32 sobrado Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -22,9 +22,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $OpenBSD: mopprobe.1,v 1.13 2007/05/31 19:20:25 jmc Exp $
+.\" @(#) $OpenBSD: mopprobe.1,v 1.14 2009/07/11 13:42:32 sobrado Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 11 2009 $
 .Dt MOPPROBE 1
 .Os
 .Sh NAME
@@ -32,15 +32,8 @@
 .Nd MOP Probe Utility
 .Sh SYNOPSIS
 .Nm mopprobe
-.Fl a
-.Op Fl 3 | 4
-.Op Fl o
-.Op Fl v
-.Pp
-.Nm mopprobe
 .Op Fl 3 | 4
-.Op Fl o
-.Op Fl v
+.Op Fl aov
 .Ar interface
 .Sh DESCRIPTION
 .Nm
@@ -50,26 +43,24 @@ Ethernet connected to
 or all known interfaces if
 .Fl a
 is given.
-.Sq Fl a
-is given.
 If
-.Sq Fl o
+.Fl o
 inhibits all messages but the first from a node.
 With
-.Sq Fl v
+.Fl v
 all MOP/RC SID messages will be shown (e.g., machines running DECnet).
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
+.It Fl 3
+Ignore MOP V3 messages (Ethernet II).
+.It Fl 4
+Ignore MOP V4 messages (Ethernet 802.3).
 .It Fl a
 Listen on all the Ethernets attached to the system.
 If
 .Fl a
 is omitted, an interface must be specified.
-.It Fl 3
-Ignore MOP V3 messages (Ethernet II).
-.It Fl 4
-Ignore MOP V4 messages (Ethernet 802.3).
 .It Fl o
 Print a node just once.
 .It Fl v
diff --git a/usr.sbin/mopd/mopprobe/mopprobe.c b/usr.sbin/mopd/mopprobe/mopprobe.c
index 36adca5ec43..6987c40346d 100644
--- a/usr.sbin/mopd/mopprobe/mopprobe.c
+++ b/usr.sbin/mopd/mopprobe/mopprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopprobe.c,v 1.10 2006/04/16 20:18:27 maja Exp $ */
+/*	$OpenBSD: mopprobe.c,v 1.11 2009/07/11 13:42:32 sobrado Exp $ */
 
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
@@ -25,14 +25,13 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: mopprobe.c,v 1.10 2006/04/16 20:18:27 maja Exp $";
+static const char rcsid[] = "$OpenBSD: mopprobe.c,v 1.11 2009/07/11 13:42:32 sobrado Exp $";
 #endif
 
 /*
  * mopprobe - MOP Probe Utility
  *
- * Usage:	mopprobe -a [ -3 | -4 ] [-v] [-o]
- *		mopprobe [ -3 | -4 ] [-v] [-o] interface
+ * Usage:	mopprobe [-3 | -4] [-aov] interface
  */
 
 #include "os.h"
@@ -119,9 +118,7 @@ main(int argc, char *argv[])
 void
 Usage()
 {
-	fprintf(stderr, "usage: %s -a [ -3 | -4 ] [-v] [-o]\n", __progname);
-	fprintf(stderr, "       %s [ -3 | -4 ] [-v] [-o] interface\n",
-	    __progname);
+	fprintf(stderr, "usage: %s [-3 | -4] [-aov] interface\n", __progname);
 	exit(1);
 }
 
diff --git a/usr.sbin/mopd/moptrace/moptrace.1 b/usr.sbin/mopd/moptrace/moptrace.1
index 078dbcd869c..de7ab42bc1c 100644
--- a/usr.sbin/mopd/moptrace/moptrace.1
+++ b/usr.sbin/mopd/moptrace/moptrace.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: moptrace.1,v 1.9 2007/05/31 19:20:25 jmc Exp $
+.\"	$OpenBSD: moptrace.1,v 1.10 2009/07/11 13:42:32 sobrado Exp $
 .\"
 .\" Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
 .\"
@@ -22,9 +22,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $OpenBSD: moptrace.1,v 1.9 2007/05/31 19:20:25 jmc Exp $
+.\" @(#) $OpenBSD: moptrace.1,v 1.10 2009/07/11 13:42:32 sobrado Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 11 2009 $
 .Dt MOPTRACE 1
 .Os
 .Sh NAME
@@ -32,14 +32,9 @@
 .Nd MOP Trace Utility
 .Sh SYNOPSIS
 .Nm moptrace
-.Op Fl a
-.Op Fl d
 .Op Fl 3 | 4
-.Pp
-.Nm moptrace
-.Op Fl d
-.Op Fl 3 | 4
-.Op Ar interface
+.Op Fl ad
+.Ar interface
 .Sh DESCRIPTION
 .Nm
 prints the contents of MOP packages on the Ethernet connected to
@@ -50,6 +45,10 @@ is given.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
+.It Fl 3
+Ignore MOP V3 messages (Ethernet II).
+.It Fl 4
+Ignore MOP V4 messages (Ethernet 802.3).
 .It Fl a
 Listen on all the Ethernets attached to the system.
 If
@@ -57,10 +56,6 @@ If
 is omitted, an interface must be specified.
 .It Fl d
 Run in debug mode, with all the output to stderr.
-.It Fl 3
-Ignore MOP V3 messages (Ethernet II).
-.It Fl 4
-Ignore MOP V4 messages (Ethernet 802.3).
 .El
 .Sh SEE ALSO
 .Xr mopa.out 1 ,
diff --git a/usr.sbin/mopd/moptrace/moptrace.c b/usr.sbin/mopd/moptrace/moptrace.c
index 407f169bd0f..6278b927504 100644
--- a/usr.sbin/mopd/moptrace/moptrace.c
+++ b/usr.sbin/mopd/moptrace/moptrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: moptrace.c,v 1.9 2006/04/16 11:48:19 maja Exp $ */
+/*	$OpenBSD: moptrace.c,v 1.10 2009/07/11 13:42:32 sobrado Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -25,14 +25,13 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: moptrace.c,v 1.9 2006/04/16 11:48:19 maja Exp $";
+static const char rcsid[] = "$OpenBSD: moptrace.c,v 1.10 2009/07/11 13:42:32 sobrado Exp $";
 #endif
 
 /*
  * moptrace - MOP Trace Utility
  *
- * Usage:	moptrace -a [ -d ] [ -3 | -4 ]
- *		moptrace [ -d ] [ -3 | -4 ] interface
+ * Usage:	moptrace [-3 | -4] [-ad] interface
  */
 
 #include "os.h"
@@ -111,9 +110,7 @@ main(int argc, char *argv[])
 void
 Usage()
 {
-	fprintf(stderr, "usage: %s -a [ -d ] [ -3 | -4 ]\n", __progname);
-	fprintf(stderr, "       %s [ -d ] [ -3 | -4 ] interface\n",
-	    __progname);
+	fprintf(stderr, "usage: %s [-3 | -4] [-ad] interface\n", __progname);
 	exit(1);
 }