X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftemp%2Fmktemp.c;h=7b3d2648b20676eb25fd451ea26db93ef8ca8b65;hb=0fbd7d6683d04dcaa636df53e7fce69ece746241;hp=c0e06f5ef424216c3b142999942b1146c801fa4d;hpb=aed707f679cce80afd929f0efaf080f1e8481330;p=musl

diff --git a/src/temp/mktemp.c b/src/temp/mktemp.c
index c0e06f5e..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 i, l = strlen(template);
-	int retries = 10000;
-	unsigned long r;
+	size_t l = strlen(template);
+	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;
 	}
-	while (retries--) {
-		clock_gettime(CLOCK_REALTIME, &ts);
-		r = ts.tv_nsec + (uintptr_t)&ts / 16 + (uintptr_t)template;
-		for (i=1; i<=6; i++, r>>=4)
-			template[l-i] = 'A'+(r&15);
-		if (access(template, F_OK) < 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 template;
 }
-
-weak_alias(__mktemp, mktemp);