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=371d6a2dbd197898c69d381d2cee4fe5267662b5;hp=381aa70bedb1a94f64520dc55fc78738c8021994;hb=f907449eee3f58fafafee0658e80578b1dbb2722;hpb=033e9f8cde5a7feec1334888aec69def99c945b5

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 381aa70be..371d6a2db 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -39,10 +39,6 @@
 
 #include "../../udev/udev.h"
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
-#endif
-
 static int debug;
 
 static void log_fn(struct udev *udev, int priority,
@@ -80,6 +76,7 @@ static unsigned int cd_mrw;
 static unsigned int cd_mrw_w;
 
 /* media info */
+static unsigned int cd_media;
 static unsigned int cd_media_cd_rom;
 static unsigned int cd_media_cd_r;
 static unsigned int cd_media_cd_rw;
@@ -329,6 +326,8 @@ static int cd_profiles(struct udev *udev, int fd)
 		return -1;
 	}
 
+	cd_media = 1;
+
 	switch (cur_profile) {
 	case 0x03:
 	case 0x04:
@@ -571,10 +570,8 @@ int main(int argc, char *argv[])
 	}
 
 	/* check drive */
-	if (cd_inquiry(udev, fd) < 0) {
-		rc = 2;
-		goto exit;
-	}
+	if (cd_inquiry(udev, fd) < 0)
+		goto print;
 
 	/* read drive and possibly current profile */
 	if (cd_profiles(udev, fd) < 0)
@@ -631,6 +628,8 @@ print:
 	if (cd_mrw_w)
 		printf("ID_CDROM_MRW_W=1\n");
 
+	if (cd_media)
+		printf("ID_CDROM_MEDIA=1\n");
 	if (cd_media_mo)
 		printf("ID_CDROM_MEDIA_MO=1\n");
 	if (cd_media_mrw)