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=83184d008ba23724fd30996440534c0633a0d0aa;hp=0ec79e677bf15d22eeaa4e7391b5dc02033e861f;hpb=a6b03c09617354d729cedada9e63dc2a595c0c62;p=elogind.git

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 0ec79e677..f9d6e0bc2 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -85,6 +85,8 @@ static unsigned int cd_media_cd_rw = 0;
 static unsigned int cd_media_dvd_rom = 0;
 static unsigned int cd_media_dvd_r = 0;
 static unsigned int cd_media_dvd_rw = 0;
+static unsigned int cd_media_dvd_rw_ro = 0; /* restricted overwrite mode */
+static unsigned int cd_media_dvd_rw_seq = 0; /* sequential mode */
 static unsigned int cd_media_dvd_ram = 0;
 static unsigned int cd_media_dvd_plus_r = 0;
 static unsigned int cd_media_dvd_plus_rw = 0;
@@ -295,9 +297,14 @@ static int feature_profiles(struct udev *udev, const unsigned char *profiles, si
 			cd_dvd_ram = 1;
 			break;
 		case 0x13:
+			info(udev, "profile 0x%02x media_dvd_rw\n", profile);
+			cd_media_dvd_rw = 1;
+			cd_media_dvd_rw_ro = 1;
+			break;
 		case 0x14:
 			info(udev, "profile 0x%02x dvd_rw\n", profile);
 			cd_dvd_rw = 1;
+			cd_media_dvd_rw_seq = 1;
 			break;
 		case 0x1B:
 			info(udev, "profile 0x%02x dvd_plus_r\n", profile);
@@ -371,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;
 }
@@ -568,15 +573,22 @@ 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)
 		cd_media_state = media_status[header[2] & 3];
 
+	/* fresh DVD-RW in restricted overwite mode reports itself as
+	 * "appendable"; change it to "blank" to make it consistent with what
+	 * gets reported after blanking, and what userspace expects  */
+	if (cd_media_dvd_rw_ro && (header[2] & 3) == 1)
+		cd_media_state = media_status[0];
+
 	/* DVD+RW discs (and DVD-RW in restricted mode) once formatted are
 	 * always "complete", DVD-RAM are "other" or "complete" if the disc is
 	 * write protected; we need to check the contents if it is blank */
-	if ((cd_media_dvd_rw || cd_media_dvd_plus_rw || cd_media_dvd_plus_rw_dl || cd_media_dvd_ram) && (header[2] & 3) > 1) {
+	if ((cd_media_dvd_rw_ro || cd_media_dvd_plus_rw || cd_media_dvd_plus_rw_dl || cd_media_dvd_ram) && (header[2] & 3) > 1) {
 		unsigned char buffer[17 * 2048];
 		unsigned char result, len;
 		int block, offset;
@@ -678,7 +690,9 @@ static int cd_media_info(struct udev *udev, int fd)
 	}
 
 determined:
-	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];
@@ -856,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");