From patchwork Wed Aug 26 21:02:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40330 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 7610C386F801; Wed, 26 Aug 2020 21:03:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7610C386F801 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1598475785; bh=IQLaX+PjR8BSKrBNkXbLcf+2igwUoV4zs3V0f8l2aGU=; 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=lPyB+CZs+CELOv17bQd9O+lrv7MJ7XjMejI1b1/jSngbOrHlkY/0TCmnjEcJBRkOG SOyzuRDL95N8ubbrQa/gSoQ+AcqefwICkqGW+V7gJKQAotMQUfJiqAt1Yp9o3Sr8oi Vg3D1W+7xcna4kelsnaglnyu3R5Xdbk57YN7qgzs= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) by sourceware.org (Postfix) with ESMTPS id 50E4C3842433 for ; Wed, 26 Aug 2020 21:03:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 50E4C3842433 Received: by mail-qk1-x743.google.com with SMTP id d139so3696369qke.11 for ; Wed, 26 Aug 2020 14:03:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IQLaX+PjR8BSKrBNkXbLcf+2igwUoV4zs3V0f8l2aGU=; b=VFCOY7GMPft8eZz1tOynE0pm0WXdl05WU4YyK4uSVAyGp5lZ79+2j/prYN/FgiE+dq wQ5NWpqobqFFhRT1n467VnXMjl4vuybWlCaYAcL6K4uhiEw64iwjOFKx/qK08P0vFNGa g118PqHkWtKj5koz9A8yihDdIQraAS3iYRtGvWHwKHCoh3Gdl+0VTwW+eCirbggGVhOv ZlQZ3vhfA5/eU/njeW0qsvjTXQfStexcjqfEg5yQv2op6dHUSU+/BAQIIC3mbq35RGzv aHvGwg6LWpdhhS9FnQljQcug7PAvd6fNEay3oGWLSsLWW2MDUQwCPWXTAquAuXRRoc6L 1pXA== X-Gm-Message-State: AOAM530ogMaTkzTeYe8Edg/VbcH4m/jmHm42HJ0EJ3Ho8Ly6blvX9URi qRsYx1VIrsSddEN7vgB9NHPWP0CY2rhwF9Pf X-Google-Smtp-Source: ABdhPJzYTBjFMG7Tn8KBD1zZYqOokjdiJ6vfxZryBZUJYbxErLnzk3VhLrnpgHY+696tNo1rvDmkWQ== X-Received: by 2002:a37:9b12:: with SMTP id d18mr5383457qke.475.1598475775349; Wed, 26 Aug 2020 14:02:55 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id k5sm153837qtu.2.2020.08.26.14.02.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 14:02:54 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 4/4] io: Reorganize the getcwd implementation Date: Wed, 26 Aug 2020 18:02:46 -0300 Message-Id: <20200826210246.2830973-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200826210246.2830973-1-adhemerval.zanella@linaro.org> References: <20200826210246.2830973-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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 Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The generic implementation uses two internal symbols: __getcwd_system (which might be overriden by the system) and __getcwd_generic (the generic implementation shared with gnulib). The Linux implementation is moved to __getcwd_system and generic POSIX implementation is moved to __getcwd_generic. This change aims to make the code sync with gnulib easier and simplify the Linux override implementation. The dl-fxstatat64 is not required anymore and adding it explicit issue a duplicate symbol in libc.so linking. Hurd still overrides the getcwd altogether and one possibility would to be move its implementation to __getcwd_system and reimplement the __getcwd_generic to be a empty one. Checked on x86_64-linux-gnu and i686-linux-gnu. --- include/unistd.h | 2 + io/Makefile | 2 +- sysdeps/posix/getcwd.c => io/getcwd-generic.c | 7 +-- io/getcwd-system.c | 28 +++++++++ io/getcwd.c | 9 ++- sysdeps/unix/sysv/linux/Makefile | 3 +- sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c | 1 - sysdeps/unix/sysv/linux/dl-fxstatat64.c | 1 - sysdeps/unix/sysv/linux/dl-getcwd.c | 1 - .../sysv/linux/{getcwd.c => getcwd-system.c} | 58 +------------------ .../sysv/linux/sparc/sparc64/dl-fxstatat64.c | 1 - .../sysv/linux/wordsize-64/dl-fxstatat64.c | 1 - 12 files changed, 40 insertions(+), 74 deletions(-) rename sysdeps/posix/getcwd.c => io/getcwd-generic.c (99%) create mode 100644 io/getcwd-system.c delete mode 100644 sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c delete mode 100644 sysdeps/unix/sysv/linux/dl-fxstatat64.c delete mode 100644 sysdeps/unix/sysv/linux/dl-getcwd.c rename sysdeps/unix/sysv/linux/{getcwd.c => getcwd-system.c} (53%) delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c diff --git a/include/unistd.h b/include/unistd.h index f48da2c7a3..792cfdff0b 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -76,6 +76,8 @@ extern int __lchown (const char *__file, __uid_t __owner, __gid_t __group); extern int __chdir (const char *__path) attribute_hidden; extern int __fchdir (int __fd) attribute_hidden; +extern char *__getcwd_generic (char *__buf, size_t __size) attribute_hidden; +extern char *__getcwd_system (char *__buf, size_t __size) attribute_hidden; extern char *__getcwd (char *__buf, size_t __size); libc_hidden_proto (__getcwd) extern int __rmdir (const char *__path) attribute_hidden; diff --git a/io/Makefile b/io/Makefile index cf380f3516..26dfe047c0 100644 --- a/io/Makefile +++ b/io/Makefile @@ -46,7 +46,7 @@ routines := \ close dup dup2 dup3 pipe pipe2 \ creat creat64 \ chdir fchdir \ - getcwd getwd getdirname \ + getcwd getwd getcwd-system getcwd-generic getdirname \ chown fchown lchown fchownat \ ttyname ttyname_r isatty \ link linkat symlink symlinkat readlink readlinkat \ diff --git a/sysdeps/posix/getcwd.c b/io/getcwd-generic.c similarity index 99% rename from sysdeps/posix/getcwd.c rename to io/getcwd-generic.c index 1e6fc9b845..e259ce14da 100644 --- a/sysdeps/posix/getcwd.c +++ b/io/getcwd-generic.c @@ -154,7 +154,7 @@ getcwd_nothrow (char *buf, size_t size) bytes long, unless SIZE == 0, in which case it is as big as necessary. */ char * -__getcwd (char *buf, size_t size) +__getcwd_generic (char *buf, size_t size) { /* Lengths of big file name components and entire file names, and a deep level of file name nesting. These numbers are not upper @@ -486,8 +486,3 @@ __getcwd (char *buf, size_t size) } return NULL; } - -#if defined _LIBC && !defined __getcwd -libc_hidden_def (__getcwd) -weak_alias (__getcwd, getcwd) -#endif diff --git a/io/getcwd-system.c b/io/getcwd-system.c new file mode 100644 index 0000000000..4390479aa2 --- /dev/null +++ b/io/getcwd-system.c @@ -0,0 +1,28 @@ +/* Architectur specific getcwd implementation. Generic implementation. + Copyright (C) 2020 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +/* This function is called by the generic 'getcwd' implementation to allow + a system to implement if the it provides a faster or simpler way to obtain + the current direction (e.g. through a syscall). */ +char * +__getcwd_system (char *buf, size_t size) +{ + return NULL; +} diff --git a/io/getcwd.c b/io/getcwd.c index 0fabd98131..cf7a8e1a30 100644 --- a/io/getcwd.c +++ b/io/getcwd.c @@ -29,11 +29,10 @@ char * __getcwd (char *buf, size_t size) { - __set_errno (ENOSYS); - return NULL; + char *r = __getcwd_system (buf, size); + if (r == NULL) + r = __getcwd_generic (buf, size); + return r; } libc_hidden_def (__getcwd) weak_alias (__getcwd, getcwd) - -stub_warning (__getcwd) -stub_warning (getcwd) diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 9b2a253032..465ffe7104 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -280,8 +280,7 @@ tests += tst-fallocate tst-fallocate64 tst-o_path-locks endif ifeq ($(subdir),elf) -sysdep-rtld-routines += dl-brk dl-sbrk dl-getcwd dl-openat64 dl-opendir \ - dl-fxstatat64 +sysdep-rtld-routines += dl-brk dl-sbrk dl-openat64 dl-opendir libof-lddlibc4 = lddlibc4 diff --git a/sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c b/sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c deleted file mode 100644 index 330b33f7c7..0000000000 --- a/sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c +++ /dev/null @@ -1 +0,0 @@ -#include "fxstatat.c" diff --git a/sysdeps/unix/sysv/linux/dl-fxstatat64.c b/sysdeps/unix/sysv/linux/dl-fxstatat64.c deleted file mode 100644 index d229d0ea0f..0000000000 --- a/sysdeps/unix/sysv/linux/dl-fxstatat64.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/dl-getcwd.c b/sysdeps/unix/sysv/linux/dl-getcwd.c deleted file mode 100644 index 4bd5657f1e..0000000000 --- a/sysdeps/unix/sysv/linux/dl-getcwd.c +++ /dev/null @@ -1 +0,0 @@ -#include "getcwd.c" diff --git a/sysdeps/unix/sysv/linux/getcwd.c b/sysdeps/unix/sysv/linux/getcwd-system.c similarity index 53% rename from sysdeps/unix/sysv/linux/getcwd.c rename to sysdeps/unix/sysv/linux/getcwd-system.c index fabc4bb8cc..a7e8535b72 100644 --- a/sysdeps/unix/sysv/linux/getcwd.c +++ b/sysdeps/unix/sysv/linux/getcwd-system.c @@ -17,16 +17,8 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include -#include #include -#include - #include -#include - /* If we compile the file for use in ld.so we don't need the feature that getcwd() allocates the buffers itself. */ @@ -34,19 +26,10 @@ # define NO_ALLOCATION 1 #endif - -/* The "proc" filesystem provides an easy method to retrieve the value. - For each process, the corresponding directory contains a symbolic link - named `cwd'. Reading the content of this link immediate gives us the - information. But we have to take care for systems which do not have - the proc filesystem mounted. Use the POSIX implementation in this case. */ -static char *generic_getcwd (char *buf, size_t size); - char * -__getcwd (char *buf, size_t size) +__getcwd_system (char *buf, size_t size) { char *path; - char *result; #ifndef NO_ALLOCATION size_t alloc_size = size; @@ -58,7 +41,7 @@ __getcwd (char *buf, size_t size) return NULL; } - alloc_size = MAX (PATH_MAX, __getpagesize ()); + alloc_size = PATH_MAX; } if (buf == NULL) @@ -75,7 +58,7 @@ __getcwd (char *buf, size_t size) int retval; - retval = INLINE_SYSCALL (getcwd, 2, path, alloc_size); + retval = INLINE_SYSCALL_CALL (getcwd, path, alloc_size); if (retval > 0 && path[0] == '/') { #ifndef NO_ALLOCATION @@ -92,34 +75,6 @@ __getcwd (char *buf, size_t size) return buf; } - /* The system call either cannot handle paths longer than a page - or can succeed without returning an absolute path. Just use the - generic implementation right away. */ - if (retval >= 0 || errno == ENAMETOOLONG) - { -#ifndef NO_ALLOCATION - if (buf == NULL && size == 0) - { - free (path); - path = NULL; - } -#endif - - result = generic_getcwd (path, size); - -#ifndef NO_ALLOCATION - if (result == NULL && buf == NULL && size != 0) - free (path); -#endif - - return result; - } - - /* It should never happen that the `getcwd' syscall failed because - the buffer is too small if we allocated the buffer ourselves - large enough. */ - assert (errno != ERANGE || buf != NULL || size != 0); - #ifndef NO_ALLOCATION if (buf == NULL) free (path); @@ -127,10 +82,3 @@ __getcwd (char *buf, size_t size) return NULL; } -libc_hidden_def (__getcwd) -weak_alias (__getcwd, getcwd) - -/* Get the code for the generic version. */ -#define GETCWD_RETURN_TYPE static char * -#define __getcwd generic_getcwd -#include diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c b/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c deleted file mode 100644 index 330b33f7c7..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c +++ /dev/null @@ -1 +0,0 @@ -#include "fxstatat.c" diff --git a/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c b/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c deleted file mode 100644 index 330b33f7c7..0000000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c +++ /dev/null @@ -1 +0,0 @@ -#include "fxstatat.c"