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

diff --git a/src/temp/mktemp.c b/src/temp/mktemp.c
index 1078b9df..24c858bb 100644
--- a/src/temp/mktemp.c
+++ b/src/temp/mktemp.c
@@ -1,31 +1,28 @@
 #include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 #include "libc.h"
 
+char *__randname(char *);
+
 char *__mktemp(char *template)
 {
-	static int lock;
-	static int index;
-	int l = strlen(template);
+	size_t l = strlen(template);
+	int retries = 10000;
 
-	if (l < 6 || strcmp(template+l-6, "XXXXXX")) {
+	if (l < 6 || memcmp(template+l-6, "XXXXXX", 6)) {
 		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--) {
+		__randname(template+l-6);
+		if (access(template, F_OK) < 0) return template;
 	}
-	UNLOCK(&lock);
-	return NULL;	
+	*template = 0;
+	errno = EEXIST;
+	return template;
 }
 
 weak_alias(__mktemp, mktemp);