X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdirectory.c;h=f829443a1be0c4fb85e565538b928693168c5b56;hb=eeaa54cf2c5d1dca043b6d655d5786d138b83503;hp=1e14ff9b6f7f5ad9d8d210263e1603ce724922c8;hpb=5a989669c617078efd638d0a4edd3d51d929a349;p=vlc diff --git a/modules/access/directory.c b/modules/access/directory.c index 1e14ff9b6f..f829443a1b 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-2008 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,39 +26,33 @@ * Preamble *****************************************************************************/ -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include -#include -#include #ifdef HAVE_SYS_TYPES_H # include #endif #ifdef HAVE_SYS_STAT_H # include #endif -#ifdef HAVE_ERRNO_H -# include -#endif -#ifdef HAVE_FCNTL_H -# include -#endif #ifdef HAVE_UNISTD_H # include #elif defined( WIN32 ) && !defined( UNDER_CE ) # include -#elif defined( UNDER_CE ) -# define strcoll strcmp #endif #ifdef HAVE_DIRENT_H # include #endif -#include "charset.h" +#include +#include /***************************************************************************** * Module descriptor @@ -65,8 +60,6 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -static int DemuxOpen ( vlc_object_t * ); - #define RECURSIVE_TEXT N_("Subdirectory behavior") #define RECURSIVE_LONGTEXT N_( \ "Select whether subdirectories must be expanded.\n" \ @@ -74,9 +67,9 @@ static int DemuxOpen ( vlc_object_t * ); "collapse: subdirectories appear but are expanded on first play.\n" \ "expand: all subdirectories are expanded.\n" ) -static const char *psz_recursive_list[] = { "none", "collapse", "expand" }; -static const char *psz_recursive_list_text[] = { N_("none"), N_("collapse"), - N_("expand") }; +static const char *const psz_recursive_list[] = { "none", "collapse", "expand" }; +static const char *const psz_recursive_list_text[] = { + N_("none"), N_("collapse"), N_("expand") }; #define IGNORE_TEXT N_("Ignored extensions") #define IGNORE_LONGTEXT N_( \ @@ -87,24 +80,19 @@ static const char *psz_recursive_list_text[] = { N_("none"), N_("collapse"), vlc_module_begin(); set_category( CAT_INPUT ); - set_shortname( _("Directory" ) ); + set_shortname( N_("Directory" ) ); set_subcategory( SUBCAT_INPUT_ACCESS ); - set_description( _("Standard filesystem directory input") ); - set_capability( "access2", 55 ); + set_description( N_("Standard filesystem directory input") ); + set_capability( "access", 55 ); add_shortcut( "directory" ); add_shortcut( "dir" ); + add_shortcut( "file" ); add_string( "recursive", "expand" , NULL, RECURSIVE_TEXT, - RECURSIVE_LONGTEXT, VLC_FALSE ); + RECURSIVE_LONGTEXT, false ); change_string_list( psz_recursive_list, psz_recursive_list_text, 0 ); add_string( "ignore-filetypes", "m3u,db,nfo,jpg,gif,sfv,txt,sub,idx,srt,cue", - NULL, IGNORE_TEXT, IGNORE_LONGTEXT, VLC_FALSE ); + NULL, IGNORE_TEXT, IGNORE_LONGTEXT, false ); set_callbacks( Open, Close ); - - add_submodule(); - set_description( "Directory EOF"); - set_capability( "demux2", 0 ); - add_shortcut( "directory" ); - set_callbacks( DemuxOpen, NULL ); vlc_module_end(); @@ -112,20 +100,35 @@ vlc_module_end(); * Local prototypes, constants, structures *****************************************************************************/ -#define MODE_EXPAND 0 -#define MODE_COLLAPSE 1 -#define MODE_NONE 2 - -static int Read( access_t *, uint8_t *, int ); -static int ReadNull( access_t *, uint8_t *, int ); -static int Control( access_t *, int, va_list ); +enum +{ + MODE_EXPAND, + MODE_COLLAPSE, + MODE_NONE +}; -static int Demux( demux_t *p_demux ); -static int DemuxControl( demux_t *p_demux, int i_query, va_list args ); +typedef struct directory_t directory_t; +struct directory_t +{ + directory_t *parent; + DIR *handle; + char *uri; +#ifndef WIN32 + struct stat st; +#endif + char path[1]; +}; +struct access_sys_t +{ + directory_t *current; + DIR *handle; + char *ignored_exts; + int mode; +}; -static int ReadDir( playlist_t *, const char *psz_name, int i_mode, - playlist_item_t *, playlist_item_t *, input_item_t * ); +static block_t *Block( access_t * ); +static int Control( access_t *, int, va_list ); /***************************************************************************** * Open: open the directory @@ -133,25 +136,40 @@ static int ReadDir( playlist_t *, const char *psz_name, int i_mode, static int Open( vlc_object_t *p_this ) { access_t *p_access = (access_t*)p_this; + access_sys_t *p_sys; - struct stat stat_info; + if( !p_access->psz_path ) + return VLC_EGENERIC; -#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 = utf8_opendir (p_access->psz_path); + if (handle == NULL) return VLC_EGENERIC; - p_access->pf_read = Read; - p_access->pf_block = NULL; + p_sys = malloc (sizeof (*p_sys)); + if (!p_sys) + return VLC_ENOMEM; + + p_access->p_sys = p_sys; + p_sys->current = NULL; + p_sys->handle = handle; + p_sys->ignored_exts = var_CreateGetString (p_access, "ignore-filetypes"); + + /* Handle mode */ + char *psz = var_CreateGetString( p_access, "recursive" ); + if( *psz == '\0' || !strcasecmp( psz, "none" ) ) + p_sys->mode = MODE_NONE; + else if( !strcasecmp( psz, "collapse" ) ) + p_sys->mode = MODE_COLLAPSE; + else + p_sys->mode = MODE_EXPAND; + free( psz ); + + p_access->pf_read = NULL; + p_access->pf_block = Block; p_access->pf_seek = NULL; p_access->pf_control= Control; - - /* Force a demux */ - p_access->psz_demux = strdup( "directory" ); + free (p_access->psz_demux); + p_access->psz_demux = strdup ("xspf-open"); return VLC_SUCCESS; } @@ -161,95 +179,220 @@ static int Open( vlc_object_t *p_this ) *****************************************************************************/ static void Close( vlc_object_t * p_this ) { + access_t *p_access = (access_t*)p_this; + access_sys_t *p_sys = p_access->p_sys; + + while (p_sys->current) + { + directory_t *current = p_sys->current; + + p_sys->current = current->parent; + closedir (current->handle); + free (current->uri); + free (current); + } + if (p_sys->handle != NULL) + closedir (p_sys->handle); /* corner case,:Block() not called ever */ + free (p_sys->ignored_exts); + free (p_sys); } -/***************************************************************************** - * ReadNull: read the directory - *****************************************************************************/ -static int ReadNull( access_t *p_access, uint8_t *p_buffer, int i_len) +/** + * URI-encodes a file path. The only reserved characters is slash. + */ +static char *encode_path (const char *path) +{ + static const char sep[]= "%2F"; + char *enc = encode_URI_component (path), *ptr = enc; + + if (enc == NULL) + return NULL; + + /* Replace '%2F' with '/'. TODO: extend encode_URI*() */ + /* (On Windows, both ':' and '\\' will be encoded) */ + while ((ptr = strstr (ptr, sep)) != NULL) + { + *ptr++ = '/'; + memmove (ptr, ptr + 2, strlen (ptr) - 1); + } + return enc; +} + +/* Detect directories that recurse into themselves. */ +static bool has_inode_loop (const directory_t *dir) { - /* Return fake data */ - memset( p_buffer, 0, i_len ); - return i_len; +#ifndef WIN32 + dev_t dev = dir->st.st_dev; + ino_t inode = dir->st.st_ino; + + while ((dir = dir->parent) != NULL) + if ((dir->st.st_dev == dev) && (dir->st.st_ino == inode)) + return true; +#else +# define fstat( fd, st ) (0) +#endif + return false; } -/***************************************************************************** - * Read: read the directory - *****************************************************************************/ -static int Read( access_t *p_access, uint8_t *p_buffer, int i_len) +static block_t *Block (access_t *p_access) { - 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_thread_t*)p_access->p_parent) - ->input.p_item; - 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; + access_sys_t *p_sys = p_access->p_sys; + directory_t *current = p_sys->current; + + if (p_access->info.b_eof) + return NULL; + + if (current == NULL) + { /* Startup: send the XSPF header */ + static const char header[] = + "\n" + "\n" + " \n"; + block_t *block = block_Alloc (sizeof (header) - 1); + if (!block) + goto fatal; + memcpy (block->p_buffer, header, sizeof (header) - 1); + + /* "Open" the base directory */ + current = malloc (sizeof (*current) + strlen (p_access->psz_path)); + if (current == NULL) + { + block_Release (block); + goto fatal; + } + current->parent = NULL; + current->handle = p_sys->handle; + strcpy (current->path, p_access->psz_path); + current->uri = encode_path (current->path); + if ((current->uri == NULL) + || fstat (dirfd (current->handle), ¤t->st)) + { + free (current->uri); + free (current); + block_Release (block); + goto fatal; + } + + p_sys->handle = NULL; + p_sys->current = current; + return block; + } - if( p_current == NULL ) { - msg_Err( p_access, "unable to find item in playlist" ); - return VLC_ENOOBJ; + char *entry = utf8_readdir (current->handle); + if (entry == NULL) + { /* End of directory, go back to parent */ + closedir (current->handle); + p_sys->current = current->parent; + free (current); + + if (p_sys->current == NULL) + { /* End of XSPF playlist */ + static const char footer[] = + " \n" + "\n"; + + block_t *block = block_Alloc (sizeof (footer) - 1); + if (!block) + goto fatal; + memcpy (block->p_buffer, footer, sizeof (footer) - 1); + p_access->info.b_eof = true; + return block; + } + return NULL; } - /* Remove the ending '/' char */ - if (psz_name[0]) + /* Skip current and parent directories */ + if (!strcmp (entry, ".") || !strcmp (entry, "..")) + return NULL; + /* Handle recursion */ + if (p_sys->mode != MODE_COLLAPSE) { - char *ptr = psz_name + strlen (psz_name); - switch (*--ptr) + directory_t *sub = malloc (sizeof (*sub) + strlen (current->path) + 1 + + strlen (entry)); + if (sub == NULL) + return NULL; + sprintf (sub->path, "%s/%s", current->path, entry); + + DIR *handle = utf8_opendir (sub->path); + if (handle != NULL) { - case '/': - case '\\': - *ptr = '\0'; + sub->parent = current; + sub->handle = handle; + sub->uri = encode_path (sub->path); + + if ((p_sys->mode == MODE_NONE) + || fstat (dirfd (handle), &sub->st) + || has_inode_loop (sub) + || (sub->uri == NULL)) + { + closedir (handle); + free (sub); + return NULL; + } + p_sys->current = sub; + return NULL; } + else + free (sub); } - /* Handle mode */ - psz = var_CreateGetString( p_access, "recursive" ); - if( *psz == '\0' || !strncmp( psz, "none" , 4 ) ) - i_mode = MODE_NONE; - else if( !strncmp( psz, "collapse", 8 ) ) - i_mode = MODE_COLLAPSE; - else - 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 ); - - i_activity = var_GetInteger( p_playlist, "activity" ); - var_SetInteger( p_playlist, "activity", i_activity + - DIRECTORY_ACTIVITY ); + /* Skip files with ignored extensions */ + if (p_sys->ignored_exts != NULL) + { + const char *ext = strrchr (entry, '.'); + if (ext != NULL) + { + size_t extlen = strlen (++ext); + for (const char *type = p_sys->ignored_exts, *end; + type[0]; type = end + 1) + { + end = strchr (type, ','); + if (end == NULL) + end = type + strlen (type); - ReadDir( p_playlist, psz_name, i_mode, p_current, p_item_in_category, - p_current_input ); + if (type + extlen == end + && !strncasecmp (ext, type, extlen)) + return NULL; - i_activity = var_GetInteger( p_playlist, "activity" ); - var_SetInteger( p_playlist, "activity", i_activity - - DIRECTORY_ACTIVITY ); + if (*end == '\0') + break; + } + } + } - if( psz_name ) free( psz_name ); - vlc_object_release( p_playlist ); + char *encoded = encode_URI_component (entry); + free (entry); + if (encoded == NULL) + goto fatal; + int len = asprintf (&entry, + " file://%s/%s\n", + current->uri, encoded); + free (encoded); + if (len == -1) + goto fatal; + + /* TODO: new block allocator for malloc()ated data */ + block_t *block = block_Alloc (len); + if (!block) + { + free (entry); + goto fatal; + } + memcpy (block->p_buffer, entry, len); + free (entry); + return block; - /* Return fake data forever */ - p_access->pf_read = ReadNull; - return ReadNull( p_access, p_buffer, i_len ); +fatal: + p_access->info.b_eof = true; + return NULL; } /***************************************************************************** - * DemuxOpen: + * Control: *****************************************************************************/ static int Control( access_t *p_access, int i_query, va_list args ) { - vlc_bool_t *pb_bool; + bool *pb_bool; int *pi_int; int64_t *pi_64; @@ -258,10 +401,14 @@ static int Control( access_t *p_access, int i_query, va_list args ) /* */ case ACCESS_CAN_SEEK: case ACCESS_CAN_FASTSEEK: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; + break; + case ACCESS_CAN_PAUSE: case ACCESS_CAN_CONTROL_PACE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_FALSE; /* FIXME */ + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; break; /* */ @@ -281,6 +428,8 @@ 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: + case ACCESS_GET_META: return VLC_EGENERIC; default: @@ -289,210 +438,3 @@ static int Control( access_t *p_access, int i_query, va_list args ) } return VLC_SUCCESS; } - -/***************************************************************************** - * DemuxOpen: - *****************************************************************************/ -static int DemuxOpen ( vlc_object_t *p_this ) -{ - demux_t *p_demux = (demux_t*)p_this; - - if( strcmp( p_demux->psz_demux, "directory" ) ) - return VLC_EGENERIC; - - p_demux->pf_demux = Demux; - p_demux->pf_control = DemuxControl; - return VLC_SUCCESS; -} - -/***************************************************************************** - * Demux: EOF - *****************************************************************************/ -static int Demux( demux_t *p_demux ) -{ - return 0; -} - -/***************************************************************************** - * DemuxControl: - *****************************************************************************/ -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 Sort (const char **a, const char **b) -{ - return strcoll (*a, *b); -} - -/***************************************************************************** - * 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 ) -{ - char **pp_dir_content = NULL; - int i_dir_content, i, i_return = VLC_SUCCESS; - playlist_item_t *p_node; - - char **ppsz_extensions = NULL; - int i_extensions = 0; - char *psz_ignore; - - /* Get the first directory entry */ - i_dir_content = utf8_scandir (psz_name, &pp_dir_content, NULL, Sort); - if( i_dir_content == -1 ) - { - msg_Warn( p_playlist, "failed to read directory" ); - return VLC_EGENERIC; - } - else if( i_dir_content <= 0 ) - { - /* directory is empty */ - if( pp_dir_content ) free( pp_dir_content ); - return VLC_SUCCESS; - } - - /* Build array with ignores */ - psz_ignore = var_CreateGetString( p_playlist, "ignore-filetypes" ); - if( psz_ignore && *psz_ignore ) - { - char *psz_parser = psz_ignore; - int a; - - for( a = 0; psz_parser[a] != '\0'; a++ ) - { - if( psz_parser[a] == ',' ) i_extensions++; - } - - ppsz_extensions = (char **)calloc (i_extensions, sizeof (char *)); - - for( a = 0; a < i_extensions; a++ ) - { - char *tmp, *ptr; - - while( psz_parser[0] != '\0' && psz_parser[0] == ' ' ) psz_parser++; - ptr = strchr( psz_parser, ','); - tmp = ( ptr == NULL ) - ? strdup( psz_parser ) - : strndup( psz_parser, ptr - psz_parser ); - - ppsz_extensions[a] = tmp; - 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++ ) - { - const char *entry = pp_dir_content[i]; - int i_size_entry = strlen( psz_name ) + - strlen( entry ) + 2; - char psz_uri[i_size_entry]; - - 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; - - if (!utf8_stat (psz_uri, &stat_data) - && S_ISDIR(stat_data.st_mode) && 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 (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 ); - 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); - - /* 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; - } - } - } - else - { - input_item_t *p_input; - - if( i_extensions > 0 ) - { - const char *psz_dot = strrchr (entry, '.' ); - if( psz_dot++ && *psz_dot ) - { - int a; - for( a = 0; a < i_extensions; a++ ) - { - if( !strcmp( psz_dot, ppsz_extensions[a] ) ) - break; - } - if( a < i_extensions ) - { - msg_Dbg( p_playlist, "ignoring file %s", psz_uri ); - continue; - } - } - } - - p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist), - psz_uri, entry, 0, NULL, - -1, ITEM_TYPE_VFILE ); - 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 ); - } - } - } - } - - for( i = 0; i < i_extensions; i++ ) - if( ppsz_extensions[i] ) free( ppsz_extensions[i] ); - if( ppsz_extensions ) free( ppsz_extensions ); - - 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; -}