One line usage string: see man page for more info.

2 files changed, 23 insertions, 30 deletions

diff --git a/usr.sbin/wormcontrol/wormcontrol.8 b/usr.sbin/wormcontrol/wormcontrol.8
index 14197db..5b007de 100644
--- a/usr.sbin/wormcontrol/wormcontrol.8
+++ b/usr.sbin/wormcontrol/wormcontrol.8
@@ -32,7 +32,7 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $Id: wormcontrol.8,v 1.8 1997/05/19 17:37:29 jmz Exp $
+.\" $Id: wormcontrol.8,v 1.9 1997/06/23 04:52:12 steve Exp $
 .\"
 .\" arrgh, hilit19 needs this" :-(
 .Dd January 27, 1996
@@ -47,15 +47,6 @@
 .Ar command
 .Op Ar params...
 .Sh DESCRIPTION
-.Ss Options
-.Bl -tag -ident -width "XXX"
-.It Fl f Ar device
-Use
-.Ar device
-instead of the default
-.Pa /dev/rworm0 .
-.El
-.Ss Overview
 The
 .Nm
 utility is used to control the behaviour of the
@@ -82,8 +73,14 @@ Once all tracks of a session have been written, the disk must be
 .Em fixated .
 This writes the table of contents and leadout information to the disk.
 The disk won't be usable without doing this.
-.Ss Commands
-.Bl -tag -indent -width "prepdisk"
+.Pp
+The following options are available:
+.Bl -tag -width ident
+.It Fl f Ar device
+Use
+.Ar device
+instead of the default
+.Pa /dev/rworm0 .
 .It prepdisk Ar single \&| double Op Ar dummy
 Prepare the disk for recording.  This must be done before any tracks
 can be prepared, and remains in effect until the session has been
@@ -135,7 +132,7 @@ remains unchangeable.
 Error codes for the underlying
 .Xr ioctl 2
 commands are printed by the
-.Xr perror 3
+.Xr err 3
 facility.
 .Sh EXAMPLES
 The typical sequence of burning a data CD-R looks like:
@@ -164,7 +161,7 @@ pipe a constant data stream into the CD recorder.
 .Xr dd 1 ,
 .Xr team 1 ,
 .Xr ioctl 2 ,
-.Xr perror 3 ,
+.Xr err 3 ,
 .Xr worm 4
 .Pp
 .Pa /usr/share/examples/worm/*
diff --git a/usr.sbin/wormcontrol/wormcontrol.c b/usr.sbin/wormcontrol/wormcontrol.c
index 49b44e8..5f7aff2 100644
--- a/usr.sbin/wormcontrol/wormcontrol.c
+++ b/usr.sbin/wormcontrol/wormcontrol.c
@@ -31,33 +31,29 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
- *
- * $Id: wormcontrol.c,v 1.5 1997/03/31 05:11:40 imp Exp $
- *
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
+#include <err.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <err.h>
 #include <sysexits.h>
+#include <unistd.h>
 
 #include <sys/ioctl.h>
 #include <sys/wormio.h>
 
-
-void
-usage(void)
+static void
+usage()
 {
-	errx(EX_USAGE,
-	     "usage: wormcontrol [-f device] command [args]\n"
-	     "commands:\n"
-	     "       select vendor-id model-id\n"
-	     "       prepdisk [dummy] single|double\n"
-	     "       track audio|data [preemp]\n"
-	     "       fixate toc-type [onp]\n");
+	fprintf(stderr,"usage: wormcontrol [-f device] command [args]\n");
+	exit(EX_USAGE);
 }
 
 #define eq(a, b) (strcmp(a, b) == 0)