From nobody Thu Sep 18 22:42:50 2025 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 4cSVyg1LkSz6893g; Thu, 18 Sep 2025 22:42:51 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSVyf6s27z3qC4; Thu, 18 Sep 2025 22:42:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758235371; 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=ZeWGZfJMluhc5Vm98w7F91z7UQDhvEhvgbA0cmcYpZA=; b=EmjLy7YAzhSmx74/Yfym6YjzvBEuTuvn7AdPFERuQW4wML4X6GKHvXjgvYeUaEl0DlR5wQ 0wksXT8GSSa0KrEKaVWnz1Rvwzp7gl8Rgo4wlXYZ4IMOKk+r5AR4zy2fv6JgOn7h0HexST eIceN6r/p+oIr7whYeWysgq0YNbQsVQzmN30v6wmPSGL31fx8UWLSnHCQNwUmw31A5R7PA R5Kdm1UPugATtrIRAfWWm2ehYF1EKwr6jocssUHn21KPMnHe03UZX9nGMBEnkc6iZG1As6 ZJUrYKOUtqgatefp89UVlb/BIQ74pjZ/PhIQGQt+PKV3S0vwpoGX3EZysnDbqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758235371; 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=ZeWGZfJMluhc5Vm98w7F91z7UQDhvEhvgbA0cmcYpZA=; b=pVchVRTqkA6vGTajI+ypfUGoJ8sFLK7mcKEpU0QqiVTEU+v9fYoT6/7yCudZbIK5Mgd3Oz gD1ctQrx5o/II5KcH0aPFVhDNq6lu4FTl8hE8lnT5PNil1W/VU2H4sIXCXt4OcankcIbYI BqJtdEbMEhNVEoBdErcN2Z/xi9yQfL2/QVMkwrN57n2p7y8ZEeiHwJk7aC9sOhAWy04bG2 K6GktyFC+aKVBbmeqrXKPyqkzqoPv/5wHO69S1ssY9EEpPgmV5BK5fDNxIx5vdYgdB2nv+ qzVOdPwVzVMbcfe9AxDHesP7f2v6yllycZ2XPpIrPedAR/mQ4IWq+kjrxN7LLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758235371; a=rsa-sha256; cv=none; b=quwKr4AY8ZkEWEhkeBNfio6cxv7ctn94plyDvJVuRtIo+VqZl9KwA9DGWgcn9vF8MPi8PM 8qBbTHsPF7pPEexnVKU+hePnS0O6As421rN9zhwuD31hJ+D1pC7MW1vyb/MAIGb4UV1wPf +zK3d0EN0KolBpj8D75xkrYuM5IOCcnsZIlFqzzyMnlmTQ7UKw4lBrhQeeVNvAt9VKrSAj R8rryNA4jjqpN9urXQnViwOd+Eu7NNIBan0Iuwf4LryxZ6Uu/Ve/GsQhRRN2Xh+7/ECknA u3f843Xkz0dpiNtpw/upkcquV2oamvvc63N3Kxd1bzzfxIG04PXaOIcDbUP4Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cSVyf6M4KzWbm; Thu, 18 Sep 2025 22:42:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58IMgo0q081852; Thu, 18 Sep 2025 22:42:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58IMgoiA081849; Thu, 18 Sep 2025 22:42:50 GMT (envelope-from git) Date: Thu, 18 Sep 2025 22:42:50 GMT Message-Id: <202509182242.58IMgoiA081849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a03d150a3d44 - main - pw: Use copy_file_range() when copying skeleton files 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a03d150a3d44c49344ebd0862defd1a5ad1f524e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a03d150a3d44c49344ebd0862defd1a5ad1f524e commit a03d150a3d44c49344ebd0862defd1a5ad1f524e Author: Mark Johnston AuthorDate: 2025-09-18 22:39:39 +0000 Commit: Mark Johnston CommitDate: 2025-09-18 22:39:39 +0000 pw: Use copy_file_range() when copying skeleton files As a bonus, check for I/O errors and print them to standard error. Reviewed by: bapt, emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D52588 --- usr.sbin/pw/cpdir.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pw/cpdir.c b/usr.sbin/pw/cpdir.c index 63068cab000c..3839a039495a 100644 --- a/usr.sbin/pw/cpdir.c +++ b/usr.sbin/pw/cpdir.c @@ -36,10 +36,10 @@ #include "pw.h" void -copymkdir(int rootfd, char const * dir, int skelfd, mode_t mode, uid_t uid, +copymkdir(int rootfd, char const *dir, int skelfd, mode_t mode, uid_t uid, gid_t gid, int flags) { - char *p, lnk[MAXPATHLEN], copybuf[4096]; + char *p, lnk[MAXPATHLEN]; int len, homefd, srcfd, destfd; ssize_t sz; struct stat st; @@ -120,8 +120,12 @@ copymkdir(int rootfd, char const * dir, int skelfd, mode_t mode, uid_t uid, continue; } - while ((sz = read(srcfd, copybuf, sizeof(copybuf))) > 0) - write(destfd, copybuf, sz); + do { + sz = copy_file_range(srcfd, NULL, destfd, NULL, + SSIZE_MAX, 0); + } while (sz > 0); + if (sz < 0) + warn("copy_file_range"); close(srcfd); /*