fix: allow blank media in medium-info

This resolves the second part of issue #19.

This bug was present since upstream v0.79.5

src/debug.c

@@ -877,7 +877,7 @@ void ReadSector(char *arg)
 
    /*** Open the device */
 
-   image = OpenImageFromDevice(Closure->device);
+   image = OpenImageFromDevice(Closure->device, 0);
    if(!image)
      Stop(_("Can't open %s:\n%s"), Closure->imageName, strerror(errno));
 
@@ -931,7 +931,7 @@ void RawSector(char *arg)
 
    /*** Open the device */
 
-   image = OpenImageFromDevice(Closure->device);
+   image = OpenImageFromDevice(Closure->device, 0);
    if(!image)
      Stop(_("Can't open %s:\n%s"), Closure->imageName, strerror(errno));
    sense = &image->dh->sense;

src/dvdisaster.h

@@ -894,7 +894,7 @@ typedef struct _Image
 } Image;
 
 Image* OpenImageFromFile(char*, int, mode_t);
-Image* OpenImageFromDevice(char*);   /* really in scsi-layer.h */
+Image* OpenImageFromDevice(char*, int);   /* really in scsi-layer.h */
 Image* OpenEccFileForImage(Image*, char*, int, mode_t);
 int ReportImageEccInconsistencies(Image*);
 int GetImageFingerprint(Image*, guint8*, guint64);

src/medium-info.c

@@ -104,7 +104,7 @@ void PrintMediumInfo(void *mi_ptr)
       print_defaults(mi);
 #endif
 
-   image = OpenImageFromDevice(Closure->device);
+   image = OpenImageFromDevice(Closure->device, 2 /* allow blanks, see comment in OpenImageFromDevice() */);
    if(!image) return;
    dh = image->dh;
    QueryBlankCapacity(dh);

src/read-adaptive.c

@@ -626,7 +626,7 @@ static void open_and_determine_mode(read_closure *rc)
  
    /* open the device */
 
-   rc->medium = OpenImageFromDevice(Closure->device);
+   rc->medium = OpenImageFromDevice(Closure->device, 0);
    rc->dh = rc->medium->dh;
    rc->readMode = IMAGE_ONLY;
 

src/read-linear.c

@@ -832,7 +832,7 @@ void ReadMediumLinear(gpointer data)
         and possibly the respective ecc file.
         The on disk image is maintained in rc->reader|writerImage. */
 
-   rc->image = OpenImageFromDevice(Closure->device);
+   rc->image = OpenImageFromDevice(Closure->device, 0);
    Closure->readErrors = Closure->crcErrors = rc->readOK = 0;
 
    /*** Save some useful information for the missing sector marker */

src/scsi-layer.c

@@ -1054,6 +1054,17 @@ static int query_bd(DeviceHandle *dh, int probe_only)
 
 /*
  * Find out what type of disc has been inserted.
+ *
+ * `probe_only` is passed down to query_cd/dvd/br, and has
+ * a boolean meaning there:
+ * - 0: abort the program on error (call Stop())
+ * - 1: return error to the caller (us).
+ * If we're called with probe_only == 2, we additionally won't
+ * return an error to our caller even if query_cd/dvd/br return FALSE:
+ * this is used when querying media that may be blank (in PrintMediumInfo),
+ * as query_* attempt to read the TOC, which is always expected to fail
+ * on blank media. However we will still return FALSE if we get any
+ * other type of error.
  */
 
 static int query_type(DeviceHandle *dh, int probe_only)
@@ -1063,6 +1074,7 @@ static int query_type(DeviceHandle *dh, int probe_only)
    Sense *sense = &dh->sense;
    unsigned int length;
    int status;
+   int ret;
 
    /*** See which profile the drive selected.
 	This should at least give us a hint to decide 
@@ -1133,31 +1145,40 @@ static int query_type(DeviceHandle *dh, int probe_only)
 	dh->singleRate  = 150.0;
 	dh->maxRate     = 52;
 	dh->clusterSize = 16;  /* really 1, but this is faster */ 
-	return dh->incomplete ? query_incomplete(dh, probe_only) : query_cd(dh, probe_only);
+	ret = dh->incomplete ? query_incomplete(dh, probe_only) : query_cd(dh, probe_only);
+	return (probe_only == 2 ? TRUE : ret);
 
       case DVD:
 	dh->read        = read_dvd_sector;
 	dh->singleRate  = 1352.54;
 	dh->maxRate     = 17;
 	dh->clusterSize = 16;
-	if(!dh->incomplete) return query_dvd(dh, probe_only);
+	if(!dh->incomplete)
-	else
+	{	ret = query_dvd(dh, probe_only);
-	{  if(query_dvd(dh, TRUE)) return TRUE;
+		return (probe_only == 2 ? TRUE : ret);
-	   return query_incomplete(dh, probe_only);
 	}
-	break;
+	else
+	{	if(query_dvd(dh, TRUE)) return TRUE;
+		ret = query_incomplete(dh, probe_only);
+		return (probe_only == 2 ? TRUE : ret);
+	}
+	break; /* unreachable */
 
       case BD:
 	dh->read        = read_dvd_sector;
 	dh->singleRate  = 36000.0/8.0;  /* 1x = 36 kbit */
 	dh->maxRate     = 9;
 	dh->clusterSize = 32;
-	if(!dh->incomplete) return query_bd(dh, probe_only);
+	if(!dh->incomplete)
-	else
+	{	ret = query_bd(dh, probe_only);
-	{  if(query_bd(dh, TRUE)) return TRUE;
+		return (probe_only == 2 ? TRUE : ret);
-	   return query_incomplete(dh, probe_only);
 	}
-	break;
+	else
+	{	if(query_bd(dh, TRUE)) return TRUE;
+		ret = query_incomplete(dh, probe_only);
+		return (probe_only == 2 ? TRUE : ret);
+	}
+	break; /* unreachable */
 
       default:  /* maybe HD DVD or sth else we do not support */
 	return FALSE;
@@ -2017,7 +2038,7 @@ gint64 CurrentMediumSize(int get_blank_size)
    gint64 size;
 
 
-   image = OpenImageFromDevice(Closure->device);
+   image = OpenImageFromDevice(Closure->device, 0);
    if(!image) return 0;
    if(InquireDevice(image->dh, 1) != 0x05) 
    {  CloseImage(image);
@@ -2571,7 +2592,7 @@ int ReadSectorsFast(DeviceHandle *dh, unsigned char *buf, gint64 s, int nsectors
  *** Open the device and query some of its properties.
  ***/
 
-Image* OpenImageFromDevice(char *device)
+Image* OpenImageFromDevice(char *device, int query_only)
 {  Image *image = NULL;
    DeviceHandle *dh = NULL;
 
@@ -2604,7 +2625,7 @@ Image* OpenImageFromDevice(char *device)
    /* Query the type and fail immediately if incompatible medium is found
       so that the later tests are not derailed by the wrong medium type */
 
-   if(!query_type(dh, 0))
+   if(!query_type(dh, query_only))
    {  CloseDevice(dh);
       Stop(_("Drive failed to report media type."));
       return NULL;