summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2002-10-24 20:03:08 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2002-10-24 20:03:08 +0000
commit54d7d1c1606aa89f6d6cb644650c1f9cd2235b30 (patch)
treed6dabdb606e9f24f829f023506db32a6d236092e /usr.bin
parentc6511c1c40ca3455ab5284eb41a64494a746cd59 (diff)
- Add missing cdid command to cdio.1.
- Remove ambiguity between cddbinfo and cdid commands, so CD matches cddbinfo and CDI cdid. millert@ ok.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cdio/cdio.14
-rw-r--r--usr.bin/cdio/cdio.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/cdio/cdio.1 b/usr.bin/cdio/cdio.1
index 018fc280bb9..8cadc161dd6 100644
--- a/usr.bin/cdio/cdio.1
+++ b/usr.bin/cdio/cdio.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cdio.1,v 1.24 2002/05/19 12:39:54 espie Exp $
+.\" $OpenBSD: cdio.1,v 1.25 2002/10/24 20:03:07 fgsch Exp $
.\"
.Dd July 3, 1995
.Dt CDIO 1
@@ -136,6 +136,8 @@ Print the table of contents.
Print the table of contents after matching the disc with the cddb.
In case of multiple matches, reissue the command with
.Ar n
+.It Ic cdid
+Print the disc id that will be used for matching with the cddb.
.It Ic status
Print information about the disc:
the current playing status and position,
diff --git a/usr.bin/cdio/cdio.c b/usr.bin/cdio/cdio.c
index 211d2317283..e30f1e44268 100644
--- a/usr.bin/cdio/cdio.c
+++ b/usr.bin/cdio/cdio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cdio.c,v 1.25 2002/04/18 22:17:04 espie Exp $ */
+/* $OpenBSD: cdio.c,v 1.26 2002/10/24 20:03:07 fgsch 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
@@ -98,7 +98,7 @@ struct cmdtab {
{ CMD_STOP, "stop", 3, "" },
{ CMD_VOLUME, "volume", 1, "<l> <r> | left | right | mute | mono | stereo" },
{ CMD_CDDB, "cddbinfo", 2, "[n]" },
-{ CMD_CDID, "cdid", 2, "" },
+{ CMD_CDID, "cdid", 3, "" },
{ 0, 0, 0, 0}
};