X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdirectory.c;h=10075f0a78d03b0c265c9a586f033b57c5d33a38;hb=93b0b1790b5c1c9cc252de109aaa351c0689b255;hp=07f966f7d19e161faf74cea37029a2b632bc5e9e;hpb=a9ac3e9e17a136f4114f27f99dae976a81bac7e2;p=vlc diff --git a/modules/access/directory.c b/modules/access/directory.c index 07f966f7d1..10075f0a78 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -1,10 +1,11 @@ /***************************************************************************** * directory.c: expands a directory (directory: access plug-in) ***************************************************************************** - * Copyright (C) 2002-2004 the VideoLAN team + * Copyright (C) 2002-2007 the VideoLAN team * $Id$ * * Authors: Derk-Jan Hartman + * Rémi Denis-Courmont * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,8 +32,6 @@ #include #include -#include -#include #ifdef HAVE_SYS_TYPES_H # include #endif @@ -94,6 +93,7 @@ vlc_module_begin(); set_capability( "access2", 55 ); add_shortcut( "directory" ); add_shortcut( "dir" ); + add_shortcut( "file" ); add_string( "recursive", "expand" , NULL, RECURSIVE_TEXT, RECURSIVE_LONGTEXT, VLC_FALSE ); change_string_list( psz_recursive_list, psz_recursive_list_text, 0 ); @@ -104,7 +104,6 @@ vlc_module_begin(); add_submodule(); set_description( "Directory EOF"); set_capability( "demux2", 0 ); - add_shortcut( "directory" ); set_callbacks( DemuxOpen, NULL ); vlc_module_end(); @@ -113,9 +112,14 @@ vlc_module_end(); * Local prototypes, constants, structures *****************************************************************************/ -#define MODE_EXPAND 0 -#define MODE_COLLAPSE 1 -#define MODE_NONE 2 +enum +{ + MODE_EXPAND, + MODE_COLLAPSE, + MODE_NONE +}; + +typedef struct stat_list_t stat_list_t; static int Read( access_t *, uint8_t *, int ); static int ReadNull( access_t *, uint8_t *, int ); @@ -126,7 +130,10 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args ); static int ReadDir( playlist_t *, const char *psz_name, int i_mode, - playlist_item_t *, playlist_item_t *, input_item_t * ); + playlist_item_t *, playlist_item_t *, input_item_t *, + DIR *handle, stat_list_t *stats ); + +static DIR *OpenDir (vlc_object_t *obj, const char *psz_name); /***************************************************************************** * Open: open the directory @@ -135,17 +142,12 @@ static int Open( vlc_object_t *p_this ) { access_t *p_access = (access_t*)p_this; - struct stat stat_info; - -#ifdef S_ISDIR - if (utf8_stat (p_access->psz_path, &stat_info) - || !S_ISDIR (stat_info.st_mode)) -#else - if( strcmp( p_access->psz_access, "dir") && - strcmp( p_access->psz_access, "directory") ) -#endif + DIR *handle = OpenDir (p_this, p_access->psz_path); + if (handle == NULL) return VLC_EGENERIC; + p_access->p_sys = (access_sys_t *)handle; + p_access->pf_read = Read; p_access->pf_block = NULL; p_access->pf_seek = NULL; @@ -162,6 +164,9 @@ static int Open( vlc_object_t *p_this ) *****************************************************************************/ static void Close( vlc_object_t * p_this ) { + access_t *p_access = (access_t*)p_this; + DIR *handle = (DIR *)p_access->p_sys; + closedir (handle); } /***************************************************************************** @@ -181,25 +186,38 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len) { char *psz; int i_mode, i_activity; - playlist_t *p_playlist = pl_Yield( p_access ); - playlist_item_t *p_item_in_category; - input_item_t *p_current_input = input_GetItem( - (input_thread_t*)p_access->p_parent); - playlist_item_t *p_current = playlist_ItemGetByInput( p_playlist, - p_current_input, - VLC_FALSE ); char *psz_name = strdup (p_access->psz_path); if( psz_name == NULL ) return VLC_ENOMEM; - if( p_current == NULL ) { + playlist_t *p_playlist = pl_Yield( p_access ); + input_thread_t *p_input = (input_thread_t*)vlc_object_find( p_access, VLC_OBJECT_INPUT, FIND_PARENT ); + + playlist_item_t *p_item_in_category; + input_item_t *p_current_input; + playlist_item_t *p_current; + + if( !p_input ) + { + msg_Err( p_access, "unable to find input (internal error)" ); + vlc_object_release( p_playlist ); + return VLC_ENOOBJ; + } + + p_current_input = input_GetItem( p_input ); + p_current = playlist_ItemGetByInput( p_playlist, p_current_input, VLC_FALSE ); + + if( !p_current ) + { msg_Err( p_access, "unable to find item in playlist" ); + vlc_object_release( p_input ); + vlc_object_release( p_playlist ); return VLC_ENOOBJ; } /* Remove the ending '/' char */ - if (psz_name[0]) + if( psz_name[0] ) { char *ptr = psz_name + strlen (psz_name); switch (*--ptr) @@ -220,8 +238,6 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len) i_mode = MODE_EXPAND; free( psz ); - msg_Dbg( p_access, "opening directory `%s'", p_access->psz_path ); - p_current->p_input->i_type = ITEM_TYPE_DIRECTORY; p_item_in_category = playlist_ItemToNode( p_playlist, p_current, VLC_FALSE ); @@ -231,13 +247,16 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len) DIRECTORY_ACTIVITY ); ReadDir( p_playlist, psz_name, i_mode, p_current, p_item_in_category, - p_current_input ); + p_current_input, (DIR *)p_access->p_sys, NULL ); i_activity = var_GetInteger( p_playlist, "activity" ); var_SetInteger( p_playlist, "activity", i_activity - DIRECTORY_ACTIVITY ); + playlist_Signal( p_playlist ); + if( psz_name ) free( psz_name ); + vlc_object_release( p_input ); vlc_object_release( p_playlist ); /* Return fake data forever */ @@ -246,7 +265,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len) } /***************************************************************************** - * DemuxOpen: + * Control: *****************************************************************************/ static int Control( access_t *p_access, int i_query, va_list args ) { @@ -282,6 +301,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) case ACCESS_SET_TITLE: case ACCESS_SET_SEEKPOINT: case ACCESS_SET_PRIVATE_ID_STATE: + case ACCESS_GET_CONTENT_TYPE: return VLC_EGENERIC; default: @@ -328,13 +348,21 @@ static int Sort (const char **a, const char **b) return strcoll (*a, *b); } +struct stat_list_t +{ + stat_list_t *parent; + struct stat st; +}; + + /***************************************************************************** * ReadDir: read a directory and add its content to the list *****************************************************************************/ static int ReadDir( playlist_t *p_playlist, const char *psz_name, int i_mode, playlist_item_t *p_parent, playlist_item_t *p_parent_category, - input_item_t *p_current_input ) + input_item_t *p_current_input, + DIR *handle, stat_list_t *stparent ) { char **pp_dir_content = NULL; int i_dir_content, i, i_return = VLC_SUCCESS; @@ -344,17 +372,47 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, int i_extensions = 0; char *psz_ignore; + struct stat_list_t stself; +#ifndef WIN32 + int fd = dirfd (handle); + + if ((fd == -1) || fstat (fd, &stself.st)) + { + msg_Err (p_playlist, "cannot stat `%s': %m", psz_name); + return VLC_EGENERIC; + } + + for (stat_list_t *stats = stparent; stats != NULL; stats = stats->parent) + { + if ((stself.st.st_ino == stats->st.st_ino) + && (stself.st.st_dev == stats->st.st_dev)) + { + msg_Warn (p_playlist, + "ignoring infinitely recursive directory `%s'", + psz_name); + return VLC_SUCCESS; + } + } +#else + /* Windows has st_dev (driver letter - 'A'), but it zeroes st_ino, + * so that the test above will always incorrectly succeed. + * Besides, Windows does not have dirfd(). */ +#endif + + stself.parent = stparent; + /* Get the first directory entry */ - i_dir_content = utf8_scandir (psz_name, &pp_dir_content, NULL, Sort); + i_dir_content = utf8_loaddir (handle, &pp_dir_content, NULL, Sort); if( i_dir_content == -1 ) { - msg_Warn( p_playlist, "failed to read directory" ); + msg_Err (p_playlist, "cannot read `%s': %m", psz_name); return VLC_EGENERIC; } else if( i_dir_content <= 0 ) { /* directory is empty */ - if( pp_dir_content ) free( pp_dir_content ); + msg_Dbg( p_playlist, "%s directory is empty", psz_name ); + free( pp_dir_content ); return VLC_SUCCESS; } @@ -393,61 +451,41 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, { const char *entry = pp_dir_content[i]; int i_size_entry = strlen( psz_name ) + - strlen( entry ) + 2; + strlen( entry ) + 2 + 7 /* strlen("file://") */; char psz_uri[i_size_entry]; - char psz_mrl[i_size_entry + 7]; /* "file://psz_uri" */ sprintf( psz_uri, "%s/%s", psz_name, entry); /* if it starts with '.' then forget it */ if (entry[0] != '.') { -#if defined( S_ISDIR ) - struct stat stat_data; + DIR *subdir = (i_mode != MODE_COLLAPSE) + ? OpenDir (VLC_OBJECT (p_playlist), psz_uri) : NULL; - if (!utf8_stat (psz_uri, &stat_data) - && S_ISDIR(stat_data.st_mode) && i_mode != MODE_COLLAPSE ) -#else - if( 0 ) -#endif + if (subdir != NULL) /* Recurse into subdirectory */ { -#if defined( S_ISLNK ) -/* - * FIXME: there is a ToCToU race condition here; but it is rather tricky - * impossible to fix while keeping some kind of portable code, and maybe even - * in a non-portable way. - */ - if (utf8_lstat (psz_uri, &stat_data) - || S_ISLNK(stat_data.st_mode) ) - { - msg_Dbg( p_playlist, "skipping directory symlink %s", - psz_uri ); - continue; - } -#endif if( i_mode == MODE_NONE ) { - msg_Dbg( p_playlist, "skipping subdirectory %s", psz_uri ); + msg_Dbg( p_playlist, "skipping subdirectory `%s'", + psz_uri ); + closedir (subdir); continue; } - else if( i_mode == MODE_EXPAND ) - { - msg_Dbg(p_playlist, "creading subdirectory %s", psz_uri ); - p_node = playlist_NodeCreate (p_playlist, entry, - p_parent_category); + msg_Dbg (p_playlist, "creating subdirectory %s", psz_uri); - /* If we had the parent in category, the it is now node. - * Else, we still don't have */ - if( ReadDir( p_playlist, psz_uri , MODE_EXPAND, - p_node, p_parent_category ? p_node : NULL, - p_current_input ) - != VLC_SUCCESS ) - { - i_return = VLC_EGENERIC; - break; - } - } + p_node = playlist_NodeCreate( p_playlist, entry, + p_parent_category, + PLAYLIST_NO_REBUILD, NULL ); + + /* If we had the parent in category, the it is now node. + * Else, we still don't have */ + i_return = ReadDir( p_playlist, psz_uri , MODE_EXPAND, + p_node, p_parent_category ? p_node : NULL, + p_current_input, subdir, &stself ); + closedir (subdir); + if (i_return) + break; // error :-( } else { @@ -472,18 +510,21 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, } } - sprintf( &psz_mrl, "file://%s", psz_uri ); + memmove (psz_uri + 7, psz_uri, sizeof (psz_uri) - 7); + memcpy (psz_uri, "file://", 7); p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist), - psz_mrl, entry, 0, NULL, - -1, ITEM_TYPE_VFILE ); + psz_uri, entry, 0, NULL, + -1, ITEM_TYPE_FILE ); if (p_input != NULL) { if( p_current_input ) input_ItemCopyOptions( p_current_input, p_input ); playlist_BothAddInput( p_playlist, p_input, p_parent_category, - PLAYLIST_APPEND|PLAYLIST_PREPARSE, - PLAYLIST_END, NULL, NULL ); + PLAYLIST_APPEND|PLAYLIST_PREPARSE| + PLAYLIST_NO_REBUILD, + PLAYLIST_END, NULL, NULL, + VLC_FALSE ); } } } @@ -499,3 +540,22 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, return i_return; } + + +static DIR *OpenDir (vlc_object_t *obj, const char *path) +{ + msg_Dbg (obj, "opening directory `%s'", path); + DIR *handle = utf8_opendir (path); + if (handle == NULL) + { + int err = errno; + if (err != ENOTDIR) + msg_Err (obj, "%s: %m", path); + else + msg_Dbg (obj, "skipping non-directory `%s'", path); + errno = err; + + return NULL; + } + return handle; +}