Changeset 21439 for trunk/src

Timestamp:

Sep 1, 2010, 3:47:00 PM (15 years ago)

Author:

dmik

Message:

minivcrt: Provide a _fullpath() reimplementation that returns char * (as required by MSVCRT specs) instead of int returned by the EMX version, when building under EMX.

Location:

trunk/src/msvcrt

Files:

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

trunk/src/msvcrt/dir.c

@@ -63 +63 @@
 #include <stdlib.h>
 
+#ifdef __EMX__
+// restore the EMX version of _fullpath
+#undef _fullpath
+#endif
+
 #endif /* !__MINIVCRT__ */
 
@@ -769 +774 @@
 }
 
+#else /* !__MINIVCRT__ */
+
+#ifdef __EMX__
+
+// The EMX version of _fullpath() returns int instead of char*,
+// provide a wrapper
+char *MSVCRT__fullpath(char * absPath, const char* relPath, unsigned int size)
+{
+    return _fullpath(absPath, relPath, size) == 0 ? absPath : NULL;
+}
+
+#endif /* EMX */
+
 #endif /* !__MINIVCRT__ */
 
@@ -885 +903 @@
 MSVCRT_wchar_t* _wfullpath(MSVCRT_wchar_t* absPath,const MSVCRT_wchar_t* relPath,MSVCRT(size_t) size)
 {
-   MSVCRT_wchar_t ch;
    char asciiabsPath[280], asciirelPath[280];
 

trunk/src/msvcrt/minivcrt_internal.h

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