From patchwork Wed Oct 19 22:14:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 59103 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 08670386075D for ; Wed, 19 Oct 2022 22:18:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08670386075D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666217914; bh=q9GSxT2qGMi3i27OiJ8sTpuhWLNiLw7g/MJN2iDbon4=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=ZUd7WiTgPomomJJMRKeRbjyguIrR5H24A2/4SvzQ7PcVPDDx1SHawiWRqRlhHjMpv c/4NFLhmfH5pFhCSPNi++OrsPBC/ajzwhcUV6396Lpz3NbPDdJzV4+qo4YiLFqK6iG DU1x1E6oainPkq4yPfMTH2Gs16ttS6bNi/owThog= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by sourceware.org (Postfix) with ESMTPS id D9564385828B for ; Wed, 19 Oct 2022 22:14:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D9564385828B Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-13ae8117023so802671fac.9 for ; Wed, 19 Oct 2022 15:14:53 -0700 (PDT) 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q9GSxT2qGMi3i27OiJ8sTpuhWLNiLw7g/MJN2iDbon4=; b=dsVgerGYp7UmRadIRQbd5d4RSNcjSIpJIwHQwoQ8j6bhkdbDdTQqq29UiRKsV6kXLf zMPU5jqXECEQH7p2lG8iJ3+WC73cGcuc975jTk5vmo0VeashhrlXdIj79rqsdip8CXFr J0xDBdLLAFX+nEHtiQikkmCApbxJt1OSXc56PTHv2OCpujDofMw49mu/tdlAmYoZYmBY c87j1nQ/+b4y4bP5c+1U/Yg/77J8Wm9o37+DKqwG3vTn4MumuHKABlKM7BGAM6mRdBAJ Y+dunpiJmHZvprTUeOuC+2VPDczeCznBXWH+X8v8p1vsIvnTP/4M4cDbnwJn178OotNy lmQw== X-Gm-Message-State: ACrzQf2uS3+2BAC2uVOctihYThJD1fFgXqllJRJlwAoZc5C9bNMgtpk8 cT6KM3ew7HbkFw62fpYohZv4CKGZ2WSGfKQt X-Google-Smtp-Source: AMsMyM41mirX8QGt7HoUWVyvQ+jmJ7LRTNH3DMwGccpR5OY4sNKZQVJN93qfJJUCsH0a5FK+ZlP8Hw== X-Received: by 2002:a05:6871:b06:b0:136:c445:82d0 with SMTP id fq6-20020a0568710b0600b00136c44582d0mr22702984oab.146.1666217692707; Wed, 19 Oct 2022 15:14:52 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c3:7d19:f1c1:9fb4:472a:ab68]) by smtp.gmail.com with ESMTPSA id m9-20020aca5809000000b00353fe4fb4casm7137927oib.48.2022.10.19.15.14.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 15:14:52 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 11/30] Linux: consolidate readlink implementation Date: Wed, 19 Oct 2022 19:14:14 -0300 Message-Id: <20221019221433.1082017-12-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> References: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Use readlink syscall if defined, otherwise readlinkat. Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/{generic => }/readlink.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) rename sysdeps/unix/sysv/linux/{generic => }/readlink.c (80%) diff --git a/sysdeps/unix/sysv/linux/generic/readlink.c b/sysdeps/unix/sysv/linux/readlink.c similarity index 80% rename from sysdeps/unix/sysv/linux/generic/readlink.c rename to sysdeps/unix/sysv/linux/readlink.c index 9f25811a35..083dcaf502 100644 --- a/sysdeps/unix/sysv/linux/generic/readlink.c +++ b/sysdeps/unix/sysv/linux/readlink.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2011-2022 Free Software Foundation, Inc. +/* Read value of a symbolic link. Linux version. + Copyright (C) 2011-2022 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,6 +26,10 @@ ssize_t __readlink (const char *path, char *buf, size_t len) { - return INLINE_SYSCALL (readlinkat, 4, AT_FDCWD, path, buf, len); +#ifdef __NR_readlink + return INLINE_SYSCALL_CALL (readlink, path, buf, len); +#else + return INLINE_SYSCALL_CALL (readlinkat, AT_FDCWD, path, buf, len); +#endif } weak_alias (__readlink, readlink)