X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fcdrom_id%2Fcdrom_id.c;h=f9d6e0bc24fe574aef4cc86189b516e553892567;hb=b367a1c9d8a0f565effcdb45f86a365be1c8b622;hp=338b3782cb1782ac65aca443c20961b1e2ccf45d;hpb=cf2205a1986222fdc0238190f5742f54d943cd23;p=elogind.git

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 338b3782c..f9d6e0bc2 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -378,14 +378,12 @@ static int cd_profiles_old_mmc(struct udev *udev, int fd)
 	if (header[2] & 16) {
 		cd_media_cd_rw = 1;
 		info(udev, "profile 0x0a media_cd_rw\n");
-	}	
-	else if ((header[2] & 3) < 2 && cd_cd_r) { 
+	} else if ((header[2] & 3) < 2 && cd_cd_r) {
 		cd_media_cd_r = 1;
 		info(udev, "profile 0x09 media_cd_r\n");
-	}
-	else {
-	cd_media_cd_rom = 1;
-	info(udev, "profile 0x08 media_cd_rom\n");
+	} else {
+		cd_media_cd_rom = 1;
+		info(udev, "profile 0x08 media_cd_rom\n");
 	}
 	return 0;
 }
@@ -575,6 +573,7 @@ static int cd_media_info(struct udev *udev, int fd)
 
 	cd_media = 1;
 	info(udev, "disk type %02x\n", header[8]);
+	info(udev, "hardware reported media status: %s\n", media_status[header[2] & 3]);
 
 	/* exclude plain CDROM, some fake cdroms return 0 for "blank" media here */
 	if (!cd_media_cd_rom)
@@ -691,8 +690,9 @@ static int cd_media_info(struct udev *udev, int fd)
 	}
 
 determined:
-	/* "other" is e. g. DVD-RAM, can't append sessions there either */
-	if ((header[2] & 3) < 2)
+	/* "other" is e. g. DVD-RAM, can't append sessions there; DVDs in
+	 * restricted overwrite mode can never append, only in sequential mode */
+	if ((header[2] & 3) < 2 && !cd_media_dvd_rw_ro)
 		cd_media_session_next = header[10] << 8 | header[5];
 	cd_media_session_count = header[9] << 8 | header[4];
 	cd_media_track_count = header[11] << 8 | header[6];
@@ -870,13 +870,11 @@ int main(int argc, char *argv[])
 	if (cd_profiles(udev, fd) < 0)
 		goto print;
 
-	/* get writable media state */
-	if (cd_media_info(udev, fd) < 0)
-		goto print;
-
 	/* get session/track info */
-	if (cd_media_toc(udev, fd) < 0)
-		goto print;
+	cd_media_toc(udev, fd);
+
+	/* get writable media state */
+	cd_media_info(udev, fd);
 
 print:
 	printf("ID_CDROM=1\n");