X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmodules.c;h=3ad7db8c057175e31c2aeb4741a996982d0bef6e;hb=22c5fe4ae5640b1f2e7358dccbc720faa84616a2;hp=de9d60e9b61016879fcf8fd6f8a1a52ccbb247db;hpb=53dee7b961b237b3864fd9bb1206d69902156727;p=vlc diff --git a/src/misc/modules.c b/src/misc/modules.c index de9d60e9b6..3ad7db8c05 100644 --- a/src/misc/modules.c +++ b/src/misc/modules.c @@ -1,7 +1,7 @@ /***************************************************************************** * modules.c : Builtin and plugin modules management functions ***************************************************************************** - * Copyright (C) 2001-2004 VideoLAN + * Copyright (C) 2001-2004 the VideoLAN team * $Id$ * * Authors: Sam Hocevar @@ -21,9 +21,11 @@ * * 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 + /* Some faulty libcs have a broken struct dirent when _FILE_OFFSET_BITS * is set to 64. Don't try to be cleverer. */ #ifdef _FILE_OFFSET_BITS @@ -34,15 +36,8 @@ #include /* sprintf() */ #include /* strdup() */ -#include -#include - #ifdef HAVE_DIRENT_H # include -#elif defined( UNDER_CE ) -# include /* GetFileAttributes() */ -#else -# include "../extras/dirent.h" #endif #ifdef HAVE_SYS_TYPES_H @@ -55,8 +50,9 @@ # include #endif -#define HAVE_DYNAMIC_PLUGINS -#if defined(HAVE_DL_DYLD) +#if !defined(HAVE_DYNAMIC_PLUGINS) + /* no support for plugins */ +#elif defined(HAVE_DL_DYLD) # if defined(HAVE_MACH_O_DYLD_H) # include # endif @@ -77,52 +73,58 @@ # if defined(HAVE_DL_H) # include # endif -#else -# undef HAVE_DYNAMIC_PLUGINS #endif -#include "vlc_error.h" +#include "misc/configuration.h" #include "vlc_interface.h" -#include "intf_eject.h" - #include "vlc_playlist.h" -#include "vlc_video.h" -#include "video_output.h" -#include "vout_synchro.h" -#include "vlc_spu.h" +#include "vlc_stream.h" +#include "vlc_access.h" +#include "vlc_demux.h" + +#include "vlc_vout.h" +#include "vlc_vout_synchro.h" -#include "audio_output.h" -#include "aout_internal.h" +#include "vlc_aout.h" -#include "stream_output.h" -#include "osd.h" +#include "vlc_sout.h" #include "vlc_httpd.h" +#include "vlc_acl.h" +#include "vlc_tls.h" +#include "vlc_md5.h" +#include "vlc_xml.h" +#include "vlc_url.h" #include "iso_lang.h" -#include "charset.h" +#include "vlc_charset.h" #include "vlc_block.h" #include "vlc_vlm.h" -#ifdef HAVE_DYNAMIC_PLUGINS -# include "modules_plugin.h" -#endif +#include "vlc_image.h" +#include "vlc_osd.h" + +#include "vlc_update.h" +#include "vlc_strings.h" +#include "vlc_streaming.h" -#if defined( UNDER_CE ) +#include "modules.h" + +#if defined( _MSC_VER ) && defined( UNDER_CE ) # include "modules_builtin_evc.h" #elif defined( _MSC_VER ) # include "modules_builtin_msvc.h" #else # include "modules_builtin.h" #endif -#include "network.h" +#include "vlc_network.h" -#if defined( WIN32) || defined( UNDER_CE ) +#if defined( WIN32 ) || defined( UNDER_CE ) /* Avoid name collisions */ -# define LoadModule(a,b,c) _LoadModule(a,b,c) +# define LoadModule(a,b,c) LoadVlcModule(a,b,c) #endif /***************************************************************************** @@ -135,7 +137,7 @@ static int AllocatePluginFile ( vlc_object_t *, char *, int64_t, int64_t ); static module_t * AllocatePlugin( vlc_object_t *, char * ); #endif static int AllocateBuiltinModule( vlc_object_t *, int ( * ) ( module_t * ) ); -static int DeleteModule ( module_t * ); +static int DeleteModule ( module_t *, vlc_bool_t ); #ifdef HAVE_DYNAMIC_PLUGINS static void DupModule ( module_t * ); static void UndupModule ( module_t * ); @@ -147,6 +149,7 @@ static void CacheLoad ( vlc_object_t * ); static int CacheLoadConfig ( module_t *, FILE * ); static void CacheSave ( vlc_object_t * ); static void CacheSaveConfig ( module_t *, FILE * ); +static char * CacheName ( void ); static void CacheMerge ( vlc_object_t *, module_t *, module_t * ); static module_cache_t * CacheFind( vlc_object_t *, char *, int64_t, int64_t ); @@ -155,6 +158,13 @@ static char * GetWindowsError ( void ); #endif #endif +static void module_LoadMain( vlc_object_t *p_this ); + + +/* Sub-version number + * (only used to avoid breakage in dev version when cache structure changes) */ +#define CACHE_SUBVERSION_NUM 1 + /***************************************************************************** * module_InitBank: create the module bank. ***************************************************************************** @@ -163,44 +173,44 @@ static char * GetWindowsError ( void ); *****************************************************************************/ void __module_InitBank( vlc_object_t *p_this ) { - module_bank_t *p_bank; + module_bank_t *p_bank = NULL; vlc_value_t lockval; - var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX ); - var_Get( p_this->p_libvlc, "libvlc", &lockval ); + var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc_global, "libvlc", &lockval ); vlc_mutex_lock( lockval.p_address ); - if( p_this->p_libvlc->p_module_bank ) + if( p_this->p_libvlc_global->p_module_bank ) { - p_this->p_libvlc->p_module_bank->i_usage++; + p_this->p_libvlc_global->p_module_bank->i_usage++; vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); return; } vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); p_bank = vlc_object_create( p_this, sizeof(module_bank_t) ); + if( !p_bank ) + return; p_bank->psz_object_name = "module bank"; p_bank->i_usage = 1; p_bank->i_cache = p_bank->i_loaded_cache = 0; - p_bank->pp_cache = p_bank->pp_loaded_cache = 0; + p_bank->pp_cache = p_bank->pp_loaded_cache = NULL; p_bank->b_cache = p_bank->b_cache_dirty = p_bank->b_cache_delete = VLC_FALSE; /* * Store the symbols to be exported */ -#ifdef HAVE_DYNAMIC_PLUGINS +#if defined (HAVE_DYNAMIC_PLUGINS) && !defined (HAVE_SHARED_LIBVLC) STORE_SYMBOLS( &p_bank->symbols ); #endif /* Everything worked, attach the object */ - p_this->p_libvlc->p_module_bank = p_bank; - vlc_object_attach( p_bank, p_this->p_libvlc ); + p_this->p_libvlc_global->p_module_bank = p_bank; + vlc_object_attach( p_bank, p_this->p_libvlc_global ); module_LoadMain( p_this ); - - return; } /***************************************************************************** @@ -223,52 +233,68 @@ void __module_ResetBank( vlc_object_t *p_this ) *****************************************************************************/ void __module_EndBank( vlc_object_t *p_this ) { - module_t * p_next; + module_t * p_next = NULL; vlc_value_t lockval; - var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX ); - var_Get( p_this->p_libvlc, "libvlc", &lockval ); + var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc_global, "libvlc", &lockval ); vlc_mutex_lock( lockval.p_address ); - if( !p_this->p_libvlc->p_module_bank ) + if( !p_this->p_libvlc_global->p_module_bank ) { vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); return; } - if( --p_this->p_libvlc->p_module_bank->i_usage ) + if( --p_this->p_libvlc_global->p_module_bank->i_usage ) { vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); return; } vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + + config_AutoSaveConfigFile( p_this ); #ifdef HAVE_DYNAMIC_PLUGINS -#define p_bank p_this->p_libvlc->p_module_bank +#define p_bank p_this->p_libvlc_global->p_module_bank if( p_bank->b_cache ) CacheSave( p_this ); while( p_bank->i_loaded_cache-- ) { - free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache]->psz_file ); - free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache] ); - if( !p_bank->i_loaded_cache ) free( p_bank->pp_loaded_cache ); + if( p_bank->pp_loaded_cache[p_bank->i_loaded_cache] ) + { + DeleteModule( p_bank->pp_loaded_cache[p_bank->i_loaded_cache]->p_module, p_bank->pp_loaded_cache[p_bank->i_loaded_cache]->b_used ); + free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache]->psz_file ); + free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache] ); + p_bank->pp_loaded_cache[p_bank->i_loaded_cache] = NULL; + } + } + if( p_bank->pp_loaded_cache ) + { + free( p_bank->pp_loaded_cache ); + p_bank->pp_loaded_cache = NULL; } while( p_bank->i_cache-- ) { free( p_bank->pp_cache[p_bank->i_cache]->psz_file ); free( p_bank->pp_cache[p_bank->i_cache] ); - if( !p_bank->i_cache ) free( p_bank->pp_cache ); + p_bank->pp_cache[p_bank->i_cache] = NULL; + } + if( p_bank->pp_cache ) + { + free( p_bank->pp_cache ); + p_bank->pp_cache = NULL; } #undef p_bank #endif - vlc_object_detach( p_this->p_libvlc->p_module_bank ); + vlc_object_detach( p_this->p_libvlc_global->p_module_bank ); - while( p_this->p_libvlc->p_module_bank->i_children ) + while( p_this->p_libvlc_global->p_module_bank->i_children ) { - p_next = (module_t *)p_this->p_libvlc->p_module_bank->pp_children[0]; + p_next = (module_t *)p_this->p_libvlc_global->p_module_bank->pp_children[0]; - if( DeleteModule( p_next ) ) + if( DeleteModule( p_next, VLC_TRUE ) ) { /* Module deletion failed */ msg_Err( p_this, "module \"%s\" can't be removed, trying harder", @@ -280,7 +306,8 @@ void __module_EndBank( vlc_object_t *p_this ) } } - vlc_object_destroy( p_this->p_libvlc->p_module_bank ); + vlc_object_destroy( p_this->p_libvlc_global->p_module_bank ); + p_this->p_libvlc_global->p_module_bank = NULL; return; } @@ -293,8 +320,23 @@ void __module_EndBank( vlc_object_t *p_this ) * as another module, and for instance the configuration options of main will * be available in the module bank structure just as for every other module. *****************************************************************************/ -void __module_LoadMain( vlc_object_t *p_this ) +static void module_LoadMain( vlc_object_t *p_this ) { + vlc_value_t lockval; + + var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc_global, "libvlc", &lockval ); + vlc_mutex_lock( lockval.p_address ); + if( p_this->p_libvlc_global->p_module_bank->b_main ) + { + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + return; + } + p_this->p_libvlc_global->p_module_bank->b_main = VLC_TRUE; + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + AllocateBuiltinModule( p_this, vlc_entry__main ); } @@ -305,6 +347,21 @@ void __module_LoadMain( vlc_object_t *p_this ) *****************************************************************************/ void __module_LoadBuiltins( vlc_object_t * p_this ) { + vlc_value_t lockval; + + var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc_global, "libvlc", &lockval ); + vlc_mutex_lock( lockval.p_address ); + if( p_this->p_libvlc_global->p_module_bank->b_builtins ) + { + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + return; + } + p_this->p_libvlc_global->p_module_bank->b_builtins = VLC_TRUE; + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + msg_Dbg( p_this, "checking builtin modules" ); ALLOCATE_ALL_BUILTINS(); } @@ -317,13 +374,28 @@ void __module_LoadBuiltins( vlc_object_t * p_this ) void __module_LoadPlugins( vlc_object_t * p_this ) { #ifdef HAVE_DYNAMIC_PLUGINS + vlc_value_t lockval; + + var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc_global, "libvlc", &lockval ); + vlc_mutex_lock( lockval.p_address ); + if( p_this->p_libvlc_global->p_module_bank->b_plugins ) + { + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + return; + } + p_this->p_libvlc_global->p_module_bank->b_plugins = VLC_TRUE; + vlc_mutex_unlock( lockval.p_address ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); + msg_Dbg( p_this, "checking plugin modules" ); if( config_GetInt( p_this, "plugins-cache" ) ) - p_this->p_libvlc->p_module_bank->b_cache = VLC_TRUE; + p_this->p_libvlc_global->p_module_bank->b_cache = VLC_TRUE; - if( p_this->p_libvlc->p_module_bank->b_cache || - p_this->p_libvlc->p_module_bank->b_cache_delete ) CacheLoad( p_this ); + if( p_this->p_libvlc_global->p_module_bank->b_cache || + p_this->p_libvlc_global->p_module_bank->b_cache_delete ) CacheLoad( p_this ); AllocateAllPlugins( p_this ); #endif @@ -357,8 +429,8 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, int i_shortcuts = 0; char *psz_shortcuts = NULL, *psz_var = NULL; + vlc_bool_t b_force_backup = p_this->b_force; - msg_Dbg( p_this, "looking for %s module", psz_capability ); /* Deal with variables */ if( psz_name && psz_name[0] == '$' ) @@ -432,7 +504,7 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, } /* Test if we have the required CPU */ - if( (p_module->i_cpu & p_this->p_libvlc->i_cpu) != p_module->i_cpu ) + if( (p_module->i_cpu & p_this->p_libvlc_global->i_cpu) != p_module->i_cpu ) { continue; } @@ -441,54 +513,33 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, if( i_shortcuts > 0 ) { vlc_bool_t b_trash; - int i_dummy, i_short = i_shortcuts; - char *psz_name = psz_shortcuts; + const char *psz_name = psz_shortcuts; /* Let's drop modules with a <= 0 score (unless they are * explicitly requested) */ b_trash = p_module->i_score <= 0; - while( i_short > 0 ) + for( unsigned i_short = i_shortcuts; i_short > 0; i_short-- ) { - for( i_dummy = 0; p_module->pp_shortcuts[i_dummy]; i_dummy++ ) + for( unsigned i = 0; p_module->pp_shortcuts[i]; i++ ) { - if( !strcasecmp( psz_name, - p_module->pp_shortcuts[i_dummy] ) ) + if( !strcasecmp( psz_name, p_module->pp_shortcuts[i] ) ) { /* Found it */ - b_trash = VLC_FALSE; i_shortcut_bonus = i_short * 10000; - break; + goto found_shortcut; } } - if( i_shortcut_bonus ) - { - /* We found it... remember ? */ - break; - } - /* Go to the next shortcut... This is so lame! */ - while( *psz_name ) - { - psz_name++; - } - psz_name++; - i_short--; + psz_name += strlen( psz_name ) + 1; } /* If we are in "strict" mode and we couldn't * find the module in the list of provided shortcuts, * then kick the bastard out of here!!! */ - if( i_short == 0 && b_strict ) - { - b_trash = VLC_TRUE; - } - - if( b_trash ) - { + if( b_strict ) continue; - } } /* If we didn't require a shortcut, trash <= 0 scored plugins */ else if( p_module->i_score <= 0 ) @@ -496,10 +547,13 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, continue; } +found_shortcut: + /* Special case: test if we requested a particular intf plugin */ if( !i_shortcuts && p_module->psz_program + && !strcmp( psz_capability, "interface" ) && !strcmp( p_module->psz_program, - p_this->p_vlc->psz_object_name ) ) + p_this->p_libvlc->psz_object_name ) ) { if( !b_intf ) { @@ -517,7 +571,7 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, /* Store this new module */ p_list[ i_index ].p_module = p_module; p_list[ i_index ].i_score = p_module->i_score + i_shortcut_bonus; - p_list[ i_index ].b_force = !!i_shortcut_bonus; + p_list[ i_index ].b_force = i_shortcut_bonus && b_strict; /* Add it to the modules-to-probe list */ if( i_index == 0 ) @@ -553,8 +607,8 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, i_index++; } - msg_Dbg( p_this, "probing %i candidate%s", - i_index, i_index == 1 ? "" : "s" ); + msg_Dbg( p_this, "looking for %s module: %i candidate%s", psz_capability, + i_index, i_index == 1 ? "" : "s" ); /* Lock all candidate modules */ p_tmp = p_first; @@ -573,8 +627,10 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, { #ifdef HAVE_DYNAMIC_PLUGINS /* Make sure the module is loaded in mem */ - module_t *p_module = p_tmp->p_module->b_submodule ? - (module_t *)p_tmp->p_module->p_parent : p_tmp->p_module; + module_t *p_module = p_tmp->p_module; + if( p_module->b_submodule ) + p_module = (module_t *)p_module->p_parent; + if( !p_module->b_builtin && !p_module->b_loaded ) { module_t *p_new_module = @@ -583,7 +639,7 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, { CacheMerge( p_this, p_module, p_new_module ); vlc_object_attach( p_new_module, p_module ); - DeleteModule( p_new_module ); + DeleteModule( p_new_module, VLC_TRUE ); } } #endif @@ -618,11 +674,11 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, } free( p_list ); - p_this->b_force = VLC_FALSE; + p_this->b_force = b_force_backup; if( p_module != NULL ) { - msg_Dbg( p_module, "using %s module \"%s\"", + msg_Dbg( p_this, "using %s module \"%s\"", psz_capability, p_module->psz_object_name ); } else if( p_first == NULL ) @@ -633,9 +689,12 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, psz_capability, (psz_name && *psz_name) ? psz_name : "any" ); } else - { + { msg_Err( p_this, "no %s module matched \"%s\"", psz_capability, (psz_name && *psz_name) ? psz_name : "any" ); + + msg_StackSet( VLC_EGENERIC, "no %s module matched \"%s\"", + psz_capability, (psz_name && *psz_name) ? psz_name : "any" ); } } else if( psz_name != NULL && *psz_name ) @@ -643,6 +702,8 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, msg_Warn( p_this, "no %s module matching \"%s\" could be loaded", psz_capability, (psz_name && *psz_name) ? psz_name : "any" ); } + else + msg_StackSet( VLC_EGENERIC, "no suitable %s module", psz_capability ); if( psz_shortcuts ) { @@ -672,13 +733,38 @@ void __module_Unneed( vlc_object_t * p_this, module_t * p_module ) p_module->pf_deactivate( p_this ); } - msg_Dbg( p_module, "unlocking module \"%s\"", p_module->psz_object_name ); + msg_Dbg( p_this, "removing module \"%s\"", p_module->psz_object_name ); vlc_object_release( p_module ); return; } +/***************************************************************************** + * module_Exists: tell if a module exists. + ***************************************************************************** + * This function is a boolean function that tells if a module exist or not. + *****************************************************************************/ + +vlc_bool_t __module_Exists( vlc_object_t *p_this, const char * psz_name ) +{ + vlc_list_t *p_list; + int i; + p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + for( i = 0 ; i < p_list->i_count; i++) + { + if (!strcmp( + ((module_t *) p_list->p_values[i].p_object)->psz_shortname , + psz_name ) ) + { + /* We can release the list, and return yes */ + vlc_list_release( p_list ); return VLC_TRUE; + } + } + vlc_list_release( p_list ); return VLC_FALSE; +} + + /***************************************************************************** * Following functions are local. *****************************************************************************/ @@ -690,24 +776,25 @@ void __module_Unneed( vlc_object_t * p_this, module_t * p_module ) static void AllocateAllPlugins( vlc_object_t *p_this ) { /* Yes, there are two NULLs because we replace one with "plugin-path". */ -#ifdef WIN32 - char * path[] = { "modules", "", "plugins", 0, 0 }; +#if defined( WIN32 ) || defined( UNDER_CE ) + const char *path[] = { "modules", "", "plugins", NULL, NULL }; #else - char * path[] = { "modules", PLUGIN_PATH, "plugins", 0, 0 }; + const char *path[] = { "modules", PLUGIN_PATH, "plugins", NULL, NULL }; #endif - char ** ppsz_path = path; - char * psz_fullpath; + const char *const *ppsz_path; /* If the user provided a plugin path, we add it to the list */ - path[ sizeof(path)/sizeof(char*) - 2 ] = - config_GetPsz( p_this, "plugin-path" ); + char *userpath = config_GetPsz( p_this, "plugin-path" ); + path[sizeof(path)/sizeof(path[0]) - 2] = userpath; - for( ; *ppsz_path != NULL ; ppsz_path++ ) + for (ppsz_path = path; *ppsz_path != NULL; ppsz_path++) { - if( !(*ppsz_path)[0] ) continue; + char *psz_fullpath; -#if defined( SYS_BEOS ) || defined( SYS_DARWIN ) || defined( WIN32 ) + if (!**ppsz_path) continue; + +#if defined( SYS_BEOS ) || defined( __APPLE__ ) || defined( WIN32 ) /* Handle relative as well as absolute paths */ #ifdef WIN32 @@ -717,27 +804,16 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) if( (*ppsz_path)[0] != '/' ) #endif { - int i_dirlen = strlen( *ppsz_path ); - i_dirlen += strlen( p_this->p_libvlc->psz_vlcpath ) + 2; - - psz_fullpath = malloc( i_dirlen ); - if( psz_fullpath == NULL ) - { - continue; - } -#ifdef WIN32 - sprintf( psz_fullpath, "%s\\%s", - p_this->p_libvlc->psz_vlcpath, *ppsz_path ); -#else - sprintf( psz_fullpath, "%s/%s", - p_this->p_libvlc->psz_vlcpath, *ppsz_path ); -#endif + if( 0>= asprintf(&psz_fullpath, "%s"DIR_SEP"%s", + p_this->p_libvlc_global->psz_vlcpath, *ppsz_path) ) + psz_fullpath = NULL; } else #endif - { psz_fullpath = strdup( *ppsz_path ); - } + + if( psz_fullpath == NULL ) + continue; msg_Dbg( p_this, "recursively browsing `%s'", psz_fullpath ); @@ -748,9 +824,8 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) } /* Free plugin-path */ - if( path[ sizeof(path)/sizeof(char*) - 2 ] ) - free( path[ sizeof(path)/sizeof(char*) - 2 ] ); - path[ sizeof(path)/sizeof(char*) - 2 ] = NULL; + if( userpath != NULL ) + free( userpath ); } /***************************************************************************** @@ -759,6 +834,12 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, int i_maxdepth ) { +/* FIXME: Needs to be ported to wide char on ALL Windows builds */ +#ifdef WIN32 +# undef opendir +# undef closedir +# undef readdir +#endif #if defined( UNDER_CE ) || defined( _MSC_VER ) #ifdef UNDER_CE wchar_t psz_wpath[MAX_PATH + 256]; @@ -767,7 +848,7 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, char psz_path[MAX_PATH + 256]; WIN32_FIND_DATA finddata; HANDLE handle; - unsigned int rc; + int rc; #else int i_dirlen; DIR * dir; @@ -775,7 +856,7 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, #endif char * psz_file; - if( p_this->p_vlc->b_die || i_maxdepth < 0 ) + if( p_this->p_libvlc->b_die || i_maxdepth < 0 ) { return; } @@ -785,13 +866,13 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, MultiByteToWideChar( CP_ACP, 0, psz_dir, -1, psz_wdir, MAX_PATH ); rc = GetFileAttributes( psz_wdir ); - if( !(rc & FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */ + if( rc<0 || !(rc&FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */ /* Parse all files in the directory */ swprintf( psz_wpath, L"%ls\\*", psz_wdir ); #else rc = GetFileAttributes( psz_dir ); - if( !(rc & FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */ + if( rc<0 || !(rc&FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */ #endif /* Parse all files in the directory */ @@ -820,8 +901,9 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, sprintf( psz_path, "%s\\%s", psz_dir, finddata.cFileName ); #endif - /* Skip ".", ".." and anything starting with "." */ - if( !*finddata.cFileName || *finddata.cFileName == '.' ) + /* Skip ".", ".." */ + if( !*finddata.cFileName || !strcmp( finddata.cFileName, "." ) + || !strcmp( finddata.cFileName, ".." ) ) { if( !FindNextFile( handle, &finddata ) ) break; continue; @@ -841,12 +923,30 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, - strlen( LIBEXT ), LIBEXT, strlen( LIBEXT ) ) ) { + WIN32_FILE_ATTRIBUTE_DATA attrbuf; + int64_t i_time = 0, i_size = 0; + +#ifdef UNDER_CE + if( GetFileAttributesEx( psz_wpath, GetFileExInfoStandard, + &attrbuf ) ) +#else + if( GetFileAttributesEx( psz_path, GetFileExInfoStandard, + &attrbuf ) ) +#endif + { + i_time = attrbuf.ftLastWriteTime.dwHighDateTime; + i_time <<= 32; + i_time |= attrbuf.ftLastWriteTime.dwLowDateTime; + i_size = attrbuf.nFileSizeHigh; + i_size <<= 32; + i_size |= attrbuf.nFileSizeLow; + } psz_file = psz_path; - AllocatePluginFile( p_this, psz_file, 0, 0 ); + AllocatePluginFile( p_this, psz_file, i_time, i_size ); } } - while( !p_this->p_vlc->b_die && FindNextFile( handle, &finddata ) ); + while( !p_this->p_libvlc->b_die && FindNextFile( handle, &finddata ) ); /* Close the directory */ FindClose( handle ); @@ -861,14 +961,15 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, i_dirlen = strlen( psz_dir ); /* Parse the directory and try to load all files it contains. */ - while( !p_this->p_vlc->b_die && (file = readdir( dir )) ) + while( !p_this->p_libvlc->b_die && (file = readdir( dir )) ) { struct stat statbuf; unsigned int i_len; int i_stat; - /* Skip ".", ".." and anything starting with "." */ - if( !*file->d_name || *file->d_name == '.' ) + /* Skip ".", ".." */ + if( !*file->d_name || !strcmp( file->d_name, "." ) + || !strcmp( file->d_name, ".." ) ) { continue; } @@ -921,7 +1022,7 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, int64_t i_file_time, int64_t i_file_size ) { - module_t * p_module; + module_t * p_module = NULL; module_cache_t *p_cache_entry = NULL; /* @@ -943,7 +1044,7 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, } else { - module_config_t *p_item; + module_config_t *p_item = NULL, *p_end = NULL; p_module = p_cache_entry->p_module; p_module->b_loaded = VLC_FALSE; @@ -951,12 +1052,17 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, /* For now we force loading if the module's config contains * callbacks or actions. * Could be optimized by adding an API call.*/ - for( p_item = p_module->p_config; - p_item->i_type != CONFIG_HINT_END; p_item++ ) + for( p_item = p_module->p_config, p_end = p_item + p_module->confsize; + p_item < p_end; p_item++ ) { if( p_item->pf_callback || p_item->i_action ) + { p_module = AllocatePlugin( p_this, psz_file ); + break; + } } + if( p_module == p_cache_entry->p_module ) + p_cache_entry->b_used = VLC_TRUE; } } @@ -969,22 +1075,26 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, /* msg_Dbg( p_this, "plugin \"%s\", %s", p_module->psz_object_name, p_module->psz_longname ); */ - vlc_object_attach( p_module, p_this->p_libvlc->p_module_bank ); - } + vlc_object_attach( p_module, p_this->p_libvlc_global->p_module_bank ); - if( !p_this->p_libvlc->p_module_bank->b_cache ) return 0; + if( !p_this->p_libvlc_global->p_module_bank->b_cache ) + return 0; - /* Add entry to cache */ -#define p_bank p_this->p_libvlc->p_module_bank - p_bank->pp_cache = - realloc( p_bank->pp_cache, (p_bank->i_cache + 1) * sizeof(void *) ); - p_bank->pp_cache[p_bank->i_cache] = malloc( sizeof(module_cache_t) ); - p_bank->pp_cache[p_bank->i_cache]->psz_file = strdup( psz_file ); - p_bank->pp_cache[p_bank->i_cache]->i_time = i_file_time; - p_bank->pp_cache[p_bank->i_cache]->i_size = i_file_size; - p_bank->pp_cache[p_bank->i_cache]->b_junk = p_module ? 0 : 1; - p_bank->pp_cache[p_bank->i_cache]->p_module = p_module; - p_bank->i_cache++; + /* Add entry to cache */ +#define p_bank p_this->p_libvlc_global->p_module_bank + p_bank->pp_cache = + realloc( p_bank->pp_cache, (p_bank->i_cache + 1) * sizeof(void *) ); + p_bank->pp_cache[p_bank->i_cache] = malloc( sizeof(module_cache_t) ); + if( !p_bank->pp_cache[p_bank->i_cache] ) + return -1; + p_bank->pp_cache[p_bank->i_cache]->psz_file = strdup( psz_file ); + p_bank->pp_cache[p_bank->i_cache]->i_time = i_file_time; + p_bank->pp_cache[p_bank->i_cache]->i_size = i_file_size; + p_bank->pp_cache[p_bank->i_cache]->b_junk = p_module ? 0 : 1; + p_bank->pp_cache[p_bank->i_cache]->b_used = VLC_TRUE; + p_bank->pp_cache[p_bank->i_cache]->p_module = p_module; + p_bank->i_cache++; + } return p_module ? 0 : -1; } @@ -998,10 +1108,11 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, *****************************************************************************/ static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) { - module_t * p_module; + module_t * p_module = NULL; module_handle_t handle; - if( LoadModule( p_this, psz_file, &handle ) ) return NULL; + if( LoadModule( p_this, psz_file, &handle ) ) + return NULL; /* Now that we have successfully loaded the module, we can * allocate a structure for it */ @@ -1016,7 +1127,9 @@ static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) /* We need to fill these since they may be needed by CallEntry() */ p_module->psz_filename = psz_file; p_module->handle = handle; - p_module->p_symbols = &p_this->p_libvlc->p_module_bank->symbols; +#ifndef HAVE_SHARED_LIBVLC + p_module->p_symbols = &p_this->p_libvlc_global->p_module_bank->symbols; +#endif p_module->b_loaded = VLC_TRUE; /* Initialize the module: fill p_module, default config */ @@ -1045,7 +1158,7 @@ static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) *****************************************************************************/ static void DupModule( module_t *p_module ) { - char **pp_shortcut; + const char **pp_shortcut; int i_submodule; for( pp_shortcut = p_module->pp_shortcuts ; *pp_shortcut ; pp_shortcut++ ) @@ -1057,7 +1170,8 @@ static void DupModule( module_t *p_module ) * module is unloaded. */ p_module->psz_object_name = strdup( p_module->psz_object_name ); p_module->psz_capability = strdup( p_module->psz_capability ); - p_module->psz_shortname = strdup( p_module->psz_shortname ); + p_module->psz_shortname = p_module->psz_shortname ? + strdup( p_module->psz_shortname ) : NULL; p_module->psz_longname = strdup( p_module->psz_longname ); if( p_module->psz_program != NULL ) @@ -1078,7 +1192,7 @@ static void DupModule( module_t *p_module ) *****************************************************************************/ static void UndupModule( module_t *p_module ) { - char **pp_shortcut; + const char **pp_shortcut; int i_submodule; for( i_submodule = 0; i_submodule < p_module->i_children; i_submodule++ ) @@ -1088,17 +1202,17 @@ static void UndupModule( module_t *p_module ) for( pp_shortcut = p_module->pp_shortcuts ; *pp_shortcut ; pp_shortcut++ ) { - free( *pp_shortcut ); + free( (void *)*pp_shortcut ); } - free( p_module->psz_object_name ); - free( p_module->psz_capability ); - free( p_module->psz_shortname ); - free( p_module->psz_longname ); + free( (void *)p_module->psz_object_name ); + free( (void *)p_module->psz_capability ); + if( p_module->psz_shortname ) free( (void *)p_module->psz_shortname ); + free( (void *)p_module->psz_longname ); if( p_module->psz_program != NULL ) { - free( p_module->psz_program ); + free( (void *)p_module->psz_program ); } } @@ -1141,7 +1255,7 @@ static int AllocateBuiltinModule( vlc_object_t * p_this, /* msg_Dbg( p_this, "builtin \"%s\", %s", p_module->psz_object_name, p_module->psz_longname ); */ - vlc_object_attach( p_module, p_this->p_libvlc->p_module_bank ); + vlc_object_attach( p_module, p_this->p_libvlc_global->p_module_bank ); return 0; } @@ -1151,9 +1265,11 @@ static int AllocateBuiltinModule( vlc_object_t * p_this, ***************************************************************************** * This function can only be called if the module isn't being used. *****************************************************************************/ -static int DeleteModule( module_t * p_module ) +static int DeleteModule( module_t * p_module, vlc_bool_t b_detach ) { - vlc_object_detach( p_module ); + if( !p_module ) return VLC_EGENERIC; + if( b_detach ) + vlc_object_detach( p_module ); /* We free the structures that we strdup()ed in Allocate*Module(). */ #ifdef HAVE_DYNAMIC_PLUGINS @@ -1178,7 +1294,7 @@ static int DeleteModule( module_t * p_module ) config_Free( p_module ); vlc_object_destroy( p_module ); - + p_module = NULL; return 0; } @@ -1192,7 +1308,7 @@ static int DeleteModule( module_t * p_module ) *****************************************************************************/ static int CallEntry( module_t * p_module ) { - static char *psz_name = "vlc_entry" MODULE_SUFFIX; + static const char * const psz_name = "vlc_entry" MODULE_SUFFIX; int (* pf_symbol) ( module_t * p_module ); /* Try to resolve the symbol */ @@ -1225,7 +1341,7 @@ static int CallEntry( module_t * p_module ) { /* With a well-written module we shouldn't have to print an * additional error message here, but just make sure. */ - msg_Err( p_module, "failed calling symbol \"%s\" in file `%s'", + msg_Err( p_module, "Failed to call symbol \"%s\" in file `%s'", psz_name, p_module->psz_filename ); return -1; } @@ -1303,7 +1419,6 @@ static int LoadModule( vlc_object_t *p_this, char *psz_file, #elif defined(HAVE_DL_DLOPEN) && defined(RTLD_NOW) /* static is OK, we are called atomically */ - static vlc_bool_t b_kde = VLC_FALSE; # if defined(SYS_LINUX) /* XXX HACK #1 - we should NOT open modules with RTLD_GLOBAL, or we @@ -1320,18 +1435,6 @@ static int LoadModule( vlc_object_t *p_this, char *psz_file, } } # endif - /* XXX HACK #2 - the ugly KDE workaround. It seems that libkdewhatever - * causes dlopen() to segfault if libstdc++ is not loaded in the caller, - * so we just load libstdc++. Bwahahaha! ph34r! -- Sam. */ - /* Update: FYI, this is Debian bug #180505, and seems to be fixed. */ - if( !b_kde && !strstr( psz_file, "kde" ) ) - { - dlopen( "libstdc++.so.6", RTLD_NOW ) - || dlopen( "libstdc++.so.5", RTLD_NOW ) - || dlopen( "libstdc++.so.4", RTLD_NOW ) - || dlopen( "libstdc++.so.3", RTLD_NOW ); - b_kde = VLC_TRUE; - } handle = dlopen( psz_file, RTLD_NOW ); if( handle == NULL ) @@ -1472,23 +1575,19 @@ static void * _module_getsymbol( module_handle_t handle, static char * GetWindowsError( void ) { #if defined(UNDER_CE) - wchar_t psz_tmp[256]; - char * psz_buffer = malloc( 256 ); + wchar_t psz_tmp[MAX_PATH]; + char * psz_buffer = malloc( MAX_PATH ); #else - char * psz_tmp = malloc( 256 ); + char * psz_tmp = malloc( MAX_PATH ); #endif int i = 0, i_error = GetLastError(); FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, i_error, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) psz_tmp, 256, NULL ); + (LPTSTR)psz_tmp, MAX_PATH, NULL ); /* Go to the end of the string */ -#if defined(UNDER_CE) - while( psz_tmp[i] && psz_tmp[i] != L'\r' && psz_tmp[i] != L'\n' ) -#else - while( psz_tmp[i] && psz_tmp[i] != '\r' && psz_tmp[i] != '\n' ) -#endif + while( psz_tmp[i] && psz_tmp[i] != _T('\r') && psz_tmp[i] != _T('\n') ) { i++; } @@ -1505,8 +1604,7 @@ static char * GetWindowsError( void ) } #if defined(UNDER_CE) - WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, psz_tmp, -1, - psz_buffer, 256, NULL, NULL ); + wcstombs( psz_buffer, psz_tmp, MAX_PATH ); return psz_buffer; #else return psz_tmp; @@ -1527,45 +1625,44 @@ static void CacheLoad( vlc_object_t *p_this ) char *psz_filename, *psz_homedir; FILE *file; int i, j, i_size, i_read; - char p_cachestring[sizeof(PLUGINSCACHE_FILE COPYRIGHT_MESSAGE)]; + char p_cachestring[sizeof(PLUGINSCACHE_DIR COPYRIGHT_MESSAGE)]; + char p_cachelang[6], p_lang[6]; int i_cache; module_cache_t **pp_cache = 0; - int32_t i_file_size; + int32_t i_file_size, i_marker; - psz_homedir = p_this->p_vlc->psz_homedir; + psz_homedir = p_this->p_libvlc->psz_homedir; if( !psz_homedir ) { msg_Err( p_this, "psz_homedir is null" ); return; } - psz_filename = - (char *)malloc( sizeof("/" CONFIG_DIR "/" PLUGINSCACHE_FILE) + - strlen(psz_homedir) ); - - if( psz_filename ) - sprintf( psz_filename, "%s/" CONFIG_DIR "/" PLUGINSCACHE_FILE, - psz_homedir ); - if( !psz_filename ) + i_size = asprintf( &psz_filename, "%s/%s/%s/%s", psz_homedir, CONFIG_DIR, + PLUGINSCACHE_DIR, CacheName() ); + if( i_size <= 0 ) { msg_Err( p_this, "out of memory" ); return; } - if( p_this->p_libvlc->p_module_bank->b_cache_delete ) + if( p_this->p_libvlc_global->p_module_bank->b_cache_delete ) { - msg_Dbg( p_this, "removing plugins cache file %s", psz_filename ); #if !defined( UNDER_CE ) unlink( psz_filename ); #else - msg_Err( p_this, "FIXME, unlink not implemented" ); + wchar_t psz_wf[MAX_PATH]; + MultiByteToWideChar( CP_ACP, 0, psz_filename, -1, psz_wf, MAX_PATH ); + DeleteFile( psz_wf ); #endif + msg_Dbg( p_this, "removing plugins cache file %s", psz_filename ); + free( psz_filename ); return; } msg_Dbg( p_this, "loading plugins cache file %s", psz_filename ); - file = fopen( psz_filename, "rb" ); + file = utf8_fopen( psz_filename, "rb" ); if( !file ) { msg_Warn( p_this, "could not open plugins cache file %s for reading", @@ -1596,53 +1693,96 @@ static void CacheLoad( vlc_object_t *p_this ) fseek( file, sizeof(i_file_size), SEEK_SET ); /* Check the file is a plugins cache */ - i_size = sizeof(PLUGINSCACHE_FILE COPYRIGHT_MESSAGE) - 1; + i_size = sizeof(PLUGINSCACHE_DIR COPYRIGHT_MESSAGE) - 1; i_read = fread( p_cachestring, sizeof(char), i_size, file ); if( i_read != i_size || - memcmp( p_cachestring, PLUGINSCACHE_FILE COPYRIGHT_MESSAGE, i_size ) ) + memcmp( p_cachestring, PLUGINSCACHE_DIR COPYRIGHT_MESSAGE, i_size ) ) { msg_Warn( p_this, "This doesn't look like a valid plugins cache" ); fclose( file ); return; } - p_this->p_libvlc->p_module_bank->i_loaded_cache = 0; + /* Check Sub-version number */ + i_read = fread( &i_marker, sizeof(char), sizeof(i_marker), file ); + if( i_read != sizeof(i_marker) || i_marker != CACHE_SUBVERSION_NUM ) + { + msg_Warn( p_this, "This doesn't look like a valid plugins cache " + "(corrupted header)" ); + fclose( file ); + return; + } + + /* Check the language hasn't changed */ + sprintf( p_lang, "%5.5s", _("C") ); i_size = 5; + i_read = fread( p_cachelang, sizeof(char), i_size, file ); + if( i_read != i_size || memcmp( p_cachelang, p_lang, i_size ) ) + { + msg_Warn( p_this, "This doesn't look like a valid plugins cache " + "(language changed)" ); + fclose( file ); + return; + } + + /* Check header marker */ + i_read = fread( &i_marker, sizeof(char), sizeof(i_marker), file ); + if( i_read != sizeof(i_marker) || + i_marker != ftell( file ) - (int)sizeof(i_marker) ) + { + msg_Warn( p_this, "This doesn't look like a valid plugins cache " + "(corrupted header)" ); + fclose( file ); + return; + } + + p_this->p_libvlc_global->p_module_bank->i_loaded_cache = 0; fread( &i_cache, sizeof(char), sizeof(i_cache), file ); - pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_cache = - malloc( i_cache * sizeof(void *) ); + if( i_cache ) + pp_cache = p_this->p_libvlc_global->p_module_bank->pp_loaded_cache = + malloc( i_cache * sizeof(void *) ); #define LOAD_IMMEDIATE(a) \ - if( fread( &a, sizeof(char), sizeof(a), file ) != sizeof(a) ) goto error + if( fread( (void *)&a, sizeof(char), sizeof(a), file ) != sizeof(a) ) goto error #define LOAD_STRING(a) \ - { if( fread( &i_size, sizeof(char), sizeof(i_size), file ) \ - != sizeof(i_size) ) goto error; \ - if( i_size ) { \ - a = malloc( i_size ); \ - if( fread( a, sizeof(char), i_size, file ) != (size_t)i_size ) \ - goto error; \ - } else a = 0; \ - } while(0) - +{ \ + a = NULL; \ + if( ( fread( &i_size, sizeof(i_size), 1, file ) != 1 ) \ + || ( i_size > 16384 ) ) \ + goto error; \ + if( i_size ) { \ + char *psz = malloc( i_size ); \ + if( fread( psz, i_size, 1, file ) != 1 ) { \ + free( psz ); \ + goto error; \ + } \ + if( psz[i_size-1] ) { \ + free( psz ); \ + goto error; \ + } \ + a = psz; \ + } \ +} for( i = 0; i < i_cache; i++ ) { - int16_t i_size; + uint16_t i_size; int i_submodules; pp_cache[i] = malloc( sizeof(module_cache_t) ); - p_this->p_libvlc->p_module_bank->i_loaded_cache++; + p_this->p_libvlc_global->p_module_bank->i_loaded_cache++; - /* Save common info */ + /* Load common info */ LOAD_STRING( pp_cache[i]->psz_file ); LOAD_IMMEDIATE( pp_cache[i]->i_time ); LOAD_IMMEDIATE( pp_cache[i]->i_size ); LOAD_IMMEDIATE( pp_cache[i]->b_junk ); + pp_cache[i]->b_used = VLC_FALSE; if( pp_cache[i]->b_junk ) continue; pp_cache[i]->p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE ); - /* Save additional infos */ + /* Load additional infos */ LOAD_STRING( pp_cache[i]->p_module->psz_object_name ); LOAD_STRING( pp_cache[i]->p_module->psz_shortname ); LOAD_STRING( pp_cache[i]->p_module->psz_longname ); @@ -1696,16 +1836,17 @@ static void CacheLoad( vlc_object_t *p_this ) msg_Warn( p_this, "plugins cache not loaded (corrupted)" ); /* TODO: cleanup */ - p_this->p_libvlc->p_module_bank->i_loaded_cache = 0; + p_this->p_libvlc_global->p_module_bank->i_loaded_cache = 0; fclose( file ); return; } + int CacheLoadConfig( module_t *p_module, FILE *file ) { - int i, j, i_lines; - int16_t i_size; + uint32_t i_lines; + uint16_t i_size; /* Calculate the structure length */ LOAD_IMMEDIATE( p_module->i_config_items ); @@ -1714,16 +1855,21 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) LOAD_IMMEDIATE( i_lines ); /* Allocate memory */ - p_module->p_config = - (module_config_t *)malloc( sizeof(module_config_t) * (i_lines + 1)); - if( p_module->p_config == NULL ) + if (i_lines) { - msg_Err( p_module, "config error: can't duplicate p_config" ); - return VLC_ENOMEM; + p_module->p_config = + (module_config_t *)calloc( i_lines, sizeof(module_config_t) ); + if( p_module->p_config == NULL ) + { + p_module->confsize = 0; + msg_Err( p_module, "config error: can't duplicate p_config" ); + return VLC_ENOMEM; + } } + p_module->confsize = i_lines; /* Do the duplication job */ - for( i = 0; i < i_lines ; i++ ) + for (size_t i = 0; i < i_lines; i++ ) { LOAD_IMMEDIATE( p_module->p_config[i] ); @@ -1731,13 +1877,25 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) LOAD_STRING( p_module->p_config[i].psz_name ); LOAD_STRING( p_module->p_config[i].psz_text ); LOAD_STRING( p_module->p_config[i].psz_longtext ); - LOAD_STRING( p_module->p_config[i].psz_value_orig ); + LOAD_STRING( p_module->p_config[i].psz_current ); - p_module->p_config[i].psz_value = - p_module->p_config[i].psz_value_orig ? - strdup( p_module->p_config[i].psz_value_orig ) : 0; - p_module->p_config[i].i_value = p_module->p_config[i].i_value_orig; - p_module->p_config[i].f_value = p_module->p_config[i].f_value_orig; + if (IsConfigStringType (p_module->p_config[i].i_type)) + { + LOAD_STRING (p_module->p_config[i].orig.psz); + p_module->p_config[i].value.psz = + (p_module->p_config[i].orig.psz != NULL) + ? strdup (p_module->p_config[i].orig.psz) : NULL; + p_module->p_config[i].saved.psz = NULL; + } + else + { + memcpy (&p_module->p_config[i].value, &p_module->p_config[i].orig, + sizeof (p_module->p_config[i].value)); + memcpy (&p_module->p_config[i].saved, &p_module->p_config[i].orig, + sizeof (p_module->p_config[i].saved)); + } + + p_module->p_config[i].b_dirty = VLC_FALSE; p_module->p_config[i].p_lock = &p_module->object_lock; @@ -1745,6 +1903,7 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) { if( p_module->p_config[i].ppsz_list ) { + int j; p_module->p_config[i].ppsz_list = malloc( (p_module->p_config[i].i_list+1) * sizeof(char *)); if( p_module->p_config[i].ppsz_list ) @@ -1756,6 +1915,7 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) } if( p_module->p_config[i].ppsz_list_text ) { + int j; p_module->p_config[i].ppsz_list_text = malloc( (p_module->p_config[i].i_list+1) * sizeof(char *)); if( p_module->p_config[i].ppsz_list_text ) @@ -1771,7 +1931,7 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) malloc( (p_module->p_config[i].i_list + 1) * sizeof(int) ); if( p_module->p_config[i].pi_list ) { - for( j = 0; j < p_module->p_config[i].i_list; j++ ) + for (int j = 0; j < p_module->p_config[i].i_list; j++) LOAD_IMMEDIATE( p_module->p_config[i].pi_list[j] ); } } @@ -1784,7 +1944,7 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) p_module->p_config[i].ppsz_action_text = malloc( p_module->p_config[i].i_action * sizeof(char *) ); - for( j = 0; j < p_module->p_config[i].i_action; j++ ) + for (int j = 0; j < p_module->p_config[i].i_action; j++) { p_module->p_config[i].ppf_action[j] = 0; LOAD_STRING( p_module->p_config[i].ppsz_action_text[j] ); @@ -1794,8 +1954,6 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) LOAD_IMMEDIATE( p_module->p_config[i].pf_callback ); } - p_module->p_config[i].i_type = CONFIG_HINT_END; - return VLC_SUCCESS; error: @@ -1808,24 +1966,27 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) *****************************************************************************/ static void CacheSave( vlc_object_t *p_this ) { + static char const psz_tag[] = + "Signature: 8a477f597d28d172789f06886806bc55\r\n" + "# This file is a cache directory tag created by VLC.\r\n" + "# For information about cache directory tags, see:\r\n" + "# http://www.brynosaurus.com/cachedir/\r\n"; + char *psz_filename, *psz_homedir; FILE *file; int i, j, i_cache; module_cache_t **pp_cache; int32_t i_file_size = 0; - psz_homedir = p_this->p_vlc->psz_homedir; + psz_homedir = p_this->p_libvlc->psz_homedir; if( !psz_homedir ) { msg_Err( p_this, "psz_homedir is null" ); return; } psz_filename = - (char *)malloc( sizeof("/" CONFIG_DIR "/" PLUGINSCACHE_FILE) + - strlen(psz_homedir) ); - - if( psz_filename ) - sprintf( psz_filename, "%s/" CONFIG_DIR, psz_homedir ); + (char *)malloc( sizeof("/" CONFIG_DIR "/" PLUGINSCACHE_DIR "/" ) + + strlen(psz_homedir) + strlen(CacheName()) ); if( !psz_filename ) { @@ -1833,13 +1994,29 @@ static void CacheSave( vlc_object_t *p_this ) return; } + sprintf( psz_filename, "%s/%s", psz_homedir, CONFIG_DIR ); + config_CreateDir( p_this, psz_filename ); - strcat( psz_filename, "/" PLUGINSCACHE_FILE ); + strcat( psz_filename, "/" PLUGINSCACHE_DIR ); + + config_CreateDir( p_this, psz_filename ); + + strcat( psz_filename, "/CACHEDIR.TAG" ); + + file = utf8_fopen( psz_filename, "wb" ); + if( file ) + { + fwrite( psz_tag, 1, strlen(psz_tag), file ); + fclose( file ); + } + + sprintf( psz_filename, "%s/%s/%s/%s", psz_homedir, CONFIG_DIR, + PLUGINSCACHE_DIR, CacheName() ); msg_Dbg( p_this, "saving plugins cache file %s", psz_filename ); - file = fopen( psz_filename, "wb" ); + file = utf8_fopen( psz_filename, "wb" ); if( !file ) { msg_Warn( p_this, "could not open plugins cache file %s for writing", @@ -1853,10 +2030,22 @@ static void CacheSave( vlc_object_t *p_this ) fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file ); /* Contains version number */ - fprintf( file, PLUGINSCACHE_FILE COPYRIGHT_MESSAGE ); + fprintf( file, "%s", PLUGINSCACHE_DIR COPYRIGHT_MESSAGE ); + + /* Sub-version number (to avoid breakage in the dev version when cache + * structure changes) */ + i_file_size = CACHE_SUBVERSION_NUM; + fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file ); - i_cache = p_this->p_libvlc->p_module_bank->i_cache; - pp_cache = p_this->p_libvlc->p_module_bank->pp_cache; + /* Language */ + fprintf( file, "%5.5s", _("C") ); + + /* Header marker */ + i_file_size = ftell( file ); + fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file ); + + i_cache = p_this->p_libvlc_global->p_module_bank->i_cache; + pp_cache = p_this->p_libvlc_global->p_module_bank->pp_cache; fwrite( &i_cache, sizeof(char), sizeof(i_cache), file ); @@ -1870,8 +2059,8 @@ static void CacheSave( vlc_object_t *p_this ) for( i = 0; i < i_cache; i++ ) { - int16_t i_size; - int32_t i_submodule; + uint16_t i_size; + uint32_t i_submodule; /* Save common info */ SAVE_STRING( pp_cache[i]->psz_file ); @@ -1904,7 +2093,8 @@ static void CacheSave( vlc_object_t *p_this ) i_submodule = pp_cache[i]->p_module->i_children; SAVE_IMMEDIATE( i_submodule ); - for( i_submodule = 0; i_submodule < pp_cache[i]->p_module->i_children; + for( i_submodule = 0; + i_submodule < (unsigned)pp_cache[i]->p_module->i_children; i_submodule++ ) { module_t *p_module = @@ -1938,19 +2128,14 @@ static void CacheSave( vlc_object_t *p_this ) void CacheSaveConfig( module_t *p_module, FILE *file ) { - int i, j, i_lines = 0; - module_config_t *p_item; - int16_t i_size; + uint32_t i_lines = p_module->confsize; + uint16_t i_size; SAVE_IMMEDIATE( p_module->i_config_items ); SAVE_IMMEDIATE( p_module->i_bool_items ); - - for( p_item = p_module->p_config; p_item->i_type != CONFIG_HINT_END; - p_item++ ) i_lines++; - SAVE_IMMEDIATE( i_lines ); - for( i = 0; i < i_lines ; i++ ) + for (size_t i = 0; i < i_lines ; i++) { SAVE_IMMEDIATE( p_module->p_config[i] ); @@ -1958,35 +2143,51 @@ void CacheSaveConfig( module_t *p_module, FILE *file ) SAVE_STRING( p_module->p_config[i].psz_name ); SAVE_STRING( p_module->p_config[i].psz_text ); SAVE_STRING( p_module->p_config[i].psz_longtext ); - SAVE_STRING( p_module->p_config[i].psz_value_orig ); + SAVE_STRING( p_module->p_config[i].psz_current ); + if (IsConfigStringType (p_module->p_config[i].i_type)) + SAVE_STRING( p_module->p_config[i].orig.psz ); if( p_module->p_config[i].i_list ) { if( p_module->p_config[i].ppsz_list ) { - for( j = 0; j < p_module->p_config[i].i_list; j++ ) + for (int j = 0; j < p_module->p_config[i].i_list; j++) SAVE_STRING( p_module->p_config[i].ppsz_list[j] ); } if( p_module->p_config[i].ppsz_list_text ) { - for( j = 0; j < p_module->p_config[i].i_list; j++ ) + for (int j = 0; j < p_module->p_config[i].i_list; j++) SAVE_STRING( p_module->p_config[i].ppsz_list_text[j] ); } if( p_module->p_config[i].pi_list ) { - for( j = 0; j < p_module->p_config[i].i_list; j++ ) + for (int j = 0; j < p_module->p_config[i].i_list; j++) SAVE_IMMEDIATE( p_module->p_config[i].pi_list[j] ); } } - for( j = 0; j < p_module->p_config[i].i_action; j++ ) + for (int j = 0; j < p_module->p_config[i].i_action; j++) SAVE_STRING( p_module->p_config[i].ppsz_action_text[j] ); SAVE_IMMEDIATE( p_module->p_config[i].pf_callback ); } } +/***************************************************************************** + * CacheName: Return the cache file name for this platform. + *****************************************************************************/ +static char *CacheName( void ) +{ + static char psz_cachename[32]; + + /* Code int size, pointer size and endianness in the filename */ + int32_t x = 0xbe00001e; + sprintf( psz_cachename, "plugins-%.2x%.2x%.2x.dat", (int)sizeof(int), + (int)sizeof(void *), (unsigned int)((unsigned char *)&x)[0] ); + return psz_cachename; +} + /***************************************************************************** * CacheMerge: Merge a cache module descriptor with a full module descriptor. *****************************************************************************/ @@ -1997,7 +2198,9 @@ static void CacheMerge( vlc_object_t *p_this, module_t *p_cache, p_cache->pf_activate = p_module->pf_activate; p_cache->pf_deactivate = p_module->pf_deactivate; +#ifndef HAVE_SHARED_LIBVLC p_cache->p_symbols = p_module->p_symbols; +#endif p_cache->handle = p_module->handle; for( i_submodule = 0; i_submodule < p_module->i_children; i_submodule++ ) @@ -2006,7 +2209,9 @@ static void CacheMerge( vlc_object_t *p_this, module_t *p_cache, module_t *p_cchild = (module_t*)p_cache->pp_children[i_submodule]; p_cchild->pf_activate = p_child->pf_activate; p_cchild->pf_deactivate = p_child->pf_deactivate; +#ifndef HAVE_SHARED_LIBVLC p_cchild->p_symbols = p_child->p_symbols; +#endif } p_cache->b_loaded = VLC_TRUE; @@ -2014,7 +2219,7 @@ static void CacheMerge( vlc_object_t *p_this, module_t *p_cache, } /***************************************************************************** - * FindPluginCache: finds the cache entry corresponding to a file + * CacheFind: finds the cache entry corresponding to a file *****************************************************************************/ static module_cache_t *CacheFind( vlc_object_t *p_this, char *psz_file, int64_t i_time, int64_t i_size ) @@ -2022,8 +2227,8 @@ static module_cache_t *CacheFind( vlc_object_t *p_this, char *psz_file, module_cache_t **pp_cache; int i_cache, i; - pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_cache; - i_cache = p_this->p_libvlc->p_module_bank->i_loaded_cache; + pp_cache = p_this->p_libvlc_global->p_module_bank->pp_loaded_cache; + i_cache = p_this->p_libvlc_global->p_module_bank->i_loaded_cache; for( i = 0; i < i_cache; i++ ) {