Treat model numbers 0x4a/0x4d as Silvermont

[platform/upstream/glibc.git] / stdio-common / tmpnam.c

diff --git a/stdio-common/tmpnam.c b/stdio-common/tmpnam.c
index e5c6bf1..7a1b746 100644 (file)
--- a/stdio-common/tmpnam.c
+++ b/stdio-common/tmpnam.c
@@ -1,24 +1,25 @@
-/* Copyright (C) 1991, 1993, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
 #include <string.h>
 
+static char tmpnam_buffer[L_tmpnam];
+
 /* Generate a unique filename in P_tmpdir.
 
    This function is *not* thread safe!  */
@@ -27,23 +28,24 @@ tmpnam (char *s)
 {
   /* By using two buffers we manage to be thread safe in the case
      where S != NULL.  */
-  static char buf[L_tmpnam];
-  char tmpbuf[L_tmpnam];
+  char tmpbufmem[L_tmpnam];
+  char *tmpbuf = s ?: tmpbufmem;
 
   /* In the following call we use the buffer pointed to by S if
      non-NULL although we don't know the size.  But we limit the size
      to L_tmpnam characters in any case.  */
-  if (__path_search (s ? : tmpbuf, L_tmpnam, NULL, NULL))
+  if (__builtin_expect (__path_search (tmpbuf, L_tmpnam, NULL, NULL, 0),
+                       0))
     return NULL;
 
-  if (__gen_tempname (s ? : tmpbuf, 0, 0))
+  if (__glibc_unlikely (__gen_tempname (tmpbuf, 0, 0, __GT_NOCREATE)))
     return NULL;
 
   if (s == NULL)
-    {
-      memcpy (buf, tmpbuf, L_tmpnam);
-      return buf;
-    }
-  else
-    return s;
+    return (char *) memcpy (tmpnam_buffer, tmpbuf, L_tmpnam);
+
+  return s;
 }
+
+link_warning (tmpnam,
+             "the use of `tmpnam' is dangerous, better use `mkstemp'")