X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ftemp%2Fmktemp.c;h=7b3d2648b20676eb25fd451ea26db93ef8ca8b65;hb=59b64ff686cef2a87e9552658b2c8d2531f87176;hp=654a2794a92801d72ab57f2e6d8207ba5bbc040b;hpb=382584724308442f03f3d29f7fc6de9e9d140982;p=musl

diff --git a/src/temp/mktemp.c b/src/temp/mktemp.c
index 654a2794..7b3d2648 100644
--- a/src/temp/mktemp.c
+++ b/src/temp/mktemp.c
@@ -1,35 +1,30 @@
+#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 *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;
 		*template = 0;
 		return template;
 	}
-	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;
-	}
+
+	do {
+		__randname(template+l-6);
+		if (stat(template, &st)) {
+			if (errno != ENOENT) *template = 0;
+			return template;
+		}
+	} while (--retries);
+
 	*template = 0;
 	errno = EEXIST;
 	return template;
 }
-
-weak_alias(__mktemp, mktemp);