/*****************************************************************************
* 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 <hartman at videolan dot org>
+ * 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
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_plugin.h>
#include <vlc_playlist.h>
#include <vlc_input.h>
+#include <vlc_access.h>
+#include <vlc_demux.h>
-#include <stdlib.h>
-#include <string.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
# include <dirent.h>
#endif
-#include "charset.h"
+#include <vlc_charset.h>
/*****************************************************************************
* Module descriptor
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_capability( "demux", 0 );
set_callbacks( DemuxOpen, NULL );
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 );
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
{
access_t *p_access = (access_t*)p_this;
- 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
+ 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;
p_access->pf_control= Control;
/* Force a demux */
+ free( p_access->psz_demux );
p_access->psz_demux = strdup( "directory" );
return VLC_SUCCESS;
*****************************************************************************/
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 );
/*****************************************************************************
* 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;
- int i_mode, i_activity;
+ char *psz;
+ int i_mode, i_activity;
+ char *psz_name = strdup (p_access->psz_path);
- char *psz_name = strdup (p_access->psz_path);
- if (psz_name == NULL)
+ 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_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, 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)
}
}
- playlist_item_t *p_item, *p_root_category;
- playlist_t *p_playlist = pl_Yield( p_access );
-
/* Handle mode */
psz = var_CreateGetString( p_access, "recursive" );
if( *psz == '\0' || !strncmp( psz, "none" , 4 ) )
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,
+ 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 );
- if( psz_name ) free( psz_name );
+
+ playlist_Signal( p_playlist );
+
+ 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 )
{
- vlc_bool_t *pb_bool;
+ bool *pb_bool;
int *pi_int;
int64_t *pi_64;
case ACCESS_CAN_FASTSEEK:
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 = false; /* FIXME */
break;
/* */
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
+ case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
*****************************************************************************/
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 );
+ return demux_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
}
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 )
{
char **pp_dir_content = NULL;
int i_dir_content, i, i_return = VLC_SUCCESS;
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;
}
psz_parser = ptr + 1;
}
}
- if( psz_ignore ) free( 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;
+ strlen( entry ) + 2 + 7 /* strlen("file://") */;
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;
+ 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 )
- != 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
{
}
}
+ memmove (psz_uri + 7, psz_uri, sizeof (psz_uri) - 7);
+ memcpy (psz_uri, "file://", 7);
p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist),
psz_uri, entry, 0, NULL,
- -1, ITEM_TYPE_VFILE );
+ -1, ITEM_TYPE_FILE );
if (p_input != NULL)
- playlist_AddWhereverNeeded (p_playlist, p_input, p_parent,
- p_parent_category, VLC_FALSE,
- PLAYLIST_APPEND|PLAYLIST_PREPARSE);
+ {
+ 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,
+ false );
+ vlc_gc_decref( p_input );
+ if( i_ret != VLC_SUCCESS )
+ return VLC_EGENERIC;
+ }
}
}
}
for( i = 0; i < i_extensions; i++ )
- if( ppsz_extensions[i] ) free( ppsz_extensions[i] );
- if( ppsz_extensions ) free( ppsz_extensions );
+ free( ppsz_extensions[i] );
+ 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 );
+ free( pp_dir_content[i] );
+ 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;
+}
projects / vlc / blobdiff