}
static void clear_progress(void)
{ clear_progress_internal(); fflush(stdout); }
+#ifdef DEBUG
+static void debug_clear_progress(void)
+ { if (progresslen) { putchar('\n'); progresslen = 0; } }
+#endif
static void vappend_progress(const char *fmt, va_list ap)
{ progresslen += vprintf(fmt, ap); }
__attribute__((format(printf, 1, 2)))
struct badblock *bad, *best;
unsigned char *p = buf;
- best = 0; lo = 0; hi = badblocks.n;
+ if (badblocks.n) {
+ best = 0; lo = 0; hi = badblocks.n;
#ifdef DEBUG
- clear_progress();
- printf(";; searching badblocks for %"PRIuSEC" .. %"PRIuSEC"\n",
- pos, pos + want);
+ debug_clear_progress();
+ printf(";; searching badblocks for %"PRIuSEC" .. %"PRIuSEC"\n",
+ pos, pos + want);
#endif
- while (lo < hi) {
- mid = lo + (hi - lo)/2; bad = &badblocks.v[mid];
+ while (lo < hi) {
+ mid = lo + (hi - lo)/2; bad = &badblocks.v[mid];
#ifdef DEBUG
- printf(";; try %zu (%"PRIuSEC" .. %"PRIuSEC")... ",
- mid, bad->start, bad->end);
+ printf(";; try %zu (%"PRIuSEC" .. %"PRIuSEC")... ",
+ mid, bad->start, bad->end);
#endif
- if (pos < bad->start) { D( printf("high\n"); ) best = bad; hi = mid; }
- else if (pos >= bad->end) { D( printf("low\n"); ) lo = mid + 1; }
- else { D( printf("match!\n"); ) errno = EIO; return (-1); }
- }
+ if (pos < bad->start) { D( printf("high\n"); ) best = bad; hi = mid; }
+ else if (pos >= bad->end) { D( printf("low\n"); ) lo = mid + 1; }
+ else { D( printf("match!\n"); ) errno = EIO; return (-1); }
+ }
#ifdef DEBUG
- if (best)
- printf(";; next is %"PRIuSEC" .. %"PRIuSEC"\n",
- best->start, best->end);
+ if (best)
+ printf(";; next is %"PRIuSEC" .. %"PRIuSEC"\n",
+ best->start, best->end);
#endif
- if (best && pos + want > best->start)
- { want = best->start - pos; fakeerr = EIO; }
-
+ if (best && pos + want > best->start)
+ { want = best->start - pos; fakeerr = EIO; }
+ }
done = 0;
while (want) {
if (vob)
va_list ap;
va_start(ap, what);
- clear_progress();
+ debug_clear_progress();
printf(";; recovery buffer (");
vprintf(what, ap);
printf("): "
ssize_t n;
#ifdef DEBUG
- clear_progress();
+ debug_clear_progress();
show_recovery_buffer_map(r, "begin(%"PRIuSEC", %"PRIuSEC")", pos, want);
#endif
#ifdef DEBUG
printf(";; read high (%"PRIuSEC"@%"PRIuSEC", %"PRIuSEC")",
r->pos + pp, pp, nn);
-fflush(stdout);
+ fflush(stdout);
#endif
- n = recovery_read_sectors(r, pos, pp, nn);
+ n = recovery_read_sectors(r, pos + pp, pp, nn);
#ifdef DEBUG
printf(" -> %zd\n", n);
#endif
for (i = 0; i < 4; i++) {
n = recovery_read(&r, pos, want);
#ifdef DEBUG
- clear_progress();
+ debug_clear_progress();
printf(";; [retry] try reading %"PRIuSEC" .. %"PRIuSEC" -> %zd\n",
pos, pos + want, n);
#endif
want = run_length_wanted(pos, step, sz, end);
n = recovery_read(&r, pos, want);
#ifdef DEBUG
- clear_progress();
+ debug_clear_progress();
printf(";; [bound] try reading %"PRIuSEC" .. %"PRIuSEC" -> %zd\n",
pos, pos + want, n);
#endif
want = run_length_wanted(pos, step, sz, end);
n = recovery_read(&r, pos, want);
#ifdef DEBUG
- clear_progress();
+ debug_clear_progress();
printf(";; [limit] try reading %"PRIuSEC" .. %"PRIuSEC" -> %zd\n",
pos, pos + want, n);
#endif
else bad_hi = pos + n + 1;
}
recovered(bad_lo, bad_hi); *pos_inout = good;
- if (r.pos + r.start <= good && good <= r.pos + r.end) {
- rearrange_sectors(&r, 0, good - r.pos, r.pos + r.end - good);
- } else
+ if (good < r.pos + r.start || r.pos + r.end <= good)
n = 0;
+ else {
+ n = r.pos + r.end - good;
+ rearrange_sectors(&r, 0, good - r.pos, n);
+ }
+#ifdef DEBUG
+ show_recovery_buffer_map(&r, "returning %zd good sectors at %"PRIuSEC"",
+ n, good);
+#endif
return (n);
}
if (f&f_write) emit(pos, ev->pos);
pos = ev->pos;
#ifdef DEBUG
- clear_progress();
+ debug_clear_progress();
printf(";;\n");
#endif
}
set_live(ev->file);
#ifdef DEBUG
store_filename(fn, filetab.v[ev->file].id);
- clear_progress();
+ debug_clear_progress();
printf(";; %8"PRIuSEC": begin `%s'\n", pos, fn);
#endif
break;
"(sector %"PRIuSEC") in output file `%s'",
ev->pos, outfile);
#ifdef DEBUG
- clear_progress();
+ debug_clear_progress();
printf(";; %8"PRIuSEC": begin write\n", pos);
#endif
f |= f_write;
case EV_STOP:
f &= ~f_write;
#ifdef DEBUG
- clear_progress();
+ debug_clear_progress();
printf(";; %8"PRIuSEC": end write\n", pos);
#endif
break;
clear_live(ev->file);
#ifdef DEBUG
store_filename(fn, filetab.v[ev->file].id);
- clear_progress();
+ debug_clear_progress();
printf(";; %8"PRIuSEC": end `%s'\n", pos, fn);
#endif
break;