/*****************************************************************************
* directory.c: expands a directory (directory: access plug-in)
*****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
+ * Copyright (C) 2002-2004 the VideoLAN team
* $Id$
*
- * Authors: Derk-Jan Hartman <hartman at videolan dot org>>
+ * Authors: Derk-Jan Hartman <hartman at videolan dot org>
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
# include <dirent.h>
#endif
+#include "charset.h"
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
static char *psz_recursive_list_text[] = { N_("none"), N_("collapse"),
N_("expand") };
-#define IGNORE_TEXT N_("Ignore files with these extensions")
+#define IGNORE_TEXT N_("Ignored extensions")
#define IGNORE_LONGTEXT N_( \
- "Specify a comma seperated list of file extensions. " \
- "Files with these extensions will not be added to playlist when opening a directory. " \
- "This is useful if you add directories that contain mp3 albums for instance." )
+ "Files with these extensions will not be added to playlist when " \
+ "opening a directory.\n" \
+ "This is useful if you add directories that contain playlist files " \
+ "for instance. Use a comma-separated list of extensions." )
vlc_module_begin();
set_category( CAT_INPUT );
add_string( "recursive", "expand" , NULL, RECURSIVE_TEXT,
RECURSIVE_LONGTEXT, VLC_FALSE );
change_string_list( psz_recursive_list, psz_recursive_list_text, 0 );
-#ifdef HAVE_STRSEP
add_string( "ignore-filetypes", "m3u,db,nfo,jpg,gif,sfv,txt,sub,idx,srt,cue",
NULL, IGNORE_TEXT, IGNORE_LONGTEXT, VLC_FALSE );
-#endif
set_callbacks( Open, Close );
add_submodule();
static int DemuxControl( demux_t *p_demux, int i_query, va_list args );
-static int ReadDir( playlist_t *, char *psz_name, int i_mode, int *pi_pos,
+static int ReadDir( playlist_t *, const char *psz_name, int i_mode,
playlist_item_t * );
/*****************************************************************************
#ifdef HAVE_SYS_STAT_H
struct stat stat_info;
+ char *psz_path = ToLocale( p_access->psz_path );
- if( ( stat( p_access->psz_path, &stat_info ) == -1 ) ||
+ if( ( stat( psz_path, &stat_info ) == -1 ) ||
!S_ISDIR( stat_info.st_mode ) )
-
#elif defined(WIN32)
int i_ret;
strcmp( p_access->psz_access, "directory") )
#endif
{
+ LocaleFree( psz_path );
return VLC_EGENERIC;
}
+ LocaleFree( psz_path );
p_access->pf_read = Read;
p_access->pf_block = NULL;
p_access->pf_seek = NULL;
msg_Err( p_access, "can't find playlist" );
goto end;
}
+ else
+ {
+ char *ptr;
- /* Remove the ending '/' char */
- psz_name = strdup( p_access->psz_path );
- if( psz_name == NULL )
- goto end;
+ psz_name = ToLocale( p_access->psz_path );
+ ptr = strdup( psz_name );
+ LocaleFree( psz_name );
+ if( ptr == NULL )
+ goto end;
- if( (psz_name[strlen(psz_name)-1] == '/') ||
- (psz_name[strlen(psz_name)-1] == '\\') )
- {
- psz_name[strlen(psz_name)-1] = '\0';
+ psz_name = ptr;
+
+ /* Remove the ending '/' char */
+ ptr += strlen( ptr );
+ if( ( ptr > psz_name ) )
+ {
+ switch( *--ptr )
+ {
+ case '/':
+ case '\\':
+ *ptr = '\0';
+ }
+ }
}
/* Initialize structure */
/* The playlist position we will use for the add */
i_pos = p_playlist->i_index + 1;
- msg_Dbg( p_access, "opening directory `%s'", psz_name );
+ msg_Dbg( p_access, "opening directory `%s'", p_access->psz_path );
if( &p_playlist->status.p_item->input ==
((input_thread_t *)p_access->p_parent)->input.p_item )
}
p_item->input.i_type = ITEM_TYPE_DIRECTORY;
- if( ReadDir( p_playlist, psz_name , i_mode, &i_pos,
- p_item ) != VLC_SUCCESS )
+ if( ReadDir( p_playlist, psz_name , i_mode, p_item ) != VLC_SUCCESS )
{
}
end:
{
return 0;
}
+
/*****************************************************************************
* DemuxControl:
*****************************************************************************/
return demux2_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
}
-#if defined(SYS_BEOS) || defined(WIN32)
-/* BeOS doesn't have scandir/alphasort/versionsort */
-static int alphasort( const struct dirent **a, const struct dirent **b )
-{
- return strcoll( (*a)->d_name, (*b)->d_name );
-}
-
-static int scandir( const char *name, struct dirent ***namelist,
- int (*filter) ( const struct dirent * ),
- int (*compar) ( const struct dirent **,
- const struct dirent ** ) )
-{
- DIR * p_dir;
- struct dirent * p_content;
- struct dirent ** pp_list;
- int ret, size;
-
- if( !namelist || !( p_dir = opendir( name ) ) ) return -1;
-
- ret = 0;
- pp_list = NULL;
- while( ( p_content = readdir( p_dir ) ) )
- {
- if( filter && !filter( p_content ) )
- {
- continue;
- }
- pp_list = realloc( pp_list, ( ret + 1 ) * sizeof( struct dirent * ) );
- size = sizeof( struct dirent ) + strlen( p_content->d_name ) + 1;
- pp_list[ret] = malloc( size );
- memcpy( pp_list[ret], p_content, size );
- ret++;
- }
-
- closedir( p_dir );
-
- if( compar )
- {
- qsort( pp_list, ret, sizeof( struct dirent * ),
- (int (*)(const void *, const void *)) compar );
- }
-
- *namelist = pp_list;
- return ret;
-}
-#endif
-
static int Filter( const struct dirent *foo )
{
return VLC_TRUE;
}
+
/*****************************************************************************
* ReadDir: read a directory and add its content to the list
*****************************************************************************/
-static int ReadDir( playlist_t *p_playlist,
- char *psz_name , int i_mode, int *pi_position,
- playlist_item_t *p_parent )
+static int ReadDir( playlist_t *p_playlist, const char *psz_name,
+ int i_mode, playlist_item_t *p_parent )
{
struct dirent **pp_dir_content;
int i_dir_content, i;
playlist_item_t *p_node;
/* Build array with ignores */
-#ifdef HAVE_STRSEP
char **ppsz_extensions = 0;
int i_extensions = 0;
char *psz_ignore = var_CreateGetString( p_playlist, "ignore-filetypes" );
if( psz_ignore && *psz_ignore )
{
- char *psz_backup;
- char *psz_parser = psz_backup = strdup( psz_ignore );
- int a = 0;
+ char *psz_parser = psz_ignore;
+ int a;
- while( strsep( &psz_parser, "," ) ) i_extensions++;
- free( psz_backup );
+ for( a = 0; psz_parser[a] != '\0'; a++ )
+ {
+ if( psz_parser[a] == ',' ) i_extensions++;
+ }
ppsz_extensions = (char **)malloc( sizeof( char * ) * i_extensions );
- psz_parser = psz_ignore;
- while( a < i_extensions &&
- ( ppsz_extensions[a++] = strsep( &psz_parser, "," ) ) );
+ for( a = 0; a < i_extensions; a++ )
+ {
+ int b;
+ char *tmp;
+
+ while( psz_parser[0] != '\0' && psz_parser[0] == ' ' ) psz_parser++;
+ for( b = 0; psz_parser[b] != '\0'; b++ )
+ {
+ if( psz_parser[b] == ',' ) break;
+ }
+ tmp = malloc( b + 1 );
+ strncpy( tmp, psz_parser, b );
+ tmp[b] = 0;
+ ppsz_extensions[a] = tmp;
+ psz_parser += b+1;
+ }
}
-#endif /* HAVE_STRSEP */
/* Change the item to a node */
if( p_parent->i_children == -1 )
{
#if defined( S_ISDIR )
struct stat stat_data;
- stat( psz_uri, &stat_data );
- if( S_ISDIR(stat_data.st_mode) && i_mode != MODE_COLLAPSE )
+
+ 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 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 );
}
else if( i_mode == MODE_EXPAND )
{
- char *psz_newname;
+ char *psz_newname, *psz_tmp;
msg_Dbg(p_playlist, "Reading subdirectory %s", psz_uri );
- if( !strncmp( psz_uri, psz_name, strlen( psz_name ) ) )
- {
- char *psz_subdir = psz_uri;
- /* Skip the parent path + the separator */
- psz_subdir += strlen( psz_name ) + 1;
- psz_newname = strdup( psz_subdir );
- }
- else
- {
- psz_newname = strdup( psz_uri );
- }
+ psz_tmp = FromLocale( p_dir_content->d_name );
+ psz_newname = vlc_fix_readdir_charset(
+ p_playlist, psz_tmp );
+ LocaleFree( psz_tmp );
+
p_node = playlist_NodeCreate( p_playlist,
p_parent->pp_parents[0]->i_view,
psz_newname, p_parent );
p_node->input.i_type = ITEM_TYPE_DIRECTORY;
if( ReadDir( p_playlist, psz_uri , MODE_EXPAND,
- pi_position, p_node ) != VLC_SUCCESS )
+ p_node ) != VLC_SUCCESS )
{
return VLC_EGENERIC;
}
+ /* an strdup() just because of Mac OS X */
free( psz_newname );
}
}
else
{
playlist_item_t *p_item;
+ char *psz_tmp1, *psz_tmp2, *psz_loc;
-#ifdef HAVE_STRSEP
if( i_extensions > 0 )
{
char *psz_dot = strrchr( p_dir_content->d_name, '.' );
}
}
}
-#endif /* HAVE_STRSEP */
+
+ 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 );
p_item = playlist_ItemNewWithType( VLC_OBJECT(p_playlist),
- psz_uri, p_dir_content->d_name, ITEM_TYPE_VFILE );
+ psz_tmp1, psz_tmp2, ITEM_TYPE_VFILE );
playlist_NodeAddItem( p_playlist,p_item,
p_parent->pp_parents[0]->i_view,
p_parent,
- PLAYLIST_APPEND, PLAYLIST_END );
+ PLAYLIST_APPEND | PLAYLIST_PREPARSE,
+ PLAYLIST_END );
playlist_CopyParents( p_parent, p_item );
}
free( psz_uri );
}
-#ifdef HAVE_STRSEP
+ 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 );
-#endif /* HAVE_STRSEP */
- free( pp_dir_content );
+ 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 VLC_SUCCESS;
}
projects / vlc / blobdiff