[vlc-devel] commit: directory: remove special case for '-' ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Jan 16 12:30:17 CET 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan 16 13:00:16 2010 +0200| [300579565c3afadb7bb090335b97583d33501d9b] | committer: Rémi Denis-Courmont 

directory: remove special case for '-'

directory does not register the "fd" shortcut, so the standard input
case should not occur.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=300579565c3afadb7bb090335b97583d33501d9b
---

 modules/access/directory.c |   17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)

diff --git a/modules/access/directory.c b/modules/access/directory.c
index a0fe15c..feb655e 100644
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -100,22 +100,7 @@ int DirOpen( vlc_object_t *p_this )
     if( !p_access->psz_path )
         return VLC_EGENERIC;
 
-    DIR *handle;
-    if (strcmp (p_access->psz_path, "-"))
-        handle = utf8_opendir (p_access->psz_path);
-    else
-    {
-#if 0   /* This won't work yet, it generates paths like "-/music.ogg".
-         * We'd need to use openat() here and in the file access... */
-        int fd = dup (0);
-        handle = fdopendir (fd);
-        if (handle == NULL)
-            close (fd);
-#else
-        return VLC_EGENERIC;
-#endif
-    }
-
+    DIR *handle = utf8_opendir (p_access->psz_path);
     if (handle == NULL)
         return VLC_EGENERIC;
 




More information about the vlc-devel mailing list