From 094861183a14eb5aa70b116f587e9f1d52abc7ad Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Mon, 20 Oct 2003 04:28:38 +0000
Subject: [PATCH] Don't print blocks if read failed.

---
 src/cd-read.c | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/cd-read.c b/src/cd-read.c
index 7168d2ba..d75ada52 100644
--- a/src/cd-read.c
+++ b/src/cd-read.c
@@ -1,5 +1,5 @@
 /*
-  $Id: cd-read.c,v 1.13 2003/10/16 13:21:56 rocky Exp $
+  $Id: cd-read.c,v 1.14 2003/10/20 04:28:38 rocky Exp $
 
   Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
   
@@ -469,23 +469,43 @@ main(int argc, const char *argv[])
   for ( ; opts.start_lsn <= opts.end_lsn; opts.start_lsn++ ) {
     switch (opts.read_mode) {
     case READ_AUDIO:
-      cdio_read_audio_sector(cdio, &buffer, opts.start_lsn);
+      if (cdio_read_audio_sector(cdio, &buffer, opts.start_lsn)) {
+        fprintf (stderr, "error reading block %u\n", 
+		 (unsigned int) opts.start_lsn);
+	blocklen = 0;
+      }
       break;
     case READ_M1F1:
-      cdio_read_mode1_sector(cdio, &buffer, opts.start_lsn, false);
-      blocklen=CDIO_CD_FRAMESIZE;
+      if (cdio_read_mode1_sector(cdio, &buffer, opts.start_lsn, false)) {
+        fprintf (stderr, "error reading block %u\n", 
+		 (unsigned int) opts.start_lsn);
+	blocklen = 0;
+      } else
+	blocklen=CDIO_CD_FRAMESIZE;
       break;
     case READ_M1F2:
-      cdio_read_mode1_sector(cdio, &buffer, opts.start_lsn, true);
-      blocklen=M2RAW_SECTOR_SIZE;
+      if (cdio_read_mode1_sector(cdio, &buffer, opts.start_lsn, true)) {
+        fprintf (stderr, "error reading block %u\n", 
+		 (unsigned int) opts.start_lsn);
+	blocklen = 0;
+      } else 
+	blocklen=M2RAW_SECTOR_SIZE;
       break;
     case READ_M2F1:
-      cdio_read_mode2_sector(cdio, &buffer, opts.start_lsn, false);
-      blocklen=CDIO_CD_FRAMESIZE;
+      if (cdio_read_mode2_sector(cdio, &buffer, opts.start_lsn, false)) {
+        fprintf (stderr, "error reading block %u\n", 
+		 (unsigned int) opts.start_lsn);
+	blocklen=0;
+      } else
+	blocklen=CDIO_CD_FRAMESIZE;
       break;
     case READ_M2F2:
-      blocklen=M2F2_SECTOR_SIZE;
-      cdio_read_mode2_sector(cdio, &buffer, opts.start_lsn, true);
+      if (cdio_read_mode2_sector(cdio, &buffer, opts.start_lsn, true)) {
+        fprintf (stderr, "error reading block %u\n", 
+		 (unsigned int) opts.start_lsn);
+	blocklen=0;
+      } else
+	blocklen=M2F2_SECTOR_SIZE;
       break;
 #if AUTO_FINISHED
     case READ_AUTO: