dvd-sector-copy.c: Extract the post-recovery code into a function.

[dvdrip] / dvd-sector-copy.c

diff --git a/dvd-sector-copy.c b/dvd-sector-copy.c
index f29c0d6..d663c0b 100644 (file)
--- a/dvd-sector-copy.c
+++ b/dvd-sector-copy.c
@@ -379,18 +379,6 @@ static void report_progress(secaddr pos)
 #undef BETA
 }
 
-static void report_bad_blocks_progress(secaddr lo, secaddr hi, int err)
-{
-  report_progress(hi);
-
-  if (lo == hi) append_progress(": retrying bad sector");
-  else
-    append_progress(": %"PRIuSEC" bad %s",
-                   hi - lo, hi == lo + 1 ? "sector" : "sectors");
-  if (err != EIO) append_progress(" (%s)", strerror(err));
-  fflush(stdout);
-}
-
 static dvd_reader_t *dvd;
 static int dvdfd = -1, outfd = -1;
 static dvd_file_t *vob;
@@ -415,9 +403,11 @@ static int compare_badblock(const void *a, const void *b)
 
 static ssize_t read_sectors(secaddr pos, void *buf, secaddr want)
 {
-  ssize_t n;
+  ssize_t n, done;
   size_t lo, mid, hi;
+  int fakeerr = 0;
   struct badblock *bad, *best;
+  unsigned char *p = buf;
 
   best = 0; lo = 0; hi = badblocks.n;
 #ifdef DEBUG
@@ -440,23 +430,63 @@ static ssize_t read_sectors(secaddr pos, void *buf, secaddr want)
     printf(";;   next is %"PRIuSEC" .. %"PRIuSEC"\n",
           best->start, best->end);
 #endif
-  if (best && pos + want > best->start) want = best->start - pos;
-
-again:
-  if (vob)
-    n = DVDReadBlocks(vob, pos - file->start, want, buf);
-  else if (file) {
-    if (lseek(dvdfd, (off_t)pos*SECTORSZ, SEEK_SET) < 0)
-      bail_syserr(errno, "failed to seek to sector %"PRIuSEC"", pos);
-    n = read(dvdfd, buf, want*SECTORSZ);
-    if (n >= 0) n /= SECTORSZ;
-  } else {
-    memset(buf, 0, want*SECTORSZ);
-    n = want;
+  if (best && pos + want > best->start)
+    { want = best->start - pos; fakeerr = EIO; }
+
+  done = 0;
+  while (want) {
+    if (vob)
+      { errno = 0; n = DVDReadBlocks(vob, pos - file->start, want, p); }
+    else if (file) {
+      if (lseek(dvdfd, (off_t)pos*SECTORSZ, SEEK_SET) < 0)
+       bail_syserr(errno, "failed to seek to sector %"PRIuSEC"", pos);
+      errno = 0; n = read(dvdfd, p, want*SECTORSZ);
+      if (n >= 0) n /= SECTORSZ;
+    } else {
+      memset(p, 0, want*SECTORSZ);
+      n = want;
+    }
+
+    if (n > 0) { done += n; pos += n; p += n*SECTORSZ; want -= n; }
+    else if (!n || errno != EINTR) break;
   }
+  if (fakeerr && !errno) errno = fakeerr;
+  return (!done && errno ? -1 : done);
+}
 
-  if (n < 0 && errno == EINTR) goto again;
-  return (n);
+static void report_bad_blocks_progress(secaddr lo, secaddr hi, int err)
+{
+  report_progress(hi);
+
+  if (lo == hi) append_progress(": retrying bad sector");
+  else
+    append_progress(": %"PRIuSEC" bad %s",
+                   hi - lo, hi == lo + 1 ? "sector" : "sectors");
+  if (err && err != EIO) append_progress(" (%s)", strerror(err));
+  fflush(stdout);
+}
+
+static void recovered(secaddr bad_lo, secaddr bad_hi)
+{
+  clear_progress();
+  moan("skipping %"PRIuSEC" bad sectors (%"PRIuSEC" .. %"PRIuSEC")",
+       bad_hi - bad_lo, bad_lo, bad_hi);
+  if (mapfile) {
+    if (!mapfp) {
+      mapfp = fopen(mapfile, "w");
+      if (!mapfp)
+       bail_syserr(errno, "failed to open bad-sector map file `%s'",
+                   optarg);
+      fprintf(mapfp, "## bad sector map\n\n");
+    }
+    fprintf(mapfp, "%"PRIuSEC" %"PRIuSEC"\n", bad_lo, bad_hi);
+    fflush(mapfp);
+    if (ferror(mapfp))
+      bail_syserr(errno, "error writing bad-sector map file");
+  }
+  if (lseek(outfd, (off_t)(bad_hi - bad_lo)*SECTORSZ, SEEK_CUR) < 0)
+    bail_syserr(errno, "failed to seek past bad sectors");
+  status = 1;
 }
 
 static ssize_t find_good_sector(secaddr *pos_inout, secaddr end,
@@ -473,7 +503,7 @@ static ssize_t find_good_sector(secaddr *pos_inout, secaddr end,
       clear_progress();
       moan("sector %"PRIuSEC" read ok after retry", pos);
       bad_lo = bad_hi = pos;
-      goto recovered;
+      return (n);
     }
   }
 
@@ -483,7 +513,7 @@ static ssize_t find_good_sector(secaddr *pos_inout, secaddr end,
     if (bad_hi >= end) {
       clear_progress();
       moan("giving up on this extent");
-      n = 0; goto recovered;
+      recovered(bad_lo, end); *pos_inout = end; return (0);
     }
     step *= 2;
     if (step > end - bad_lo) step = end - bad_lo;
@@ -501,29 +531,7 @@ static ssize_t find_good_sector(secaddr *pos_inout, secaddr end,
     if (n > 0) good = pos;
     else bad_hi = pos + 1;
   }
-recovered:
-  if (bad_hi > bad_lo) {
-    clear_progress();
-    moan("skipping %"PRIuSEC" bad sectors (%"PRIuSEC" .. %"PRIuSEC")",
-        bad_hi - bad_lo, bad_lo, bad_hi);
-    if (mapfile) {
-      if (!mapfp) {
-       mapfp = fopen(mapfile, "w");
-       if (!mapfp)
-         bail_syserr(errno, "failed to open bad-sector map file `%s'",
-                     optarg);
-       fprintf(mapfp, "## bad sector map\n\n");
-      }
-      fprintf(mapfp, "%"PRIuSEC" %"PRIuSEC"\n", bad_lo, bad_hi);
-      fflush(mapfp);
-      if (ferror(mapfp))
-       bail_syserr(errno, "error writing bad-sector map file");
-    }
-    if (lseek(outfd, (off_t)(bad_hi - bad_lo)*SECTORSZ, SEEK_CUR) < 0)
-      bail_syserr(errno, "failed to seek past bad sectors");
-    status = 1;
-  }
-  *pos_inout = bad_hi;
+  recovered(bad_lo, bad_hi); *pos_inout = good;
   return (n);
 }
 
@@ -531,7 +539,7 @@ static void emit(secaddr start, secaddr end)
 {
 #define BUFSECTORS 512
 
-  int least, i;
+  int least;
   unsigned char buf[BUFSECTORS*SECTORSZ];
   secaddr pos;
   size_t want;
@@ -541,6 +549,7 @@ static void emit(secaddr start, secaddr end)
   struct file *f;
   char fn[MAXFNSZ];
   int act = -1;
+  int i;
 #endif
 
   least = least_live();