remove ugly prng from mk*temp and just re-poll time on retry

[musl] / src / temp / mkstemp.c

diff --git a/src/temp/mkstemp.c b/src/temp/mkstemp.c
index b156719..a390d42 100644 (file)
--- a/src/temp/mkstemp.c
+++ b/src/temp/mkstemp.c
@@ -7,18 +7,20 @@
 #include <errno.h>
 #include "libc.h"
 
+char *__mktemp(char *);
+
 int mkstemp(char *template)
 {
-       int fd;
-retry:
-       if (!mktemp(template)) return -1;
-       fd = open(template, O_RDWR | O_CREAT | O_EXCL, 0600);
-       if (fd >= 0) return fd;
-       if (errno == EEXIST) {
+       int fd, retries = 100, t0 = *template;
+       while (retries--) {
+               if (!*__mktemp(template)) return -1;
+               if ((fd = open(template, O_RDWR | O_CREAT | O_EXCL, 0600))>=0)
+                       return fd;
+               if (errno != EEXIST) return -1;
                /* this is safe because mktemp verified
                 * that we have a valid template string */
+               template[0] = t0;
                strcpy(template+strlen(template)-6, "XXXXXX");
-               goto retry;
        }
        return -1;
 }