From patchwork Wed Dec 5 22:25:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 30560 Received: (qmail 13092 invoked by alias); 5 Dec 2018 22:25:49 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 12960 invoked by uid 89); 5 Dec 2018 22:25:48 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [PATCH] hurd: Fix linknamespace of spawni Date: Wed, 5 Dec 2018 23:25:41 +0100 Message-Id: <20181205222541.27924-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 * include/unistd.h (__confstr): Add prototype and hidden prototype. * posix/confstr.c (confstr): Rename to __confstr. (__confstr): Add hidden def. (confstr): Add weak alias for __confstr. * sysdeps/mach/hurd/spawni.c (__spawni): Call __confstr instead of confstr. --- ChangeLog | 9 +++++++++ include/unistd.h | 2 ++ posix/confstr.c | 4 +++- sysdeps/mach/hurd/spawni.c | 4 ++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/include/unistd.h b/include/unistd.h index a171b00326..a043431ecf 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -6,6 +6,8 @@ libc_hidden_proto (_exit, __noreturn__) rtld_hidden_proto (_exit, __noreturn__) libc_hidden_proto (alarm) +extern size_t __confstr (int name, char *buf, size_t len); +libc_hidden_proto (__confstr) libc_hidden_proto (confstr) libc_hidden_proto (execl) libc_hidden_proto (execle) diff --git a/posix/confstr.c b/posix/confstr.c index de4cff76cc..73ebb2e254 100644 --- a/posix/confstr.c +++ b/posix/confstr.c @@ -29,7 +29,7 @@ of BUF with the value corresponding to NAME and zero-terminate BUF. Return the number of bytes required to hold NAME's entire value. */ size_t -confstr (int name, char *buf, size_t len) +__confstr (int name, char *buf, size_t len) { const char *string = ""; size_t string_len = 1; @@ -289,4 +289,6 @@ confstr (int name, char *buf, size_t len) } return string_len; } +libc_hidden_def (__confstr) libc_hidden_def (confstr) +weak_alias (__confstr, confstr) diff --git a/sysdeps/mach/hurd/spawni.c b/sysdeps/mach/hurd/spawni.c index b98e991d3b..ecc21d2a57 100644 --- a/sysdeps/mach/hurd/spawni.c +++ b/sysdeps/mach/hurd/spawni.c @@ -629,10 +629,10 @@ __spawni (pid_t *pid, const char *file, /* There is no `PATH' in the environment. The default search path is the current directory followed by the path `confstr' returns for `_CS_PATH'. */ - len = confstr (_CS_PATH, (char *) NULL, 0); + len = __confstr (_CS_PATH, (char *) NULL, 0); path = (char *) __alloca (1 + len); path[0] = ':'; - (void) confstr (_CS_PATH, path + 1, len); + (void) __confstr (_CS_PATH, path + 1, len); } len = strlen (file) + 1;