git: a9ac7da4c0c3 - stable/14 - cp: Expect EINTR while copying
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 15 Feb 2026 08:58:47 UTC
The branch stable/14 has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=a9ac7da4c0c3907e21a5634a2338878eb9b33453
commit a9ac7da4c0c3907e21a5634a2338878eb9b33453
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-02-11 16:24:46 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2026-02-15 08:58:34 +0000
cp: Expect EINTR while copying
Both copy_file_range() and copy_fallback() can be interrupted before
they have read anything at all, in which case they return -1 and set
errno to EINTR. If that happens, we should retry, not fail.
PR: 293028
MFC after: 1 week
Reviewed by: kevans
Differential Revision: https://reviews.freebsd.org/D55167
(cherry picked from commit 7aa30669d6e04444b8ad1e4863a6e674fcac4afc)
---
bin/cp/utils.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index a2cb2f536843..a39c6ed0416b 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -213,7 +213,10 @@ copy_file(const FTSENT *entp, int dne)
if (!use_copy_file_range) {
wcount = copy_fallback(from_fd, to_fd);
}
- wtotal += wcount;
+ if (wcount >= 0)
+ wtotal += wcount;
+ else if (errno != EINTR)
+ break;
if (info) {
info = 0;
(void)fprintf(stderr,
@@ -221,7 +224,7 @@ copy_file(const FTSENT *entp, int dne)
entp->fts_path, to.p_path,
cp_pct(wtotal, fs->st_size));
}
- } while (wcount > 0);
+ } while (wcount != 0);
if (wcount < 0) {
warn("%s", entp->fts_path);
rval = 1;