Changeset 3012 for branches/libc-0.6/src/emx

Timestamp:

Apr 7, 2007, 6:29:36 AM (18 years ago)

Author:

bird

Message:

Fixed tempnam(NULL,NULL) crash and errno clobbering.

File:

• branches/libc-0.6/src/emx/src/lib/io/_tempnam.c (modified) (4 diffs)

branches/libc-0.6/src/emx/src/lib/io/_tempnam.c

@@ -11 +11 @@
 #include <io.h>
 #include <errno.h>
+#include <sys/stat.h>
 #include <sys/param.h>
 #include <emx/io.h>
-#include <emx/syscalls.h>
 #include "_tmp.h"
 
@@ -22 +22 @@
 static int _isdir (char *dst, const char *src)
 {
-  int attr;
+  struct stat s;
 
   if (_fullpath (dst, src, MAXPATHLEN) != 0)
     return 0;
-  attr = __chmod (dst, 0, 0);
-  return attr >= 0 && (attr & _A_SUBDIR);
+  return lstat (dst, &s) == 0
+      && S_ISDIR(s.st_mode);
 }
 
@@ -59 +59 @@
     tmpname[len++] = '/';
   p = tmpname + len;
+
+  if (!prefix)
+    prefix = "kLC";
 
   TMPIDX_LOCK;
@@ -98 +101 @@
   free (tmpname);
   p = strdup (buf);
-  if (p == NULL)
+  if (p != NULL)
+    errno = saved_errno;
+  else
     errno = ENOMEM;
   return p;