X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fcdrom_id%2Fcdrom_id.c;h=d4156ce7ac310586f90e5c28ef924353d3bb9f6a;hb=9ab11b6258abe2c9c0420a70e5b21f3f341c82c5;hp=0d873ae8e5f847eaba7df3d0bc6cc846e948a75d;hpb=d6f0b22d574c6a5e5f3430be3fc619d4b2f46cd5;p=elogind.git

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 0d873ae8e..d4156ce7a 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -37,7 +37,8 @@
 #include <sys/ioctl.h>
 #include <linux/cdrom.h>
 
-#include "../../udev/udev.h"
+#include "libudev.h"
+#include "libudev-private.h"
 
 static int debug;
 
@@ -426,8 +427,10 @@ static int cd_media_info(struct udev *udev, int fd)
 
 	info(udev, "disk type %02x\n", header[8]);
 
-	if ((header[2] & 3) < 4)
+	/* exclude plain CDROM, some fake cdroms return 0 for "blank" media here */
+	if (!cd_media_cd_rom && (header[2] & 3) < 4)
 		cd_media_state = media_status[header[2] & 3];
+
 	if ((header[2] & 3) != 2)
 		cd_media_session_next = header[10] << 8 | header[5];
 	cd_media_session_count = header[9] << 8 | header[4];
@@ -526,7 +529,7 @@ int main(int argc, char *argv[])
 	if (udev == NULL)
 		goto exit;
 
-	logging_init("cdrom_id");
+	udev_log_init("cdrom_id");
 	udev_set_log_fn(udev, log_fn);
 
 	while (1) {
@@ -568,6 +571,7 @@ int main(int argc, char *argv[])
 	fd = open(node, O_RDONLY | O_NONBLOCK);
 	if (fd < 0) {
 		info(udev, "unable to open '%s'\n", node);
+		fprintf(stderr, "unable to open '%s'\n", node);
 		rc = 1;
 		goto exit;
 	}
@@ -703,7 +707,7 @@ exit:
 	if (fd >= 0)
 		close(fd);
 	udev_unref(udev);
-	logging_close();
+	udev_log_close();
 	return rc;
 }