X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=support%2Fdirent.c;h=bc1b3e238e16730ad5113258b05eb174ec214b6f;hb=098e88f3a87205d92516a1fe912b6f84164d0a59;hp=6fb49902d0beef6f1284d781c9e68523fd3cbd33;hpb=2007998771b1c4d9e762943676d7959daaf74385;p=mono.git

diff --git a/support/dirent.c b/support/dirent.c
index 6fb49902d0b..bc1b3e238e1 100644
--- a/support/dirent.c
+++ b/support/dirent.c
@@ -11,37 +11,43 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
+#include <limits.h>
 #include <unistd.h>
 
+#include "map.h"
 #include "mph.h"
 
-G_BEGIN_DECLS
+#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
 
-struct Mono_Posix_Syscall__Dirent {
-	/* ino_t  */ mph_ino_t      d_ino;
-	/* off_t  */ mph_off_t      d_off;
-	/* ushort */ unsigned short d_reclen;
-	/* byte   */ unsigned char  d_type;
-	/* string */ char          *d_name;
-};
+G_BEGIN_DECLS
 
+#if HAVE_SEEKDIR
 gint32
 Mono_Posix_Syscall_seekdir (void *dir, mph_off_t offset)
 {
 	mph_return_if_off_t_overflow (offset);
 
-	errno = 0;
-
 	seekdir ((DIR*) dir, (off_t) offset);
 
-	return errno != 0;
+	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)
@@ -72,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) {
@@ -86,24 +93,25 @@ 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;
+	struct dirent *_entry = malloc (sizeof (struct dirent) + MPH_PATH_MAX + 1);
 	int r;
 
-	r = readdir_r (dirp, &_entry, (struct dirent**) result);
+	r = readdir_r (dirp, _entry, (struct dirent**) result);
 
-	if (r == 0 && result != NULL) {
-		copy_dirent (entry, &_entry);
+	if (r == 0 && *result != NULL) {
+		copy_dirent (entry, _entry);
 	}
 
+	free (_entry);
+
 	return r;
 }
 
 int
 Mono_Posix_Syscall_rewinddir (void* dir)
 {
-	errno = 0;
 	rewinddir (dir);
-	return errno == 0 ? 0 : -1;
+	return 0;
 }
 
 G_END_DECLS