d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Register the bad read before bailing on terminal errors.

Browse Source 
This way running recoverdisk in a loop will not get stuck on a bad
block which causes the disk or SD card detach.
This commit is contained in:
Poul-Henning Kamp 2021-02-02 12:01:38 +00:00
parent 40407d3998
commit d21ce74dcc
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sbin/recoverdisk/recoverdisk.c
View File

@ -149,12 +149,10 @@ static void
set_verbose(void)
{
struct winsize wsz;
time_t t0;
if (!isatty(STDIN_FILENO) || ioctl(STDIN_FILENO, TIOCGWINSZ, &wsz))
return;
verbose = 1;
t0 = time(NULL);
}
static void
@ -587,6 +585,13 @@ if (!(random() & 0xf)) {
lp->start, sz, lp->state, strerror(error));
if (verbose)
report(lp, sz);
if (fdw >= 0 && strlen(unreadable_pattern)) {
fill_buf(buf, sz, unreadable_pattern);
write_buf(fdw, buf, sz, lp->start);
}
new_lump(lp->start, sz, lp->state + 1);
lp->start += sz;
lp->len -= sz;
if (error == EINVAL) {
printf("Try with -b 131072 or lower ?\n");
aborting = 1;
@ -597,13 +602,6 @@ if (!(random() & 0xf)) {
aborting = 1;
break;
}
if (fdw >= 0 && strlen(unreadable_pattern)) {
fill_buf(buf, sz, unreadable_pattern);
write_buf(fdw, buf, sz, lp->start);
}
new_lump(lp->start, sz, lp->state + 1);
lp->start += sz;
lp->len -= sz;
}
if (aborting)
save_worklist();