Update WCsubst.c for Unicode 5.1.0, and add a README.Unicode

[ghc-base.git] / cbits / dirUtils.c

diff --git a/cbits/dirUtils.c b/cbits/dirUtils.c
index 316a689..8e87db3 100644 (file)
--- a/cbits/dirUtils.c
+++ b/cbits/dirUtils.c
@@ -4,37 +4,38 @@
  * Directory Runtime Support
  */
 
-#include "config.h"
+/* needed only for solaris2_HOST_OS */
+#include "ghcconfig.h"
 
 // The following is required on Solaris to force the POSIX versions of
 // the various _r functions instead of the Solaris versions.
-#ifdef solaris2_TARGET_OS
+#ifdef solaris2_HOST_OS
 #define _POSIX_PTHREAD_SEMANTICS
 #endif
 
 #include "HsBase.h"
 
-#if defined(mingw32_TARGET_OS)
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
 #include <windows.h>
 #endif
 
+
 /*
  * read an entry from the directory stream; opt for the
  * re-entrant friendly way of doing this, if available.
  */
-HsInt
-__hscore_readdir( HsAddr dirPtr, HsAddr pDirEnt )
+int
+__hscore_readdir( DIR *dirPtr, struct dirent **pDirEnt )
 {
-  struct dirent **pDirE = (struct dirent**)pDirEnt;
 #if HAVE_READDIR_R
   struct dirent* p;
   int res;
-  static unsigned int nm_max = -1;
+  static unsigned int nm_max = (unsigned int)-1;
   
-  if (pDirE == NULL) {
+  if (pDirEnt == NULL) {
     return -1;
   }
-  if (nm_max == -1) {
+  if (nm_max == (unsigned int)-1) {
 #ifdef NAME_MAX
     nm_max = NAME_MAX + 1;
 #else
@@ -45,20 +46,24 @@ __hscore_readdir( HsAddr dirPtr, HsAddr pDirEnt )
   }
   p = (struct dirent*)malloc(sizeof(struct dirent) + nm_max);
   if (p == NULL) return -1;
-  res = readdir_r((DIR*)dirPtr, p, pDirE);
+  res = readdir_r(dirPtr, p, pDirEnt);
   if (res != 0) {
-    *pDirE = NULL;
+      *pDirEnt = NULL;
+      free(p);
+  }
+  else if (*pDirEnt == NULL) {
+    // end of stream
     free(p);
   }
   return res;
 #else
 
-  if (pDirE == NULL) {
+  if (pDirEnt == NULL) {
     return -1;
   }
 
-  *pDirE = readdir((DIR*)dirPtr);
-  if (*pDirE == NULL) {
+  *pDirEnt = readdir(dirPtr);
+  if (*pDirEnt == NULL) {
     return -1;
   } else {
     return 0;
@@ -75,25 +80,23 @@ __hscore_readdir( HsAddr dirPtr, HsAddr pDirEnt )
  * an error
  *
  */
-HsInt
-__hscore_renameFile( HsAddr src,
-                    HsAddr dest)
+int
+__hscore_renameFile( char *src, char *dest)
 {
-#if defined(_MSC_VER) || defined(_WIN32)
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
     static int forNT = -1;
-    DWORD rc;
     
     /* ToDo: propagate error codes back */
     if (MoveFileA(src, dest)) {
        return 0;
     } else {
-       rc = GetLastError();
+       ;
     }
     
     /* Failed...it could be because the target already existed. */
     if ( !GetFileAttributes(dest) ) {
        /* No, it's not there - just fail. */
-       errno = 0;
+       maperrno();
        return (-1);
     }
 
@@ -101,7 +104,7 @@ __hscore_renameFile( HsAddr src,
        OSVERSIONINFO ovi;
        ovi.dwOSVersionInfoSize = sizeof(ovi);
        if ( !GetVersionEx(&ovi) ) {
-           errno = 0; 
+           maperrno();
            return (-1);
        }
        forNT = ((ovi.dwPlatformId & VER_PLATFORM_WIN32_NT) != 0);
@@ -112,7 +115,7 @@ __hscore_renameFile( HsAddr src,
        if ( MoveFileExA(src, dest, MOVEFILE_REPLACE_EXISTING) ) {
            return 0;
        } else {
-           errno = 0; 
+           maperrno();
            return (-1);
        }
     }
@@ -123,11 +126,11 @@ __hscore_renameFile( HsAddr src,
        if (MoveFileA(src,dest)) {
            return 0;
        } else {
-           errno = 0;
+           maperrno();
            return (-1);
        }
     } else {
-       errno = 0;
+       maperrno();
        return (-1);
     }
 #else