2 files changed, 11 insertions, 7 deletions
diff --git a/libc/misc/internals/tempname.c b/libc/misc/internals/tempname.c
index ef41cb62f..fae3687ad 100644
--- a/libc/misc/internals/tempname.c
+++ b/libc/misc/internals/tempname.c
@@ -63,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;
@@ -143,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;
@@ -182,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);
diff --git a/libc/misc/internals/tempname.h b/libc/misc/internals/tempname.h
index dfe9399ca..80a6cf7c1 100644
--- a/libc/misc/internals/tempname.h
+++ b/libc/misc/internals/tempname.h
@@ -3,8 +3,12 @@
 
 #define	__need_size_t
 #include <stddef.h>
-extern int __path_search (char *tmpl, size_t tmpl_len, const char *dir, 
-	        const char *pfx, int try_tmpdir) attribute_hidden;
+
+/* Disable support for $TMPDIR */
+extern int ___path_search (char *tmpl, size_t tmpl_len, const char *dir, 
+	        const char *pfx /*, int try_tmpdir */) attribute_hidden;
+#define __path_search(tmpl, tmpl_len, dir, pfx, try_tmpdir) ___path_search(tmpl, tmpl_len, dir, pfx)
+
 extern int __gen_tempname (char *__tmpl, int __kind) attribute_hidden;
 
 /* The __kind argument to __gen_tempname may be one of: */