Libc-1272.250.1.tar.gz

[apple/libc.git] / stdio / FreeBSD / tmpnam.c

diff --git a/stdio/FreeBSD/tmpnam.c b/stdio/FreeBSD/tmpnam.c
index 38fcdd65cffde402e6d97672641e885db1558292..6dad888a2941790f3f34e6d8d9bbd1840234a77d 100644 (file)
--- a/stdio/FreeBSD/tmpnam.c
+++ b/stdio/FreeBSD/tmpnam.c
@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.

  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.


@@ -38,27 +34,41 @@
 static char sccsid[] = "@(#)tmpnam.c   8.3 (Berkeley) 3/28/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 static char sccsid[] = "@(#)tmpnam.c   8.3 (Berkeley) 3/28/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/stdio/tmpnam.c,v 1.5 2002/03/22 21:53:04 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/tmpnam.c,v 1.6 2007/01/09 00:28:07 imp Exp $");

 
 #include <sys/types.h>
 
 #include <stdio.h>
 #include <unistd.h>
 
 #include <sys/types.h>
 
 #include <stdio.h>
 #include <unistd.h>

+#include <pthread.h>
+#include <stdlib.h>

 
 __warn_references(tmpnam,
     "warning: tmpnam() possibly used unsafely; consider using mkstemp()");
 
 extern char *_mktemp(char *);
 
 
 __warn_references(tmpnam,
     "warning: tmpnam() possibly used unsafely; consider using mkstemp()");
 
 extern char *_mktemp(char *);
 

+static char *tmpnam_buf = NULL;
+static pthread_once_t tmpnam_buf_control = PTHREAD_ONCE_INIT;
+
+static void tmpnam_buf_allocate(void)
+{
+       tmpnam_buf = malloc(L_tmpnam);
+}
+

 char *
 tmpnam(s)
        char *s;
 {
        static u_long tmpcount;
 char *
 tmpnam(s)
        char *s;
 {
        static u_long tmpcount;

-       static char buf[L_tmpnam];

 
 

-       if (s == NULL)
-               s = buf;
+       if (s == NULL) {
+               if (pthread_once(&tmpnam_buf_control, tmpnam_buf_allocate)
+                       || !tmpnam_buf) {
+                       return NULL;
+               }
+               s = tmpnam_buf;
+       }

        (void)snprintf(s, L_tmpnam, "%stmp.%lu.XXXXXX", P_tmpdir, tmpcount);
        ++tmpcount;
        return (_mktemp(s));
        (void)snprintf(s, L_tmpnam, "%stmp.%lu.XXXXXX", P_tmpdir, tmpcount);
        ++tmpcount;
        return (_mktemp(s));