posix: open directories with close-on-exec flag

7f3120af · Rémi Denis-Courmont · 2a2bb7af · 7f3120af
Commit 7f3120af authored Mar 19, 2012 by Rémi Denis-Courmont
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

src/posix/filesystem.c src/posix/filesystem.c +9 -7

No files found.
--- a/src/posix/filesystem.c
+++ b/src/posix/filesystem.c
@@ -162,15 +162,17 @@ int vlc_mkdir (const char *dirname, mode_t mode)
 */
 DIR *vlc_opendir (const char *dirname)
 {
-    const char *local_name = ToLocale (dirname);
+#ifdef O_DIRECTORY
-    if (unlikely(local_name == NULL))
+    int fd = vlc_open (dirname, O_RDONLY | O_DIRECTORY);
-    {
+#else /* If O_DIRECTORY is missing. fdopendir() will deal with ENOTDIR. */
-        errno = ENOENT;
+    int fd = vlc_open (dirname, O_RDONLY);
+#endif
+    if (fd == -1)
        return NULL;
-    }
-    DIR *dir = opendir (local_name);
+    DIR *dir = fdopendir (fd);
-    LocaleFree (local_name);
+    if (dir == NULL)
+        close (fd);
    return dir;
 }