From aaee5e6e88f27e55d94ebf5c5c1622fd516b7d84 Mon Sep 17 00:00:00 2001 From: drochner Date: Sun, 11 Mar 2001 11:04:19 +0000 Subject: recognize "Device not ready" in addition to "medium not present" as empty CD drive, avoids endless hang in my case (may be ATAPI specific) --- sysutils/xcdroast/files/patch-sum | 4 ++-- sysutils/xcdroast/patches/patch-ac | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'sysutils') diff --git a/sysutils/xcdroast/files/patch-sum b/sysutils/xcdroast/files/patch-sum index 28b34bc0308..3c3fdfc2580 100644 --- a/sysutils/xcdroast/files/patch-sum +++ b/sysutils/xcdroast/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.2 2001/03/10 10:31:33 drochner Exp $ +$NetBSD: patch-sum,v 1.3 2001/03/11 11:04:19 drochner Exp $ SHA1 (patch-aa) = 96207a9ae670099258507894854a351fca321050 SHA1 (patch-ab) = bb019f49215db561d29f52971d186600f1db710e -SHA1 (patch-ac) = 0ed9ee21a221800b8c7d1c6d3e17a734c81f3eca +SHA1 (patch-ac) = abc9f5273a273bae7f5e3aac6266375a16eff605 SHA1 (patch-ad) = 0a9ec2f5f20a39211669fdb0b613955295a41720 diff --git a/sysutils/xcdroast/patches/patch-ac b/sysutils/xcdroast/patches/patch-ac index 2ffd8d4ca4f..de2dac55a68 100644 --- a/sysutils/xcdroast/patches/patch-ac +++ b/sysutils/xcdroast/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.1 2001/03/10 10:31:33 drochner Exp $ +$NetBSD: patch-ac,v 1.2 2001/03/11 11:04:20 drochner Exp $ ---- io.c~ Sun Nov 26 13:55:57 2000 -+++ io.c Fri Mar 9 21:43:07 2001 +--- io.c.orig Sun Nov 26 13:55:57 2000 ++++ io.c Sat Mar 10 16:34:38 2001 @@ -20,7 +20,8 @@ #include #include @@ -75,3 +75,13 @@ $NetBSD: patch-ac,v 1.1 2001/03/10 10:31:33 drochner Exp $ dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val); mix = open(setupdata.mix_device, O_WRONLY); +@@ -3026,6 +3027,9 @@ + /* got the message that no medium is present? + in this case, ignore return code */ + if (strstr(line,"medium not present")) { ++ found = 1; ++ } ++ if (strstr(line,"Device not ready")) { + found = 1; + } + } -- cgit v1.2.3