X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fmodules.c;h=267267c73063e22330195882ac2068bd3d81eb9b;hb=b9a0fa9677d7084913a9499fd0050c0c952927b9;hp=d6540cd0d19a6573b2f47824a9ea5edf34c93786;hpb=ae578e67c27fe06d60efb507590d4e52b7a02796;p=vlc diff --git a/src/modules/modules.c b/src/modules/modules.c index d6540cd0d1..267267c730 100644 --- a/src/modules/modules.c +++ b/src/modules/modules.c @@ -30,14 +30,9 @@ #include #include +#include #include "libvlc.h" -/* 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 -#undef _FILE_OFFSET_BITS -#endif - #include /* free(), strtol() */ #include /* sprintf() */ #include /* strdup() */ @@ -47,9 +42,7 @@ # include #endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_SYS_STAT_H # include #endif @@ -57,50 +50,28 @@ # include #endif -#if !defined(HAVE_DYNAMIC_PLUGINS) - /* no support for plugins */ -#elif defined(HAVE_DL_DYLD) -# if defined(HAVE_MACH_O_DYLD_H) -# include -# endif -#elif defined(HAVE_DL_BEOS) -# if defined(HAVE_IMAGE_H) -# include -# endif -#elif defined(HAVE_DL_WINDOWS) -# include -#elif defined(HAVE_DL_DLOPEN) -# if defined(HAVE_DLFCN_H) /* Linux, BSD, Hurd */ -# include -# endif -# if defined(HAVE_SYS_DL_H) -# include -# endif -#elif defined(HAVE_DL_SHL_LOAD) -# if defined(HAVE_DL_H) -# include -# endif -#endif - #include "config/configuration.h" #include "vlc_charset.h" #include "vlc_arrays.h" #include "modules/modules.h" -#include "modules/builtin.h" static module_bank_t *p_module_bank = NULL; static vlc_mutex_t module_lock = VLC_STATIC_MUTEX; +int vlc_entry__main( module_t * ); + /***************************************************************************** * Local prototypes *****************************************************************************/ #ifdef HAVE_DYNAMIC_PLUGINS -static void AllocateAllPlugins ( vlc_object_t * ); -static void AllocatePluginDir ( vlc_object_t *, const char *, int ); -static int AllocatePluginFile ( vlc_object_t *, char *, int64_t, int64_t ); -static module_t * AllocatePlugin( vlc_object_t *, char * ); +static void AllocateAllPlugins( vlc_object_t *, module_bank_t * ); +static void AllocatePluginDir( vlc_object_t *, module_bank_t *, const char *, + unsigned ); +static int AllocatePluginFile( vlc_object_t *, module_bank_t *, const char *, + int64_t, int64_t ); +static module_t * AllocatePlugin( vlc_object_t *, const char * ); #endif static int AllocateBuiltinModule( vlc_object_t *, int ( * ) ( module_t * ) ); static void DeleteModule ( module_bank_t *, module_t * ); @@ -141,43 +112,58 @@ void __module_InitBank( vlc_object_t *p_this ) * options of main will be available in the module bank structure just * as for every other module. */ AllocateBuiltinModule( p_this, vlc_entry__main ); + vlc_rwlock_init (&config_lock); + config_SortConfig (); } else p_module_bank->i_usage++; - vlc_mutex_unlock( &module_lock ); + /* We do retain the module bank lock until the plugins are loaded as well. + * This is ugly, this staged loading approach is needed: LibVLC gets + * some configuration parameters relevant to loading the plugins from + * the main (builtin) module. The module bank becomes shared read-only data + * once it is ready, so we need to fully serialize initialization. + * DO NOT UNCOMMENT the following line unless you managed to squeeze + * module_LoadPlugins() before you unlock the mutex. */ + /*vlc_mutex_unlock( &module_lock );*/ } - +#undef module_EndBank /** - * End bank - * * Unloads all unused plugin modules and empties the module * bank in case of success. * \param p_this vlc object structure * \return nothing */ -void __module_EndBank( vlc_object_t *p_this ) +void module_EndBank( vlc_object_t *p_this, bool b_plugins ) { - module_bank_t *p_bank; + module_bank_t *p_bank = p_module_bank; + + assert (p_bank != NULL); /* Save the configuration */ - config_AutoSaveConfigFile( p_this ); + if( !var_InheritBool( p_this, "ignore-config" ) ) + config_AutoSaveConfigFile( p_this ); + + /* If plugins were _not_ loaded, then the caller still has the bank lock + * from module_InitBank(). */ + if( b_plugins ) + vlc_mutex_lock( &module_lock ); + /*else + vlc_assert_locked( &module_lock ); not for static mutexes :( */ - vlc_mutex_lock( &module_lock ); - p_bank = p_module_bank; - assert (p_bank != NULL); if( --p_bank->i_usage > 0 ) { vlc_mutex_unlock( &module_lock ); return; } + + config_UnsortConfig (); + vlc_rwlock_destroy (&config_lock); p_module_bank = NULL; vlc_mutex_unlock( &module_lock ); #ifdef HAVE_DYNAMIC_PLUGINS - if( p_bank->b_cache ) - CacheSave( p_this, p_bank ); while( p_bank->i_loaded_cache-- ) { if( p_bank->pp_loaded_cache[p_bank->i_loaded_cache] ) @@ -186,25 +172,15 @@ void __module_EndBank( vlc_object_t *p_this ) 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] ); - 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; - } + free( p_bank->pp_loaded_cache ); 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] ); - p_bank->pp_cache[p_bank->i_cache] = NULL; - } - if( p_bank->pp_cache ) - { - free( p_bank->pp_cache ); - p_bank->pp_cache = NULL; } + free( p_bank->pp_cache ); #endif while( p_bank->head != NULL ) @@ -213,59 +189,37 @@ void __module_EndBank( vlc_object_t *p_this ) free( p_bank ); } -/** - * Load all modules which we built with. - * - * Fills the module bank structure with the builtin modules. - * \param p_this vlc object structure - * \return nothing - */ -void __module_LoadBuiltins( vlc_object_t * p_this ) -{ - vlc_mutex_lock( &module_lock ); - if( p_module_bank->b_builtins ) - { - vlc_mutex_unlock( &module_lock ); - return; - } - p_module_bank->b_builtins = true; - vlc_mutex_unlock( &module_lock ); - - msg_Dbg( p_this, "checking builtin modules" ); - /* FIXME: race here - do this under the lock!! */ - ALLOCATE_ALL_BUILTINS(); -} - #undef module_LoadPlugins /** - * Load all plugins - * - * Load all plugin modules we can find. + * Loads module descriptions for all available plugins. * Fills the module bank structure with the plugin modules. + * * \param p_this vlc object structure * \return nothing */ void module_LoadPlugins( vlc_object_t * p_this, bool b_cache_delete ) { + module_bank_t *p_bank = p_module_bank; + + assert( p_bank ); + /*vlc_assert_locked( &module_lock ); not for static mutexes :( */ + #ifdef HAVE_DYNAMIC_PLUGINS - vlc_mutex_lock( &module_lock ); - if( p_module_bank->b_plugins ) + if( p_bank->i_usage == 1 ) { - vlc_mutex_unlock( &module_lock ); - return; + msg_Dbg( p_this, "checking plugin modules" ); + p_module_bank->b_cache = var_InheritBool( p_this, "plugins-cache" ); + + if( p_module_bank->b_cache || b_cache_delete ) + CacheLoad( p_this, p_module_bank, b_cache_delete ); + AllocateAllPlugins( p_this, p_module_bank ); + if( p_module_bank->b_cache ) + CacheSave( p_this, p_bank ); + config_UnsortConfig (); + config_SortConfig (); } - p_module_bank->b_plugins = true; - vlc_mutex_unlock( &module_lock ); - - msg_Dbg( p_this, "checking plugin modules" ); - p_module_bank->b_cache = config_GetInt( p_this, "plugins-cache" ) > 0; - - if( p_module_bank->b_cache || b_cache_delete ) - CacheLoad( p_this, p_module_bank, b_cache_delete ); - - /* FIXME: race - do this under the lock */ - AllocateAllPlugins( p_this ); #endif + vlc_mutex_unlock( &module_lock ); } /** @@ -303,7 +257,7 @@ const char *module_get_name( const module_t *m, bool long_name ) if( long_name && ( m->psz_longname != NULL) ) return m->psz_longname; - return m->psz_shortname ?: m->psz_object_name; + return m->psz_shortname ? m->psz_shortname : m->psz_object_name; } /** @@ -317,6 +271,28 @@ const char *module_get_help( const module_t *m ) return m->psz_help; } +/** + * Get the capability for a module + * + * \param m the module + * return the capability + */ +const char *module_get_capability( const module_t *m ) +{ + return m->psz_capability; +} + +/** + * Get the score for a module + * + * \param m the module + * return the score for the capability + */ +int module_get_score( const module_t *m ) +{ + return m->i_score; +} + module_t *module_hold (module_t *m) { vlc_hold (&m->vlc_gc_data); @@ -399,15 +375,11 @@ static int modulecmp (const void *a, const void *b) * * Return the best module function, given a capability list. * - * If the p_this object doesn't have it's psz_object_name set, then - * psz_object_name will be set to the module's name, unless the user - * provided an alias using the "module name@alias" syntax in which case - * psz_object_name will be set to the alias. - * * \param p_this the vlc object * \param psz_capability list of capabilities needed * \param psz_name name of the module asked - * \param b_strict TRUE yto use the strict mode + * \param b_strict if true, do not fallback to plugin with a different name + * but the same capability * \return the module or NULL in case of a failure */ module_t * __module_need( vlc_object_t *p_this, const char *psz_capability, @@ -443,16 +415,13 @@ module_t * __module_need( vlc_object_t *p_this, const char *psz_capability, } i_shortcuts++; - psz_shortcuts = psz_last_shortcut = strdup( psz_name ); + psz_parser = psz_shortcuts = psz_last_shortcut = strdup( psz_name ); - for( psz_parser = psz_shortcuts; *psz_parser; psz_parser++ ) + while( ( psz_parser = strchr( psz_parser, ',' ) ) ) { - if( *psz_parser == ',' ) - { - *psz_parser = '\0'; - i_shortcuts++; - psz_last_shortcut = psz_parser + 1; - } + *psz_parser = '\0'; + i_shortcuts++; + psz_last_shortcut = ++psz_parser; } /* Check if the user wants to override the "strict" mode */ @@ -475,46 +444,42 @@ module_t * __module_need( vlc_object_t *p_this, const char *psz_capability, size_t count; module_t **p_all = module_list_get (&count); p_list = malloc( count * sizeof( module_list_t ) ); - unsigned i_cpu = vlc_CPU(); /* Parse the module list for capabilities and probe each of them */ count = 0; for (size_t i = 0; (p_module = p_all[i]) != NULL; i++) { - bool b_shortcut_bonus = false; + int i_shortcut_bonus = 0; /* Test that this module can do what we need */ if( !module_provides( p_module, psz_capability ) ) continue; - /* Test if we have the required CPU */ - if( (p_module->i_cpu & i_cpu) != p_module->i_cpu ) - continue; /* If we required a shortcut, check this plugin provides it. */ if( i_shortcuts > 0 ) { - const char *psz_name = psz_shortcuts; + const char *name = psz_shortcuts; for( unsigned i_short = i_shortcuts; i_short > 0; i_short-- ) { for( unsigned i = 0; p_module->pp_shortcuts[i]; i++ ) { char *c; - if( ( c = strchr( psz_name, '@' ) ) - ? !strncasecmp( psz_name, p_module->pp_shortcuts[i], - c-psz_name ) - : !strcasecmp( psz_name, p_module->pp_shortcuts[i] ) ) + if( ( c = strchr( name, '@' ) ) + ? !strncasecmp( name, p_module->pp_shortcuts[i], + c-name ) + : !strcasecmp( name, p_module->pp_shortcuts[i] ) ) { /* Found it */ if( c && c[1] ) psz_alias = c+1; - b_shortcut_bonus = true; + i_shortcut_bonus = i_short * 10000; goto found_shortcut; } } /* Go to the next shortcut... This is so lame! */ - psz_name += strlen( psz_name ) + 1; + name += strlen( name ) + 1; } /* If we are in "strict" mode and we couldn't @@ -523,19 +488,16 @@ module_t * __module_need( vlc_object_t *p_this, const char *psz_capability, if( b_strict ) continue; } - /* If we didn't require a shortcut, trash <= 0 scored plugins */ - else if( p_module->i_score <= 0 ) - { + + /* Trash <= 0 scored plugins (they can only be selected by shortcut) */ + if( p_module->i_score <= 0 ) continue; - } found_shortcut: /* Store this new module */ p_list[count].p_module = module_hold (p_module); - p_list[count].i_score = p_module->i_score; - if( b_shortcut_bonus ) - p_list[count].i_score += 10000; - p_list[count].b_force = b_shortcut_bonus && b_strict; + p_list[count].i_score = p_module->i_score + i_shortcut_bonus; + p_list[count].b_force = i_shortcut_bonus && b_strict; count++; } @@ -544,7 +506,7 @@ found_shortcut: /* Sort candidates by descending score */ qsort (p_list, count, sizeof (p_list[0]), modulecmp); - msg_Dbg( p_this, "looking for %s module: %i candidate%s", psz_capability, + msg_Dbg( p_this, "looking for %s module: %zu candidate%s", psz_capability, count, count == 1 ? "" : "s" ); /* Parse the linked list and use the first successful module */ @@ -560,25 +522,42 @@ found_shortcut: { module_t *p_new_module = AllocatePlugin( p_this, p_real->psz_filename ); - if( p_new_module ) - { - CacheMerge( p_this, p_real, p_new_module ); - DeleteModule( p_module_bank, p_new_module ); + if( p_new_module == NULL ) + { /* Corrupted module */ + msg_Err( p_this, "possibly corrupt module cache" ); + module_release( p_cand ); + continue; } + CacheMerge( p_this, p_real, p_new_module ); + DeleteModule( p_module_bank, p_new_module ); } #endif p_this->b_force = p_list[i].b_force; - if( p_cand->pf_activate - && p_cand->pf_activate( p_this ) == VLC_SUCCESS ) + + int ret = VLC_SUCCESS; + if( p_cand->pf_activate ) + ret = p_cand->pf_activate( p_this ); + switch( ret ) { + case VLC_SUCCESS: + /* good module! */ p_module = p_cand; - /* Release the remaining modules */ - while (++i < count) - module_release (p_list[i].p_module); - } - else + break; + + case VLC_ETIMEOUT: + /* good module, but aborted */ + module_release( p_cand ); + break; + + default: /* bad module */ module_release( p_cand ); + continue; + } + + /* Release the remaining modules */ + while (++i < count) + module_release (p_list[i].p_module); } free( p_list ); @@ -588,20 +567,13 @@ found_shortcut: { msg_Dbg( p_this, "using %s module \"%s\"", psz_capability, p_module->psz_object_name ); - if( !p_this->psz_object_name ) - { - /* This assumes that p_this is the object which will be using the - * module. That's not always the case ... but it is in most cases. - */ - if( psz_alias ) - p_this->psz_object_name = strdup( psz_alias ); - else - p_this->psz_object_name = strdup( p_module->psz_object_name ); - } + vlc_object_set_name( p_this, psz_alias ? psz_alias + : p_module->psz_object_name ); } else if( count == 0 ) { if( !strcmp( psz_capability, "access_demux" ) + || !strcmp( psz_capability, "stream_filter" ) || !strcmp( psz_capability, "vout_window" ) ) { msg_Dbg( p_this, "no %s module matched \"%s\"", @@ -660,7 +632,6 @@ void __module_unneed( vlc_object_t * p_this, module_t * p_module ) /** * Get a pointer to a module_t given it's name. * - * \param p_this vlc object structure * \param psz_name the name of the module * \return a pointer to the module or NULL in case of a failure */ @@ -689,7 +660,6 @@ module_t *module_find( const char * psz_name ) /** * Tell if a module exists and release it in thic case * - * \param p_this vlc object structure * \param psz_name th name of the module * \return TRUE if the module exists */ @@ -702,72 +672,38 @@ bool module_exists (const char * psz_name) } /** - * GetModuleNamesForCapability + * Get a pointer to a module_t that matches a shortcut. + * This is a temporary hack for SD. Do not re-use (generally multiple modules + * can have the same shortcut, so this is *broken* - use module_need()!). * - * Return a NULL terminated array with the names of the modules - * that have a certain capability. - * Free after uses both the string and the table. - * \param psz_capability the capability asked - * \param pppsz_longname an pointer to an array of string to contain - the long names of the modules. If set to NULL the function don't use it. - * \return the NULL terminated array + * \param psz_shortcut shortcut of the module + * \param psz_cap capability of the module + * \return a pointer to the module or NULL in case of a failure */ -char ** module_GetModulesNamesForCapability( const char *psz_capability, - char ***pppsz_longname ) +module_t *module_find_by_shortcut (const char *psz_shortcut) { - size_t count = 0; - char **psz_ret; - - module_t **list = module_list_get (NULL); - - /* Do it in two passes : count the number of modules before */ - for (size_t i = 0; list[i]; i++) - { - module_t *p_module = list[i]; - const char *psz_module_capability = p_module->psz_capability; - - if( psz_module_capability && !strcmp( psz_module_capability, psz_capability ) ) - count++; - } + module_t **list, *module; - psz_ret = malloc( sizeof(char*) * (count+1) ); - if( pppsz_longname ) - *pppsz_longname = malloc( sizeof(char*) * (count+1) ); - if( !psz_ret || ( pppsz_longname && *pppsz_longname == NULL ) ) - { - free( psz_ret ); - if( pppsz_longname ) - free( *pppsz_longname ); - *pppsz_longname = NULL; - module_list_free (list); + list = module_list_get (NULL); + if (!list) return NULL; - } - for (size_t i = 0, j = 0; list[i]; i++) + for (size_t i = 0; (module = list[i]) != NULL; i++) { - module_t *p_module = list[i]; - const char *psz_module_capability = p_module->psz_capability; - - if( psz_module_capability && !strcmp( psz_module_capability, psz_capability ) ) + for (size_t j = 0; + (module->pp_shortcuts[j] != NULL) && (j < MODULE_SHORTCUT_MAX); + j++) { - int k = -1; /* hack to handle submodules properly */ - if( p_module->b_submodule ) + if (!strcmp (module->pp_shortcuts[j], psz_shortcut)) { - while( p_module->pp_shortcuts[++k] != NULL ); - k--; - } - psz_ret[j] = strdup( k>=0?p_module->pp_shortcuts[k] - :p_module->psz_object_name ); - if( pppsz_longname ) - (*pppsz_longname)[j] = strdup( module_get_name( p_module, true ) ); - j++; + module_hold (module); + goto out; + } } } - psz_ret[count] = NULL; - +out: module_list_free (list); - - return psz_ret; + return module; } /** @@ -857,7 +793,7 @@ static char * copy_next_paths_token( char * paths, char ** remaining_paths ) else path[done++] = paths[i]; } - path[done++] = 0; + path[done] = 0; /* Return the remaining paths */ if( remaining_paths ) { @@ -873,7 +809,7 @@ char *psz_vlcpath = NULL; * AllocateAllPlugins: load all plugin modules we can find. *****************************************************************************/ #ifdef HAVE_DYNAMIC_PLUGINS -static void AllocateAllPlugins( vlc_object_t *p_this ) +static void AllocateAllPlugins( vlc_object_t *p_this, module_bank_t *p_bank ) { const char *vlcpath = psz_vlcpath; int count,i; @@ -892,7 +828,7 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) #endif /* If the user provided a plugin path, we add it to the list */ - char *userpaths = config_GetPsz( p_this, "plugin-path" ); + char *userpaths = var_InheritString( p_this, "plugin-path" ); char *paths_iter; for( paths_iter = userpaths; paths_iter; ) @@ -912,7 +848,7 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) msg_Dbg( p_this, "recursively browsing `%s'", path ); /* Don't go deeper than 5 subdirectories */ - AllocatePluginDir( p_this, path, 5 ); + AllocatePluginDir( p_this, p_bank, path, 5 ); free( path ); } @@ -924,181 +860,53 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) /***************************************************************************** * AllocatePluginDir: recursively parse a directory to look for plugins *****************************************************************************/ -static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, - int i_maxdepth ) +static void AllocatePluginDir( vlc_object_t *p_this, module_bank_t *p_bank, + const char *psz_dir, unsigned 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]; - wchar_t psz_wdir[MAX_PATH]; -#endif - char psz_path[MAX_PATH + 256]; - WIN32_FIND_DATA finddata; - HANDLE handle; - int rc; -#else - int i_dirlen; - DIR * dir; - struct dirent * file; -#endif - char * psz_file; - - if( p_this->p_libvlc->b_die || i_maxdepth < 0 ) - { + if( i_maxdepth == 0 ) return; - } - -#if defined( UNDER_CE ) || defined( _MSC_VER ) -#ifdef UNDER_CE - MultiByteToWideChar( CP_ACP, 0, psz_dir, -1, psz_wdir, MAX_PATH ); - - rc = GetFileAttributes( psz_wdir ); - 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<0 || !(rc&FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */ -#endif - - /* Parse all files in the directory */ - sprintf( psz_path, "%s\\*", psz_dir ); -#ifdef UNDER_CE - handle = FindFirstFile( psz_wpath, &finddata ); -#else - handle = FindFirstFile( psz_path, &finddata ); -#endif - if( handle == INVALID_HANDLE_VALUE ) - { - /* Empty directory */ + DIR *dh = utf8_opendir (psz_dir); + if (dh == NULL) return; - } /* Parse the directory and try to load all files it contains. */ - do - { -#ifdef UNDER_CE - unsigned int i_len = wcslen( finddata.cFileName ); - swprintf( psz_wpath, L"%ls\\%ls", psz_wdir, finddata.cFileName ); - sprintf( psz_path, "%s\\%ls", psz_dir, finddata.cFileName ); -#else - unsigned int i_len = strlen( finddata.cFileName ); - sprintf( psz_path, "%s\\%s", psz_dir, finddata.cFileName ); -#endif - - /* Skip ".", ".." */ - if( !*finddata.cFileName || !strcmp( finddata.cFileName, "." ) - || !strcmp( finddata.cFileName, ".." ) ) - { - if( !FindNextFile( handle, &finddata ) ) break; - continue; - } - -#ifdef UNDER_CE - if( GetFileAttributes( psz_wpath ) & FILE_ATTRIBUTE_DIRECTORY ) -#else - if( GetFileAttributes( psz_path ) & FILE_ATTRIBUTE_DIRECTORY ) -#endif - { - AllocatePluginDir( p_this, psz_path, i_maxdepth - 1 ); - } - else if( i_len > strlen( LIBEXT ) - /* We only load files ending with LIBEXT */ - && !strncasecmp( psz_path + strlen( psz_path) - - 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, i_time, i_size ); - } - } - while( !p_this->p_libvlc->b_die && FindNextFile( handle, &finddata ) ); - - /* Close the directory */ - FindClose( handle ); - -#else - dir = opendir( psz_dir ); - if( !dir ) + for (;;) { - return; - } - - i_dirlen = strlen( psz_dir ); + char *file = utf8_readdir (dh), *path; + struct stat st; - /* Parse the directory and try to load all files it contains. */ - while( !p_this->p_libvlc->b_die && ( file = readdir( dir ) ) ) - { - struct stat statbuf; - unsigned int i_len; - int i_stat; + if (file == NULL) + break; /* Skip ".", ".." */ - if( !*file->d_name || !strcmp( file->d_name, "." ) - || !strcmp( file->d_name, ".." ) ) + if (!strcmp (file, ".") || !strcmp (file, "..") + /* Skip directories for unsupported optimizations */ + || !vlc_CPU_CheckPluginDir (file)) { + free (file); continue; } - i_len = strlen( file->d_name ); - psz_file = malloc( i_dirlen + 1 + i_len + 1 ); - sprintf( psz_file, "%s"DIR_SEP"%s", psz_dir, file->d_name ); - - i_stat = stat( psz_file, &statbuf ); - if( !i_stat && statbuf.st_mode & S_IFDIR ) - { - AllocatePluginDir( p_this, psz_file, i_maxdepth - 1 ); - } - else if( i_len > strlen( LIBEXT ) - /* We only load files ending with LIBEXT */ - && !strncasecmp( file->d_name + i_len - strlen( LIBEXT ), - LIBEXT, strlen( LIBEXT ) ) ) - { - int64_t i_time = 0, i_size = 0; - - if( !i_stat ) - { - i_time = statbuf.st_mtime; - i_size = statbuf.st_size; - } - - AllocatePluginFile( p_this, psz_file, i_time, i_size ); - } + const int pathlen = asprintf (&path, "%s"DIR_SEP"%s", psz_dir, file); + free (file); + if (pathlen == -1 || utf8_stat (path, &st)) + continue; - free( psz_file ); + if (S_ISDIR (st.st_mode)) + /* Recurse into another directory */ + AllocatePluginDir (p_this, p_bank, path, i_maxdepth - 1); + else + if (S_ISREG (st.st_mode) + && ((size_t)pathlen >= strlen (LIBEXT)) + && !strncasecmp (path + pathlen - strlen (LIBEXT), LIBEXT, + strlen (LIBEXT))) + /* ^^ We only load files ending with LIBEXT */ + AllocatePluginFile (p_this, p_bank, path, st.st_mtime, st.st_size); + + free (path); } - - /* Close the directory */ - closedir( dir ); - -#endif + closedir (dh); } /***************************************************************************** @@ -1108,7 +916,8 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, * for its information data. The module can then be handled by module_need * and module_unneed. It can be removed by DeleteModule. *****************************************************************************/ -static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, +static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank, + const char *psz_file, int64_t i_file_time, int64_t i_file_size ) { module_t * p_module = NULL; @@ -1117,76 +926,71 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, /* * Check our plugins cache first then load plugin if needed */ - p_cache_entry = - CacheFind( p_module_bank, psz_file, i_file_time, i_file_size ); - + p_cache_entry = CacheFind( p_bank, psz_file, i_file_time, i_file_size ); if( !p_cache_entry ) { p_module = AllocatePlugin( p_this, psz_file ); } else + /* If junk dll, don't try to load it */ + if( p_cache_entry->b_junk ) + return -1; + else { - /* If junk dll, don't try to load it */ - if( p_cache_entry->b_junk ) - { - p_module = NULL; - } - else - { - module_config_t *p_item = NULL, *p_end = NULL; + module_config_t *p_item = NULL, *p_end = NULL; - p_module = p_cache_entry->p_module; - p_module->b_loaded = false; + p_module = p_cache_entry->p_module; + p_module->b_loaded = false; - /* 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_end = p_item + p_module->confsize; - p_item < p_end; p_item++ ) + /* 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_end = p_item + p_module->confsize; + p_item < p_end; p_item++ ) + { + if( p_item->pf_callback || p_item->i_action ) { - if( p_item->pf_callback || p_item->i_action ) - { - p_module = AllocatePlugin( p_this, psz_file ); - break; - } + p_module = AllocatePlugin( p_this, psz_file ); + break; } - if( p_module == p_cache_entry->p_module ) - p_cache_entry->b_used = true; } + if( p_module == p_cache_entry->p_module ) + p_cache_entry->b_used = true; } - if( p_module ) - { - /* Everything worked fine ! - * The module is ready to be added to the list. */ - p_module->b_builtin = false; - - /* msg_Dbg( p_this, "plugin \"%s\", %s", - p_module->psz_object_name, p_module->psz_longname ); */ - p_module->next = p_module_bank->head; - p_module_bank->head = p_module; - - if( !p_module_bank->b_cache ) - return 0; - -#define p_bank p_module_bank - /* Add entry to cache */ - 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 = true; - p_bank->pp_cache[p_bank->i_cache]->p_module = p_module; - p_bank->i_cache++; -#undef p_bank - } + if( p_module == NULL ) + return -1; + + /* Everything worked fine ! + * The module is ready to be added to the list. */ + p_module->b_builtin = false; + + /* msg_Dbg( p_this, "plugin \"%s\", %s", + p_module->psz_object_name, p_module->psz_longname ); */ + p_module->next = p_bank->head; + p_bank->head = p_module; - return p_module ? 0 : -1; + if( !p_module_bank->b_cache ) + return 0; + + /* Add entry to cache */ + module_cache_t **pp_cache = p_bank->pp_cache; + + pp_cache = realloc_or_free( pp_cache, (p_bank->i_cache + 1) * sizeof(void *) ); + if( pp_cache == NULL ) + return -1; + pp_cache[p_bank->i_cache] = malloc( sizeof(module_cache_t) ); + if( pp_cache[p_bank->i_cache] == NULL ) + return -1; + pp_cache[p_bank->i_cache]->psz_file = strdup( psz_file ); + pp_cache[p_bank->i_cache]->i_time = i_file_time; + pp_cache[p_bank->i_cache]->i_size = i_file_size; + pp_cache[p_bank->i_cache]->b_junk = p_module ? 0 : 1; + pp_cache[p_bank->i_cache]->b_used = true; + pp_cache[p_bank->i_cache]->p_module = p_module; + p_bank->pp_cache = pp_cache; + p_bank->i_cache++; + return 0; } /***************************************************************************** @@ -1196,7 +1000,7 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, * for its information data. The module can then be handled by module_need * and module_unneed. It can be removed by DeleteModule. *****************************************************************************/ -static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) +static module_t * AllocatePlugin( vlc_object_t * p_this, const char *psz_file ) { module_t * p_module = NULL; module_handle_t handle; @@ -1213,8 +1017,7 @@ static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) return NULL; } - /* We need to fill these since they may be needed by module_Call() */ - p_module->psz_filename = psz_file; + p_module->psz_filename = strdup( psz_file ); p_module->handle = handle; p_module->b_loaded = true; @@ -1222,13 +1025,13 @@ static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) if( module_Call( p_this, p_module ) != 0 ) { /* We couldn't call module_init() */ + free( p_module->psz_filename ); module_release( p_module ); module_Unload( handle ); return NULL; } DupModule( p_module ); - p_module->psz_filename = strdup( p_module->psz_filename ); /* Everything worked fine ! The module is ready to be added to the list. */ p_module->b_builtin = false;