X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fcdrom_id%2Fcdrom_id.c;h=9e274718631e38ac0b431ede4578be792fbac1b4;hp=6d3326bd311851dfca1104fe68e346ba33f9d317;hb=c2175d25248fc25356c881798d688d8745cb5359;hpb=ec404619a6867d14adebe107a1ed74475ae2413f

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 6d3326bd3..9e2747186 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -37,7 +37,8 @@
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <linux/cdrom.h>
-#include "../../udev.h"
+
+#include "../../udev/udev.h"
 
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
@@ -470,9 +471,13 @@ static int cd_media_toc(int fd)
 	info("READ TOC: len: %d\n", len);
 	if (len > sizeof(toc))
 		return -1;
-	if (len < 8)
+	if (len < 2)
 		return -1;
 
+	/* empty media has no tracks */
+	if (len < 8)
+		return 0;
+
 	scsi_cmd_set(&sc, 0, 0x43);
 	scsi_cmd_set(&sc, 6, header[2]); /* First Track/Session Number */
 	scsi_cmd_set(&sc, 7, len >> 8);
@@ -688,11 +693,11 @@ print:
 		printf("ID_CDROM_MEDIA_SESSION_COUNT=%d\n", cd_media_session_count);
 	if (cd_media_track_count > 0)
 		printf("ID_CDROM_MEDIA_TRACK_COUNT=%d\n", cd_media_track_count);
-	if (cd_media_track_count_audio)
+	if (cd_media_track_count_audio > 0)
 		printf("ID_CDROM_MEDIA_TRACK_COUNT_AUDIO=%d\n", cd_media_track_count_audio);
-	if (cd_media_track_count_data)
+	if (cd_media_track_count_data > 0)
 		printf("ID_CDROM_MEDIA_TRACK_COUNT_DATA=%d\n", cd_media_track_count_data);
-	if (cd_media_session_last_offset)
+	if (cd_media_session_last_offset > 0)
 		printf("ID_CDROM_MEDIA_SESSION_LAST_OFFSET=%llu\n", cd_media_session_last_offset);
 exit:
 	if (fd >= 0)