This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
GNU C Library master sources branch master updated. glibc-2.26-410-g4009ddc

From: sthibaul at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 27 Sep 2017 23:17:54 -0000
Subject: GNU C Library master sources branch master updated. glibc-2.26-410-g4009ddc
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  4009ddc69225d571772aaea597615a0c032e14ab (commit)
       via  64a4af28a62e9f305c82bc9649bbe065fffdeb0d (commit)
       via  52a1f1814ef530d8c78442f2bcaf28f4f2575790 (commit)
       via  2c7bbfaf4e361b482f3ccfbdbb29cc5121ca0ea8 (commit)
      from  825adeeed1e95990fd1efb70d9ac3eb7f1ea802a (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=4009ddc69225d571772aaea597615a0c032e14ab

commit 4009ddc69225d571772aaea597615a0c032e14ab
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Thu Sep 28 00:19:18 2017 +0200

    hurd: Fix `getifaddrs' and `freeifaddrs' symbol exposition
    
    from `freeaddrinfo'.
    
    `getifaddrs' and `freeifaddrs' are not in POSIX, they should not be
    exposed along `freeaddrinfo' (through `__check_pf') which is POSIX.
    
    	* include/ifaddrs.h (__getifaddrs, __freeifaddrs): New declarations,
    	and use libc_hidden_def on them.
    	* inet/ifaddrs.c (__getifaddrs, __freeifaddrs): Use libc_hidden_def on
    	them.
    	* sysdeps/gnu/ifaddrs.c (__getifaddrs, __freeifaddrs): Likewise.
    	* inet/check_pf.c (__check_pf): Use __getifaddrs and __freeifaddrs
    	instead of getifaddrs and freeifaddrs.

diff --git a/ChangeLog b/ChangeLog
index 737dc8f..8e26c00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,13 @@
 	redefine as weak alias.
 	* sysdeps/mach/hurd/rewinddir.c (__rewinddir): Use __seekdir instead
 	of seekdir.
+	* include/ifaddrs.h (__getifaddrs, __freeifaddrs): New declarations,
+	and use libc_hidden_def on them.
+	* inet/ifaddrs.c (__getifaddrs, __freeifaddrs): Use libc_hidden_def on
+	them.
+	* sysdeps/gnu/ifaddrs.c (__getifaddrs, __freeifaddrs): Likewise.
+	* inet/check_pf.c (__check_pf): Use __getifaddrs and __freeifaddrs
+	instead of getifaddrs and freeifaddrs.
 
 2017-09-26  H.J. Lu  <hongjiu.lu@intel.com>
 
diff --git a/include/ifaddrs.h b/include/ifaddrs.h
index 54f4b7a..416118f 100644
--- a/include/ifaddrs.h
+++ b/include/ifaddrs.h
@@ -9,6 +9,11 @@
 libc_hidden_proto (getifaddrs)
 libc_hidden_proto (freeifaddrs)
 
+extern int __getifaddrs (struct ifaddrs **__ifap);
+libc_hidden_proto (__getifaddrs)
+extern void __freeifaddrs (struct ifaddrs *__ifa);
+libc_hidden_proto (__freeifaddrs)
+
 struct in6addrinfo
 {
   enum {
diff --git a/inet/check_pf.c b/inet/check_pf.c
index a56723a..84dd169 100644
--- a/inet/check_pf.c
+++ b/inet/check_pf.c
@@ -32,7 +32,7 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
 
   /* Get the interface list via getifaddrs.  */
   struct ifaddrs *ifa = NULL;
-  if (getifaddrs (&ifa) != 0)
+  if (__getifaddrs (&ifa) != 0)
     {
       /* We cannot determine what interfaces are available.  Be
 	 pessimistic.  */
@@ -51,7 +51,7 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
     else if (runp->ifa_addr->sa_family == PF_INET6)
       *seen_ipv6 = true;
 
-  (void) freeifaddrs (ifa);
+  (void) __freeifaddrs (ifa);
 }
 
 
diff --git a/inet/ifaddrs.c b/inet/ifaddrs.c
index 35cc277..0a5c71c 100644
--- a/inet/ifaddrs.c
+++ b/inet/ifaddrs.c
@@ -30,6 +30,7 @@ __getifaddrs (struct ifaddrs **ifap)
   return -1;
 }
 weak_alias (__getifaddrs, getifaddrs)
+libc_hidden_def (__getifaddrs)
 libc_hidden_weak (getifaddrs)
 stub_warning (getifaddrs)
 
@@ -43,5 +44,6 @@ __freeifaddrs (struct ifaddrs *ifa)
   abort ();
 }
 weak_alias (__freeifaddrs, freeifaddrs)
+libc_hidden_def (__freeifaddrs)
 libc_hidden_weak (freeifaddrs)
 stub_warning (freeifaddrs)
diff --git a/sysdeps/gnu/ifaddrs.c b/sysdeps/gnu/ifaddrs.c
index 37b3248..80702eb 100644
--- a/sysdeps/gnu/ifaddrs.c
+++ b/sysdeps/gnu/ifaddrs.c
@@ -151,6 +151,7 @@ __getifaddrs (struct ifaddrs **ifap)
   return 0;
 }
 weak_alias (__getifaddrs, getifaddrs)
+libc_hidden_def (__getifaddrs)
 #ifndef getifaddrs
 libc_hidden_weak (getifaddrs)
 #endif
@@ -161,4 +162,5 @@ __freeifaddrs (struct ifaddrs *ifa)
   free (ifa);
 }
 weak_alias (__freeifaddrs, freeifaddrs)
+libc_hidden_def (__freeifaddrs)
 libc_hidden_weak (freeifaddrs)

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=64a4af28a62e9f305c82bc9649bbe065fffdeb0d

commit 64a4af28a62e9f305c82bc9649bbe065fffdeb0d
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Thu Sep 28 00:41:02 2017 +0200

    hurd: Fix `seekdir' symbol exposition from `rewinddir'
    
    `seekdir' is MISC || XOPEN, it should not be exposed along `rewinddir' which
    is POSIX.
    
    	* include/dirent.h (__seekdir): New declaration.
    	* sysdeps/mach/hurd/seekdir.c (seekdir): Rename to __seekdir and
    	redefine as weak alias.
    	* sysdeps/mach/hurd/rewinddir.c (__rewinddir): Use __seekdir instead
    	of seekdir.

diff --git a/ChangeLog b/ChangeLog
index ff321d7..737dc8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,11 @@
 	* sysdeps/mach/hurd/revoke.c (revoke): Likewise.
 	* sysdeps/unix/bsd/unlockpt.c (unlockpt): Use __revoke instead of
 	revoke.
+	* include/dirent.h (__seekdir): New declaration.
+	* sysdeps/mach/hurd/seekdir.c (seekdir): Rename to __seekdir and
+	redefine as weak alias.
+	* sysdeps/mach/hurd/rewinddir.c (__rewinddir): Use __seekdir instead
+	of seekdir.
 
 2017-09-26  H.J. Lu  <hongjiu.lu@intel.com>
 
diff --git a/include/dirent.h b/include/dirent.h
index 5720d58..d7dbf83 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -46,6 +46,7 @@ extern int __versionsort64 (const struct dirent64 **a,
 extern DIR *__alloc_dir (int fd, bool close_fd, int flags,
 			 const struct stat64 *statp) attribute_hidden;
 extern __typeof (rewinddir) __rewinddir;
+extern __typeof (seekdir) __seekdir;
 extern __typeof (dirfd) __dirfd;
 
 extern void __scandir_cancel_handler (void *arg) attribute_hidden;
diff --git a/sysdeps/mach/hurd/rewinddir.c b/sysdeps/mach/hurd/rewinddir.c
index b6791d9..84aa87c 100644
--- a/sysdeps/mach/hurd/rewinddir.c
+++ b/sysdeps/mach/hurd/rewinddir.c
@@ -24,7 +24,7 @@
 void
 __rewinddir (DIR *dirp)
 {
-  seekdir (dirp, (off_t) 0L);
+  __seekdir (dirp, (off_t) 0L);
 }
 libc_hidden_def (__rewinddir)
 weak_alias (__rewinddir, rewinddir)
diff --git a/sysdeps/mach/hurd/seekdir.c b/sysdeps/mach/hurd/seekdir.c
index 8d3020b..68f7ce0 100644
--- a/sysdeps/mach/hurd/seekdir.c
+++ b/sysdeps/mach/hurd/seekdir.c
@@ -22,9 +22,8 @@
 #include "dirstream.h"
 
 /* Seek to position POS in DIRP.  */
-/* XXX should be __seekdir ? */
 void
-seekdir (DIR *dirp, long int pos)
+__seekdir (DIR *dirp, long int pos)
 {
   __libc_lock_lock (dirp->__lock);
   /* Change our entry index pointer to POS and discard any data already
@@ -35,3 +34,5 @@ seekdir (DIR *dirp, long int pos)
   dirp->__size = 0;
   __libc_lock_unlock (dirp->__lock);
 }
+
+weak_alias (__seekdir, seekdir)

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=52a1f1814ef530d8c78442f2bcaf28f4f2575790

commit 52a1f1814ef530d8c78442f2bcaf28f4f2575790
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Thu Sep 28 00:01:40 2017 +0200

    hurd: Fix `revoke' symbol exposition from `unlockpt'
    
    `revoke' is MISC only, it should not be exposed along `unlockpt' which is
    XOPEN.
    
    	* include/unistd.h (__revoke): New declaration.
    	* misc/revoke.c (revoke): Rename to __revoke, and redefine as weak
    	alias.
    	* sysdeps/mach/hurd/revoke.c (revoke): Likewise.
    	* sysdeps/unix/bsd/unlockpt.c (unlockpt): Use __revoke instead of
    	revoke.

diff --git a/ChangeLog b/ChangeLog
index a535da8..ff321d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,12 @@
 	* sysdeps/posix/dirfd/dirfd.c (dirfd): Likewise.
 	* sysdeps/mach/hurd/dirfd.c (dirfd): Likewise.
 	* io/ftw.c (open_dir_stream, ftw_dir): Use __dirfd instead of dirfd.
+	* include/unistd.h (__revoke): New declaration.
+	* misc/revoke.c (revoke): Rename to __revoke, and redefine as weak
+	alias.
+	* sysdeps/mach/hurd/revoke.c (revoke): Likewise.
+	* sysdeps/unix/bsd/unlockpt.c (unlockpt): Use __revoke instead of
+	revoke.
 
 2017-09-26  H.J. Lu  <hongjiu.lu@intel.com>
 
diff --git a/include/unistd.h b/include/unistd.h
index a5625ed..bfe0e4d 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -130,6 +130,7 @@ extern int __symlink (const char *__from, const char *__to);
 extern ssize_t __readlink (const char *__path, char *__buf, size_t __len);
 extern int __unlink (const char *__name);
 extern int __gethostname (char *__name, size_t __len);
+extern int __revoke (const char *__file);
 extern int __profil (unsigned short int *__sample_buffer, size_t __size,
 		     size_t __offset, unsigned int __scale);
 extern int __getdtablesize (void);
diff --git a/misc/revoke.c b/misc/revoke.c
index d953216..21df2bb 100644
--- a/misc/revoke.c
+++ b/misc/revoke.c
@@ -20,9 +20,11 @@
 #include <errno.h>
 
 int
-revoke (const char *file)
+__revoke (const char *file)
 {
   __set_errno (ENOSYS);
   return -1;
 }
+
+weak_alias (__revoke, revoke)
 stub_warning (revoke)
diff --git a/sysdeps/mach/hurd/revoke.c b/sysdeps/mach/hurd/revoke.c
index 15b955b..2f47f42 100644
--- a/sysdeps/mach/hurd/revoke.c
+++ b/sysdeps/mach/hurd/revoke.c
@@ -21,7 +21,7 @@
 #include <hurd.h>
 
 int
-revoke (const char *file_name)
+__revoke (const char *file_name)
 {
   error_t err;
   file_t file = __file_name_lookup (file_name, 0, 0);
@@ -36,3 +36,5 @@ revoke (const char *file_name)
     return __hurd_fail (err);
   return 0;
 }
+
+weak_alias (__revoke, revoke)
diff --git a/sysdeps/unix/bsd/unlockpt.c b/sysdeps/unix/bsd/unlockpt.c
index 7388c98..ca4e7c6 100644
--- a/sysdeps/unix/bsd/unlockpt.c
+++ b/sysdeps/unix/bsd/unlockpt.c
@@ -32,5 +32,5 @@ unlockpt (int fd)
   /* BSD doesn't have a lock, but it does have `revoke'.  */
   if (__ptsname_r (fd, buf, sizeof (buf)))
     return -1;
-  return revoke (buf);
+  return __revoke (buf);
 }

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2c7bbfaf4e361b482f3ccfbdbb29cc5121ca0ea8

commit 2c7bbfaf4e361b482f3ccfbdbb29cc5121ca0ea8
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Wed Sep 27 23:46:51 2017 +0200

    hurd: Fix dirfd symbol exposition from ftw
    
    dirfd is XOPEN2K8 only, it should not be exposed along ftw which is earlier.
    
    	* include/dirent.h (__dirfd): New declaration.
    	* dirent/dirfd.c (dirfd): Rename to __dirfd, and redefine as weak
    	alias.
    	* sysdeps/posix/dirfd/dirfd.c (dirfd): Likewise.
    	* sysdeps/mach/hurd/dirfd.c (dirfd): Likewise.
    	* io/ftw.c (open_dir_stream, ftw_dir): Use __dirfd instead of dirfd.

diff --git a/ChangeLog b/ChangeLog
index a731980..a535da8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-09-27  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* include/dirent.h (__dirfd): New declaration.
+	* dirent/dirfd.c (dirfd): Rename to __dirfd, and redefine as weak
+	alias.
+	* sysdeps/posix/dirfd/dirfd.c (dirfd): Likewise.
+	* sysdeps/mach/hurd/dirfd.c (dirfd): Likewise.
+	* io/ftw.c (open_dir_stream, ftw_dir): Use __dirfd instead of dirfd.
+
 2017-09-26  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #18822]
diff --git a/dirent/dirfd.c b/dirent/dirfd.c
index 7af77ad..c1069ff 100644
--- a/dirent/dirfd.c
+++ b/dirent/dirfd.c
@@ -21,10 +21,11 @@
 #include <errno.h>
 
 int
-dirfd (DIR *dirp)
+__dirfd (DIR *dirp)
 {
   __set_errno (ENOSYS);
   return -1;
 }
 
+weak_alias (__dirfd, dirfd)
 stub_warning (dirfd)
diff --git a/include/dirent.h b/include/dirent.h
index bebcd52..5720d58 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -46,6 +46,7 @@ extern int __versionsort64 (const struct dirent64 **a,
 extern DIR *__alloc_dir (int fd, bool close_fd, int flags,
 			 const struct stat64 *statp) attribute_hidden;
 extern __typeof (rewinddir) __rewinddir;
+extern __typeof (dirfd) __dirfd;
 
 extern void __scandir_cancel_handler (void *arg) attribute_hidden;
 extern int __scandir_tail (DIR *dp,
diff --git a/io/ftw.c b/io/ftw.c
index 63448e1..6cca0e4 100644
--- a/io/ftw.c
+++ b/io/ftw.c
@@ -361,7 +361,7 @@ open_dir_stream (int *dfdp, struct ftw_data *data, struct dir_data *dirp)
 	result = -1;
       else
 	{
-	  dirp->streamfd = dirfd (dirp->stream);
+	  dirp->streamfd = __dirfd (dirp->stream);
 	  dirp->content = NULL;
 	  data->dirstreams[data->actdir] = dirp;
 
@@ -518,7 +518,7 @@ fail:
   /* If necessary, change to this directory.  */
   if (data->flags & FTW_CHDIR)
     {
-      if (__fchdir (dirfd (dir.stream)) < 0)
+      if (__fchdir (__dirfd (dir.stream)) < 0)
 	{
 	  result = -1;
 	  goto fail;
@@ -602,7 +602,7 @@ fail:
       /* Change back to the parent directory.  */
       int done = 0;
       if (old_dir->stream != NULL)
-	if (__fchdir (dirfd (old_dir->stream)) == 0)
+	if (__fchdir (__dirfd (old_dir->stream)) == 0)
 	  done = 1;
 
       if (!done)
diff --git a/sysdeps/mach/hurd/dirfd.c b/sysdeps/mach/hurd/dirfd.c
index 0ad290d..6567333 100644
--- a/sysdeps/mach/hurd/dirfd.c
+++ b/sysdeps/mach/hurd/dirfd.c
@@ -22,7 +22,7 @@
 #include <errno.h>
 
 int
-dirfd (DIR *dirp)
+__dirfd (DIR *dirp)
 {
   int fd;
 
@@ -41,3 +41,5 @@ dirfd (DIR *dirp)
 
   return fd;
 }
+
+weak_alias (__dirfd, dirfd)
diff --git a/sysdeps/posix/dirfd.c b/sysdeps/posix/dirfd.c
index fee8326..ce779c5 100644
--- a/sysdeps/posix/dirfd.c
+++ b/sysdeps/posix/dirfd.c
@@ -22,7 +22,9 @@
 #undef dirfd
 
 int
-dirfd (DIR *dirp)
+__dirfd (DIR *dirp)
 {
   return dirp->fd;
 }
+
+weak_alias (__dirfd, dirfd)

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

Summary of changes:
 ChangeLog                     |   27 +++++++++++++++++++++++++++
 dirent/dirfd.c                |    3 ++-
 include/dirent.h              |    2 ++
 include/ifaddrs.h             |    5 +++++
 include/unistd.h              |    1 +
 inet/check_pf.c               |    4 ++--
 inet/ifaddrs.c                |    2 ++
 io/ftw.c                      |    6 +++---
 misc/revoke.c                 |    4 +++-
 sysdeps/gnu/ifaddrs.c         |    2 ++
 sysdeps/mach/hurd/dirfd.c     |    4 +++-
 sysdeps/mach/hurd/revoke.c    |    4 +++-
 sysdeps/mach/hurd/rewinddir.c |    2 +-
 sysdeps/mach/hurd/seekdir.c   |    5 +++--
 sysdeps/posix/dirfd.c         |    4 +++-
 sysdeps/unix/bsd/unlockpt.c   |    2 +-
 16 files changed, 63 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]