dvdnav: fix memory leak.

[vlc] / modules / access / directory.c

diff --git a/modules/access/directory.c b/modules/access/directory.c
index a1e1eaaa22ecb61f817793818c305555ee248689..b778cf0e252ff37cac3c064a0a556c3092462a77 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -46,9 +46,6 @@
 #   include <io.h>
 #endif
 
-#ifdef HAVE_DIRENT_H
-#   include <dirent.h>
-#endif
 #ifdef __sun__
 static inline int dirfd (DIR *dir)
 {
@@ -76,7 +73,7 @@ struct directory_t
 #ifndef WIN32
     struct stat  st;
 #endif
-#ifndef HAVE_FDOPENDIR
+#ifndef HAVE_OPENAT
     char         *path;
 #endif
 };
@@ -99,10 +96,10 @@ int DirOpen( vlc_object_t *p_this )
 {
     access_t *p_access = (access_t*)p_this;
 
-    if( !p_access->psz_path )
+    if( !p_access->psz_filepath )
         return VLC_EGENERIC;
 
-    DIR *handle = vlc_opendir (p_access->psz_path);
+    DIR *handle = vlc_opendir (p_access->psz_filepath);
     if (handle == NULL)
         return VLC_EGENERIC;
 
@@ -118,11 +115,11 @@ int DirInit (access_t *p_access, DIR *handle)
     char *uri;
     if (!strcmp (p_access->psz_access, "fd"))
     {
-        if (asprintf (&uri, "fd://%s", p_access->psz_path) == -1)
+        if (asprintf (&uri, "fd://%s", p_access->psz_location) == -1)
             uri = NULL;
     }
     else
-        uri = make_URI (p_access->psz_path);
+        uri = make_URI (p_access->psz_filepath, "file");
     if (unlikely(uri == NULL))
         goto error;
 
@@ -175,7 +172,7 @@ void DirClose( vlc_object_t * p_this )
         p_sys->current = current->parent;
         closedir (current->handle);
         free (current->uri);
-#ifndef HAVE_FDOPENDIR
+#ifndef HAVE_OPENAT
         free (current->path);
 #endif
         free (current);
@@ -237,8 +234,8 @@ block_t *DirBlock (access_t *p_access)
         }
         current->parent = NULL;
         current->handle = p_sys->handle;
-#ifndef HAVE_FDOPENDIR
-        current->path = strdup (p_access->psz_path);
+#ifndef HAVE_OPENAT
+        current->path = strdup (p_access->psz_filepath);
 #endif
         current->uri = p_sys->uri;
         if (fstat (dirfd (current->handle), &current->st))
@@ -260,7 +257,7 @@ block_t *DirBlock (access_t *p_access)
         closedir (current->handle);
         p_sys->current = current->parent;
         free (current->uri);
-#ifndef HAVE_FDOPENDIR
+#ifndef HAVE_OPENAT
         free (current->path);
 #endif
         free (current);
@@ -315,9 +312,8 @@ block_t *DirBlock (access_t *p_access)
         }
 
         DIR *handle;
-#ifdef HAVE_FDOPENDIR
-        /* TODO: ToLocale */
-        int fd = openat (dirfd (current->handle), entry, O_RDONLY);
+#ifdef HAVE_OPENAT
+        int fd = vlc_openat (dirfd (current->handle), entry, O_RDONLY);
         if (fd != -1)
         {
             handle = fdopendir (fd);