static int dvdfd = -1, outfd = -1;
static dvd_file_t *vob;
static const char *mapfile; static FILE *mapfp;
+static const char *errfile; static FILE *errfp;
struct badblock { secaddr start, end; };
DEFVEC(badblock_v, struct badblock);
}
if (n > 0) { done += n; pos += n; p += n*SECTORSZ; want -= n; }
- else if (!n || errno != EINTR) break;
+ else if (!n) break;
+ else if (errno == EIO && errfile) {
+ open_file_on_demand(errfile, &errfp, "bad-sector error log");
+ fprintf(errfp, "%"PRIuSEC" %"PRIuSEC"\n", pos, pos + 1);
+ check_write(errfp, "bad-sector error log");
+ break;
+ } else if (errno != EINTR) break;
}
if (fakeerr && !errno) errno = fakeerr;
return (!done && errno ? -1 : done);
n = r->pos + r->end - pos;
if (!n && want) n = -1;
+ else if (n > want) n = want;
end:
#ifdef DEBUG
bad_lo = pos; bad_hi = pos + 1;
for (;;) {
report_bad_blocks_progress(bad_lo, bad_hi, errno);
+#ifdef DEBUG
+ debug_clear_progress();
+ printf(";; bounding bad-block region: "
+ "%"PRIuSEC" ..%"PRIuSEC".. %"PRIuSEC"\n",
+ bad_lo, bad_hi - bad_lo, bad_hi);
+#endif
if (bad_hi >= end) {
clear_progress();
moan("giving up on this extent");
want = run_length_wanted(pos, step, sz, end);
n = recovery_read(&r, pos, want);
#ifdef DEBUG
- debug_clear_progress();
printf(";; [bound] try reading %"PRIuSEC" .. %"PRIuSEC" -> %zd\n",
pos, pos + want, n);
#endif
good = pos;
while (good > bad_hi) {
report_bad_blocks_progress(bad_lo, bad_hi, errno);
+#ifdef DEBUG
+ debug_clear_progress();
+ printf(";; limiting bad-block region: "
+ "%"PRIuSEC" ..%"PRIuSEC".. %"PRIuSEC" ..%"PRIuSEC".. %"PRIuSEC"\n",
+ bad_lo, bad_hi - bad_lo, bad_hi, good - bad_hi, good);
+#endif
pos = bad_hi + (good - bad_hi)/2;
step = pos - bad_lo;
want = run_length_wanted(pos, step, sz, end);
n = recovery_read(&r, pos, want);
#ifdef DEBUG
- debug_clear_progress();
printf(";; [limit] try reading %"PRIuSEC" .. %"PRIuSEC" -> %zd\n",
pos, pos + want, n);
#endif
p = strrchr(argv[0], '/'); prog = p ? p + 1 : argv[0];
for (;;) {
- opt = getopt(argc, argv, "hFR:X:b:cr:"); if (opt < 0) break;
+ opt = getopt(argc, argv, "hE:FR:X:b:cr:"); if (opt < 0) break;
switch (opt) {
case 'h': usage(stderr); exit(0);
+ case 'E': errfile = optarg; break;
case 'F': f |= f_fixup; break;
case 'R':
fp = fopen(optarg, "r");
if (dvdfd >= 0) close(dvdfd);
if (outfd >= 0) close(outfd);
carefully_fclose(mapfp, "bad-sector region map");
+ carefully_fclose(errfp, "bad-sector error log");
#undef f_bogus
#undef f_continue