Hide reference to mktemp in libpthread

diff --git a/ChangeLog b/ChangeLog
index 78ab4abaad415a912654ebddb668a07816840797..248e8df1255f1b13bc425ddcc35082101354b17e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-16  Andreas Schwab  <schwab@suse.de>
+
+       [BZ #14327]
+       * include/stdlib.h (__mktemp): Add declaration.
+       * misc/mktemp.c (__mktemp): Renamed from mktemp, add weak alias.
+       * misc/Versions (GLIBC_PRIVATE): Add __mktemp.
+
 2013-01-16  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
         * sysdeps/ieee754/dbl-64/atnat.h: Remove constant value

diff --git a/NEWS b/NEWS
index 1cdc37a215cae565db50db8ac98d75ade6dbdc8f..55f65fd6864619539e44d3c2d6c32921fa47437e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,8 @@ Version 2.18
 
 * The following bugs are resolved with this release:
 
-  13951, 14200, 14317, 14964, 14981, 14982, 14985, 14994, 14996, 15003.
+  13951, 14200, 14317, 14327, 14964, 14981, 14982, 14985, 14994, 14996,
+  15003.
 
 \f
 Version 2.17

diff --git a/include/stdlib.h b/include/stdlib.h
index d45b2f02de9e5d34e559d1f7ec42d94367b16839..2e536641b9d00fb51208aaf1dc9396618a3cf8a3 100644 (file)
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -77,6 +77,7 @@ extern struct drand48_data __libc_drand48_data attribute_hidden;
 extern int __setenv (const char *__name, const char *__value, int __replace);
 extern int __unsetenv (const char *__name);
 extern int __clearenv (void);
+extern char *__mktemp (char *__template) __THROW __nonnull ((1));
 extern char *__canonicalize_file_name (const char *__name);
 extern char *__realpath (const char *__name, char *__resolved);
 extern int __ptsname_r (int __fd, char *__buf, size_t __buflen);

diff --git a/misc/Versions b/misc/Versions
index 64632f0bfa81b00af7446ecbbd30fa3fbc259156..ec5aea7b523e7041084f43c400bca42014d927fb 100644 (file)
--- a/misc/Versions
+++ b/misc/Versions
@@ -151,6 +151,7 @@ libc {
   }
   GLIBC_PRIVATE {
     __madvise;
+    __mktemp;
     __libc_ifunc_impl_list;
   }
 }

diff --git a/misc/mktemp.c b/misc/mktemp.c
index 9886c5d751dee74f4e71a80f42740696b3b29f06..55421fd74a97bcb1be39cee1f40a869e120f4ff8 100644 (file)
--- a/misc/mktemp.c
+++ b/misc/mktemp.c
@@ -22,7 +22,7 @@
    The last six characters of TEMPLATE must be "XXXXXX";
    they are replaced with a string that makes the filename unique.  */
 char *
-mktemp (template)
+__mktemp (template)
      char *template;
 {
   if (__gen_tempname (template, 0, 0, __GT_NOCREATE) < 0)
@@ -31,5 +31,6 @@ mktemp (template)
 
   return template;
 }
+weak_alias (__mktemp, mktemp)
 
 link_warning (mktemp, "the use of `mktemp' is dangerous, better use `mkstemp'")

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 4aacc17e9942f942146e90337251295a84999883..c4f6c630cc13a2e933176f9383394745ed25ab00 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-16  Andreas Schwab  <schwab@suse.de>
+
+       [BZ #14327]
+       * sem_open.c (sem_open): Use __mktemp instead of mktemp.
+
 2013-01-11  Carlos O'Donell  <codonell@redhat.com>
 
        * allocatestack.c (allocate_stack): Add comment. Remove assert

diff --git a/nptl/sem_open.c b/nptl/sem_open.c
index 5bc56c5bd908b19000f986bcfce6f5763f32503c..83b2fdf4721695bef37ccc3f2264356938cbe052 100644 (file)
--- a/nptl/sem_open.c
+++ b/nptl/sem_open.c
@@ -329,7 +329,7 @@ sem_open (const char *name, int oflag, ...)
             since the file must be opened with a specific mode.  The
             mode cannot later be set since then we cannot apply the
             file create mask.  */
-         if (mktemp (tmpfname) == NULL)
+         if (__mktemp (tmpfname) == NULL)
            return SEM_FAILED;
 
          /* Open the file.  Make sure we do not overwrite anything.  */