git-revoke-linknamespace

commit 22f24293a4311e395fa978b3bb3b1e30e9a01caf
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.

Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name git-revoke-linknamespace.diff

diff --git a/include/unistd.h b/include/unistd.h
index 96e6930f3cac073c45d0d9c5f93618a3fb55b6c9..527699074b86643a9f16e5fc6248cac34e9fe79b 100644 (file)
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -131,6 +131,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 d953216246024159f90545ca91c1b088b9e63520..21df2bbf9072db7c0410b2adf8be983cfd01a88a 100644 (file)
--- 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 15b955b733c614b4d52f6bb9034e2bca18498a3a..2f47f42de68d184d7e3623a59651ca19235d39c2 100644 (file)
--- 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 7388c985238bf8aceee905cf6fd4068fc2bf45d5..ca4e7c654e0860366286d310df75cbb0f412d75c 100644 (file)
--- 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);
 }