From nobody Sun Nov 23 16:39:10 2025 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 4dDvmb0jLGz6HGdF for ; Sun, 23 Nov 2025 16:39:11 +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 4dDvmZ2bXxz45VB for ; Sun, 23 Nov 2025 16:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fr5zcHLSVWt5pazdDLpn01ENu/syFBcsUhX1TmNdCrc=; b=sP9cHiD/PCX828A5JHLYITtSCswgCkXc51AlT2zOHqnkdQuzVSUpbu/lG9gxGi6groyozn YqTGrSHfZLc20cDNuVzeLSApEZcINk6f9aLGYmKblcBCTtQLQjT4p4pR13A426SPdyW7BT PZhqqNqJJDTXZ2ZlLhkYir93JQfxR4fOuCUizqdBurIzBUo9XLzizyH5JW6WXfKfHJw0Xf z8eFC4nktT5U6yqOQeRA1N6KFVWg3iVX6AvV21fmtrEdgnyf7mpZrgijqeam04Uh1YrUZt yL2ZqS46UErtOiNiTzkYkSwXiGgNqrOOmq9r8CSVK5QxwS3I98YHnM37P6IZEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fr5zcHLSVWt5pazdDLpn01ENu/syFBcsUhX1TmNdCrc=; b=NVE1as0xHRKpZvRUuV5XjWYXWCXFlqIl1OQ/FvWXH01lT09cHH+t0i7AfPXB3/WikqR3iV ywxXyB+0gVYcKs6jx9lT6fdPCrH9ixw6yBLgu23u/ac41cVXDKdzgYpeTSMfiC6dVw1pGr fdB1MRSb2meZjc/03wY4LOHxt5N+vTtSfPn76WsDtG52auCDSIoaQzL0v+NjmltyE4SqHl 4tgrGYYTr9SUh4hOw8AY/2pnxgvDTZAGdJDGjo3rg65StwKmLtuA6VfKwH39GBNFgSSZX3 rFSz/ZPBZlFKAJayBcEhppNyRmB2Ybx8OqW97c2B6cEGRBe3hJI1zfXAtXRAEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763915950; a=rsa-sha256; cv=none; b=NVIv9q6NW11+suvQnWJbxNlOvYxA3zThIT3Lyqsh72+amiqZPC5UHMxJdmmRWVXg52nV4G NmqJgkAaFfiB901x7M45LOy9KKl8YkC6b+PJDNq/uWCinXaZ+fFNTASV+SQsF8gMC3gtz4 Plv2Fy8mPIpHlq+JM1SjG7V+OXBNnkW5DmzkZJUatadBBnTeN6JGzmV3TBmtAtPHMJjQUL DnrYAWhLblIWI7s57xX8E9D5/1FMBS2KDwYiPvZUAvrmXC6QN0XG8FLb40N8sYvtGgnYFA /bVpYk7fESvWSvewcjXB+KMz7/4pP/NtNzljowpIRWhhS5hMWcTFrvkz/xNHDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmZ1m3szcvY for ; Sun, 23 Nov 2025 16:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36fa8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 16:39:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: 54808d50412a - releng/15.0 - cp: Fix copying the root directory 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 54808d50412aee31692f0041b4f78ddaf43bac8f Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 16:39:10 +0000 Message-Id: <692338ae.36fa8.2b5de0db@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=54808d50412aee31692f0041b4f78ddaf43bac8f commit 54808d50412aee31692f0041b4f78ddaf43bac8f Author: Dag-Erling Smørgrav AuthorDate: 2025-11-22 12:11:59 +0000 Commit: Colin Percival CommitDate: 2025-11-23 16:38:48 +0000 cp: Fix copying the root directory When the source of the copy operation is the root directory, we should neither append it to the destination path on FTS_D nor trim it back off on FTS_DP. Approved by: re (cperciva) PR: 291132 MFC after: 3 days Fixes: 82fc0d09e862 ("cp: Partly restore symlink folllowing.") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53863 (cherry picked from commit fe836c50120daed3e4084f43c27d8d650d36dee8) (cherry picked from commit c4843e5805dec10ee552d21f19c8da7707c1fcbc) --- bin/cp/cp.c | 7 ++++++- bin/cp/tests/cp_test.sh | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 38fe65399d06..7ac1e5f6a4c4 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -433,6 +433,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) sep = strchr(to.base, '\0'); sep[0] = '/'; sep[1] = '\0'; + } else if (strcmp(curr->fts_name, "/") == 0) { + /* special case when source is the root directory */ } else { /* entering a directory; append its name to to.path */ len = snprintf(to.end, END(to.path) - to.end, "%s%s", @@ -520,6 +522,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) if (type == DIR_TO_DNE && curr->fts_level == FTS_ROOTLEVEL) { /* this is actually our created root */ + } else if (strcmp(curr->fts_name, "/") == 0) { + /* special case when source is the root directory */ } else { while (to.end > to.path && *to.end != '/') to.end--; @@ -551,7 +555,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) /* Not an error but need to remember it happened. */ if (to.path[0] == '\0') { /* - * This can happen in two cases: + * This can happen in three cases: + * - The source path is the root directory. * - DIR_TO_DNE; we created the directory and * populated root_stat earlier. * - FILE_TO_DIR if a source has a trailing slash; diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index b637f862b7d3..af309ca7ea80 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -747,9 +747,23 @@ dstmode_body() atf_check cmp dir/file dst/file } +atf_test_case root +root_head() +{ + atf_set "descr" "Test copying the root directory" +} +root_body() +{ + atf_check mkdir dst + atf_check -s exit:1 \ + -e inline:"cp: / is a directory (not copied).\n" \ + cp / dst +} + atf_test_case to_root cleanup to_root_head() { + atf_set "descr" "Test copying to the root directory" atf_set "require.user" "unprivileged" } to_root_body() @@ -893,6 +907,7 @@ atf_init_test_cases() atf_add_test_case to_deaddirlink atf_add_test_case to_link_outside atf_add_test_case dstmode + atf_add_test_case root atf_add_test_case to_root atf_add_test_case dirloop atf_add_test_case unrdir