GNU C Library master sources branch master updated. glibc-2.28.9000-367-g45f33aa

sthibaul@sourceware.org sthibaul@sourceware.org
Fri Dec 7 19:23:00 GMT 2018


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  45f33aac78e86d0f23c74a207295f3c7a77a94c0 (commit)
      from  a092ca9453df677053787b376322362e3bbe91ca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=45f33aac78e86d0f23c74a207295f3c7a77a94c0

commit 45f33aac78e86d0f23c74a207295f3c7a77a94c0
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Wed Dec 5 23:24:03 2018 +0100

    hurd: Fix linknamespace of spawni
    
    	* 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.

diff --git a/ChangeLog b/ChangeLog
index 616e370..998f4c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-12-05  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* 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.
+
 2018-12-07  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* NEWS: Mention getcpu.
diff --git a/include/unistd.h b/include/unistd.h
index a171b00..a043431 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 de4cff7..73ebb2e 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 16c927b..e31b21c 100644
--- a/sysdeps/mach/hurd/spawni.c
+++ b/sysdeps/mach/hurd/spawni.c
@@ -673,10 +673,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;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |    9 +++++++++
 include/unistd.h           |    2 ++
 posix/confstr.c            |    4 +++-
 sysdeps/mach/hurd/spawni.c |    4 ++--
 4 files changed, 16 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources



More information about the Glibc-cvs mailing list