From nobody Wed Feb 11 16:25:23 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fB3gm17mVz6Rm0k for ; Wed, 11 Feb 2026 16:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB3gl5Zzyz411X for ; Wed, 11 Feb 2026 16:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770827123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EjRgon5f8jUkjbb1CwEw4z3OCLap7ncrxppCKWCD2pM=; b=cZWnYBnFf8I4HmF2PhkqMDhygccQH39fbBi8iBZTi4EU3jBEQ4Ml3ncs2OAw4uQhLW2cUV JsD1sagt1AgEzkduMkbR+z01U4jCppbKBtyzamxx3B8F60rE58Ed4E6zrkgb4LXIj8/v8Q KOOHJ3JBT5m+gt1GPr25RZrG56iwibZ7Qov/nZWsP7ldqCj7YIHMlowAdsVA09dDcfsvmK nYupF+Ba3Y3jm1tq6haGeKdbYU7mhppYifoDEmwq8eyC24UWDzYml6oMLleHfImDPXmWOM Xm5015s34MbWS3cX8l60uXwNQM785Q0QQgAc2/lNapZDaHc2Xct0M3fWN2KFgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770827123; a=rsa-sha256; cv=none; b=nomhfvSHwbpCr83NLBOXoxVMFXAUitFx+PD45ZCgGmhoESTmIxAVWf23aGZAvNsrjPLBQq +jsO48ptug386CKCudy7zJcdh6+EGf0ixHq4Cpj6iFXXf/X6sZ/0nQsSPtZUOS0peNkX4S 48n4RkBhPDQkTsvCDTZgrKj0L9dn+OKj/NoqQXKiBadbO7uSYVqNVO62RcmNMdOE6fqzv5 qg7vJeyCystQAU6MZ24YOuCujFEICCq4CRNaNMtJrP07XqZE6vRVRPo0oLWmaxDdQSCr/T KP8mw6C/AYWIp6cQhi5Q5K5hwjoXmorWobwulPNHCHc0p1dSlh9j155eh0X01w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770827123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EjRgon5f8jUkjbb1CwEw4z3OCLap7ncrxppCKWCD2pM=; b=PNcZCYAIb8EcKJoByHGnhXeZL5Pc71l3WLaBfxoE7FyxZygDMm/DuOJpFgAjffagIF/hC7 WmNcKc4cSYzQjoc3OGHSsLAn+Yz2Rjc3gEzk+8eUFfAPupy/5UdQFCzczmxzJjLM1yiNle 9YOUFQH0CAreB9ErvCbxrf5H4kis3m40cz2Ji1PT4Jk52wwyrTtM2L8X2lQtlvozeo413x ZKJ0RaSpG6JPurJbLpN5zqZQ3N9DhGnmBFOS7t6x40T41ereepLrHiW+C7orgFZ9jijZvR NeY00uY5RKn/PTMQ0KGLs1+qFCeAIXhDaVDsZ/ty9GkNsQvV4kvMgujRi2SorQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB3gl4Rbczx1X for ; Wed, 11 Feb 2026 16:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2277f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 16:25:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 7aa30669d6e0 - main - cp: Expect EINTR while copying List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7aa30669d6e04444b8ad1e4863a6e674fcac4afc Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 16:25:23 +0000 Message-Id: <698cad73.2277f.4f4dd5d5@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7aa30669d6e04444b8ad1e4863a6e674fcac4afc commit 7aa30669d6e04444b8ad1e4863a6e674fcac4afc Author: Dag-Erling Smørgrav AuthorDate: 2026-02-11 16:24:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-11 16:24:46 +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 --- 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 2036056ada68..2579ea0a9603 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -216,7 +216,10 @@ copy_file(const FTSENT *entp, bool dne, bool beneath) 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, @@ -224,7 +227,7 @@ copy_file(const FTSENT *entp, bool dne, bool beneath) entp->fts_path, to.base, to.path, cp_pct(wtotal, fs->st_size)); } - } while (wcount > 0); + } while (wcount != 0); if (wcount < 0) { warn("%s", entp->fts_path); rval = 1;