Eject didn't work; turns out this was due to the fd never being

closed after doing an eject, something which caused the
tray to never eject until the program closed and the fd
was closed that way.

Fix provided by Nils Nordman <nino@nforced.com>
This commit is contained in:
lebel 2001-06-25 12:44:32 +00:00
parent 2e0465b6cf
commit fe93663297
2 changed files with 15 additions and 4 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2001/05/19 00:21:00 lebel Exp $
# $OpenBSD: Makefile,v 1.2 2001/06/25 12:44:32 lebel Exp $
COMMENT= "front-end to external cd audio rippers and mp3 encoders"
V= 2.95
DISTNAME= grip-${V}
PKGNAME= ${DISTNAME}p1
CATEGORIES= audio
NEED_VERSION= 1.402
EXTRACT_SUFX= .tgz

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cd_c,v 1.1.1.1 2001/05/19 00:21:00 lebel Exp $
--- cd.c.orig Wed Oct 18 15:12:53 2000
+++ cd.c Tue Apr 10 15:00:59 2001
$OpenBSD: patch-cd_c,v 1.2 2001/06/25 12:44:33 lebel Exp $
--- cd.c.orig Mon Jun 25 08:35:29 2001
+++ cd.c Mon Jun 25 08:35:35 2001
@@ -46,7 +46,7 @@
#include <sys/cdio.h>
#endif
@ -128,3 +128,13 @@ $OpenBSD: patch-cd_c,v 1.1.1.1 2001/05/19 00:21:00 lebel Exp $
cdte.address_format = CD_MSF_FORMAT;
cdte.starting_track = 0;
cdte.data = toc_buffer;
@@ -547,6 +588,9 @@ int CDEject(int cd_desc)
perror("CDIOCEJECT");
return -1;
}
+#ifdef __OpenBSD__
+ close( cd_desc );
+#endif
#endif
#ifdef CDROMEJECT
if(ioctl(cd_desc, CDROMEJECT) < 0)