Rework __gen_tempname() to better match glibc, and add mkstemp64(),

which is needed for busybox ash when using largefile support.
 -Erik

4 files changed, 33 insertions, 8 deletions

diff --git a/libc/stdlib/Makefile b/libc/stdlib/Makefile
index 71136c2fa..44a359434 100644
--- a/libc/stdlib/Makefile
+++ b/libc/stdlib/Makefile
@@ -38,8 +38,8 @@ MSRC2=atexit.c
 MOBJ2=atexit.o on_exit.o __exit_handler.o exit.o
 
 CSRC =	abort.c getenv.c mktemp.c qsort.c realpath.c bsearch.c \
-	mkstemp.c putenv.c rand.c random.c random_r.c setenv.c system.c div.c \
-	ldiv.c getpt.c ptsname.c grantpt.c unlockpt.c gcvt.c
+	mkstemp.c mkstemp64.c putenv.c rand.c random.c random_r.c setenv.c \
+	system.c div.c ldiv.c getpt.c ptsname.c grantpt.c unlockpt.c gcvt.c
 CSRC+=  drand48.c drand48-iter.c drand48_r.c erand48.c erand48_r.c \
 	jrand48.c jrand48_r.c lrand48.c lrand48_r.c mrand48.c mrand48_r.c \
 	nrand48.c nrand48_r.c rand_r.c srand48.c srand48_r.c
diff --git a/libc/stdlib/mkstemp.c b/libc/stdlib/mkstemp.c
index d0104c8f3..de5d557f4 100644
--- a/libc/stdlib/mkstemp.c
+++ b/libc/stdlib/mkstemp.c
@@ -19,13 +19,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-extern int __gen_tempname (char *tmpl, int openit);
-
 /* Generate a unique temporary file name from TEMPLATE.
    The last six characters of TEMPLATE must be "XXXXXX";
    they are replaced with a string that makes the filename unique.
    Then open the file and return a fd. */
 int mkstemp (char *template)
 {
-    return __gen_tempname (template, 1);
+    return __gen_tempname (template, __GT_FILE);
 }
diff --git a/libc/stdlib/mkstemp64.c b/libc/stdlib/mkstemp64.c
new file mode 100644
index 000000000..5762da79d
--- /dev/null
+++ b/libc/stdlib/mkstemp64.c
@@ -0,0 +1,29 @@
+/* Copyright (C) 1998 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.
+
+   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.
+
+   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.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/* Generate a unique temporary file name from TEMPLATE.
+   The last six characters of TEMPLATE must be "XXXXXX";
+   they are replaced with a string that makes the filename unique.
+   Then open the file and return a fd. */
+int mkstemp64 (char *template)
+{
+    return __gen_tempname (template, __GT_BIGFILE);
+}
diff --git a/libc/stdlib/mktemp.c b/libc/stdlib/mktemp.c
index 432d64f2a..4faa3e671 100644
--- a/libc/stdlib/mktemp.c
+++ b/libc/stdlib/mktemp.c
@@ -19,14 +19,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-extern int __gen_tempname (char *tmpl, int openit);
-
 /* Generate a unique temporary file name from TEMPLATE.
    The last six characters of TEMPLATE must be "XXXXXX";
    they are replaced with a string that makes the filename unique.  */
 char * mktemp (char *template)
 {
-    if (__gen_tempname (template, 0) < 0)
+    if (__gen_tempname (template, __GT_NOCREATE) < 0)
 	/* We return the null string if we can't find a unique file name.  */
 	template[0] = '\0';