summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorav <av@cvs.openbsd.org>2008-06-08 21:40:59 +0000
committerav <av@cvs.openbsd.org>2008-06-08 21:40:59 +0000
commitb500720610e579fcb41594ca262b6553ce74f8b8 (patch)
tree6a1e3beadbbdb212a8acbdd3c0852b86d41d50e3 /usr.bin
parenteb01a39af653085bfa3f67d2294b6a29326b3a79 (diff)
check whether media supports TAO or blanking.
It makes error output nicer, e.g.: "The media can't be written in TAO mode" instead of "cdio: Only 0 of the required _N_ blocks available" ok fgsch
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cdio/cdio.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/usr.bin/cdio/cdio.c b/usr.bin/cdio/cdio.c
index ca69cf675b1..f6c20487d6c 100644
--- a/usr.bin/cdio/cdio.c
+++ b/usr.bin/cdio/cdio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cdio.c,v 1.59 2008/06/06 10:16:52 av Exp $ */
+/* $OpenBSD: cdio.c,v 1.60 2008/06/08 21:40:58 av Exp $ */
/* Copyright (c) 1995 Serge V. Vakulenko
* All rights reserved.
@@ -235,6 +235,7 @@ main(int argc, char **argv)
u_int blklen;
u_int ntracks = 0;
char type;
+ int cap;
cdname = getenv("DISC");
if (!cdname)
@@ -322,6 +323,12 @@ main(int argc, char **argv)
}
if (!open_cd(cdname, 1))
exit(1);
+
+ if (get_media_capabilities(&cap) == -1)
+ errx(1, "Can't determine media type");
+ if ((cap & MEDIACAP_TAO) == 0)
+ errx(1, "The media can't be written in TAO mode");
+
get_disc_size(&availblk);
SLIST_FOREACH(tr, &tracks, track_list) {
needblk += tr->sz/tr->blklen;
@@ -378,7 +385,7 @@ main(int argc, char **argv)
int
run(int cmd, char *arg)
{
- int l, r, rc;
+ int l, r, rc, cap;
static char newcdname[MAXPATHLEN];
switch (cmd) {
@@ -576,6 +583,15 @@ run(int cmd, char *arg)
if (!open_cd(cdname, 1))
return 0;
+ if (get_media_capabilities(&cap) == -1) {
+ warnx("Can't determine media type");
+ return (0);
+ }
+ if ((cap & MEDIACAP_CDRW_WRITE) == 0) {
+ warnx("The media doesn't support blanking");
+ return (0);
+ }
+
return blank();
case CMD_CDRIP:
if (!open_cd(cdname, 0))