From nobody Sat Nov 22 12:12:13 2025 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 4dD9v20GnQz6H0sM for ; Sat, 22 Nov 2025 12:12:14 +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 4dD9v16m0vz3bKZ for ; Sat, 22 Nov 2025 12:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763813534; 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=VJ2yMjxeRCXWLT3xDtFV0+eMxU2gQckhUw6g0DovgDo=; b=YLb5Looec+YQRTsOFOYIKLfFtoJe1Psc65K+N5YsLSvOUeW1KY5txnzb139rIJYWMKgAeY GVuAVLJFuaJbf7YsCqulB2bKAVm6ohqfOsAQwJSm+d6cIaI3dCVLuYz/A1zzSyeikFyfJH sUJeRmPsiRtFwDBuppGAJDL6EsL4fWF6kA0YNAkhgXc9kfWpfkMhctG5d75A3cyrE0bXdj XROHuxARMLwg0BY6MJ9wk6OrPwMu2MxV4XaIIkk0JAetqO+em9lBs9CJ+1wa4Hszp+Qg4F m1V1RMe20ZU/VY0sVCgUieqtDoDrr0zCGj5DJZY6sNbSILT6D9JkGehwVOIYcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763813533; 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=VJ2yMjxeRCXWLT3xDtFV0+eMxU2gQckhUw6g0DovgDo=; b=iA6hRPuVOdMeIojIXCNK6l2S3FkIOzT7BngCjF77NlkKJXREvLyboawDx+EApUW/5krBES Nzg+gWtSPHtvYwlRHnaW4vhZfDbhgeGn3z13kIiVfmCSSh4Cq/gZn/6PK69JizoWOqHKIF 70Ey9r6tAUuqnFkVGUmp0DEKtvI3K3lQA/j9LXm7jm0rzQFYlZicKVfaZMba+gcu/CRf3R 7GUhbKsCxHT2DtB7EMbIlZULlz+g9BijFqugOzcwwP0fi0E2IfT0dEfxsh7+fRa+RWNMYa sZa1XOI6PaKnITgpxeuC/vFKjoxFqEH+Z/Hhs5zt9UxHaIcsILVm5rNOefmndw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763813533; a=rsa-sha256; cv=none; b=oryDZ8q8fD6ExDoPf5M6e7Vlv90p87YQLKr2ArJhFAFAALhavczBQuJSUi4Ag05IQOTIAo LgqZnanzC0YlSaHqE3jtIG1GBwpi+UOxh/jF1UBOyubbh8fYVDNOjW5H3LVy1nE544sZ0z zByXuHaWVFcXGkQudQL+07TjxMqQg79qwrmdIFWS0UMXotwrkRgrCz0KvvrUVFn60fDdS1 dvlaCPf//p+7VqWSK74gV635mGoOihlwGuDFxEuxi1WwMCn+nua+ivWGcPqmJqTCv3po9+ gksd8GVFbZhoacCxrOk0Z27jtAw+9+frDSuIcJKJivJMKWsJF1/Epbaaez1iyg== 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 4dD9v166HTzxX4 for ; Sat, 22 Nov 2025 12:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fc66 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 12:12:13 +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: fe836c50120d - main - cp: Fix copying the root directory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: fe836c50120daed3e4084f43c27d8d650d36dee8 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 12:12:13 +0000 Message-Id: <6921a89d.fc66.7dd6db22@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fe836c50120daed3e4084f43c27d8d650d36dee8 commit fe836c50120daed3e4084f43c27d8d650d36dee8 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-22 12:11:59 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-22 12:11:59 +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. PR: 291132 MFC after: 3 days Fixes: 82fc0d09e862 ("cp: Partly restore symlink folllowing.") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53863 --- 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