Changeset 21947 for trunk/src

Timestamp:

Jan 18, 2012, 8:23:03 PM (14 years ago)

Author:

dmik

Message:

Add MSVCRTtempnam() to minivcrt.lib.

This is mainly to replace _tempnam() broken in kLIBC (see #63)
that may be needed somewhere in the future. This commit also
fixes the MSVCRTtempnam() and _wtempnam() implementations
(the first argument to GetTempPath() cannot be NULL).

Location:

trunk/src/msvcrt

Files:

• dir.c (modified) (2 diffs)
• file.c (modified) (4 diffs)

trunk/src/msvcrt/dir.c

@@ -634 +634 @@
 }
 
+#ifdef __EMX__
+
+/*
+ * NOTE: _fullpath() is broken in kLIBC and changes CWD (see
+ * http://svn.netlabs.org/odin32/ticket/63 for details). Enable the
+ * alternative implementation.
+ */
+
 /*********************************************************************
  *              _fullpath (MSVCRT.@)
@@ -695 +703 @@
   return absPath;
 }
+
+#endif /* __EMX__ */
 
 #ifndef __MINIVCRT__

trunk/src/msvcrt/file.c

@@ -1436 +1436 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
+#ifdef __EMX__
+
+/*
+ * NOTE: _fullpath() is broken in kLIBC and changes CWD (see
+ * http://svn.netlabs.org/odin32/ticket/63 for details). Enable the
+ * alternative implementation.
+ */
+
 /*********************************************************************
  *              _tempnam (MSVCRT.@)
@@ -1442 +1452 @@
 {
   char tmpbuf[MAX_PATH];
+  char tmpdir[MAX_PATH-14];
 
   TRACE("dir (%s) prefix (%s)\n",dir,prefix);
-  if (GetTempFileNameA(dir,prefix,0,tmpbuf))
-  {
-    TRACE("got name (%s)\n",tmpbuf);
-    return MSVCRT__strdup(tmpbuf);
+  if (!dir)
+  {
+    if (GetTempPathA(sizeof(tmpdir), tmpdir))
+      dir = tmpdir;
+  }
+  if (dir)
+  {
+    if (GetTempFileNameA(dir,prefix,0,tmpbuf))
+    {
+      TRACE("got name (%s)\n",tmpbuf);
+      return MSVCRT(_strdup(tmpbuf));
+    }
   }
   TRACE("failed (%ld)\n",GetLastError());
@@ -1453 +1472 @@
 }
 
-#endif /* !__MINIVCRT__ */
+#endif /* __EMX__ */
 
 /*********************************************************************
@@ -1461 +1480 @@
 {
   MSVCRT_wchar_t tmpbuf[MAX_PATH];
+  MSVCRT_wchar_t tmpdir[MAX_PATH-14];
 
   TRACE("dir (%s) prefix (%s)\n",debugstr_w(dir),debugstr_w(prefix));
-  if (GetTempFileNameW(dir,prefix,0,tmpbuf))
-  {
-    TRACE("got name (%s)\n",debugstr_w(tmpbuf));
-    return _wcsdup(tmpbuf);
+  if (!dir)
+  {
+    if (GetTempPathW(sizeof(tmpdir)/sizeof(wchar_t), tmpdir))
+      dir = tmpdir;
+  }
+  if (dir)
+  {
+    if (GetTempFileNameW(dir,prefix,0,tmpbuf))
+    {
+      TRACE("got name (%s)\n",debugstr_w(tmpbuf));
+      return _wcsdup(tmpbuf);
+    }
   }
   TRACE("failed (%ld)\n",GetLastError());