X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdirectory.c;h=f49a66f57146c8cccd97b8d8a8bd015b46ebe7f8;hb=0e86a35f7852d41c4f7d70759bc966c5f21c9ac0;hp=2a7016410759e7b5c878a50097488b91ad74dd33;hpb=07b2e364addba87a4f304d3a3dfd2db79103e76e;p=vlc diff --git a/modules/access/directory.c b/modules/access/directory.c index 2a70164107..f49a66f571 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 @@ -25,13 +26,16 @@ * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include #include #include +#include +#include -#include -#include #ifdef HAVE_SYS_TYPES_H # include #endif @@ -57,7 +61,7 @@ # include #endif -#include "charset.h" +#include /***************************************************************************** * Module descriptor @@ -93,6 +97,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 ); @@ -103,7 +108,6 @@ vlc_module_begin(); add_submodule(); set_description( "Directory EOF"); set_capability( "demux2", 0 ); - add_shortcut( "directory" ); set_callbacks( DemuxOpen, NULL ); vlc_module_end(); @@ -112,12 +116,17 @@ 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 +}; -static int Read( access_t *, uint8_t *, int ); -static int ReadNull( access_t *, uint8_t *, int ); +typedef struct stat_list_t stat_list_t; + +static ssize_t Read( access_t *, uint8_t *, size_t ); +static ssize_t ReadNull( access_t *, uint8_t *, size_t ); static int Control( access_t *, int, va_list ); static int Demux( demux_t *p_demux ); @@ -125,7 +134,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 * ); + 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 @@ -134,17 +146,19 @@ static int Open( vlc_object_t *p_this ) { access_t *p_access = (access_t*)p_this; - struct stat stat_info; + if( !p_access->psz_path ) + return VLC_EGENERIC; -#ifdef HAVE_SYS_STAT_H - 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 + struct stat st; + if( !stat( p_access->psz_path, &st ) && !S_ISDIR( st.st_mode ) ) + return VLC_EGENERIC; + + 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; @@ -161,12 +175,15 @@ 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); } /***************************************************************************** * ReadNull: read the directory *****************************************************************************/ -static int ReadNull( access_t *p_access, uint8_t *p_buffer, int i_len) +static ssize_t ReadNull( access_t *p_access, uint8_t *p_buffer, size_t i_len) { /* Return fake data */ memset( p_buffer, 0, i_len ); @@ -176,29 +193,45 @@ static int ReadNull( access_t *p_access, uint8_t *p_buffer, int i_len) /***************************************************************************** * Read: read the directory *****************************************************************************/ -static int Read( access_t *p_access, uint8_t *p_buffer, int i_len) +static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len) { - char *psz_name = NULL; - char *psz; - char *ptr; - int i_mode, i_activity; + char *psz; + int i_mode, i_activity; + char *psz_name = strdup (p_access->psz_path); + + if( psz_name == NULL ) + return VLC_ENOMEM; + + 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, *p_root_category; - playlist_t *p_playlist = pl_Yield( p_access ); + playlist_item_t *p_item_in_category; + input_item_t *p_current_input; + playlist_item_t *p_current; - psz_name = ToLocale( p_access->psz_path ); - ptr = strdup( psz_name ); - LocaleFree( psz_name ); - if( ptr == NULL ) - goto end; + 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 ); - psz_name = ptr; + 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 */ - ptr += strlen( ptr ); - if( ( ptr > psz_name ) ) + if( psz_name[0] ) { - switch( *--ptr ) + char *ptr = psz_name + strlen (psz_name); + switch (*--ptr) { case '/': case '\\': @@ -216,46 +249,34 @@ 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 ); - - if( p_playlist->status.p_item && p_playlist->status.p_item->p_input == - ((input_thread_t *)p_access->p_parent)->input.p_item ) - p_item = p_playlist->status.p_item; - else - { - input_item_t *p_current = ( (input_thread_t*)p_access->p_parent)-> - input.p_item; - p_item = playlist_LockItemGetByInput( p_playlist, p_current ); - if( !p_item ) - { - msg_Dbg( p_playlist, "unable to find item in playlist"); - return VLC_ENOOBJ; - } - } - p_item->p_input->i_type = ITEM_TYPE_DIRECTORY; - - p_root_category = playlist_LockItemToNode( p_playlist, p_item ); + p_current->p_input->i_type = ITEM_TYPE_DIRECTORY; + p_item_in_category = playlist_ItemToNode( p_playlist, p_current, + VLC_FALSE ); i_activity = var_GetInteger( p_playlist, "activity" ); var_SetInteger( p_playlist, "activity", i_activity + DIRECTORY_ACTIVITY ); - ReadDir( p_playlist, psz_name , i_mode, p_item, p_root_category ); + ReadDir( p_playlist, psz_name, i_mode, p_current, p_item_in_category, + 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 ); -end: + + playlist_Signal( p_playlist ); + if( psz_name ) free( psz_name ); + vlc_object_release( p_input ); vlc_object_release( p_playlist ); /* Return fake data forever */ p_access->pf_read = ReadNull; - return ReadNull( p_access, p_buffer, i_len ); + return -1; } /***************************************************************************** - * DemuxOpen: + * Control: *****************************************************************************/ static int Control( access_t *p_access, int i_query, va_list args ) { @@ -291,6 +312,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: @@ -331,37 +353,77 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args ) return demux2_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args ); } -static int Filter( const struct dirent *foo ) + +static int Sort (const char **a, const char **b) { - return VLC_TRUE; + 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 ) + playlist_item_t *p_parent_category, + input_item_t *p_current_input, + DIR *handle, stat_list_t *stparent ) { - struct dirent **pp_dir_content = 0; + char **pp_dir_content = NULL; int i_dir_content, i, i_return = VLC_SUCCESS; playlist_item_t *p_node; - char **ppsz_extensions = 0; + char **ppsz_extensions = NULL; 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 = scandir( psz_name, &pp_dir_content, Filter, alphasort ); + 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; } @@ -377,7 +439,7 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, if( psz_parser[a] == ',' ) i_extensions++; } - ppsz_extensions = (char **)malloc( sizeof( char * ) * i_extensions ); + ppsz_extensions = (char **)calloc (i_extensions, sizeof (char *)); for( a = 0; a < i_extensions; a++ ) { @@ -393,95 +455,56 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, psz_parser = ptr + 1; } } + if( psz_ignore ) free( psz_ignore ); /* While we still have entries in the directory */ for( i = 0; i < i_dir_content; i++ ) { - struct dirent *p_dir_content = pp_dir_content[i]; + const char *entry = pp_dir_content[i]; int i_size_entry = strlen( psz_name ) + - strlen( p_dir_content->d_name ) + 2; - char *psz_uri = (char *)malloc( sizeof(char) * i_size_entry ); + strlen( entry ) + 2 + 7 /* strlen("file://") */; + char psz_uri[i_size_entry]; - sprintf( psz_uri, "%s/%s", psz_name, p_dir_content->d_name ); + sprintf( psz_uri, "%s/%s", psz_name, entry); /* if it starts with '.' then forget it */ - if( p_dir_content->d_name[0] != '.' ) + 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( !stat( psz_uri, &stat_data ) - && S_ISDIR(stat_data.st_mode) && i_mode != MODE_COLLAPSE ) -#elif defined( DT_DIR ) - if( ( p_dir_content->d_type & DT_DIR ) && 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( lstat( psz_uri, &stat_data ) - || S_ISLNK(stat_data.st_mode) ) - { - msg_Dbg( p_playlist, "skipping directory symlink %s", - psz_uri ); - free( psz_uri ); - continue; - } -#endif if( i_mode == MODE_NONE ) { - msg_Dbg( p_playlist, "skipping subdirectory %s", psz_uri ); - free( psz_uri ); + msg_Dbg( p_playlist, "skipping subdirectory `%s'", + psz_uri ); + closedir (subdir); continue; } - else if( i_mode == MODE_EXPAND ) - { - char *psz_newname, *psz_tmp; - msg_Dbg(p_playlist, "reading subdirectory %s", psz_uri ); - psz_tmp = FromLocale( p_dir_content->d_name ); - psz_newname = vlc_fix_readdir_charset( - p_playlist, psz_tmp ); - LocaleFree( psz_tmp ); + msg_Dbg (p_playlist, "creating subdirectory %s", psz_uri); - if( p_parent_category ) - { - p_node = playlist_NodeCreate( p_playlist, psz_newname, - p_parent_category ); - } - else - { - p_node = playlist_NodeCreate( p_playlist, psz_newname, - p_parent_category ); - } - - /* an strdup() just because of Mac OS X */ - free( psz_newname ); + 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 */ - if( ReadDir( p_playlist, psz_uri , MODE_EXPAND, - p_node, p_parent_category ? p_node : NULL ) - != VLC_SUCCESS ) - { - i_return = VLC_EGENERIC; - break; - } - } + /* 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 { input_item_t *p_input; - char *psz_tmp1, *psz_tmp2, *psz_loc; if( i_extensions > 0 ) { - char *psz_dot = strrchr( p_dir_content->d_name, '.' ); + const char *psz_dot = strrchr (entry, '.' ); if( psz_dot++ && *psz_dot ) { int a; @@ -493,43 +516,60 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, if( a < i_extensions ) { msg_Dbg( p_playlist, "ignoring file %s", psz_uri ); - free( psz_uri ); continue; } } } - psz_loc = FromLocale( psz_uri ); - psz_tmp1 = vlc_fix_readdir_charset( VLC_OBJECT(p_playlist), - psz_loc ); - LocaleFree( psz_loc ); - - psz_loc = FromLocale( p_dir_content->d_name ); - psz_tmp2 = vlc_fix_readdir_charset( VLC_OBJECT(p_playlist), - psz_loc ); - LocaleFree( psz_loc ); - + memmove (psz_uri + 7, psz_uri, sizeof (psz_uri) - 7); + memcpy (psz_uri, "file://", 7); p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist), - psz_tmp1, psz_tmp2, 0, NULL, - -1, ITEM_TYPE_VFILE ); - - playlist_AddWhereverNeeded( p_playlist, p_input, p_parent, - p_parent_category, VLC_FALSE, - PLAYLIST_APPEND|PLAYLIST_PREPARSE); + psz_uri, entry, 0, NULL, + -1, ITEM_TYPE_FILE ); + if (p_input != NULL) + { + if( p_current_input ) + input_ItemCopyOptions( p_current_input, p_input ); + int i_ret = playlist_BothAddInput( p_playlist, p_input, + p_parent_category, + PLAYLIST_APPEND|PLAYLIST_PREPARSE| + PLAYLIST_NO_REBUILD, + PLAYLIST_END, NULL, NULL, + VLC_FALSE ); + vlc_gc_decref( p_input ); + if( i_ret != VLC_SUCCESS ) + return VLC_EGENERIC; + } } } - free( psz_uri ); } for( i = 0; i < i_extensions; i++ ) if( ppsz_extensions[i] ) free( ppsz_extensions[i] ); if( ppsz_extensions ) free( ppsz_extensions ); - if( psz_ignore ) free( psz_ignore ); - for( i = 0; i < i_dir_content; i++ ) if( pp_dir_content[i] ) free( pp_dir_content[i] ); if( pp_dir_content ) free( pp_dir_content ); 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; +}