Merge from trunk.

1 files changed, 8 insertions, 6 deletions

diff --git a/libc/misc/internals/tempname.c b/libc/misc/internals/tempname.c
index 99a8ac0d8..fae3687ad 100644
--- a/libc/misc/internals/tempname.c
+++ b/libc/misc/internals/tempname.c
@@ -32,6 +32,8 @@
  */
 
 #define open64 __open64
+#define mkdir __mkdir
+#define gettimeofday __gettimeofday
 
 #include <stddef.h>
 #include <stdint.h>
@@ -61,8 +63,8 @@ static int direxists (const char *dir)
    for use with mk[s]temp.  Will fail (-1) if DIR is non-null and
    doesn't exist, none of the searched dirs exists, or there's not
    enough space in TMPL. */
-int attribute_hidden __path_search (char *tmpl, size_t tmpl_len, const char *dir,
-	const char *pfx, int try_tmpdir)
+int attribute_hidden ___path_search (char *tmpl, size_t tmpl_len, const char *dir,
+	const char *pfx /*, int try_tmpdir*/)
 {
     //const char *d;
     size_t dlen, plen;
@@ -116,7 +118,7 @@ int attribute_hidden __path_search (char *tmpl, size_t tmpl_len, const char *dir
 	return -1;
     }
 
-    sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx);
+    __sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx);
     return 0;
 }
 
@@ -141,7 +143,7 @@ static unsigned int fillrand(unsigned char *buf, unsigned int len)
 
 static void brain_damaged_fillrand(unsigned char *buf, unsigned int len)
 {
-	int i, k;
+	unsigned int i, k;
 	struct timeval tv;
 	uint32_t high, low, rh;
 	static uint64_t value;
@@ -180,8 +182,8 @@ static void brain_damaged_fillrand(unsigned char *buf, unsigned int len)
 int attribute_hidden __gen_tempname (char *tmpl, int kind)
 {
     char *XXXXXX;
-    unsigned int k;
-    int len, i, count, fd, save_errno = errno;
+    unsigned int i, k;
+    int len, count, fd, save_errno = errno;
     unsigned char randomness[6];
 
     len = __strlen (tmpl);