select: fix 64-bit timeout truncation on pre-time64 kernels

[musl] / src / stdio / tmpnam.c

diff --git a/src/stdio/tmpnam.c b/src/stdio/tmpnam.c
index 010cf03..71dc8bb 100644 (file)
--- a/src/stdio/tmpnam.c
+++ b/src/stdio/tmpnam.c
@@ -1,30 +1,27 @@
 #include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <string.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
-#include "libc.h"
 #include "syscall.h"
-#include "atomic.h"
 
 #define MAXTRIES 100
 
-char *tmpnam(char *s)
+char *tmpnam(char *buf)
 {
-       static int index;
-       static char s2[L_tmpnam];
-       struct timespec ts;
-       int try = 0;
-       unsigned n;
-
-       if (!s) s = s2;
-
-       if (__syscall(SYS_access, P_tmpdir, R_OK|W_OK|X_OK) != 0)
-               return NULL;
-
-       do {
-               __syscall(SYS_clock_gettime, CLOCK_REALTIME, &ts, 0);
-               n = ts.tv_nsec ^ (unsigned)&s ^ (unsigned)s;
-               snprintf(s, L_tmpnam, "/tmp/t%x-%x", a_fetch_add(&index, 1), n);
-       } while (!__syscall(SYS_access, s, F_OK) && try++<MAXTRIES);
-       return try>=MAXTRIES ? 0 : s;
+       static char internal[L_tmpnam];
+       char s[] = "/tmp/tmpnam_XXXXXX";
+       int try;
+       int r;
+       for (try=0; try<MAXTRIES; try++) {
+               __randname(s+12);
+#ifdef SYS_readlink
+               r = __syscall(SYS_readlink, s, (char[1]){0}, 1);
+#else
+               r = __syscall(SYS_readlinkat, AT_FDCWD, s, (char[1]){0}, 1);
+#endif
+               if (r == -ENOENT) return strcpy(buf ? buf : internal, s);
+       }
+       return 0;
 }