net_Connect: missing hints ai_socktype

[vlc] / src / text / filesystem.c

diff --git a/src/text/filesystem.c b/src/text/filesystem.c
index 34d03f44ff8e1773391c67a3efe61938ec1a6fa8..31fddef92647e1d80da80da98ce82bc16497cb2d 100644 (file)
--- a/src/text/filesystem.c
+++ b/src/text/filesystem.c
@@ -37,6 +37,7 @@
 #include <assert.h>
 
 #include <stdio.h>
+#include <limits.h> /* NAME_MAX */
 #include <errno.h>
 #include <sys/types.h>
 #ifdef HAVE_DIRENT_H
@@ -322,12 +323,18 @@ char *vlc_readdir( DIR *dir )
     return FromWide (ent->d_name);
 #else
     struct dirent *ent;
-
-    ent = readdir( (DIR *)dir );
-    if( ent == NULL )
+    struct
+    {
+        struct dirent ent;
+        char buf[NAME_MAX + 1];
+    } buf;
+    int val = readdir_r (dir, &buf.ent, &ent);
+    if (val)
+    {
+        errno = val;
         return NULL;
-
-    return vlc_fix_readdir( ent->d_name );
+    }
+    return ent ? vlc_fix_readdir( ent->d_name ) : NULL;
 #endif
 }