From d91a79d86ffb544d49f5f04ca49e5d980188934d Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Thu, 21 Sep 2023 08:08:04 +0000 Subject: A few fixes Signed-off-by: Laurent Bercot --- src/tipideed/send_file.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/tipideed/send_file.c') diff --git a/src/tipideed/send_file.c b/src/tipideed/send_file.c index 77b49dd..2ee122a 100644 --- a/src/tipideed/send_file.c +++ b/src/tipideed/send_file.c @@ -103,17 +103,16 @@ void send_file (int fd, uint64_t n, char const *fn) ssize_t r ; buffer_rpeek(buffer_1, v) ; r = allreadv(fd, v, 2) ; - if (r > n) if (r == -1) strerr_diefu2sys(111, "read from ", fn) ; if (!r) strerr_diefu3x(111, "serve ", fn, ": file was truncated") ; if (r > n) { r = n ; if (g.verbosity >= 2) - strerr_warnw2x("serving elongated file: ", fn) + strerr_warnw2x("serving elongated file: ", fn) ; } - buffer_rseek(b, r) ; - tain_add_g(&deadline, g.writetto) ; + buffer_rseek(buffer_1, r) ; + tain_add_g(&deadline, &g.writetto) ; if (!buffer_timed_flush_g(buffer_1, &deadline)) strerr_diefu1sys(111, "write to stdout") ; n -= r ; -- cgit v1.3.1