From nobody Mon Apr 25 00:03:19 2022
X-Original-To: dev-commits-src-all@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 2E0C41A80217;
	Mon, 25 Apr 2022 00:03:20 +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 "R3" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4KmlbD0qvqz3jZp;
	Mon, 25 Apr 2022 00:03:20 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1650845000;
	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=FsJAb8FYYfP6dg+zZdlVHS6ol2zqW0PC1NSRlias+Ew=;
	b=vUjNxhiZaFxzYPryWbINKXISZ9iveaHbfpGV2FQC9zlWW0VsCvue97i91OQOpLZMVcz68S
	T1QAjTwh3qfcURUPy/IIGI+V82Dq+yeTktSBdkvWMS14BTt4PawXKfX/fENlTpSDGJj27Y
	QjlG2IshO7Jmp8bpfCkx5Igp9YSb4b/OnILNAj93xv705AKgwKkTGPs70anxVl11rzzBIs
	pN9C1SvY/J6L9sz/tfZ055Sz7IBFRn1klprdIJQg0fiN0cgl6SlZc4qT9A6RTp58znZUfy
	8t7l3uMwi0k9EMn20ioF+2ufW/0fBGq+aoPihkTR2k7oCVQSNR2zseTbZeIWZQ==
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 F086A10446;
	Mon, 25 Apr 2022 00:03:19 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23P03JiL073551;
	Mon, 25 Apr 2022 00:03:19 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23P03Jwj073550;
	Mon, 25 Apr 2022 00:03:19 GMT
	(envelope-from git)
Date: Mon, 25 Apr 2022 00:03:19 GMT
Message-Id: <202204250003.23P03Jwj073550@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-branches@FreeBSD.org
From: Kyle Evans <kevans@FreeBSD.org>
Subject: git: 1d9f60b05128 - stable/12 - cp: fix -R with links
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-all@freebsd.org
X-BeenThere: dev-commits-src-all@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kevans
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 1d9f60b0512802806d3dea3c5fcc6a0d8780259f
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1650845000;
	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=FsJAb8FYYfP6dg+zZdlVHS6ol2zqW0PC1NSRlias+Ew=;
	b=vo32VRrVYpsNJnEao24fre3oVOyFRzVf0WX/6saC7FcFggiaCDtGG0smd5pB6QMKnNeIu2
	DPxVMFkEwHeLSw65hCGDwMfJ+p748rnLaaBLtBAJm742daNgwyCMfethDy1hfM0rJtARZk
	TWeY1YpWUCBbRTckvQmeasS6zvaSRSZvCL9gYNozSYEFq2SqVNfvEwnUIGgnjZ2/UebESC
	cCCuLAa4AW5SZuWAjurCnQoxpjBclSQxi0ajjdwtxVlARLWzJNk4bYkqJN0YHlWX60QT4w
	44+xV9mHvQsQI7renXSxFA5M7OCTUixkW9OLnqBVp9gBUrwaKCwSWyGXTH7f6w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650845000; a=rsa-sha256; cv=none;
	b=FZvTe01MObXaS9V29fLYJm+idWgV1Z7ciN6IZdMRLQmXOf9GRpcf191QrTI6b/YbkDGBae
	QtBZKRj9my2EyT55RDUyTH12ysrBgXUPmU+kzQeSMK6HHGeKo9hPrC2FYaqkYYtkw4tvTe
	Gy5asLsyYOBjn1mvsSPqjbwNnC2PSSIg/rZrFR+xfM7TL9PUDBM2zMbh7EpJ9kIjsov4ib
	yIIo8alxv5AFjuQkOd3RW74Cxpjvr+Y2W0auw5XmokZJrX/qg7t+UUmGcKe/ZHSKFqZq9F
	Ygj1vSaDt8QpwEYUDNMgqAgN1ooo9Off3utsOZeaTSHFyah7HZet/1mzY/v5TA==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
X-ThisMailContainsUnwantedMimeParts: N

The branch stable/12 has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=1d9f60b0512802806d3dea3c5fcc6a0d8780259f

commit 1d9f60b0512802806d3dea3c5fcc6a0d8780259f
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2022-01-27 18:02:17 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2022-04-25 00:02:16 +0000

    cp: fix -R with links
    
    The traversal was previously not properly honoring -H/-L/-P.  Notably,
    we should not have been resolving symlinks encountered during traversal
    when either -H or -P are specified.
    
    Sponsored by:   Klara, Inc.
    Reviewed by:    bapt
    
    (cherry picked from commit 33ad990ce974be50abdc25427b0f365699d83a34)
---
 bin/cp/cp.c             | 23 ++++++++++++++----
 bin/cp/tests/cp_test.sh | 64 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index e1ba95562ebb..2c4e2bd7bd3c 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -87,7 +87,7 @@ static char emptystring[] = "";
 PATH_T to = { to.p_path, emptystring, "" };
 
 int fflag, iflag, lflag, nflag, pflag, sflag, vflag;
-static int Rflag, rflag;
+static int Hflag, Lflag, Rflag, rflag;
 volatile sig_atomic_t info;
 
 enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE };
@@ -100,11 +100,10 @@ main(int argc, char *argv[])
 {
 	struct stat to_stat, tmp_stat;
 	enum op type;
-	int Hflag, Lflag, ch, fts_options, r, have_trailing_slash;
+	int ch, fts_options, r, have_trailing_slash;
 	char *target;
 
 	fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
-	Hflag = Lflag = 0;
 	while ((ch = getopt(argc, argv, "HLPRafilnprsvx")) != -1)
 		switch (ch) {
 		case 'H':
@@ -271,6 +270,22 @@ main(int argc, char *argv[])
 	    &to_stat)));
 }
 
+/* Does the right thing based on -R + -H/-L/-P */
+static int
+copy_stat(const char *path, struct stat *sb)
+{
+
+	/*
+	 * For -R -H/-P, we need to lstat() instead; copy() cares about the link
+	 * itself rather than the target if we're not following links during the
+	 * traversal.
+	 */
+	if (!Rflag || Lflag)
+		return (stat(path, sb));
+	return (lstat(path, sb));
+}
+
+
 static int
 copy(char *argv[], enum op type, int fts_options, struct stat *root_stat)
 {
@@ -448,7 +463,7 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat)
 		}
 
 		/* Not an error but need to remember it happened. */
-		if (stat(to.p_path, &to_stat) == -1)
+		if (copy_stat(to.p_path, &to_stat) == -1)
 			dne = 1;
 		else {
 			if (to_stat.st_dev == curr->fts_statp->st_dev &&
diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh
index bb1a8cce170a..a9eb65f463d8 100755
--- a/bin/cp/tests/cp_test.sh
+++ b/bin/cp/tests/cp_test.sh
@@ -43,6 +43,21 @@ basic_body()
 	check_size baz 4
 }
 
+atf_test_case basic_symlink
+basic_symlink_body()
+{
+	echo "foo" > bar
+	ln -s bar baz
+
+	atf_check cp baz foo
+	atf_check test '!' -L foo
+
+	atf_check -e inline:"cp: baz and baz are identical (not copied).\n" \
+	    -s exit:1 cp baz baz
+	atf_check -e inline:"cp: bar and baz are identical (not copied).\n" \
+	    -s exit:1 cp baz bar
+}
+
 atf_test_case chrdev
 chrdev_body()
 {
@@ -139,12 +154,61 @@ matching_srctgt_nonexistent_body()
 	atf_check -e not-empty -s not-exit:0 stat foo/dne/foo
 }
 
+recursive_link_setup()
+{
+	extra_cpflag=$1
+
+	mkdir -p foo/bar
+	ln -s bar foo/baz
+
+	mkdir foo-mirror
+	eval "cp -R $extra_cpflag foo foo-mirror"
+}
+
+atf_test_case recursive_link_dflt
+recursive_link_dflt_body()
+{
+	recursive_link_setup
+
+	# -P is the default, so this should work and preserve the link.
+	atf_check cp -R foo foo-mirror
+	atf_check test -L foo-mirror/foo/baz
+}
+
+atf_test_case recursive_link_Hflag
+recursive_link_Hflag_body()
+{
+	recursive_link_setup
+
+	# -H will not follow either, so this should also work and preserve the
+	# link.
+	atf_check cp -RH foo foo-mirror
+	atf_check test -L foo-mirror/foo/baz
+}
+
+atf_test_case recursive_link_Lflag
+recursive_link_Lflag_body()
+{
+	recursive_link_setup -L
+
+	# -L will work, but foo/baz ends up expanded to a directory.
+	atf_check test -d foo-mirror/foo/baz -a \
+	    '(' ! -L foo-mirror/foo/baz ')'
+	atf_check cp -RL foo foo-mirror
+	atf_check test -d foo-mirror/foo/baz -a \
+	    '(' ! -L foo-mirror/foo/baz ')'
+}
+
 atf_init_test_cases()
 {
 	atf_add_test_case basic
+	atf_add_test_case basic_symlink
 	atf_add_test_case chrdev
 	atf_add_test_case matching_srctgt
 	atf_add_test_case matching_srctgt_contained
 	atf_add_test_case matching_srctgt_link
 	atf_add_test_case matching_srctgt_nonexistent
+	atf_add_test_case recursive_link_dflt
+	atf_add_test_case recursive_link_Hflag
+	atf_add_test_case recursive_link_Lflag
 }