提交 0e176253 编写于 作者: R Rich Felker

avoid 64bit warnings when using pointers as entropy for temp names

上级 f09e78de
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h>
#include <unistd.h> #include <unistd.h>
#include <time.h> #include <time.h>
#include "libc.h" #include "libc.h"
...@@ -30,7 +31,7 @@ char *tempnam(const char *dir, const char *pfx) ...@@ -30,7 +31,7 @@ char *tempnam(const char *dir, const char *pfx)
do { do {
clock_gettime(CLOCK_REALTIME, &ts); clock_gettime(CLOCK_REALTIME, &ts);
n = ts.tv_nsec ^ (unsigned)&s ^ (unsigned)s; n = ts.tv_nsec ^ (uintptr_t)&s ^ (uintptr_t)s;
snprintf(s, l, "%s/%s-%d-%d-%x", dir, pfx, pid, a_fetch_add(&index, 1), n); snprintf(s, l, "%s/%s-%d-%d-%x", dir, pfx, pid, a_fetch_add(&index, 1), n);
} while (!access(s, F_OK) && try++<MAXTRIES); } while (!access(s, F_OK) && try++<MAXTRIES);
if (try>=MAXTRIES) { if (try>=MAXTRIES) {
......
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h>
#include <unistd.h> #include <unistd.h>
#include <time.h> #include <time.h>
#include "libc.h" #include "libc.h"
...@@ -23,7 +24,7 @@ char *tmpnam(char *s) ...@@ -23,7 +24,7 @@ char *tmpnam(char *s)
do { do {
__syscall(SYS_clock_gettime, CLOCK_REALTIME, &ts, 0); __syscall(SYS_clock_gettime, CLOCK_REALTIME, &ts, 0);
n = ts.tv_nsec ^ (unsigned)&s ^ (unsigned)s; n = ts.tv_nsec ^ (uintptr_t)&s ^ (uintptr_t)s;
snprintf(s, L_tmpnam, "/tmp/t%x-%x", a_fetch_add(&index, 1), n); snprintf(s, L_tmpnam, "/tmp/t%x-%x", a_fetch_add(&index, 1), n);
} while (!__syscall(SYS_access, s, F_OK) && try++<MAXTRIES); } while (!__syscall(SYS_access, s, F_OK) && try++<MAXTRIES);
return try>=MAXTRIES ? 0 : s; return try>=MAXTRIES ? 0 : s;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册