From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed, 27 Sep 2017 22:41:02 +0000 (+0200)
Subject: hurd: Fix `seekdir' symbol exposition from `rewinddir'
X-Git-Tag: glibc-2.27~850
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64a4af28a62e9f305c82bc9649bbe065fffdeb0d;p=thirdparty%2Fglibc.git

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 ff321d7e2b1..737dc8f8089 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 5720d589a26..d7dbf839647 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 b6791d95c3f..84aa87c9617 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 8d3020b02c7..68f7ce07c56 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)