From patchwork Sat Nov 8 23:09:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 123820 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E094C3858C2C for ; Sat, 8 Nov 2025 23:10:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E094C3858C2C X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 5058C3858D26 for ; Sat, 8 Nov 2025 23:09:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5058C3858D26 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5058C3858D26 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.77.166.138 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1762643391; cv=none; b=EeNZz7TbWSGbx0YBDheMBLgt2zBaINikBAZSo/39QTyJwop4hxRFW1rt2Jmi+sEQImPazalIaZxhhfr8zuNQDpsHpBnneJ99fBLw8Z73dsqpxfJrlLvdeHCyomU1NY0hUw34u3oH2gapw7gVjOc27OWrEl9HXTONg9Z50nyc3LE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1762643391; c=relaxed/simple; bh=Zs71zvJbVxwyoL+6TE88Cl62qtR9xAbIX9gTRCOAAiI=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=xUFqy+ZRREbwbcXyn3TVWIQ7TMaw2WO8DS7NIvienV9w5PhBPrsJDG2DOg4VqmkGiLA9Y6XebO6XUgL+6xxWXcsriaYGEKVqVKQ1yqI+njTWEJiARagQGs6CIwG1Jm8VksyCE6OKwcXUW0HVYE6ZuVX1XQbq6d1MvVX2iY5UgCo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5058C3858D26 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 809BEA0391; Sun, 9 Nov 2025 00:09:50 +0100 (CET) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WECb-cwy7Tz8; Sun, 9 Nov 2025 00:09:50 +0100 (CET) Received: from end (aamiens-653-1-40-48.w83-192.abo.wanadoo.fr [83.192.199.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 647E2A0375; Sun, 9 Nov 2025 00:09:50 +0100 (CET) Received: from samy by end with local (Exim 4.98.2) (envelope-from ) id 1vHs45-000000057Ye-3zaz; Sun, 09 Nov 2025 00:09:49 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd, commited] Revert "hurd: Make rename refuse trailing slashes [BZ #32570]" Date: Sun, 9 Nov 2025 00:09:49 +0100 Message-ID: <20251108230949.1220685-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org This reverts commit 2ae4ec56c2b18c46ef8220bcddac4303a4b6ef1c. This introduced regressions, as rename should accept trailing slashes for directories: BZ #33607, BZ #33608 This was rather fixed on the server side: https://cgit.git.savannah.gnu.org/cgit/hurd/hurd.git/commit/?id=e34000cb395a135dd2ad5c13e6f6d4c5c1006389 --- sysdeps/mach/hurd/renameat2.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/sysdeps/mach/hurd/renameat2.c b/sysdeps/mach/hurd/renameat2.c index 5b09fedf7f..59a4e314fc 100644 --- a/sysdeps/mach/hurd/renameat2.c +++ b/sysdeps/mach/hurd/renameat2.c @@ -37,28 +37,15 @@ __renameat2 (int oldfd, const char *old, int newfd, const char *new, if (flags & RENAME_NOREPLACE) excl = 1; - olddir = __file_name_split_at (oldfd, old, (char **) &oldname); + olddir = __directory_name_split_at (oldfd, old, (char **) &oldname); if (olddir == MACH_PORT_NULL) return -1; - if (!*oldname) - { - /* Trailing slash. */ - __mach_port_deallocate (__mach_task_self (), olddir); - return __hurd_fail (ENOTDIR); - } - newdir = __file_name_split_at (newfd, new, (char **) &newname); + newdir = __directory_name_split_at (newfd, new, (char **) &newname); if (newdir == MACH_PORT_NULL) { - __mach_port_deallocate (__mach_task_self (), olddir); + __mach_port_deallocate (__mach_task_self (), olddir); return -1; } - if (!*newname) - { - /* Trailing slash. */ - __mach_port_deallocate (__mach_task_self (), olddir); - __mach_port_deallocate (__mach_task_self (), newdir); - return __hurd_fail (ENOTDIR); - } err = __dir_rename (olddir, oldname, newdir, newname, excl); __mach_port_deallocate (__mach_task_self (), olddir);