From nobody Sun Feb 15 08:58:55 2026 X-Original-To: dev-commits-src-branches@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 4fDKZn2hxTz6SGyg for ; Sun, 15 Feb 2026 08:58:56 +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 4fDKZm2zrqz46yq for ; Sun, 15 Feb 2026 08:58:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771145936; 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=wLLpgVYXO+ZsKlb5XQIX/aVXEiSGUUi1e8NHtcv9a+4=; b=Z+fKKCl6OtsPa8UU12lqVmvhsKwfpjB7vcpO8OHGiym1uMCPYuONjgdbh9fDL1VhBvHA8a h0jLHW9byJTMOifaagcH0APOqPcZ4QD4cOm0wpvuolk8dVlB2PTV+Zr3g2AMuxEJd6qUCQ N7ObK7aN1kYp/4c1mlkF3A+DyMihlOTVwiZV3uNMnWGyf2v23ypouc1B7XvgeEt4ENx1Sh NI8kId18xQ6tDlosztttbQbYRbOL/A4G17L2uTNLyR2QbFBQAGIO0ilrwJUpImXvTHmpgy R6WdnSVLiCj7oWbJ0yk8GunQT0v3H12sqs8KCLVAmrJsPBY+o0Ba2ZCuqaH++w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771145936; a=rsa-sha256; cv=none; b=ggvFzfJW8/A1NIAZsWVNGhRACOqNg5vxm2GILqVT133vdtL7KUkFTOJ9QzaLUIEF2zsotf mDliJraGzrRjPPxAP38K1qSA8LQu+LrR9WWD5BZVU1Y75Px912B0x/xXOLTK1ia8ee6J/B Lx8bQyf6/hlA2DwrsWvOGJcJM0lUEMs7km0/VO/OfvfNOhhlIL3k380y2HKMqJl52dRmg7 P1/Un1OUu956fg7/QUmCNS+qR9I1fQNBpbSxQgOB3qH1N1Mw35BDlhQ9cLZnDhJO17PE37 A/mBOLDeGxju55Qfygk0IFRKyG0Ws3bo0m/N2PiUo6cQYFwyaF2/xupewZIa6g== 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=1771145936; 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=wLLpgVYXO+ZsKlb5XQIX/aVXEiSGUUi1e8NHtcv9a+4=; b=pOBo6t470r+wa+JjR9yAKZOh/Z+XP1+dfchDM8XVFspPxHzpXIYwZRnjc2SqKBmS27dvur AJuRCgwg49m2EvjLODFpj3sSCbHUlBvDQG/XLd4u6sHH7X1E/cbT+/eVumZBhE5iAVhPnV NIa8npjZM7pyI9BDE2OEGZe9qzd2X+pnW/xFcxCIB+BljD/V5x+6DV2UtaaqzNY/rc3Aom v+GigL8jbMNnHVYxeeXgwTUGlSXoex0js5b/K46UNhCxLMJXosqGsJS2hTWvNE2iZsH6rN Qc55fz5WNQ41oVJRWBfKG05/A87srWdu0byH2wt7z1gOsQpykPGaxrDQ9j7lSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDKZm1Tc1zmq5 for ; Sun, 15 Feb 2026 08:58:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e184 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Feb 2026 08:58:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 8e65c6674750 - stable/13 - install: Expect EINTR while copying List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8e65c667475049f355fcff19d1f8647eb932a0c7 Auto-Submitted: auto-generated Date: Sun, 15 Feb 2026 08:58:55 +0000 Message-Id: <69918acf.1e184.f7b55c2@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8e65c667475049f355fcff19d1f8647eb932a0c7 commit 8e65c667475049f355fcff19d1f8647eb932a0c7 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-11 16:24:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-15 08:58:47 +0000 install: Expect EINTR while copying Both copy_file_range() and read() / write() in our fallback loop can be interrupted before copying anything at all, in which case it returns -1 and sets errno to EINTR. If that happens, we should retry, not fail. While here, drop the size argument from copy() (we always want to copy the entire file anyway) and add test cases which exercise the metalog and digest functionality. PR: 293028 MFC after: 1 week Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55168 (cherry picked from commit 0fb940fd63dd9b6d6b848421c53b1e9ac8387265) --- usr.bin/xinstall/tests/install_test.sh | 38 ++++++++++++++++++++++++++++++++ usr.bin/xinstall/xinstall.c | 40 +++++++++++++++++----------------- 2 files changed, 58 insertions(+), 20 deletions(-) diff --git a/usr.bin/xinstall/tests/install_test.sh b/usr.bin/xinstall/tests/install_test.sh index b35706521ec3..768440a46a60 100755 --- a/usr.bin/xinstall/tests/install_test.sh +++ b/usr.bin/xinstall/tests/install_test.sh @@ -503,6 +503,42 @@ set_optional_exec_body() atf_check test ! -x testfile } +atf_test_case metalog +metalog_head() { + atf_set "descr" "Test metalog generation" +} +metalog_body() { + atf_check install -M metalog -D dst -m 0755 -d dst + echo ". type=dir mode=0755" >expect + atf_check install -M metalog -D dst -m 0705 -d dst/dir + echo "./dir type=dir mode=0705" >>expect + atf_check -o save:file echo "Hello, world!" + atf_check install -M metalog -D dst -m 0604 file dst/dir + echo "./dir/file type=file mode=0604 size=14" >>expect + atf_check install -M metalog -D dst -lrs dir/file dst/"li nk" + echo "./li\040nk type=link mode=0755 link=dir/file" >>expect + atf_check mtree -f expect -p dst + atf_check -o file:expect cat metalog +} + +atf_test_case digest +digest_head() { + atf_set "descr" "Compute digest while copying" +} +digest_body() { + atf_check mkdir src dst + atf_check -e ignore dd if=/dev/random of=src/file bs=1m count=1 + for alg in md5 rmd160 sha1 sha256 sha512 ; do + rm -f dst/file digest metalog + atf_check -o save:digest $alg -q src/file + atf_check install -M metalog -D dst -h $alg -m 0644 src/file dst + echo -n "./file type=file mode=0644 size=1048576 $alg=" >expect + cat digest >>expect + atf_check cmp src/file dst/file + atf_check -o file:expect cat metalog + done +} + atf_init_test_cases() { atf_add_test_case copy_to_empty atf_add_test_case copy_to_nonexistent @@ -547,4 +583,6 @@ atf_init_test_cases() { atf_add_test_case set_owner_group_mode atf_add_test_case set_owner_group_mode_unpriv atf_add_test_case set_optional_exec + atf_add_test_case metalog + atf_add_test_case digest } diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index efd37150246b..421e00babc00 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -152,7 +152,7 @@ static char *destdir, *digest, *fflags, *metafile, *tags; static int compare(int, const char *, size_t, int, const char *, size_t, char **); -static char *copy(int, const char *, int, const char *, off_t); +static char *copy(int, const char *, int, const char *); static int create_tempfile(const char *, char *, size_t); static char *quiet_mktemp(char *template); static char *digest_file(const char *); @@ -889,7 +889,7 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) } if (!stripped) { digestresult = copy(from_fd, from_name, to_fd, - tempfile, from_sb.st_size); + tempfile); } } } @@ -1187,8 +1187,7 @@ create_tempfile(const char *path, char *temp, size_t tsize) * copy from one file to another */ static char * -copy(int from_fd, const char *from_name, int to_fd, const char *to_name, - off_t size) +copy(int from_fd, const char *from_name, int to_fd, const char *to_name) { static char *buf = NULL; static size_t bufsize; @@ -1218,28 +1217,29 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, if (buf == NULL) err(1, "Not enough memory"); } - while ((nr = read(from_fd, buf, bufsize)) > 0) { - if ((nw = write(to_fd, buf, nr)) != nr) { + for (;;) { + if ((nr = read(from_fd, buf, bufsize)) < 0) { + if (errno == EINTR) + continue; serrno = errno; (void)unlink(to_name); - if (nw >= 0) { - errx(EX_OSERR, - "short write to %s: %jd bytes written, " - "%jd bytes asked to write", - to_name, (uintmax_t)nw, - (uintmax_t)size); - } else { + errno = serrno; + err(EX_OSERR, "%s", from_name); + } + if (nr <= 0) + break; + digest_update(&ctx, buf, nr); + while (nr > 0) { + if ((nw = write(to_fd, buf, nr)) < 0) { + if (errno == EINTR) + continue; + serrno = errno; + (void)unlink(to_name); errno = serrno; err(EX_OSERR, "%s", to_name); } + nr -= nw; } - digest_update(&ctx, buf, nr); - } - if (nr != 0) { - serrno = errno; - (void)unlink(to_name); - errno = serrno; - err(EX_OSERR, "%s", from_name); } if (safecopy && fsync(to_fd) == -1) { serrno = errno;