From patchwork Mon Dec 12 11:46:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 61778 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 39B243834856 for ; Mon, 12 Dec 2022 11:47:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 39B243834856 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670845645; bh=sKotTV94o2zJe7R8Dd4eYa0Ppk2Mo6/fMT64fDMc9nQ=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=CEW0A5gyhOQO+C1ZvCVau1U4UF53yQaARKa40MzWxqjkZyN1tUZDn9J+FC8lJN5pK lAlpXPOdIOR4ZPI2Avx8bgyLyzhMpGevEz9F5SzDqWtMrhXRc3C9KDquBDiCU4+P3l VuxqdY9j+v6P7YupEr3T/tTKcfxrps1llG8I77E4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by sourceware.org (Postfix) with ESMTPS id 1DB62385842E for ; Mon, 12 Dec 2022 11:47:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1DB62385842E Received: by mail-lf1-x12b.google.com with SMTP id 1so18101384lfz.4 for ; Mon, 12 Dec 2022 03:47:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sKotTV94o2zJe7R8Dd4eYa0Ppk2Mo6/fMT64fDMc9nQ=; b=kVt1alp6Jd3Vz1WOa9CIsPhAjek5D8Tx5ffpLsEjcIaYQ/A+xp4UAvBoUjHuYijInG 00Xkg2tL0JpjGCv0Qw6f5YlvTETt8Qb5AXnmkraIG9ODCEuK79JsFJ0mX5pNpV+j+zlb plBPVORT6vsMh5USnNk3MGV30krYJF4uOWFc3d4Oyt6mMm8UiG1XYEiyiDdpmDQvPsU6 s2ol0Y71EkeS8gny/g3fY+SXGQepAZ/QyDA8nUyZIlIRKFJzh7IGkn08holgDH46NMre rEK7At8JFzd4n1n/cNr1bjWb9h5buTjW2secZKd0Eti36CrH36ZvbhHgeOkYCWCe7bdD MFxg== X-Gm-Message-State: ANoB5pkIHfXFg4vI1YVXcrjpssdz2EyY2ZFxBn4WtMD37kiEfc9KH3pO KrZHtShU+S0yEFn3iaWm2Za6raB0AK1jnA== X-Google-Smtp-Source: AA0mqf7pyvQZSXqAwhZi02/sDImv/XzHXQJVSmrCa+XXkgzJXC2vGfTZ+zdcxGgzc8cyeY9dRlAScA== X-Received: by 2002:a05:6512:3f1d:b0:4a4:68b7:d621 with SMTP id y29-20020a0565123f1d00b004a468b7d621mr5262374lfa.8.1670845619588; Mon, 12 Dec 2022 03:46:59 -0800 (PST) Received: from surface-pro-6.. ([194.190.106.50]) by smtp.gmail.com with ESMTPSA id g42-20020a0565123baa00b00497b198987bsm1606514lfv.26.2022.12.12.03.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 03:46:59 -0800 (PST) To: bug-hurd@gnu.org, libc-alpha@sourceware.org, samuel.thibault@gnu.org Cc: Sergey Bugaev Subject: [RFC PATCH 1/3] hurd: Consolidate file_name_lookup implementation Date: Mon, 12 Dec 2022 14:46:34 +0300 Message-Id: <20221212114636.74222-2-bugaevc@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212114636.74222-1-bugaevc@gmail.com> References: <20221212114636.74222-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Sergey Bugaev via Libc-alpha From: Sergey Bugaev Reply-To: Sergey Bugaev Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Instead of __file_name_lookup_at delegating to __file_name_lookup in simple cases, make __file_name_lookup_at deal with both cases, and have __file_name_lookup simply wrap __file_name_lookup_at. --- hurd/hurdlookup.c | 10 ++-------- hurd/lookup-at.c | 51 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/hurd/hurdlookup.c b/hurd/hurdlookup.c index 7babac7d..08166a2c 100644 --- a/hurd/hurdlookup.c +++ b/hurd/hurdlookup.c @@ -16,6 +16,7 @@ . */ #include +#include #include #include #include @@ -220,14 +221,7 @@ weak_alias (__hurd_directory_name_split, hurd_directory_name_split) file_t __file_name_lookup (const char *file_name, int flags, mode_t mode) { - error_t err; - file_t result; - - err = __hurd_file_name_lookup (&_hurd_ports_use, &__getdport, 0, - file_name, flags, mode & ~_hurd_umask, - &result); - - return err ? (__hurd_fail (err), MACH_PORT_NULL) : result; + return __file_name_lookup_at (AT_FDCWD, 0, file_name, flags, mode); } weak_alias (__file_name_lookup, file_name_lookup) diff --git a/hurd/lookup-at.c b/hurd/lookup-at.c index 0c247a64..2b84dfd6 100644 --- a/hurd/lookup-at.c +++ b/hurd/lookup-at.c @@ -36,9 +36,6 @@ __file_name_lookup_at (int fd, int at_flags, if (err) return (__hurd_fail (err), MACH_PORT_NULL); - if (fd == AT_FDCWD || file_name[0] == '/') - return __file_name_lookup (file_name, flags, mode); - if (empty != 0 && file_name[0] == '\0') { enum retry_type doretry; @@ -56,22 +53,44 @@ __file_name_lookup_at (int fd, int at_flags, return err ? (__hurd_dfail (fd, err), MACH_PORT_NULL) : result; } - file_t startdir; - error_t use_init_port (int which, error_t (*operate) (mach_port_t)) + if (fd == AT_FDCWD || file_name[0] == '/') { - return (which == INIT_PORT_CWDIR ? (*operate) (startdir) - : _hurd_ports_use (which, operate)); + err = __hurd_file_name_lookup (&_hurd_ports_use, &__getdport, 0, + file_name, flags, mode & ~_hurd_umask, + &result); + if (err) + { + __hurd_fail (err); + return MACH_PORT_NULL; + } + } + else + { + file_t startdir; + /* We need to look the file up relative to the given directory (and + not our cwd). For this to work, we supply our own wrapper for + _hurd_ports_use, which replaces cwd with our startdir. */ + error_t use_init_port (int which, error_t (*operate) (mach_port_t)) + { + return (which == INIT_PORT_CWDIR ? (*operate) (startdir) + : _hurd_ports_use (which, operate)); + } + + err = HURD_DPORT_USE (fd, (startdir = port, + __hurd_file_name_lookup (&use_init_port, + &__getdport, NULL, + file_name, + flags, + mode & ~_hurd_umask, + &result))); + if (err) + { + __hurd_dfail (fd, err); + return MACH_PORT_NULL; + } } - err = HURD_DPORT_USE (fd, (startdir = port, - __hurd_file_name_lookup (&use_init_port, - &__getdport, NULL, - file_name, - flags, - mode & ~_hurd_umask, - &result))); - - return err ? (__hurd_dfail (fd, err), MACH_PORT_NULL) : result; + return result; } file_t