From 4c8bf76893a8b39eda15f91d1515c6bf6a02a9a6 Mon Sep 17 00:00:00 2001 From: Matt Jacobson Date: Mon, 24 Nov 2025 20:30:10 -0500 Subject: [PATCH] fdread: Fix logic bug when reading by sector 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 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1897 --- usr.sbin/fdread/fdread.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/fdread/fdread.c b/usr.sbin/fdread/fdread.c index ee854869978..02dbaf98da8 100644 --- a/usr.sbin/fdread/fdread.c +++ b/usr.sbin/fdread/fdread.c @@ -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);