X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftemp%2Fmktemp.c;h=4ab0df2069ac6d0c685ea2265f15d40596392217;hb=e98a54643ee95032baab883673628314e520012e;hp=1462a16c6dd189ff8354656a924bfcc324ddc67b;hpb=446b4207cc7a30d8a4d5b2445a5a1b27d440f55d;p=musl

diff --git a/src/temp/mktemp.c b/src/temp/mktemp.c
index 1462a16c..4ab0df20 100644
--- a/src/temp/mktemp.c
+++ b/src/temp/mktemp.c
@@ -1,33 +1,32 @@
+#define _GNU_SOURCE
 #include <string.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <errno.h>
-#include <time.h>
-#include <stdint.h>
-#include "libc.h"
+#include <sys/stat.h>
 
-char *__mktemp(char *template)
+char *__randname(char *);
+
+char *mktemp(char *template)
 {
-	struct timespec ts;
 	size_t l = strlen(template);
-	int retries = 10000;
-	unsigned long r;
+	int retries = 100;
+	struct stat st;
 
-	if (l < 6 || strcmp(template+l-6, "XXXXXX")) {
+	if (l < 6 || memcmp(template+l-6, "XXXXXX", 6)) {
 		errno = EINVAL;
-		return 0;
-	}
-	clock_gettime(CLOCK_REALTIME, &ts);
-	r = ts.tv_nsec + (uintptr_t)&ts / 16 + (uintptr_t)template;
-	while (retries--) {
-		snprintf(template+l-6, 7, "%06lX", r & 0xffffff);
-		if (access(template, F_OK) < 0) return template;
-		r = r * 1103515245 + 12345;
+		*template = 0;
+		return template;
 	}
+
+	do {
+		__randname(template+l-6);
+		if (stat(template, &st)) {
+			if (errno != ENOENT) *template = 0;
+			return template;
+		}
+	} while (--retries);
+
+	*template = 0;
 	errno = EEXIST;
-	return 0;
+	return template;
 }
-
-weak_alias(__mktemp, mktemp);