summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraaron <aaron@openbsd.org>2000-12-24 11:34:09 +0000
committeraaron <aaron@openbsd.org>2000-12-24 11:34:09 +0000
commit168f5c3f322ce431044ab1e1cf14ebcd275f6e51 (patch)
treecce318297a550470d662a6ee92ba410569bdb5c2
parentSync usage() with man page. (diff)
downloadwireguard-openbsd-168f5c3f322ce431044ab1e1cf14ebcd275f6e51.tar.xz
wireguard-openbsd-168f5c3f322ce431044ab1e1cf14ebcd275f6e51.zip
Get rid of ugly usage() output. People can read the man page to get a command
list. Sync the usage() with the man page.
-rw-r--r--usr.bin/cdio/cdio.16
-rw-r--r--usr.bin/cdio/cdio.c13
2 files changed, 6 insertions, 13 deletions
diff --git a/usr.bin/cdio/cdio.1 b/usr.bin/cdio/cdio.1
index b9a8d49eb5a..74d6f58ffe9 100644
--- a/usr.bin/cdio/cdio.1
+++ b/usr.bin/cdio/cdio.1
@@ -1,4 +1,5 @@
-.\" $OpenBSD: cdio.1,v 1.20 2000/12/23 20:30:19 espie Exp $
+.\" $OpenBSD: cdio.1,v 1.21 2000/12/24 11:34:09 aaron Exp $
+.\"
.Dd July 3, 1995
.Dt CDIO 1
.Os
@@ -7,8 +8,7 @@
.Nd compact disc audio player and control utility
.Sh SYNOPSIS
.Nm cdio
-.Op Fl s
-.Op Fl v
+.Op Fl sv
.Op Fl f Ar device
.Op Ar command args ...
.Sh DESCRIPTION
diff --git a/usr.bin/cdio/cdio.c b/usr.bin/cdio/cdio.c
index daa1cb01ad6..77ebc207280 100644
--- a/usr.bin/cdio/cdio.c
+++ b/usr.bin/cdio/cdio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cdio.c,v 1.13 1999/12/15 05:33:56 deraadt Exp $ */
+/* $OpenBSD: cdio.c,v 1.14 2000/12/24 11:34:10 aaron Exp $ */
/*
* Compact Disc Control Utility by Serge V. Vakulenko <vak@cronyx.ru>.
* Based on the non-X based CD player by Jean-Marc Zucconi and
@@ -155,15 +155,8 @@ void help ()
void usage ()
{
- printf ("Usage:\n\t%s [ -vs ] [ -f disc ] [ command args... ]\n", __progname);
- printf ("Options:\n");
- printf ("\t-v - verbose mode\n");
- printf ("\t-s - silent mode\n");
- printf ("\t-f disc - a block device name such as /dev/cd0c\n");
- printf ("\tDISC - shell variable with device name\n");
- printf ("\tCDROM - shell variable checked if DISC isn't sent\n");
- printf ("Commands:\n");
- help ();
+ (void)fprintf(stderr,
+ "usage: %s [-sv] [-f device] [command args ...]\n", __progname);
exit (1);
}