X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fconfig%2Fcore.c;h=c7351ad77fd5d3d7b910532549d2904048ce51f7;hb=6c5106a701f467e314dcfb52ac363120e9524f43;hp=cf83e7576a3fad6a355eac52ac76be36984a1abf;hpb=a3576a2716c6ea17349b9dbeea4757d2198b40e6;p=vlc diff --git a/src/config/core.c b/src/config/core.c index cf83e7576a..c7351ad77f 100644 --- a/src/config/core.c +++ b/src/config/core.c @@ -21,47 +21,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include "../libvlc.h" -#include "vlc_keys.h" -#include "vlc_charset.h" - -#include /* errno */ - -#ifdef HAVE_LIMITS_H -# include -#endif - -#ifdef HAVE_UNISTD_H -# include /* getuid() */ -#endif - -#ifdef HAVE_GETOPT_LONG -# ifdef HAVE_GETOPT_H -# include /* getopt() */ -# endif -#else -# include "../extras/getopt.h" +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -#if defined(HAVE_GETPWUID) -# include /* getpwuid() */ -#endif +#include +#include "vlc_keys.h" +#include "vlc_charset.h" +#include "vlc_configuration.h" -#if defined( HAVE_SYS_STAT_H ) -# include -#endif -#if defined( HAVE_SYS_TYPES_H ) -# include -#endif -#if defined( WIN32 ) -# if !defined( UNDER_CE ) -# include -# endif -#include -#endif +#include -#include "config.h" +#include "configuration.h" #include "modules/modules.h" static inline char *strdupnull (const char *src) @@ -69,11 +40,6 @@ static inline char *strdupnull (const char *src) return src ? strdup (src) : NULL; } -static inline char *_strdupnull (const char *src) -{ - return src ? strdup (_(src)) : NULL; -} - /* Item types that use a string value (i.e. serialized in the module cache) */ int IsConfigStringType (int type) { @@ -81,7 +47,7 @@ int IsConfigStringType (int type) { CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, CONFIG_ITEM_MODULE, CONFIG_ITEM_DIRECTORY, CONFIG_ITEM_MODULE_CAT, CONFIG_ITEM_PASSWORD, - CONFIG_ITEM_MODULE_LIST, CONFIG_ITEM_MODULE_LIST_CAT + CONFIG_ITEM_MODULE_LIST, CONFIG_ITEM_MODULE_LIST_CAT, CONFIG_ITEM_FONT }; /* NOTE: this needs to be changed if we ever get more than 255 types */ @@ -89,7 +55,7 @@ int IsConfigStringType (int type) } -static int IsConfigIntegerType (int type) +int IsConfigIntegerType (int type) { static const unsigned char config_types[] = { @@ -101,12 +67,6 @@ static int IsConfigIntegerType (int type) } -static inline int IsConfigFloatType (int type) -{ - return type == CONFIG_ITEM_FLOAT; -} - - /***************************************************************************** * config_GetType: get the type of a variable (bool, int, float, string) ***************************************************************************** @@ -306,7 +266,7 @@ void __config_PutPsz( vlc_object_t *p_this, else p_config->value.psz = NULL; - p_config->b_dirty = VLC_TRUE; + p_config->b_dirty = true; val.psz_string = (char *)p_config->value.psz; @@ -319,7 +279,7 @@ void __config_PutPsz( vlc_object_t *p_this, } /* free old string */ - if( oldval.psz_string ) free( oldval.psz_string ); + free( oldval.psz_string ); } /***************************************************************************** @@ -370,7 +330,7 @@ void __config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value ) p_config->value.i = i_value; } - p_config->b_dirty = VLC_TRUE; + p_config->b_dirty = true; val.i_int = p_config->value.i; @@ -429,7 +389,7 @@ void __config_PutFloat( vlc_object_t *p_this, p_config->value.f = f_value; } - p_config->b_dirty = VLC_TRUE; + p_config->b_dirty = true; val.f_float = p_config->value.f; @@ -445,20 +405,22 @@ void __config_PutFloat( vlc_object_t *p_this, ***************************************************************************** * FIXME: This function really needs to be optimized. * FIXME: And now even more. + * FIXME: remove p_this pointer parameter (or use it) *****************************************************************************/ module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name ) { - vlc_list_t *p_list; - int i_index; + VLC_UNUSED(p_this); + module_t *p_parser; if( !psz_name ) return NULL; - p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + module_t **list = module_list_get (NULL); + if (list == NULL) + return NULL; - for( i_index = 0; i_index < p_list->i_count; i_index++ ) + for (size_t i = 0; (p_parser = list[i]) != NULL; i++) { module_config_t *p_item, *p_end; - module_t *p_parser = (module_t *)p_list->p_values[i_index].p_object; if( !p_parser->i_config_items ) continue; @@ -470,155 +432,20 @@ module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name ) if( p_item->i_type & CONFIG_HINT ) /* ignore hints */ continue; - if( !strcmp( psz_name, p_item->psz_name ) ) + if( !strcmp( psz_name, p_item->psz_name ) + || ( p_item->psz_oldname + && !strcmp( psz_name, p_item->psz_oldname ) ) ) { - vlc_list_release( p_list ); + module_list_free (list); return p_item; } } } - vlc_list_release( p_list ); - + module_list_free (list); return NULL; } -/***************************************************************************** - * config_Duplicate: creates a duplicate of a module's configuration data. - ***************************************************************************** - * Unfortunatly we cannot work directly with the module's config data as - * this module might be unloaded from memory at any time (remember HideModule). - * This is why we need to create an exact copy of the config data. - *****************************************************************************/ -int config_Duplicate( module_t *p_module, const module_config_t *p_orig, - size_t n ) -{ - int j; - const module_config_t *p_item, *p_end = p_orig + n; - - /* Calculate the structure length */ - p_module->i_config_items = 0; - p_module->i_bool_items = 0; - - for( p_item = p_orig; p_item < p_end; p_item++ ) - { - if( p_item->i_type & CONFIG_ITEM ) - { - p_module->i_config_items++; - } - - if( p_item->i_type == CONFIG_ITEM_BOOL ) - { - p_module->i_bool_items++; - } - } - - /* Allocate memory */ - p_module->p_config = (module_config_t *)calloc( n, sizeof(*p_orig) ); - if( p_module->p_config == NULL ) - { - msg_Err( p_module, "config error: can't duplicate p_config" ); - return VLC_ENOMEM; - } - p_module->confsize = n; - - /* Do the duplication job */ - for( size_t i = 0; i < n ; i++ ) - { - p_module->p_config[i] = p_orig[i]; - - if (IsConfigIntegerType (p_module->p_config[i].i_type)) - { - p_module->p_config[i].orig.i = p_orig[i].value.i; - p_module->p_config[i].saved.i = p_orig[i].value.i; - } - else - if (IsConfigFloatType (p_module->p_config[i].i_type)) - { - p_module->p_config[i].orig.f = p_orig[i].value.f; - p_module->p_config[i].saved.f = p_orig[i].value.f; - } - else - if (IsConfigStringType (p_module->p_config[i].i_type)) - { - p_module->p_config[i].value.psz = strdupnull (p_orig[i].value.psz); - p_module->p_config[i].orig.psz = strdupnull (p_orig[i].value.psz); - p_module->p_config[i].saved.psz = NULL; - } - - p_module->p_config[i].psz_type = strdupnull (p_orig[i].psz_type); - p_module->p_config[i].psz_name = strdupnull (p_orig[i].psz_name); - p_module->p_config[i].psz_current = strdupnull (p_orig[i].psz_current); - p_module->p_config[i].psz_text = _strdupnull (p_orig[i].psz_text); - p_module->p_config[i].psz_longtext = _strdupnull (p_orig[i].psz_longtext); - - p_module->p_config[i].p_lock = &p_module->object_lock; - - /* duplicate the string list */ - if( p_orig[i].i_list ) - { - if( p_orig[i].ppsz_list ) - { - p_module->p_config[i].ppsz_list = - malloc( (p_orig[i].i_list + 1) * sizeof(char *) ); - if( p_module->p_config[i].ppsz_list ) - { - for( j = 0; j < p_orig[i].i_list; j++ ) - p_module->p_config[i].ppsz_list[j] = - strdupnull (p_orig[i].ppsz_list[j]); - p_module->p_config[i].ppsz_list[j] = NULL; - } - } - if( p_orig[i].ppsz_list_text ) - { - p_module->p_config[i].ppsz_list_text = - calloc( (p_orig[i].i_list + 1), sizeof(char *) ); - if( p_module->p_config[i].ppsz_list_text ) - { - for( j = 0; j < p_orig[i].i_list; j++ ) - p_module->p_config[i].ppsz_list_text[j] = - strdupnull (_(p_orig[i].ppsz_list_text[j])); - p_module->p_config[i].ppsz_list_text[j] = NULL; - } - } - if( p_orig[i].pi_list ) - { - p_module->p_config[i].pi_list = - malloc( (p_orig[i].i_list + 1) * sizeof(int) ); - if( p_module->p_config[i].pi_list ) - { - for( j = 0; j < p_orig[i].i_list; j++ ) - p_module->p_config[i].pi_list[j] = - p_orig[i].pi_list[j]; - } - } - } - - /* duplicate the actions list */ - if( p_orig[i].i_action ) - { - int j; - - p_module->p_config[i].ppf_action = - malloc( p_orig[i].i_action * sizeof(void *) ); - p_module->p_config[i].ppsz_action_text = - malloc( p_orig[i].i_action * sizeof(char *) ); - - for( j = 0; j < p_orig[i].i_action; j++ ) - { - p_module->p_config[i].ppf_action[j] = - p_orig[i].ppf_action[j]; - p_module->p_config[i].ppsz_action_text[j] = - strdupnull (p_orig[i].ppsz_action_text[j]); - } - } - - p_module->p_config[i].pf_callback = p_orig[i].pf_callback; - } - return VLC_SUCCESS; -} - - /***************************************************************************** * config_Free: frees a duplicated module's configuration data. ***************************************************************************** @@ -632,49 +459,42 @@ void config_Free( module_t *p_module ) { module_config_t *p_item = p_module->p_config + j; - free( (char*) p_item->psz_type ); - free( (char*) p_item->psz_name ); - free( (char*) p_item->psz_current ); - free( (char*) p_item->psz_text ); - free( (char*) p_item->psz_longtext ); + free( p_item->psz_type ); + free( p_item->psz_name ); + free( p_item->psz_text ); + free( p_item->psz_longtext ); + free( p_item->psz_oldname ); if (IsConfigStringType (p_item->i_type)) { - free ((char *)p_item->value.psz); - free ((char *)p_item->orig.psz); - free ((char *)p_item->saved.psz); + free (p_item->value.psz); + free (p_item->orig.psz); + free (p_item->saved.psz); } - if( p_item->i_list ) - { + if( p_item->ppsz_list ) for( i = 0; i < p_item->i_list; i++ ) - { - if( p_item->ppsz_list && p_item->ppsz_list[i] ) - free( (char*) p_item->ppsz_list[i] ); - if( p_item->ppsz_list_text && p_item->ppsz_list_text[i] ) - free( (char*) p_item->ppsz_list_text[i] ); - } - if( p_item->ppsz_list ) free( p_item->ppsz_list ); - if( p_item->ppsz_list_text ) free( p_item->ppsz_list_text ); - if( p_item->pi_list ) free( p_item->pi_list ); - } + free( p_item->ppsz_list[i] ); + if( p_item->ppsz_list_text ) + for( i = 0; i < p_item->i_list; i++ ) + free( p_item->ppsz_list_text[i] ); + free( p_item->ppsz_list ); + free( p_item->ppsz_list_text ); + free( p_item->pi_list ); if( p_item->i_action ) { for( i = 0; i < p_item->i_action; i++ ) { - free( (char*) p_item->ppsz_action_text[i] ); + free( p_item->ppsz_action_text[i] ); } - if( p_item->ppf_action ) free( p_item->ppf_action ); - if( p_item->ppsz_action_text ) free( p_item->ppsz_action_text ); + free( p_item->ppf_action ); + free( p_item->ppsz_action_text ); } } - if (p_module->p_config != NULL) - { - free (p_module->p_config); - p_module->p_config = NULL; - } + free (p_module->p_config); + p_module->p_config = NULL; } /***************************************************************************** @@ -714,397 +534,34 @@ void config_UnsetCallbacks( module_config_t *p_new, size_t n ) *****************************************************************************/ void __config_ResetAll( vlc_object_t *p_this ) { - int i_index; - vlc_list_t *p_list; + VLC_UNUSED(p_this); module_t *p_module; + module_t **list = module_list_get (NULL); - /* Acquire config file lock */ - vlc_mutex_lock( &p_this->p_libvlc->config_lock ); - - p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); - - for( i_index = 0; i_index < p_list->i_count; i_index++ ) + for (size_t j = 0; (p_module = list[j]) != NULL; j++) { - p_module = (module_t *)p_list->p_values[i_index].p_object ; if( p_module->b_submodule ) continue; for (size_t i = 0; i < p_module->confsize; i++ ) { - if (IsConfigIntegerType (p_module->p_config[i].i_type)) - p_module->p_config[i].value.i = p_module->p_config[i].orig.i; + module_config_t *p_config = p_module->p_config + i; + + vlc_mutex_lock (p_config->p_lock); + if (IsConfigIntegerType (p_config->i_type)) + p_config->value.i = p_config->orig.i; else - if (IsConfigFloatType (p_module->p_config[i].i_type)) - p_module->p_config[i].value.f = p_module->p_config[i].orig.f; + if (IsConfigFloatType (p_config->i_type)) + p_config->value.f = p_config->orig.f; else - if (IsConfigStringType (p_module->p_config[i].i_type)) + if (IsConfigStringType (p_config->i_type)) { - free ((char *)p_module->p_config[i].value.psz); - p_module->p_config[i].value.psz = - strdupnull (p_module->p_config[i].orig.psz); + free ((char *)p_config->value.psz); + p_config->value.psz = + strdupnull (p_config->orig.psz); } + vlc_mutex_unlock (p_config->p_lock); } } - vlc_list_release( p_list ); - vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); + module_list_free (list); } - -/** - * config_GetDataDir: find directory where shared data is installed - * - * @return a string (always succeeds). - */ -const char *config_GetDataDir( void ) -{ -#if defined (WIN32) || defined (UNDER_CE) - return vlc_global()->psz_vlcpath; -#elif defined(__APPLE__) || defined (SYS_BEOS) - static char path[PATH_MAX] = ""; - - if( *path == '\0' ) - { - snprintf( path, sizeof( path ), "%s/share", - vlc_global()->psz_vlcpath ); - path[sizeof( path ) - 1] = '\0'; - } - return path; -#else - return DATA_PATH; -#endif -} - -/***************************************************************************** - * config_GetHomeDir, config_GetUserDir: find the user's home directory. - ***************************************************************************** - * This function will try by different ways to find the user's home path. - * Note that this function is not reentrant, it should be called only once - * at the beginning of main where the result will be stored for later use. - *****************************************************************************/ -static char *GetDir( vlc_bool_t b_appdata ) -{ - const char *psz_localhome = NULL; - -#if defined(WIN32) && !defined(UNDER_CE) - typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD, - LPWSTR ); -#ifndef CSIDL_FLAG_CREATE -# define CSIDL_FLAG_CREATE 0x8000 -#endif -#ifndef CSIDL_APPDATA -# define CSIDL_APPDATA 0x1A -#endif -#ifndef CSIDL_PROFILE -# define CSIDL_PROFILE 0x28 -#endif -#ifndef SHGFP_TYPE_CURRENT -# define SHGFP_TYPE_CURRENT 0 -#endif - - HINSTANCE shfolder_dll; - SHGETFOLDERPATH SHGetFolderPath ; - - /* load the shfolder dll to retrieve SHGetFolderPath */ - if( ( shfolder_dll = LoadLibrary( _T("SHFolder.dll") ) ) != NULL ) - { - SHGetFolderPath = (void *)GetProcAddress( shfolder_dll, - _T("SHGetFolderPathW") ); - if ( SHGetFolderPath != NULL ) - { - wchar_t whomedir[MAX_PATH]; - - /* get the "Application Data" folder for the current user */ - if( S_OK == SHGetFolderPath( NULL, - (b_appdata ? CSIDL_APPDATA : - CSIDL_PROFILE) | CSIDL_FLAG_CREATE, - NULL, SHGFP_TYPE_CURRENT, - whomedir ) ) - { - FreeLibrary( shfolder_dll ); - return FromWide( whomedir ); - } - } - FreeLibrary( shfolder_dll ); - } - -#elif defined(UNDER_CE) - -#ifndef CSIDL_APPDATA -# define CSIDL_APPDATA 0x1A -#endif - - wchar_t whomedir[MAX_PATH]; - - /* get the "Application Data" folder for the current user */ - if( SHGetSpecialFolderPath( NULL, whomedir, CSIDL_APPDATA, 1 ) ) - return FromWide( whomedir ); -#endif - - psz_localhome = getenv( "HOME" ); - if( psz_localhome == NULL ) - { -#if defined(HAVE_GETPWUID) - struct passwd *p_pw; - (void)b_appdata; - - if( ( p_pw = getpwuid( getuid() ) ) != NULL ) - psz_localhome = p_pw->pw_dir; - else -#endif - { - psz_localhome = getenv( "TMP" ); - if( psz_localhome == NULL ) - psz_localhome = "/tmp"; - } - } - - return FromLocaleDup( psz_localhome ); -} - -/** - * Get the user's home directory - */ -char *config_GetHomeDir( void ) -{ - return GetDir( VLC_FALSE ); -} - -/** - * Get the user's main data and config directory: - * - on windows that's the App Data directory; - * - on other OSes it's the same as the home directory. - */ -char *config_GetUserDir( void ); -char *config_GetUserDir( void ) -{ - return GetDir( VLC_TRUE ); -} - -/** - * Get the user's VLC configuration directory - */ -char *config_GetConfigDir( libvlc_int_t *p_libvlc ) -{ - char *psz_dir; -#if defined(WIN32) || defined(__APPLE__) || defined(SYS_BEOS) - char *psz_parent = config_GetUserDir(); - if( !psz_parent ) psz_parent = p_libvlc->psz_homedir; - if( asprintf( &psz_dir, "%s" DIR_SEP CONFIG_DIR, psz_parent ) == -1 ) - return NULL; - return psz_dir; -#else - /* XDG Base Directory Specification - Version 0.6 */ - char *psz_env = getenv( "XDG_CONFIG_HOME" ); - if( psz_env ) - { - if( asprintf( &psz_dir, "%s/vlc", psz_env ) == -1 ) - return NULL; - return psz_dir; - } - psz_env = getenv( "HOME" ); - if( !psz_env ) psz_env = p_libvlc->psz_homedir; /* not part of XDG spec but we want a sensible fallback */ - if( asprintf( &psz_dir, "%s/.config/vlc", psz_env ) == -1 ) - return NULL; - return psz_dir; -#endif -} - -/** - * Get the user's VLC data directory - * (used for stuff like the skins, custom lua modules, ...) - */ -char *config_GetUserDataDir( libvlc_int_t *p_libvlc ) -{ - char *psz_dir; -#if defined(WIN32) || defined(__APPLE__) || defined(SYS_BEOS) - char *psz_parent = config_GetUserDir(); - if( !psz_parent ) psz_parent = p_libvlc->psz_homedir; - if( asprintf( &psz_dir, "%s" DIR_SEP CONFIG_DIR, psz_parent ) == -1 ) - return NULL; - return psz_dir; -#else - /* XDG Base Directory Specification - Version 0.6 */ - char *psz_env = getenv( "XDG_DATA_HOME" ); - if( psz_env ) - { - if( asprintf( &psz_dir, "%s/vlc", psz_env ) == -1 ) - return NULL; - return psz_dir; - } - psz_env = getenv( "HOME" ); - if( !psz_env ) psz_env = p_libvlc->psz_homedir; /* not part of XDG spec but we want a sensible fallback */ - if( asprintf( &psz_dir, "%s/.local/share/vlc", psz_env ) == -1 ) - return NULL; - return psz_dir; -#endif -} - -/** - * Get the user's VLC cache directory - * (used for stuff like the modules cache, the album art cache, ...) - */ -char *config_GetCacheDir( libvlc_int_t *p_libvlc ) -{ - char *psz_dir; -#if defined(WIN32) || defined(__APPLE__) || defined(SYS_BEOS) - char *psz_parent = config_GetUserDir(); - if( !psz_parent ) psz_parent = p_libvlc->psz_homedir; - if( asprintf( &psz_dir, "%s" DIR_SEP CONFIG_DIR, psz_parent ) == -1 ) - return NULL; - return psz_dir; -#else - /* XDG Base Directory Specification - Version 0.6 */ - char *psz_env = getenv( "XDG_CACHE_HOME" ); - if( psz_env ) - { - if( asprintf( &psz_dir, "%s/vlc", psz_env ) == -1 ) - return NULL; - return psz_dir; - } - psz_env = getenv( "HOME" ); - if( !psz_env ) psz_env = p_libvlc->psz_homedir; /* not part of XDG spec but we want a sensible fallback */ - if( asprintf( &psz_dir, "%s/.cache/vlc", psz_env ) == -1 ) - return NULL; - return psz_dir; -#endif -} - -/* Adds an extra interface to the configuration */ -void __config_AddIntf( vlc_object_t *p_this, const char *psz_intf ) -{ - assert( psz_intf ); - - char *psz_config, *psz_parser; - size_t i_len = strlen( psz_intf ); - - psz_config = psz_parser = config_GetPsz( p_this->p_libvlc, "control" ); - while( psz_parser ) - { - if( !strncmp( psz_intf, psz_parser, i_len ) ) - { - free( psz_config ); - return; - } - psz_parser = strchr( psz_parser, ':' ); - if( psz_parser ) psz_parser++; /* skip the ':' */ - } - free( psz_config ); - - psz_config = psz_parser = config_GetPsz( p_this->p_libvlc, "extraintf" ); - while( psz_parser ) - { - if( !strncmp( psz_intf, psz_parser, i_len ) ) - { - free( psz_config ); - return; - } - psz_parser = strchr( psz_parser, ':' ); - if( psz_parser ) psz_parser++; /* skip the ':' */ - } - - /* interface not found in the config, let's add it */ - if( psz_config && strlen( psz_config ) > 0 ) - { - char *psz_newconfig; - if( asprintf( &psz_newconfig, "%s:%s", psz_config, psz_intf ) != -1 ) - { - config_PutPsz( p_this->p_libvlc, "extraintf", psz_newconfig ); - free( psz_newconfig ); - } - } - else - config_PutPsz( p_this->p_libvlc, "extraintf", psz_intf ); - - free( psz_config ); -} - -/* Removes an extra interface from the configuration */ -void __config_RemoveIntf( vlc_object_t *p_this, const char *psz_intf ) -{ - assert( psz_intf ); - - char *psz_config, *psz_parser; - size_t i_len = strlen( psz_intf ); - - psz_config = psz_parser = config_GetPsz( p_this->p_libvlc, "extraintf" ); - while( psz_parser ) - { - if( !strncmp( psz_intf, psz_parser, i_len ) ) - { - char *psz_newconfig; - char *psz_end = psz_parser + i_len; - if( *psz_end == ':' ) psz_end++; - *psz_parser = '\0'; - if( asprintf( &psz_newconfig, "%s%s", psz_config, psz_end ) != -1 ) - { - config_PutPsz( p_this->p_libvlc, "extraintf", psz_newconfig ); - free( psz_newconfig ); - } - break; - } - psz_parser = strchr( psz_parser, ':' ); - if( psz_parser ) psz_parser++; /* skip the ':' */ - } - free( psz_config ); - - psz_config = psz_parser = config_GetPsz( p_this->p_libvlc, "control" ); - while( psz_parser ) - { - if( !strncmp( psz_intf, psz_parser, i_len ) ) - { - char *psz_newconfig; - char *psz_end = psz_parser + i_len; - if( *psz_end == ':' ) psz_end++; - *psz_parser = '\0'; - if( asprintf( &psz_newconfig, "%s%s", psz_config, psz_end ) != -1 ) - { - config_PutPsz( p_this->p_libvlc, "control", psz_newconfig ); - free( psz_newconfig ); - } - break; - } - psz_parser = strchr( psz_parser, ':' ); - if( psz_parser ) psz_parser++; /* skip the ':' */ - } - free( psz_config ); -} - -/* - * Returns VLC_TRUE if the specified extra interface is present in the - * configuration, VLC_FALSE if not - */ -vlc_bool_t __config_ExistIntf( vlc_object_t *p_this, const char *psz_intf ) -{ - assert( psz_intf ); - - char *psz_config, *psz_parser; - size_t i_len = strlen( psz_intf ); - - psz_config = psz_parser = config_GetPsz( p_this->p_libvlc, "extraintf" ); - while( psz_parser ) - { - if( !strncmp( psz_parser, psz_intf, i_len ) ) - { - free( psz_config ); - return VLC_TRUE; - } - psz_parser = strchr( psz_parser, ':' ); - if( psz_parser ) psz_parser++; /* skip the ':' */ - } - free( psz_config ); - - psz_config = psz_parser = config_GetPsz( p_this->p_libvlc, "control" ); - while( psz_parser ) - { - if( !strncmp( psz_parser, psz_intf, i_len ) ) - { - free( psz_config ); - return VLC_TRUE; - } - psz_parser = strchr( psz_parser, ':' ); - if( psz_parser ) psz_parser++; /* skip the ':' */ - } - free( psz_config ); - - return VLC_FALSE; -} -