From nobody Thu Feb 08 19:26:25 2024 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 4TW6RP2lMmz5BFYv; Thu, 8 Feb 2024 19:26:25 +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 4TW6RP1xfCz4pFW; Thu, 8 Feb 2024 19:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707420385; 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=ZC8iXCRzMw2VAbFymuMjRtIMnWImaKZbyg7Jr+uPIig=; b=pCaKMJddkZqvF3vx1EqhQJUyoHcNU3k9OGir6XJeeqNl1UCUtjAzdz6cE96uvNDkL3BjKJ 2wufnaWtx11CwBjfprkRru/dvFVAhI8TKTclFpX8gVlr6iJUqNhHs0o+L0WYerqa7clyMU /jLBgSyFNStY22BzFiSO8AiRjsQBXBDEtg7W3k1nThrc7mEacZik4H9iM/+3H/yl/ZnuAe 1c4v1Hvl5PyVXNu1375N325s83DH9xycy3qQjK8Wn3nFOa+ZhkguAyNmEMqBerAigzYaOd FT+gi43bClyx7EiNGHFRwO9ttDa6ZhEcqg4EPttnOJ9jr4a3U7WjtCj+EAUqTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707420385; 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=ZC8iXCRzMw2VAbFymuMjRtIMnWImaKZbyg7Jr+uPIig=; b=xalcLOFhN1fk6zJFWETvkTyyCdlEXvGCNcR8fwCN2cyU0dq3dpHdKT6MIxRtIup06F8EQq zfKN6NFY1s6pUafZfNaFgmhSNQi5SlV5SrF0XgvvriW43mWchfvi1ZP25A/xeq0Dddep2M DlYwg1FFRYtnaPNnH03piB3oKKDiWxcuCZS/4D+kcSRJckTK3u58GpX+GP9ElN5LgkbCey 146EupnDEDV3KriseSDuisxDZUvyCZOSMhE1R+QGDXT10VRjzLYtPkNkvRCCDC8gtHgnI/ ZPBLDMu3V3J0uelzFnh9vjHXwDMMQ+jk8XWsgGlc5/TgZ+G+nsfoKAqdAJRTJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707420385; a=rsa-sha256; cv=none; b=gnrErb5DsZgiLL4Bk0zSawFhnn93ldTEjltId48529K4ntZtUI2yuaE+n/2uzcntAh9c63 Y/f/zwmRlSStUPFayukS/FMUpwLJ+gmUFbI58KiFcT52J66MxacKRICZSImP5hFgwH6fsq /db20EdNDGPM30zb5F0TvfActEImk1a/ZNKWrSTKQ9XQwFWctozjRJVZa7squBLVE9GG/X DHC20QQ2/srzTgaURxOdMPZ5N+QKuzkiYR74Ab7fWC4oFyu6Z5ZvOfyC0kB8Sz/WzC+KtH pi+UOFtx3J7UNXZedjzIoCLFvra+pD1LsBgpAbsL2clNGSIM2A/5C3PbSRdDYg== 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 4TW6RP11pwz12Y7; Thu, 8 Feb 2024 19:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 418JQPOO009012; Thu, 8 Feb 2024 19:26:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 418JQPSa009009; Thu, 8 Feb 2024 19:26:25 GMT (envelope-from git) Date: Thu, 8 Feb 2024 19:26:25 GMT Message-Id: <202402081926.418JQPSa009009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 7d91a95f825a - stable/14 - Merge commit 4a39d0890894 from llvm-project (by Mark Johnston): 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: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7d91a95f825ae79245be5c16acecae254c51d142 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7d91a95f825ae79245be5c16acecae254c51d142 commit 7d91a95f825ae79245be5c16acecae254c51d142 Author: Dimitry Andric AuthorDate: 2024-01-29 17:26:48 +0000 Commit: Dimitry Andric CommitDate: 2024-02-08 19:25:52 +0000 Merge commit 4a39d0890894 from llvm-project (by Mark Johnston): [libc++] Fix filesystem::remove_all() on FreeBSD (#79540) remove_all_impl() opens the target path with O_NOFOLLOW, which fails if the target is a symbolic link. On FreeBSD, rather than returning ELOOP, openat() returns EMLINK. This is unlikely to change for compatibility reasons, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=214633 . Thus, check for EMLINK as well. Reported by: markj PR: 276632 MFC after: 3 days (cherry picked from commit ee14a9725d73150e89367550206803fe36ae3089) --- contrib/llvm-project/libcxx/src/filesystem/operations.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/libcxx/src/filesystem/operations.cpp b/contrib/llvm-project/libcxx/src/filesystem/operations.cpp index 63a119aa983e..1877bcd79f4d 100644 --- a/contrib/llvm-project/libcxx/src/filesystem/operations.cpp +++ b/contrib/llvm-project/libcxx/src/filesystem/operations.cpp @@ -823,8 +823,9 @@ uintmax_t remove_all_impl(int parent_directory, const path& p, error_code& ec) { // If opening `p` failed because it wasn't a directory, remove it as // a normal file instead. Note that `openat()` can return either ENOTDIR - // or ELOOP depending on the exact reason of the failure. - if (ec == errc::not_a_directory || ec == errc::too_many_symbolic_link_levels) { + // or ELOOP depending on the exact reason of the failure. On FreeBSD it + // may return EMLINK instead of ELOOP, contradicting POSIX. + if (ec == errc::not_a_directory || ec == errc::too_many_symbolic_link_levels || ec == errc::too_many_links) { ec.clear(); if (::unlinkat(parent_directory, p.c_str(), /* flags = */0) == -1) { ec = detail::capture_errno();