X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fmodules.c;h=b6592024e6fa9d9e1b926752bb89985eac520d89;hb=4e9e9f5cac1a576cc3c27695d00a11535a8219d6;hp=b4a1ca3c2e152352aeec484be578b918c2f19948;hpb=55c960749e8f91763e720ac610d5dd56f90fcde1;p=vlc diff --git a/src/modules/modules.c b/src/modules/modules.c index b4a1ca3c2e..b6592024e6 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 @@ -172,7 +165,7 @@ void module_EndBank( vlc_object_t *p_this, bool b_plugins ) assert (p_bank != NULL); /* Save the configuration */ - if( !config_GetInt( p_this, "ignore-config" ) ) + if( !var_InheritBool( p_this, "ignore-config" ) ) config_AutoSaveConfigFile( p_this ); /* If plugins were _not_ loaded, then the caller still has the bank lock @@ -201,25 +194,15 @@ void module_EndBank( vlc_object_t *p_this, bool b_plugins ) 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 ) @@ -247,7 +230,7 @@ void module_LoadPlugins( vlc_object_t * p_this, bool b_cache_delete ) if( p_bank->i_usage == 1 ) { msg_Dbg( p_this, "checking plugin modules" ); - p_module_bank->b_cache = config_GetInt( p_this, "plugins-cache" ) > 0; + 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 ); @@ -411,15 +394,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, @@ -455,16 +434,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 */ @@ -487,46 +463,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 @@ -543,10 +515,8 @@ module_t * __module_need( vlc_object_t *p_this, const char *psz_capability, 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++; } @@ -571,25 +541,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 ); @@ -599,16 +586,8 @@ 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 ) { @@ -746,80 +725,6 @@ out: return module; } -/** - * GetModuleNamesForCapability - * - * 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 - */ -char ** module_GetModulesNamesForCapability( const char *psz_capability, - char ***pppsz_longname ) -{ - size_t count = 0; - char **psz_ret; - - module_t **list = module_list_get (NULL); - - /* Proceed in two passes: count the number of modules first */ - 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++; - } - - /* Then get the names */ - 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); - return NULL; - } - - for (size_t i = 0, j = 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 ) ) - { - /* Explicit hack: Use the last shortcut. It _should_ be - * different from the object name, at least if the object - * contains multiple submodules with the same capability. */ - unsigned k = 0; - while( p_module->pp_shortcuts[k] != NULL ) - k++; - assert( k > 0); /* pp_shortcuts[0] is always set */ - psz_ret[j] = strdup( p_module->pp_shortcuts[k - 1] ); - if( pppsz_longname ) - (*pppsz_longname)[j] = strdup( module_get_name( p_module, true ) ); - j++; - } - } - psz_ret[count] = NULL; - - module_list_free (list); - - return psz_ret; -} - /** * Get the configuration of a module * @@ -907,7 +812,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 ) { @@ -942,7 +847,7 @@ static void AllocateAllPlugins( vlc_object_t *p_this, module_bank_t *p_bank ) #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; ) @@ -977,176 +882,50 @@ static void AllocateAllPlugins( vlc_object_t *p_this, module_bank_t *p_bank ) 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( 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, p_bank, 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, p_bank, 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, p_bank, 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, p_bank, 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); } /***************************************************************************** @@ -1216,7 +995,7 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank, /* Add entry to cache */ module_cache_t **pp_cache = p_bank->pp_cache; - pp_cache = realloc( pp_cache, (p_bank->i_cache + 1) * sizeof(void *) ); + 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) );