* 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
}
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;