kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-11 19:57:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fdread: Fix logic bug when reading by sector

Browse source 
When reading by sector (because reading a whole track failed), we can
accidentally fall into the "should not happen" path, which both
(a) emits a spurious error message and (b) fouls up our position
accounting going forward.  Ensure we do not inappropriately fall into
that path.

Avoid obscuring the "short after" message in cases where it happens.

Signed-off-by: Matt Jacobson <mhjacobson@me.com>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1897
This commit is contained in:
Matt Jacobson 2025-11-24 20:30:10 -05:00 • committed by Warner Losh
parent f7725c3c27
commit 4c8bf76893
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
usr.sbin/fdread/fdread.c
View file

@ -275,12 +275,13 @@ doread(int fd, FILE *of, const char *_devname)
errx(EX_OSERR, "unexpected read() result: %d",
rv);
}
continue;
}
if ((unsigned)rv < tracksize) {
/* should not happen */
nbytes += rv;
if (!quiet)
fprintf(stderr, "\nshort after %5d KB\r",
fprintf(stderr, "\nshort after %5d KB\n",
nbytes / 1024);
fwrite(trackbuf, sizeof(unsigned char), rv, of);
fflush(of);