mirror of git://git.musl-libc.org/musl
remove ugly prng from mk*temp and just re-poll time on retry
This commit is contained in:
parent
bbdcc403ca
commit
aed707f679
|
@ -13,20 +13,19 @@ char *__mktemp(char *template)
|
||||||
struct timespec ts;
|
struct timespec ts;
|
||||||
size_t i, l = strlen(template);
|
size_t i, l = strlen(template);
|
||||||
int retries = 10000;
|
int retries = 10000;
|
||||||
unsigned long r, t;
|
unsigned long r;
|
||||||
|
|
||||||
if (l < 6 || strcmp(template+l-6, "XXXXXX")) {
|
if (l < 6 || strcmp(template+l-6, "XXXXXX")) {
|
||||||
errno = EINVAL;
|
errno = EINVAL;
|
||||||
*template = 0;
|
*template = 0;
|
||||||
return template;
|
return template;
|
||||||
}
|
}
|
||||||
|
while (retries--) {
|
||||||
clock_gettime(CLOCK_REALTIME, &ts);
|
clock_gettime(CLOCK_REALTIME, &ts);
|
||||||
r = ts.tv_nsec + (uintptr_t)&ts / 16 + (uintptr_t)template;
|
r = ts.tv_nsec + (uintptr_t)&ts / 16 + (uintptr_t)template;
|
||||||
while (retries--) {
|
for (i=1; i<=6; i++, r>>=4)
|
||||||
for (t=r, i=1; i<=6; i++, t>>=4)
|
template[l-i] = 'A'+(r&15);
|
||||||
template[l-i] = 'A'+(t&15);
|
|
||||||
if (access(template, F_OK) < 0) return template;
|
if (access(template, F_OK) < 0) return template;
|
||||||
r = r * 1103515245 + 12345;
|
|
||||||
}
|
}
|
||||||
*template = 0;
|
*template = 0;
|
||||||
errno = EEXIST;
|
errno = EEXIST;
|
||||||
|
|
Loading…
Reference in New Issue