X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fconfig%2Fcore.c;h=7df48ae73ae634707262dc5c7310668c67d04e1b;hb=62ba5767cc3a6cf7283aa2c1c8b22c1a2ed01759;hp=5f8ec50acbe8e5fdf81016f714d93e71beb69a5e;hpb=eda425f069750a98ac8f8872aad0fcc9758560f7;p=vlc diff --git a/src/config/core.c b/src/config/core.c index 5f8ec50acb..7df48ae73a 100644 --- a/src/config/core.c +++ b/src/config/core.c @@ -21,31 +21,36 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#if defined( WIN32 ) +# if !defined( UNDER_CE ) +# define _WIN32_IE IE5 +# include +# include +# include +# endif +# include +#endif + #include #include "../libvlc.h" #include "vlc_keys.h" #include "vlc_charset.h" +#include "vlc_configuration.h" #include /* errno */ - -#ifdef HAVE_LIMITS_H -# include -#endif +#include +#include #ifdef HAVE_UNISTD_H # include /* getuid() */ #endif -#ifdef HAVE_GETOPT_LONG -# ifdef HAVE_GETOPT_H -# include /* getopt() */ -# endif -#else -# include "../extras/getopt.h" -#endif - -#if defined(HAVE_GETPWUID) -# include /* getpwuid() */ +#if defined(HAVE_GETPWUID_R) +# include #endif #if defined( HAVE_SYS_STAT_H ) @@ -54,14 +59,8 @@ #if defined( HAVE_SYS_TYPES_H ) # include #endif -#if defined( WIN32 ) -# if !defined( UNDER_CE ) -# include -# endif -#include -#endif -#include "config.h" +#include "configuration.h" #include "modules/modules.h" static inline char *strdupnull (const char *src) @@ -69,11 +68,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) { @@ -300,7 +294,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; @@ -313,7 +307,7 @@ void __config_PutPsz( vlc_object_t *p_this, } /* free old string */ - if( oldval.psz_string ) free( oldval.psz_string ); + free( oldval.psz_string ); } /***************************************************************************** @@ -364,7 +358,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; @@ -423,7 +417,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; @@ -464,7 +458,9 @@ 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 ); return p_item; @@ -477,116 +473,6 @@ module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name ) 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]; - 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. ***************************************************************************** @@ -600,48 +486,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_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; } /***************************************************************************** @@ -681,12 +561,13 @@ void config_UnsetCallbacks( module_config_t *p_new, size_t n ) *****************************************************************************/ void __config_ResetAll( vlc_object_t *p_this ) { + libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc); int i_index; vlc_list_t *p_list; module_t *p_module; /* Acquire config file lock */ - vlc_mutex_lock( &p_this->p_libvlc->config_lock ); + vlc_mutex_lock( &priv->config_lock ); p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); @@ -713,7 +594,7 @@ void __config_ResetAll( vlc_object_t *p_this ) } vlc_list_release( p_list ); - vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); + vlc_mutex_unlock( &priv->config_lock ); } /** @@ -740,61 +621,44 @@ const char *config_GetDataDir( void ) #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 ) +/** + * Determines the system configuration directory. + * + * @return a string (always succeeds). + */ +const char *config_GetConfDir( void ) { - const char *psz_localhome = NULL; +#if defined (WIN32) || defined (UNDER_CE) + return vlc_global()->psz_vlcpath; +#elif defined(__APPLE__) || defined (SYS_BEOS) + static char path[PATH_MAX] = ""; -#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 + if( *path == '\0' ) + { + snprintf( path, sizeof( path ), "%s/share", /* FIXME: Duh? */ + vlc_global()->psz_vlcpath ); + path[sizeof( path ) - 1] = '\0'; + } + return path; +#else + return SYSCONFDIR; #endif +} - HINSTANCE shfolder_dll; - SHGETFOLDERPATH SHGetFolderPath ; +static char *GetDir( bool b_appdata ) +{ + const char *psz_localhome = NULL; - /* 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 ); - } +#if defined(WIN32) && !defined(UNDER_CE) + wchar_t whomedir[MAX_PATH]; + /* Get the "Application Data" folder for the current user */ + if( S_OK == SHGetFolderPathW( NULL, + (b_appdata ? CSIDL_APPDATA : CSIDL_PROFILE) | CSIDL_FLAG_CREATE, + NULL, SHGFP_TYPE_CURRENT, whomedir ) ) + return FromWide( whomedir ); #elif defined(UNDER_CE) - + (void)b_appdata; #ifndef CSIDL_APPDATA # define CSIDL_APPDATA 0x1A #endif @@ -804,25 +668,25 @@ static char *GetDir( vlc_bool_t b_appdata ) /* get the "Application Data" folder for the current user */ if( SHGetSpecialFolderPath( NULL, whomedir, CSIDL_APPDATA, 1 ) ) return FromWide( whomedir ); +#else + (void)b_appdata; #endif psz_localhome = getenv( "HOME" ); +#if defined(HAVE_GETPWUID_R) + char buf[sysconf (_SC_GETPW_R_SIZE_MAX)]; if( psz_localhome == NULL ) { -#if defined(HAVE_GETPWUID) - struct passwd *p_pw; - (void)b_appdata; + struct passwd pw, *res; - 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"; - } + if (!getpwuid_r (getuid (), &pw, buf, sizeof (buf), &res) && res) + psz_localhome = pw.pw_dir; } +#endif + if (psz_localhome == NULL) + psz_localhome = getenv( "TMP" ); + if (psz_localhome == NULL) + psz_localhome = "/tmp"; return FromLocaleDup( psz_localhome ); } @@ -832,246 +696,67 @@ static char *GetDir( vlc_bool_t b_appdata ) */ 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 ); + return GetDir( false ); } -/** - * Get the user's VLC configuration directory - */ -char *config_GetConfigDir( libvlc_int_t *p_libvlc ) +static char *config_GetFooDir (const char *xdg_name, const char *xdg_default) { 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; + char *psz_parent = GetDir (true); + if( asprintf( &psz_dir, "%s" DIR_SEP CONFIG_DIR, psz_parent ) == -1 ) - return NULL; - return psz_dir; + psz_dir = NULL; + + free (psz_parent); + (void)xdg_name; (void)xdg_default; #else + char var[sizeof ("XDG__HOME") + strlen (xdg_name)]; + /* XDG Base Directory Specification - Version 0.6 */ - char *psz_env = getenv( "XDG_CONFIG_HOME" ); - if( psz_env ) + snprintf (var, sizeof (var), "XDG_%s_HOME", xdg_name); + char *psz_home = getenv( var ); + psz_home = psz_home ? FromLocaleDup( psz_home ) : NULL; + if( psz_home ) { - if( asprintf( &psz_dir, "%s/vlc", psz_env ) == -1 ) - return NULL; - return psz_dir; + if( asprintf( &psz_dir, "%s/vlc", psz_home ) == -1 ) + psz_dir = NULL; + goto out; } - 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; + + /* Try HOME, then fallback to non-XDG dirs */ + psz_home = config_GetHomeDir(); + if( asprintf( &psz_dir, "%s/%s/vlc", psz_home, xdg_default ) == -1 ) + psz_dir = NULL; + +out: + free (psz_home); #endif + return psz_dir; } /** - * Get the user's VLC data directory - * (used for stuff like the skins, custom lua modules, ...) + * Get the user's VLC configuration directory */ -char *config_GetUserDataDir( libvlc_int_t *p_libvlc ) +char *config_GetUserConfDir( void ) { - 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 + return config_GetFooDir ("CONFIG", ".config"); } /** - * Get the user's VLC cache directory - * (used for stuff like the modules cache, the album art cache, ...) + * Get the user's VLC data directory + * (used for stuff like the skins, custom lua modules, ...) */ -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 ) +char *config_GetUserDataDir( void ) { - 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 ); + return config_GetFooDir ("DATA", ".local/share"); } -/* - * Returns VLC_TRUE if the specified extra interface is present in the - * configuration, VLC_FALSE if not +/** + * Get the user's VLC cache directory + * (used for stuff like the modules cache, the album art cache, ...) */ -vlc_bool_t __config_ExistIntf( vlc_object_t *p_this, const char *psz_intf ) +char *config_GetCacheDir( void ) { - 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; + return config_GetFooDir ("CACHE", ".cache"); } -