Merge all static runtime libs into libmono-static.

[mono.git] / support / dirent.c

diff --git a/support/dirent.c b/support/dirent.c
index 50d2f64a8443bd31700edf70fa912262969549ef..bc1b3e238e16730ad5113258b05eb174ec214b6f 100644 (file)
--- a/support/dirent.c
+++ b/support/dirent.c
@@ -17,8 +17,19 @@
 #include "map.h"
 #include "mph.h"
 
+#if defined (PATH_MAX) && defined (NAME_MAX)
+       #define MPH_PATH_MAX MAX(PATH_MAX, NAME_MAX)
+#elif defined (PATH_MAX)
+       #define MPH_PATH_MAX PATH_MAX
+#elif defined (NAME_MAX)
+       #define MPH_PATH_MAX NAME_MAX
+#else /* !defined PATH_MAX && !defined NAME_MAX */
+       #define MPH_PATH_MAX 2048
+#endif
+
 G_BEGIN_DECLS
 
+#if HAVE_SEEKDIR
 gint32
 Mono_Posix_Syscall_seekdir (void *dir, mph_off_t offset)
 {
@@ -28,12 +39,15 @@ Mono_Posix_Syscall_seekdir (void *dir, mph_off_t offset)
 
        return 0;
 }
+#endif  /* def HAVE_SEEKDIR */
 
+#if HAVE_TELLDIR
 mph_off_t
 Mono_Posix_Syscall_telldir (void *dir)
 {
        return telldir ((DIR*) dir);
 }
+#endif  /* def HAVE_TELLDIR */
 
 static void
 copy_dirent (struct Mono_Posix_Syscall__Dirent *to, struct dirent *from)
@@ -64,6 +78,7 @@ Mono_Posix_Syscall_readdir (void *dirp, struct Mono_Posix_Syscall__Dirent *entry
                return -1;
        }
 
+       errno = 0;
        d = readdir (dirp);
 
        if (d == NULL) {
@@ -78,8 +93,7 @@ Mono_Posix_Syscall_readdir (void *dirp, struct Mono_Posix_Syscall__Dirent *entry
 gint32
 Mono_Posix_Syscall_readdir_r (void *dirp, struct Mono_Posix_Syscall__Dirent *entry, void **result)
 {
-       struct dirent *_entry = malloc(sizeof(struct dirent) + 
-                       MAX(PATH_MAX, NAME_MAX) + 1);
+       struct dirent *_entry = malloc (sizeof (struct dirent) + MPH_PATH_MAX + 1);
        int r;
 
        r = readdir_r (dirp, _entry, (struct dirent**) result);