Changeset 21550 for trunk/src

Timestamp:

Jan 9, 2011, 11:42:41 PM (15 years ago)

Author:

dmik

Message:

minivcrt: Use the own version of _fullpath() instead of the kLIBC one because the latter isn't capable of resolving non-existent paths (it allows only the last component to not exist).

Location:

trunk/src/msvcrt

Files:

• dir.c (modified) (5 diffs)
• minivcrt_internal.h (modified) (1 diff)

trunk/src/msvcrt/dir.c

@@ -65 +65 @@
 
 #ifdef __EMX__
-// restore the EMX version of _fullpath
-#undef _fullpath
+#include <direct.h>
 #endif
 
@@ -572 +571 @@
   }
 }
-
-#ifndef __MINIVCRT__
 
 /* INTERNAL: Helper for _fullpath. Modified PD code from 'snippets'. */
@@ -689 +686 @@
 
   if (!relPath || !*relPath)
-    return MSVCRT__getcwd(absPath, size);
+    return MSVCRT(_getcwd)(absPath, size);
 
   if (size < 4)
   {
-    *MSVCRT__errno() = MSVCRT_ERANGE;
+    *MSVCRT__errno() = MSVCRT(ERANGE);
     return NULL;
   }
@@ -728 +725 @@
 
   if (!absPath)
-    return MSVCRT__strdup(res);
+    return MSVCRT(_strdup(res));
   strcpy(absPath,res);
   return absPath;
 }
+
+#ifndef __MINIVCRT__
 
 /*********************************************************************
@@ -774 +773 @@
     TRACE("returning %s\n",path);
 }
-
-#else /* !__MINIVCRT__ */
-
-#ifdef __EMX__
-
-// The EMX version of _fullpath() returns int instead of char* and implicitly
-// changes the current drive. It also doesn't expect absPath to be NULL and
-// allocate a buffer in this case. Provide a wrapper to fix these issues.
-char *MSVCRT__fullpath(char * absPath, const char* relPath, unsigned int size)
-{
-    char *buf = NULL;
-    if (absPath == NULL)
-    {
-        size = PATH_MAX;
-        absPath = buf = (char *)MSVCRT_malloc(size);
-        if (buf == NULL)
-        {
-            *MSVCRT__errno() = ENOMEM;
-            return NULL;
-        }
-    }
-
-    int d = _getdrive();
-    char *result = _fullpath(absPath, relPath, size) == 0 ? absPath : NULL;
-    _chdrive(d);
-
-    if (result == NULL && buf != NULL)
-      MSVCRT_free(buf);
-
-    return result;
-}
-
-#endif /* EMX */
 
 #endif /* !__MINIVCRT__ */

trunk/src/msvcrt/minivcrt_internal.h

@@ -27 +27 @@
 #define MSVCRT__errno       _errno
 #define MSVCRT__getdrive    _getdrive
-#ifndef __EMX__
-#define MSVCRT__fullpath    _fullpath
-#endif
 
 #define MSVCRT_malloc       malloc