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

diff --git a/src/temp/mktemp.c b/src/temp/mktemp.c
index 1078b9df..c0e06f5e 100644
--- a/src/temp/mktemp.c
+++ b/src/temp/mktemp.c
@@ -4,28 +4,32 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
+#include <time.h>
+#include <stdint.h>
 #include "libc.h"
 
 char *__mktemp(char *template)
 {
-	static int lock;
-	static int index;
-	int l = strlen(template);
+	struct timespec ts;
+	size_t i, l = strlen(template);
+	int retries = 10000;
+	unsigned long r;
 
 	if (l < 6 || strcmp(template+l-6, "XXXXXX")) {
 		errno = EINVAL;
-		return NULL;
+		*template = 0;
+		return template;
 	}
-	LOCK(&lock);
-	for (; index < 1000000; index++) {
-		snprintf(template+l-6, 6, "%06d", index);
-		if (access(template, F_OK) != 0) {
-			UNLOCK(&lock);
-			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;
 	}
-	UNLOCK(&lock);
-	return NULL;	
+	*template = 0;
+	errno = EEXIST;
+	return template;
 }
 
 weak_alias(__mktemp, mktemp);