projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove leftover unused variable in mktemp after refactoring
[musl]
/
src
/
temp
/
mktemp.c
diff --git
a/src/temp/mktemp.c
b/src/temp/mktemp.c
index
1462a16
..
de0f370
100644
(file)
--- a/
src/temp/mktemp.c
+++ b/
src/temp/mktemp.c
@@
-1,33
+1,28
@@
#include <string.h>
#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
-#include <time.h>
-#include <stdint.h>
#include "libc.h"
#include "libc.h"
+char *__randname(char *);
+
char *__mktemp(char *template)
{
char *__mktemp(char *template)
{
- struct timespec ts;
size_t l = strlen(template);
int retries = 10000;
size_t l = strlen(template);
int retries = 10000;
- unsigned long r;
if (l < 6 || strcmp(template+l-6, "XXXXXX")) {
errno = EINVAL;
if (l < 6 || strcmp(template+l-6, "XXXXXX")) {
errno = EINVAL;
- return 0;
+ *template = 0;
+ return template;
}
}
- clock_gettime(CLOCK_REALTIME, &ts);
- r = ts.tv_nsec + (uintptr_t)&ts / 16 + (uintptr_t)template;
while (retries--) {
while (retries--) {
-
snprintf(template+l-6, 7, "%06lX", r & 0xffffff
);
+
__randname(template+l-6
);
if (access(template, F_OK) < 0) return template;
if (access(template, F_OK) < 0) return template;
- r = r * 1103515245 + 12345;
}
}
+ *template = 0;
errno = EEXIST;
errno = EEXIST;
- return
0
;
+ return
template
;
}
weak_alias(__mktemp, mktemp);
}
weak_alias(__mktemp, mktemp);