Deprecate external use of libio.h and _G_config.h.

[thirdparty/glibc.git] / stdio-common / tmpfile.c

diff --git a/stdio-common/tmpfile.c b/stdio-common/tmpfile.c
index 41f12bc8ba3eef8d3cf97da0da2448b1c804dd4b..c5cbb688f46f55422d4624d8893087831f2733d7 100644 (file)
--- a/stdio-common/tmpfile.c
+++ b/stdio-common/tmpfile.c
@@ -1,5 +1,5 @@
 /* Open a stdio stream on an anonymous temporary file.  Generic/POSIX version.
-   Copyright (C) 1991,93,1996-2000,2002,2003 Free Software Foundation, Inc.
+   Copyright (C) 1991-2017 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
@@ -13,24 +13,19 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
+#include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
 
-#ifdef USE_IN_LIBIO
-# include <iolibio.h>
-# define __fdopen INTUSE(_IO_fdopen)
-# ifndef tmpfile
-#  define tmpfile __new_tmpfile
-# endif
+#include <iolibio.h>
+#define __fdopen _IO_fdopen
+#ifndef tmpfile
+# define tmpfile __new_tmpfile
 #endif
 
-#ifndef GEN_THIS
-# define GEN_THIS __GT_FILE
-#endif
 
 /* This returns a new stream opened on a temporary file (generated
    by tmpnam).  The file is opened with mode "w+b" (binary read/write).
@@ -39,19 +34,31 @@
 FILE *
 tmpfile (void)
 {
-  char buf[FILENAME_MAX];
   int fd;
   FILE *f;
+  int flags = 0;
+#ifdef FLAGS
+  flags = FLAGS;
+#endif
+
+  /* First try a system specific method.  */
+  fd = __gen_tempfd (flags);
 
-  if (__path_search (buf, FILENAME_MAX, NULL, "tmpf", 0))
-    return NULL;
-  fd = __gen_tempname (buf, GEN_THIS);
   if (fd < 0)
-    return NULL;
+    {
+      char buf[FILENAME_MAX];
+
+      if (__path_search (buf, sizeof buf, NULL, "tmpf", 0))
+       return NULL;
 
-  /* Note that this relies on the Unix semantics that
-     a file is not really removed until it is closed.  */
-  (void) __unlink (buf);
+      fd = __gen_tempname (buf, 0, flags, __GT_FILE);
+      if (fd < 0)
+       return NULL;
+
+      /* Note that this relies on the Unix semantics that
+        a file is not really removed until it is closed.  */
+      (void) __unlink (buf);
+    }
 
   if ((f = __fdopen (fd, "w+b")) == NULL)
     __close (fd);
@@ -59,7 +66,11 @@ tmpfile (void)
   return f;
 }
 
-#if defined USE_IN_LIBIO && GEN_THIS == __GT_FILE /* Not for tmpfile64.  */
+#if !defined O_LARGEFILE || O_LARGEFILE == 0
+weak_alias (__new_tmpfile, tmpfile64)
+#endif
+
+#ifndef FLAGS /* Not for tmpfile64.  */
 # undef tmpfile
 # include <shlib-compat.h>
 versioned_symbol (libc, __new_tmpfile, tmpfile, GLIBC_2_1);