X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmodules.c;h=b22a48209b977b63e291dcca234b9aff33482ff5;hb=65d2183365ccbd6321ecb8fcbf8bbf42362ca1ba;hp=0d7f67e0b4fb1ce14f979e90dce61c589b20a803;hpb=83f23b6686543887f908d184387782bf018c35d5;p=vlc diff --git a/src/misc/modules.c b/src/misc/modules.c index 0d7f67e0b4..b22a48209b 100644 --- a/src/misc/modules.c +++ b/src/misc/modules.c @@ -36,8 +36,6 @@ #include /* sprintf() */ #include /* strdup() */ -#include - #ifdef HAVE_DIRENT_H # include #endif @@ -77,23 +75,21 @@ # endif #endif -#include "vlc_error.h" +#include "misc/configuration.h" #include "vlc_interface.h" -#include "vlc_interaction.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 "vlc_sout.h" #include "vlc_httpd.h" #include "vlc_acl.h" #include "vlc_tls.h" @@ -102,7 +98,7 @@ #include "vlc_url.h" #include "iso_lang.h" -#include "charset.h" +#include "vlc_charset.h" #include "vlc_block.h" @@ -113,6 +109,9 @@ #include "vlc_update.h" #include "vlc_strings.h" +#include "vlc_streaming.h" + +#include "modules.h" #if defined( _MSC_VER ) && defined( UNDER_CE ) # include "modules_builtin_evc.h" @@ -121,7 +120,7 @@ #else # include "modules_builtin.h" #endif -#include "network.h" +#include "vlc_network.h" #if defined( WIN32 ) || defined( UNDER_CE ) /* Avoid name collisions */ @@ -159,6 +158,8 @@ 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) */ @@ -175,24 +176,24 @@ void __module_InitBank( vlc_object_t *p_this ) module_bank_t *p_bank; 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) ); 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; @@ -204,8 +205,8 @@ void __module_InitBank( vlc_object_t *p_this ) #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 ); @@ -235,31 +236,32 @@ void __module_EndBank( vlc_object_t *p_this ) module_t * p_next; 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-- ) { + DeleteModule (p_bank->pp_loaded_cache[p_bank->i_loaded_cache]->p_module); free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache]->psz_file ); free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache] ); } @@ -276,11 +278,11 @@ void __module_EndBank( vlc_object_t *p_this ) #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 ) ) { @@ -294,8 +296,8 @@ void __module_EndBank( vlc_object_t *p_this ) } } - vlc_object_destroy( p_this->p_libvlc->p_module_bank ); - p_this->p_libvlc->p_module_bank = NULL; + vlc_object_destroy( p_this->p_libvlc_global->p_module_bank ); + p_this->p_libvlc_global->p_module_bank = NULL; return; } @@ -308,22 +310,22 @@ 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, "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->b_main ) + if( p_this->p_libvlc_global->p_module_bank->b_main ) { vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); return; } - p_this->p_libvlc->p_module_bank->b_main = VLC_TRUE; + p_this->p_libvlc_global->p_module_bank->b_main = VLC_TRUE; vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); AllocateBuiltinModule( p_this, vlc_entry__main ); } @@ -337,18 +339,18 @@ void __module_LoadBuiltins( vlc_object_t * p_this ) { 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->b_builtins ) + if( p_this->p_libvlc_global->p_module_bank->b_builtins ) { vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); return; } - p_this->p_libvlc->p_module_bank->b_builtins = VLC_TRUE; + p_this->p_libvlc_global->p_module_bank->b_builtins = VLC_TRUE; vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); msg_Dbg( p_this, "checking builtin modules" ); ALLOCATE_ALL_BUILTINS(); @@ -364,26 +366,26 @@ void __module_LoadPlugins( vlc_object_t * p_this ) #ifdef HAVE_DYNAMIC_PLUGINS 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->b_plugins ) + if( p_this->p_libvlc_global->p_module_bank->b_plugins ) { vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + var_Destroy( p_this->p_libvlc_global, "libvlc" ); return; } - p_this->p_libvlc->p_module_bank->b_plugins = VLC_TRUE; + p_this->p_libvlc_global->p_module_bank->b_plugins = VLC_TRUE; vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_this->p_libvlc, "libvlc" ); + 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 @@ -492,7 +494,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; } @@ -560,7 +562,7 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, 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 ) { @@ -578,7 +580,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 ) @@ -697,6 +699,9 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, { 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 ) @@ -704,6 +709,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 ) { @@ -752,21 +759,22 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) { /* Yes, there are two NULLs because we replace one with "plugin-path". */ #if defined( WIN32 ) || defined( UNDER_CE ) - char *path[] = { "modules", "", "plugins", 0, 0 }; + 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 (!**ppsz_path) continue; #if defined( SYS_BEOS ) || defined( __APPLE__ ) || defined( WIN32 ) @@ -778,27 +786,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 ); @@ -809,9 +806,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 ); } /***************************************************************************** @@ -820,6 +816,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]; @@ -836,7 +838,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; } @@ -926,7 +928,7 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, 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 ); @@ -941,7 +943,7 @@ 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; @@ -1024,7 +1026,7 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, } else { - module_config_t *p_item; + module_config_t *p_item, *p_end; p_module = p_cache_entry->p_module; p_module->b_loaded = VLC_FALSE; @@ -1032,8 +1034,8 @@ 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 ); @@ -1050,13 +1052,13 @@ 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 +#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) ); @@ -1098,7 +1100,7 @@ static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) p_module->psz_filename = psz_file; p_module->handle = handle; #ifndef HAVE_SHARED_LIBVLC - p_module->p_symbols = &p_this->p_libvlc->p_module_bank->symbols; + p_module->p_symbols = &p_this->p_libvlc_global->p_module_bank->symbols; #endif p_module->b_loaded = VLC_TRUE; @@ -1128,7 +1130,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++ ) @@ -1162,7 +1164,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++ ) @@ -1172,17 +1174,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 ); - if( p_module->psz_shortname ) 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 ); } } @@ -1225,7 +1227,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; } @@ -1276,7 +1278,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 */ @@ -1599,7 +1601,7 @@ static void CacheLoad( vlc_object_t *p_this ) module_cache_t **pp_cache = 0; 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" ); @@ -1614,7 +1616,7 @@ static void CacheLoad( vlc_object_t *p_this ) return; } - if( p_this->p_libvlc->p_module_bank->b_cache_delete ) + if( p_this->p_libvlc_global->p_module_bank->b_cache_delete ) { #if !defined( UNDER_CE ) unlink( psz_filename ); @@ -1703,35 +1705,41 @@ static void CacheLoad( vlc_object_t *p_this ) return; } - p_this->p_libvlc->p_module_bank->i_loaded_cache = 0; + p_this->p_libvlc_global->p_module_bank->i_loaded_cache = 0; fread( &i_cache, sizeof(char), sizeof(i_cache), file ); if( i_cache ) - pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_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 && i_size < 16384 ) { \ - a = malloc( i_size ); \ - if( fread( a, sizeof(char), i_size, file ) != (size_t)i_size ) \ - goto error; \ - if( a[i_size-1] ) { \ - free( a ); a = 0; \ - 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++; /* Load common info */ LOAD_STRING( pp_cache[i]->psz_file ); @@ -1797,16 +1805,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 ); @@ -1815,16 +1824,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] ); @@ -1833,16 +1847,23 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) 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_current ); - LOAD_STRING( p_module->p_config[i].psz_value_orig ); - - 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; - p_module->p_config[i].i_value_saved = p_module->p_config[i].i_value; - p_module->p_config[i].f_value_saved = p_module->p_config[i].f_value; - p_module->p_config[i].psz_value_saved = 0; + + 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; @@ -1851,6 +1872,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 ) @@ -1862,6 +1884,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 ) @@ -1877,7 +1900,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] ); } } @@ -1890,7 +1913,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] ); @@ -1900,8 +1923,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: @@ -1926,7 +1947,7 @@ static void CacheSave( vlc_object_t *p_this ) 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" ); @@ -1992,8 +2013,8 @@ static void CacheSave( vlc_object_t *p_this ) i_file_size = ftell( file ); 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; + 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 ); @@ -2007,8 +2028,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 ); @@ -2041,7 +2062,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 = @@ -2075,19 +2097,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] ); @@ -2096,29 +2113,30 @@ void CacheSaveConfig( module_t *p_module, FILE *file ) 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_current ); - SAVE_STRING( p_module->p_config[i].psz_value_orig ); + 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 ); @@ -2134,8 +2152,8 @@ static char *CacheName( void ) /* Code int size, pointer size and endianness in the filename */ int32_t x = 0xbe00001e; - sprintf( psz_cachename, "plugins-%.2x%.2x%.2x.dat", sizeof(int), - sizeof(void *), (unsigned int)((unsigned char *)&x)[0] ); + sprintf( psz_cachename, "plugins-%.2x%.2x%.2x.dat", (int)sizeof(int), + (int)sizeof(void *), (unsigned int)((unsigned char *)&x)[0] ); return psz_cachename; } @@ -2178,8 +2196,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++ ) {