From: Rémi Denis-Courmont Date: Sun, 9 Dec 2007 19:33:51 +0000 (+0000) Subject: Split the big config file X-Git-Tag: 0.9.0-test0~4217 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2d9c9ee62b6f63155566a25c4e65b0d0dd14cf6d;p=vlc Split the big config file --- diff --git a/src/Makefile.am b/src/Makefile.am index d26ccb27dd..671e4d6fa9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -299,9 +299,11 @@ SOURCES_libvlc_common = \ misc/threads.c \ misc/stats.c \ misc/cpu.c \ - modules/configuration.h \ - modules/configuration.c \ - modules/configuration_chain.c \ + config/configuration.h \ + config/core.c \ + config/chain.c \ + config/file.c \ + config/cmdline.c \ misc/events.c \ misc/image.c \ misc/messages.c \ diff --git a/src/modules/configuration_chain.c b/src/config/chain.c similarity index 98% rename from src/modules/configuration_chain.c rename to src/config/chain.c index 15ac0bcbb3..4706125018 100644 --- a/src/modules/configuration_chain.c +++ b/src/config/chain.c @@ -1,7 +1,7 @@ /***************************************************************************** - * configuration_chain.c : configuration module chain parsing stuff + * chain.c : configuration module chain parsing stuff ***************************************************************************** - * Copyright (C) 2002-2006 the VideoLAN team + * Copyright (C) 2002-2007 the VideoLAN team * $Id$ * * Authors: Christophe Massiot diff --git a/src/config/cmdline.c b/src/config/cmdline.c new file mode 100644 index 0000000000..a16c3225fc --- /dev/null +++ b/src/config/cmdline.c @@ -0,0 +1,428 @@ +/***************************************************************************** + * cmdline.c: command line parsing + ***************************************************************************** + * Copyright (C) 2001-2007 the VideoLAN team + * $Id$ + * + * Authors: Gildas Bazin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * 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" +#endif + +#if defined(HAVE_GETPWUID) +# include /* getpwuid() */ +#endif + +#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 "config.h" +#include "modules/modules.h" + +/***************************************************************************** + * config_LoadCmdLine: parse command line + ***************************************************************************** + * Parse command line for configuration options. + * Now that the module_bank has been initialized, we can dynamically + * generate the longopts structure used by getops. We have to do it this way + * because we don't know (and don't want to know) in advance the configuration + * options used (ie. exported) by each module. + *****************************************************************************/ +int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, + const char *ppsz_argv[], + vlc_bool_t b_ignore_errors ) +{ + int i_cmd, i_index, i_opts, i_shortopts, flag, i_verbose = 0; + module_t *p_parser; + vlc_list_t *p_list; + struct option *p_longopts; + int i_modules_index; + + /* Short options */ + module_config_t *pp_shortopts[256]; + char *psz_shortopts; + + /* Set default configuration and copy arguments */ + p_this->p_libvlc->i_argc = *pi_argc; + p_this->p_libvlc->ppsz_argv = ppsz_argv; + +#ifdef __APPLE__ + /* When VLC.app is run by double clicking in Mac OS X, the 2nd arg + * is the PSN - process serial number (a unique PID-ish thingie) + * still ok for real Darwin & when run from command line */ + if ( (*pi_argc > 1) && (strncmp( ppsz_argv[ 1 ] , "-psn" , 4 ) == 0) ) + /* for example -psn_0_9306113 */ + { + /* GDMF!... I can't do this or else the MacOSX window server will + * not pick up the PSN and not register the app and we crash... + * hence the following kludge otherwise we'll get confused w/ argv[1] + * being an input file name */ +#if 0 + ppsz_argv[ 1 ] = NULL; +#endif + *pi_argc = *pi_argc - 1; + pi_argc--; + return 0; + } +#endif + + /* List all modules */ + p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + + /* + * Generate the longopts and shortopts structures used by getopt_long + */ + + i_opts = 0; + for( i_modules_index = 0; i_modules_index < p_list->i_count; + i_modules_index++ ) + { + p_parser = (module_t *)p_list->p_values[i_modules_index].p_object ; + + /* count the number of exported configuration options (to allocate + * longopts). We also need to allocate space for two options when + * dealing with boolean to allow for --foo and --no-foo */ + i_opts += p_parser->i_config_items + + 2 * p_parser->i_bool_items; + } + + p_longopts = malloc( sizeof(struct option) * (i_opts + 1) ); + if( p_longopts == NULL ) + { + msg_Err( p_this, "out of memory" ); + vlc_list_release( p_list ); + return -1; + } + + psz_shortopts = malloc( sizeof( char ) * (2 * i_opts + 1) ); + if( psz_shortopts == NULL ) + { + msg_Err( p_this, "out of memory" ); + free( p_longopts ); + vlc_list_release( p_list ); + return -1; + } + + /* If we are requested to ignore errors, then we must work on a copy + * of the ppsz_argv array, otherwise getopt_long will reorder it for + * us, ignoring the arity of the options */ + if( b_ignore_errors ) + { + ppsz_argv = (const char**)malloc( *pi_argc * sizeof(char *) ); + if( ppsz_argv == NULL ) + { + msg_Err( p_this, "out of memory" ); + free( psz_shortopts ); + free( p_longopts ); + vlc_list_release( p_list ); + return -1; + } + memcpy( ppsz_argv, p_this->p_libvlc->ppsz_argv, + *pi_argc * sizeof(char *) ); + } + + i_shortopts = 0; + for( i_index = 0; i_index < 256; i_index++ ) + { + pp_shortopts[i_index] = NULL; + } + + /* Fill the p_longopts and psz_shortopts structures */ + i_index = 0; + for( i_modules_index = 0; i_modules_index < p_list->i_count; + i_modules_index++ ) + { + module_config_t *p_item, *p_end; + p_parser = (module_t *)p_list->p_values[i_modules_index].p_object ; + + if( !p_parser->i_config_items ) + continue; + + for( p_item = p_parser->p_config, p_end = p_item + p_parser->confsize; + p_item < p_end; + p_item++ ) + { + /* Ignore hints */ + if( p_item->i_type & CONFIG_HINT ) + continue; + + /* Add item to long options */ + p_longopts[i_index].name = strdup( p_item->psz_name ); + if( p_longopts[i_index].name == NULL ) continue; + p_longopts[i_index].has_arg = + (p_item->i_type == CONFIG_ITEM_BOOL)? + no_argument : required_argument; + p_longopts[i_index].flag = &flag; + p_longopts[i_index].val = 0; + i_index++; + + /* When dealing with bools we also need to add the --no-foo + * option */ + if( p_item->i_type == CONFIG_ITEM_BOOL ) + { + char *psz_name = malloc( strlen(p_item->psz_name) + 3 ); + if( psz_name == NULL ) continue; + strcpy( psz_name, "no" ); + strcat( psz_name, p_item->psz_name ); + + p_longopts[i_index].name = psz_name; + p_longopts[i_index].has_arg = no_argument; + p_longopts[i_index].flag = &flag; + p_longopts[i_index].val = 1; + i_index++; + + psz_name = malloc( strlen(p_item->psz_name) + 4 ); + if( psz_name == NULL ) continue; + strcpy( psz_name, "no-" ); + strcat( psz_name, p_item->psz_name ); + + p_longopts[i_index].name = psz_name; + p_longopts[i_index].has_arg = no_argument; + p_longopts[i_index].flag = &flag; + p_longopts[i_index].val = 1; + i_index++; + } + + /* If item also has a short option, add it */ + if( p_item->i_short ) + { + pp_shortopts[(int)p_item->i_short] = p_item; + psz_shortopts[i_shortopts] = p_item->i_short; + i_shortopts++; + if( p_item->i_type != CONFIG_ITEM_BOOL ) + { + psz_shortopts[i_shortopts] = ':'; + i_shortopts++; + + if( p_item->i_short == 'v' ) + { + psz_shortopts[i_shortopts] = ':'; + i_shortopts++; + } + } + } + } + } + + /* We don't need the module list anymore */ + vlc_list_release( p_list ); + + /* Close the longopts and shortopts structures */ + memset( &p_longopts[i_index], 0, sizeof(struct option) ); + psz_shortopts[i_shortopts] = '\0'; + + /* + * Parse the command line options + */ + opterr = 0; + optind = 0; /* set to 0 to tell GNU getopt to reinitialize */ + while( ( i_cmd = getopt_long( *pi_argc, (char **)ppsz_argv, psz_shortopts, + p_longopts, &i_index ) ) != -1 ) + { + /* A long option has been recognized */ + if( i_cmd == 0 ) + { + module_config_t *p_conf; + char *psz_name = (char *)p_longopts[i_index].name; + + /* Check if we deal with a --nofoo or --no-foo long option */ + if( flag ) psz_name += psz_name[2] == '-' ? 3 : 2; + + /* Store the configuration option */ + p_conf = config_FindConfig( p_this, psz_name ); + if( p_conf ) + { + /* Check if the option is deprecated */ + if( p_conf->psz_current ) + { + if( p_conf->b_strict ) + { + fprintf(stderr, + "Warning: option --%s no longer exists.\n", + p_conf->psz_name); + continue; + } + + fprintf( stderr, + "%s: option --%s is deprecated. Use --%s instead.\n", + b_ignore_errors ? "Warning" : "Error", + p_conf->psz_name, p_conf->psz_current); + if( !b_ignore_errors ) + { + /*free */ + for( i_index = 0; p_longopts[i_index].name; i_index++ ) + free( (char *)p_longopts[i_index].name ); + + free( p_longopts ); + free( psz_shortopts ); + return -1; + } + + psz_name = (char *)p_conf->psz_current; + p_conf = config_FindConfig( p_this, psz_name ); + } + + switch( p_conf->i_type ) + { + case CONFIG_ITEM_STRING: + case CONFIG_ITEM_PASSWORD: + case CONFIG_ITEM_FILE: + case CONFIG_ITEM_DIRECTORY: + case CONFIG_ITEM_MODULE: + case CONFIG_ITEM_MODULE_LIST: + case CONFIG_ITEM_MODULE_LIST_CAT: + case CONFIG_ITEM_MODULE_CAT: + config_PutPsz( p_this, psz_name, optarg ); + break; + case CONFIG_ITEM_INTEGER: + config_PutInt( p_this, psz_name, strtol(optarg, 0, 0)); + break; + case CONFIG_ITEM_FLOAT: + config_PutFloat( p_this, psz_name, (float)atof(optarg) ); + break; + case CONFIG_ITEM_KEY: + config_PutInt( p_this, psz_name, ConfigStringToKey( optarg ) ); + break; + case CONFIG_ITEM_BOOL: + config_PutInt( p_this, psz_name, !flag ); + break; + } + continue; + } + } + + /* A short option has been recognized */ + if( pp_shortopts[i_cmd] != NULL ) + { + switch( pp_shortopts[i_cmd]->i_type ) + { + case CONFIG_ITEM_STRING: + case CONFIG_ITEM_PASSWORD: + case CONFIG_ITEM_FILE: + case CONFIG_ITEM_DIRECTORY: + case CONFIG_ITEM_MODULE: + case CONFIG_ITEM_MODULE_CAT: + case CONFIG_ITEM_MODULE_LIST: + case CONFIG_ITEM_MODULE_LIST_CAT: + config_PutPsz( p_this, pp_shortopts[i_cmd]->psz_name, optarg ); + break; + case CONFIG_ITEM_INTEGER: + if( i_cmd == 'v' ) + { + if( optarg ) + { + if( *optarg == 'v' ) /* eg. -vvv */ + { + i_verbose++; + while( *optarg == 'v' ) + { + i_verbose++; + optarg++; + } + } + else + { + i_verbose += atoi( optarg ); /* eg. -v2 */ + } + } + else + { + i_verbose++; /* -v */ + } + config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name, + i_verbose ); + } + else + { + config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name, + strtol(optarg, 0, 0) ); + } + break; + case CONFIG_ITEM_BOOL: + config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name, 1 ); + break; + } + + continue; + } + + /* Internal error: unknown option */ + if( !b_ignore_errors ) + { + fprintf( stderr, "%s: unknown option" + " or missing mandatory argument ", + p_this->p_libvlc->psz_object_name ); + if( optopt ) + { + fprintf( stderr, "`-%c'\n", optopt ); + } + else + { + fprintf( stderr, "`%s'\n", ppsz_argv[optind-1] ); + } + fprintf( stderr, "Try `%s --help' for more information.\n", + p_this->p_libvlc->psz_object_name ); + + for( i_index = 0; p_longopts[i_index].name; i_index++ ) + free( (char *)p_longopts[i_index].name ); + free( p_longopts ); + free( psz_shortopts ); + return -1; + } + } + + /* Free allocated resources */ + for( i_index = 0; p_longopts[i_index].name; i_index++ ) + free( (char *)p_longopts[i_index].name ); + free( p_longopts ); + free( psz_shortopts ); + if( b_ignore_errors ) free( ppsz_argv ); + + return 0; +} + diff --git a/src/modules/configuration.h b/src/config/config.h similarity index 98% rename from src/modules/configuration.h rename to src/config/config.h index 3e02b6be20..84c8ba5f61 100644 --- a/src/modules/configuration.h +++ b/src/config/config.h @@ -53,6 +53,8 @@ int __config_LoadConfigFile( vlc_object_t *, const char * ); int IsConfigStringType( int type ); +int ConfigStringToKey( const char * ); + /* The configuration file and directory */ #if defined (SYS_BEOS) # define CONFIG_DIR "config/settings/VideoLAN Client" diff --git a/src/config/core.c b/src/config/core.c new file mode 100644 index 0000000000..8d7e48c761 --- /dev/null +++ b/src/config/core.c @@ -0,0 +1,1138 @@ +/***************************************************************************** + * core.c management of the modules configuration + ***************************************************************************** + * Copyright (C) 2001-2007 the VideoLAN team + * $Id$ + * + * Authors: Gildas Bazin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * 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" +#endif + +#if defined(HAVE_GETPWUID) +# include /* getpwuid() */ +#endif + +#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 "config.h" +#include "modules/modules.h" + +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) +{ + static const unsigned char config_types[] = + { + 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 + }; + + /* NOTE: this needs to be changed if we ever get more than 255 types */ + return memchr (config_types, type, sizeof (config_types)) != NULL; +} + + +static int IsConfigIntegerType (int type) +{ + static const unsigned char config_types[] = + { + CONFIG_ITEM_INTEGER, CONFIG_ITEM_KEY, CONFIG_ITEM_BOOL, + CONFIG_CATEGORY, CONFIG_SUBCATEGORY + }; + + return memchr (config_types, type, sizeof (config_types)) != NULL; +} + + +static inline int IsConfigFloatType (int type) +{ + return type == CONFIG_ITEM_FLOAT; +} + + +/***************************************************************************** + * config_GetType: get the type of a variable (bool, int, float, string) + ***************************************************************************** + * This function is used to get the type of a variable from its name. + * Beware, this is quite slow. + *****************************************************************************/ +int __config_GetType( vlc_object_t *p_this, const char *psz_name ) +{ + module_config_t *p_config; + int i_type; + + p_config = config_FindConfig( p_this, psz_name ); + + /* sanity checks */ + if( !p_config ) + { + return 0; + } + + switch( p_config->i_type ) + { + case CONFIG_ITEM_BOOL: + i_type = VLC_VAR_BOOL; + break; + + case CONFIG_ITEM_INTEGER: + case CONFIG_ITEM_KEY: + i_type = VLC_VAR_INTEGER; + break; + + case CONFIG_ITEM_FLOAT: + i_type = VLC_VAR_FLOAT; + break; + + case CONFIG_ITEM_MODULE: + case CONFIG_ITEM_MODULE_CAT: + case CONFIG_ITEM_MODULE_LIST: + case CONFIG_ITEM_MODULE_LIST_CAT: + i_type = VLC_VAR_MODULE; + break; + + case CONFIG_ITEM_STRING: + i_type = VLC_VAR_STRING; + break; + + case CONFIG_ITEM_PASSWORD: + i_type = VLC_VAR_STRING; + break; + + case CONFIG_ITEM_FILE: + i_type = VLC_VAR_FILE; + break; + + case CONFIG_ITEM_DIRECTORY: + i_type = VLC_VAR_DIRECTORY; + break; + + default: + i_type = 0; + break; + } + + return i_type; +} + +/***************************************************************************** + * config_GetInt: get the value of an int variable + ***************************************************************************** + * This function is used to get the value of variables which are internally + * represented by an integer (CONFIG_ITEM_INTEGER and + * CONFIG_ITEM_BOOL). + *****************************************************************************/ +int __config_GetInt( vlc_object_t *p_this, const char *psz_name ) +{ + module_config_t *p_config; + + p_config = config_FindConfig( p_this, psz_name ); + + /* sanity checks */ + if( !p_config ) + { + msg_Err( p_this, "option %s does not exist", psz_name ); + return -1; + } + + if (!IsConfigIntegerType (p_config->i_type)) + { + msg_Err( p_this, "option %s does not refer to an int", psz_name ); + return -1; + } + + return p_config->value.i; +} + +/***************************************************************************** + * config_GetFloat: get the value of a float variable + ***************************************************************************** + * This function is used to get the value of variables which are internally + * represented by a float (CONFIG_ITEM_FLOAT). + *****************************************************************************/ +float __config_GetFloat( vlc_object_t *p_this, const char *psz_name ) +{ + module_config_t *p_config; + + p_config = config_FindConfig( p_this, psz_name ); + + /* sanity checks */ + if( !p_config ) + { + msg_Err( p_this, "option %s does not exist", psz_name ); + return -1; + } + + if (!IsConfigFloatType (p_config->i_type)) + { + msg_Err( p_this, "option %s does not refer to a float", psz_name ); + return -1; + } + + return p_config->value.f; +} + +/***************************************************************************** + * config_GetPsz: get the string value of a string variable + ***************************************************************************** + * This function is used to get the value of variables which are internally + * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, + * CONFIG_ITEM_DIRECTORY, CONFIG_ITEM_PASSWORD, and CONFIG_ITEM_MODULE). + * + * Important note: remember to free() the returned char* because it's a + * duplicate of the actual value. It isn't safe to return a pointer to the + * actual value as it can be modified at any time. + *****************************************************************************/ +char * __config_GetPsz( vlc_object_t *p_this, const char *psz_name ) +{ + module_config_t *p_config; + + p_config = config_FindConfig( p_this, psz_name ); + + /* sanity checks */ + if( !p_config ) + { + msg_Err( p_this, "option %s does not exist", psz_name ); + return NULL; + } + + if (!IsConfigStringType (p_config->i_type)) + { + msg_Err( p_this, "option %s does not refer to a string", psz_name ); + return NULL; + } + + /* return a copy of the string */ + vlc_mutex_lock( p_config->p_lock ); + char *psz_value = strdupnull (p_config->value.psz); + vlc_mutex_unlock( p_config->p_lock ); + + return psz_value; +} + +/***************************************************************************** + * config_PutPsz: set the string value of a string variable + ***************************************************************************** + * This function is used to set the value of variables which are internally + * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, + * CONFIG_ITEM_DIRECTORY, CONFIG_ITEM_PASSWORD, and CONFIG_ITEM_MODULE). + *****************************************************************************/ +void __config_PutPsz( vlc_object_t *p_this, + const char *psz_name, const char *psz_value ) +{ + module_config_t *p_config; + vlc_value_t oldval, val; + + p_config = config_FindConfig( p_this, psz_name ); + + + /* sanity checks */ + if( !p_config ) + { + msg_Warn( p_this, "option %s does not exist", psz_name ); + return; + } + + if (!IsConfigStringType (p_config->i_type)) + { + msg_Err( p_this, "option %s does not refer to a string", psz_name ); + return; + } + + vlc_mutex_lock( p_config->p_lock ); + + /* backup old value */ + oldval.psz_string = (char *)p_config->value.psz; + + if ((psz_value != NULL) && *psz_value) + p_config->value.psz = strdup (psz_value); + else + p_config->value.psz = NULL; + + p_config->b_dirty = VLC_TRUE; + + val.psz_string = (char *)p_config->value.psz; + + vlc_mutex_unlock( p_config->p_lock ); + + if( p_config->pf_callback ) + { + p_config->pf_callback( p_this, psz_name, oldval, val, + p_config->p_callback_data ); + } + + /* free old string */ + if( oldval.psz_string ) free( oldval.psz_string ); +} + +/***************************************************************************** + * config_PutInt: set the integer value of an int variable + ***************************************************************************** + * This function is used to set the value of variables which are internally + * represented by an integer (CONFIG_ITEM_INTEGER and + * CONFIG_ITEM_BOOL). + *****************************************************************************/ +void __config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value ) +{ + module_config_t *p_config; + vlc_value_t oldval, val; + + p_config = config_FindConfig( p_this, psz_name ); + + /* sanity checks */ + if( !p_config ) + { + msg_Warn( p_this, "option %s does not exist", psz_name ); + return; + } + + if (!IsConfigIntegerType (p_config->i_type)) + { + msg_Err( p_this, "option %s does not refer to an int", psz_name ); + return; + } + + /* backup old value */ + oldval.i_int = p_config->value.i; + + /* if i_min == i_max == 0, then do not use them */ + if ((p_config->min.i == 0) && (p_config->max.i == 0)) + { + p_config->value.i = i_value; + } + else if (i_value < p_config->min.i) + { + p_config->value.i = p_config->min.i; + } + else if (i_value > p_config->max.i) + { + p_config->value.i = p_config->max.i; + } + else + { + p_config->value.i = i_value; + } + + p_config->b_dirty = VLC_TRUE; + + val.i_int = p_config->value.i; + + if( p_config->pf_callback ) + { + p_config->pf_callback( p_this, psz_name, oldval, val, + p_config->p_callback_data ); + } +} + +/***************************************************************************** + * config_PutFloat: set the value of a float variable + ***************************************************************************** + * This function is used to set the value of variables which are internally + * represented by a float (CONFIG_ITEM_FLOAT). + *****************************************************************************/ +void __config_PutFloat( vlc_object_t *p_this, + const char *psz_name, float f_value ) +{ + module_config_t *p_config; + vlc_value_t oldval, val; + + p_config = config_FindConfig( p_this, psz_name ); + + /* sanity checks */ + if( !p_config ) + { + msg_Warn( p_this, "option %s does not exist", psz_name ); + return; + } + + if (!IsConfigFloatType (p_config->i_type)) + { + msg_Err( p_this, "option %s does not refer to a float", psz_name ); + return; + } + + /* backup old value */ + oldval.f_float = p_config->value.f; + + /* if f_min == f_max == 0, then do not use them */ + if ((p_config->min.f == 0) && (p_config->max.f == 0)) + { + p_config->value.f = f_value; + } + else if (f_value < p_config->min.f) + { + p_config->value.f = p_config->min.f; + } + else if (f_value > p_config->max.f) + { + p_config->value.f = p_config->max.f; + } + else + { + p_config->value.f = f_value; + } + + p_config->b_dirty = VLC_TRUE; + + val.f_float = p_config->value.f; + + if( p_config->pf_callback ) + { + p_config->pf_callback( p_this, psz_name, oldval, val, + p_config->p_callback_data ); + } +} + +/***************************************************************************** + * config_FindConfig: find the config structure associated with an option. + ***************************************************************************** + * FIXME: This function really needs to be optimized. + * FIXME: And now even more. + *****************************************************************************/ +module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name ) +{ + vlc_list_t *p_list; + int i_index; + + if( !psz_name ) return NULL; + + p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + + for( i_index = 0; i_index < p_list->i_count; i_index++ ) + { + 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; + + for( p_item = p_parser->p_config, p_end = p_item + p_parser->confsize; + p_item < p_end; + p_item++ ) + { + if( p_item->i_type & CONFIG_HINT ) + /* ignore hints */ + continue; + if( !strcmp( psz_name, p_item->psz_name ) ) + { + vlc_list_release( p_list ); + return p_item; + } + } + } + + vlc_list_release( p_list ); + + return NULL; +} + +/***************************************************************************** + * config_FindModule: find a specific module structure. + *****************************************************************************/ +module_t *config_FindModule( vlc_object_t *p_this, const char *psz_name ) +{ + vlc_list_t *p_list; + module_t *p_module, *p_result = NULL; + int i_index; + + if( !psz_name ) return NULL; + + p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + + for( i_index = 0; i_index < p_list->i_count; i_index++ ) + { + p_module = (module_t *)p_list->p_values[i_index].p_object; + if( !strcmp( p_module->psz_object_name, psz_name ) ) + { + p_result = p_module; + break; + } + } + + vlc_list_release( p_list ); + + return p_result; +} + +/***************************************************************************** + * 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. + ***************************************************************************** + * This function frees all the data duplicated by config_Duplicate. + *****************************************************************************/ +void config_Free( module_t *p_module ) +{ + int i; + + for (size_t j = 0; j < p_module->confsize; j++) + { + 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 ); + + if (IsConfigStringType (p_item->i_type)) + { + free ((char *)p_item->value.psz); + free ((char *)p_item->orig.psz); + free ((char *)p_item->saved.psz); + } + + if( p_item->i_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 ); + } + + if( p_item->i_action ) + { + for( i = 0; i < p_item->i_action; i++ ) + { + free( (char*) 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 ); + } + } + + if (p_module->p_config != NULL) + { + free (p_module->p_config); + p_module->p_config = NULL; + } +} + +/***************************************************************************** + * config_SetCallbacks: sets callback functions in the duplicate p_config. + ***************************************************************************** + * 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 duplicate callbacks each time we reload the module. + *****************************************************************************/ +void config_SetCallbacks( module_config_t *p_new, module_config_t *p_orig, + size_t n ) +{ + for (size_t i = 0; i < n; i++) + { + p_new->pf_callback = p_orig->pf_callback; + p_new++; + p_orig++; + } +} + +/***************************************************************************** + * config_UnsetCallbacks: unsets callback functions in the duplicate p_config. + ***************************************************************************** + * We simply undo what we did in config_SetCallbacks. + *****************************************************************************/ +void config_UnsetCallbacks( module_config_t *p_new, size_t n ) +{ + for (size_t i = 0; i < n; i++) + { + p_new->pf_callback = NULL; + p_new++; + } +} + +/***************************************************************************** + * config_ResetAll: reset the configuration data for all the modules. + *****************************************************************************/ +void __config_ResetAll( vlc_object_t *p_this ) +{ + 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 ); + + p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + + for( i_index = 0; i_index < p_list->i_count; i_index++ ) + { + 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; + else + if (IsConfigFloatType (p_module->p_config[i].i_type)) + p_module->p_config[i].value.f = p_module->p_config[i].orig.f; + else + if (IsConfigStringType (p_module->p_config[i].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); + } + } + } + + vlc_list_release( p_list ); + vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); +} + +/** + * 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; +} + diff --git a/src/config/file.c b/src/config/file.c new file mode 100644 index 0000000000..c730423510 --- /dev/null +++ b/src/config/file.c @@ -0,0 +1,757 @@ +/***************************************************************************** + * file.c: configuration file handling + ***************************************************************************** + * Copyright (C) 2001-2007 the VideoLAN team + * $Id$ + * + * Authors: Gildas Bazin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ + +#include +#include "../libvlc.h" +#include "vlc_charset.h" +#include "vlc_keys.h" + +#include /* errno */ + +#ifdef HAVE_LIMITS_H +# include +#endif + +#include "config.h" +#include "modules/modules.h" + +static char *ConfigKeyToString( int ); + +static inline char *strdupnull (const char *src) +{ + return src ? strdup (src) : NULL; +} + +static inline char *_strdupnull (const char *src) +{ + return src ? strdup (_(src)) : NULL; +} + + +static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode ) +{ + char *psz_filename = p_obj->p_libvlc->psz_configfile; + FILE *p_stream; + + if( !psz_filename ) + { + psz_filename = config_GetConfigFile( p_obj->p_libvlc ); + } + + msg_Dbg( p_obj, "opening config file (%s)", psz_filename ); + + p_stream = utf8_fopen( psz_filename, mode ); + if( p_stream == NULL && errno != ENOENT ) + { + msg_Err( p_obj, "cannot open config file (%s): %m", + psz_filename ); + + } +#if !( defined(WIN32) || defined(__APPLE__) || defined(SYS_BEOS) ) + else if( p_stream == NULL && errno == ENOENT && mode[0] == 'r' ) + { + /* This is the fallback for pre XDG Base Directory + * Specification configs */ + char *psz_old; + if( asprintf( &psz_old, "%s" DIR_SEP CONFIG_DIR DIR_SEP CONFIG_FILE, + p_obj->p_libvlc->psz_homedir ) != -1 ) + { + p_stream = utf8_fopen( psz_old, mode ); + if( p_stream ) + { + /* Old config file found. We want to write it at the + * new location now. */ + msg_Info( p_obj->p_libvlc, "Found old config file at %s. " + "VLC will now use %s.", psz_old, psz_filename ); + char *psz_readme; + if( asprintf(&psz_readme,"%s"DIR_SEP CONFIG_DIR DIR_SEP"README", + p_obj->p_libvlc->psz_homedir ) != -1 ) + { + FILE *p_readme = utf8_fopen( psz_readme, "wt" ); + if( p_readme ) + { + fputs( "The VLC media player configuration folder has " + "moved to comply with the XDG Base " + "Directory Specification version 0.6. Your " + "configuration has been copied to the new " + "location (", p_readme ); + fputs( p_obj->p_libvlc->psz_configdir, p_readme ); + fputs( "). You can delete this directory and " + "all its contents.", p_readme ); + fclose( p_readme ); + } + free( psz_readme ); + } + } + free( psz_old ); + } + } +#endif + else if( p_stream != NULL ) + { + p_obj->p_libvlc->psz_configfile = psz_filename; + } + + return p_stream; +} + + +static int strtoi (const char *str) +{ + char *end; + long l; + + errno = 0; + l = strtol (str, &end, 0); + + if (!errno) + { + if ((l > INT_MAX) || (l < INT_MIN)) + errno = ERANGE; + if (*end) + errno = EINVAL; + } + return (int)l; +} + + +/***************************************************************************** + * config_LoadConfigFile: loads the configuration file. + ***************************************************************************** + * This function is called to load the config options stored in the config + * file. + *****************************************************************************/ +int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name ) +{ + vlc_list_t *p_list; + FILE *file; + + file = config_OpenConfigFile (p_this, "rt"); + if (file == NULL) + return VLC_EGENERIC; + + /* Acquire config file lock */ + vlc_mutex_lock( &p_this->p_libvlc->config_lock ); + + /* Look for the selected module, if NULL then save everything */ + p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + + /* Look for UTF-8 Byte Order Mark */ + char * (*convert) (const char *) = strdupnull; + char bom[3]; + + if ((fread (bom, 1, 3, file) != 3) + || memcmp (bom, "\xEF\xBB\xBF", 3)) + { + convert = FromLocaleDup; + rewind (file); /* no BOM, rewind */ + } + + module_t *module = NULL; + char line[1024], section[1022]; + section[0] = '\0'; + + while (fgets (line, 1024, file) != NULL) + { + /* Ignore comments and empty lines */ + switch (line[0]) + { + case '#': + case '\n': + case '\0': + continue; + } + + if (line[0] == '[') + { + char *ptr = strchr (line, ']'); + if (ptr == NULL) + continue; /* syntax error; */ + *ptr = '\0'; + + /* New section ( = a given module) */ + strcpy (section, line + 1); + module = NULL; + + if ((psz_module_name == NULL) + || (strcmp (psz_module_name, section) == 0)) + { + for (int i = 0; i < p_list->i_count; i++) + { + module_t *m = (module_t *)p_list->p_values[i].p_object; + + if ((strcmp (section, m->psz_object_name) == 0) + && (m->i_config_items > 0)) /* ignore config-less modules */ + { + module = m; + if (psz_module_name != NULL) + msg_Dbg (p_this, + "loading config for module \"%s\"", + section); + break; + } + } + } + + continue; + } + + if (module == NULL) + continue; /* no need to parse if there is no matching module */ + + char *ptr = strchr (line, '\n'); + if (ptr != NULL) + *ptr = '\0'; + + /* look for option name */ + const char *psz_option_name = line; + + ptr = strchr (line, '='); + if (ptr == NULL) + continue; /* syntax error */ + + *ptr = '\0'; + const char *psz_option_value = ptr + 1; + + /* try to match this option with one of the module's options */ + for (size_t i = 0; i < module->confsize; i++) + { + module_config_t *p_item = module->p_config + i; + + if ((p_item->i_type & CONFIG_HINT) + || strcmp (p_item->psz_name, psz_option_name)) + continue; + + /* We found it */ + errno = 0; + + switch( p_item->i_type ) + { + case CONFIG_ITEM_BOOL: + case CONFIG_ITEM_INTEGER: + { + long l = strtoi (psz_option_value); + if (errno) + msg_Warn (p_this, "Integer value (%s) for %s: %m", + psz_option_value, psz_option_name); + else + p_item->saved.i = p_item->value.i = (int)l; + break; + } + + case CONFIG_ITEM_FLOAT: + if( !*psz_option_value ) + break; /* ignore empty option */ + p_item->value.f = (float)i18n_atof( psz_option_value); + p_item->saved.f = p_item->value.f; + break; + + case CONFIG_ITEM_KEY: + if( !*psz_option_value ) + break; /* ignore empty option */ + p_item->value.i = ConfigStringToKey(psz_option_value); + p_item->saved.i = p_item->value.i; + break; + + default: + vlc_mutex_lock( p_item->p_lock ); + + /* free old string */ + free( (char*) p_item->value.psz ); + free( (char*) p_item->saved.psz ); + + p_item->value.psz = convert (psz_option_value); + p_item->saved.psz = strdupnull (p_item->value.psz); + + vlc_mutex_unlock( p_item->p_lock ); + break; + } + + break; + } + } + + if (ferror (file)) + { + msg_Err (p_this, "error reading configuration: %m"); + clearerr (file); + } + fclose (file); + + vlc_list_release( p_list ); + + vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); + return 0; +} + +/***************************************************************************** + * config_CreateDir: Create configuration directory if it doesn't exist. + *****************************************************************************/ +int config_CreateDir( vlc_object_t *p_this, const char *psz_dirname ) +{ + if( !psz_dirname && !*psz_dirname ) return -1; + + if( utf8_mkdir( psz_dirname, 0700 ) == 0 ) + return 0; + + switch( errno ) + { + case EEXIST: + return 0; + + case ENOENT: + { + /* Let's try to create the parent directory */ + char psz_parent[strlen( psz_dirname ) + 1], *psz_end; + strcpy( psz_parent, psz_dirname ); + + psz_end = strrchr( psz_parent, DIR_SEP_CHAR ); + if( psz_end && psz_end != psz_parent ) + { + *psz_end = '\0'; + if( config_CreateDir( p_this, psz_parent ) == 0 ) + { + if( !utf8_mkdir( psz_dirname, 0700 ) ) + return 0; + } + } + } + } + + msg_Err( p_this, "could not create %s: %m", psz_dirname ); + return -1; +} + +/***************************************************************************** + * config_SaveConfigFile: Save a module's config options. + ***************************************************************************** + * This will save the specified module's config options to the config file. + * If psz_module_name is NULL then we save all the modules config options. + * It's no use to save the config options that kept their default values, so + * we'll try to be a bit clever here. + * + * When we save we mustn't delete the config options of the modules that + * haven't been loaded. So we cannot just create a new config file with the + * config structures we've got in memory. + * I don't really know how to deal with this nicely, so I will use a completly + * dumb method ;-) + * I will load the config file in memory, but skipping all the sections of the + * modules we want to save. Then I will create a brand new file, dump the file + * loaded in memory and then append the sections of the modules we want to + * save. + * Really stupid no ? + *****************************************************************************/ +static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name, + vlc_bool_t b_autosave ) +{ + module_t *p_parser; + vlc_list_t *p_list; + FILE *file; + char p_line[1024], *p_index2; + int i_sizebuf = 0; + char *p_bigbuffer, *p_index; + vlc_bool_t b_backup; + int i_index; + + /* Acquire config file lock */ + vlc_mutex_lock( &p_this->p_libvlc->config_lock ); + + if( p_this->p_libvlc->psz_configfile == NULL ) + { + const char *psz_configdir = p_this->p_libvlc->psz_configdir; + if( !psz_configdir ) /* XXX: This should never happen */ + { + msg_Err( p_this, "no configuration directory defined" ); + vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); + return -1; + } + + config_CreateDir( p_this, psz_configdir ); + } + + file = config_OpenConfigFile( p_this, "rt" ); + if( file != NULL ) + { + /* look for file size */ + fseek( file, 0L, SEEK_END ); + i_sizebuf = ftell( file ); + fseek( file, 0L, SEEK_SET ); + } + + p_bigbuffer = p_index = malloc( i_sizebuf+1 ); + if( !p_bigbuffer ) + { + msg_Err( p_this, "out of memory" ); + if( file ) fclose( file ); + vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); + return -1; + } + p_bigbuffer[0] = 0; + + /* List all available modules */ + p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + + /* backup file into memory, we only need to backup the sections we won't + * save later on */ + b_backup = 0; + while( file && fgets( p_line, 1024, file ) ) + { + if( (p_line[0] == '[') && (p_index2 = strchr(p_line,']'))) + { + + /* we found a section, check if we need to do a backup */ + for( i_index = 0; i_index < p_list->i_count; i_index++ ) + { + p_parser = (module_t *)p_list->p_values[i_index].p_object ; + + if( ((p_index2 - &p_line[1]) + == (int)strlen(p_parser->psz_object_name) ) + && !memcmp( &p_line[1], p_parser->psz_object_name, + strlen(p_parser->psz_object_name) ) ) + { + if( !psz_module_name ) + break; + else if( !strcmp( psz_module_name, + p_parser->psz_object_name ) ) + break; + } + } + + if( i_index == p_list->i_count ) + { + /* we don't have this section in our list so we need to back + * it up */ + *p_index2 = 0; +#if 0 + msg_Dbg( p_this, "backing up config for unknown module \"%s\"", + &p_line[1] ); +#endif + *p_index2 = ']'; + + b_backup = 1; + } + else + { + b_backup = 0; + } + } + + /* save line if requested and line is valid (doesn't begin with a + * space, tab, or eol) */ + if( b_backup && (p_line[0] != '\n') && (p_line[0] != ' ') + && (p_line[0] != '\t') ) + { + strcpy( p_index, p_line ); + p_index += strlen( p_line ); + } + } + if( file ) fclose( file ); + + + /* + * Save module config in file + */ + + file = config_OpenConfigFile (p_this, "wt"); + if( !file ) + { + vlc_list_release( p_list ); + free( p_bigbuffer ); + vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); + return -1; + } + + fprintf( file, "\xEF\xBB\xBF###\n### " COPYRIGHT_MESSAGE "\n###\n\n" + "###\n### lines begining with a '#' character are comments\n###\n\n" ); + + /* Look for the selected module, if NULL then save everything */ + for( i_index = 0; i_index < p_list->i_count; i_index++ ) + { + module_config_t *p_item, *p_end; + p_parser = (module_t *)p_list->p_values[i_index].p_object ; + + if( psz_module_name && strcmp( psz_module_name, + p_parser->psz_object_name ) ) + continue; + + if( !p_parser->i_config_items ) + continue; + + if( psz_module_name ) + msg_Dbg( p_this, "saving config for module \"%s\"", + p_parser->psz_object_name ); + + fprintf( file, "[%s]", p_parser->psz_object_name ); + if( p_parser->psz_longname ) + fprintf( file, " # %s\n\n", p_parser->psz_longname ); + else + fprintf( file, "\n\n" ); + + for( p_item = p_parser->p_config, p_end = p_item + p_parser->confsize; + p_item < p_end; + p_item++ ) + { + char *psz_key; + int i_value = p_item->value.i; + float f_value = p_item->value.f; + const char *psz_value = p_item->value.psz; + + if( p_item->i_type & CONFIG_HINT ) + /* ignore hints */ + continue; + /* Ignore deprecated options */ + if( p_item->psz_current ) + continue; + if( p_item->b_unsaveable ) + /*obvious*/ + continue; + + if( b_autosave && !p_item->b_autosave ) + { + i_value = p_item->saved.i; + f_value = p_item->saved.f; + psz_value = p_item->saved.psz; + if( !psz_value ) psz_value = p_item->orig.psz; + } + else + { + p_item->b_dirty = VLC_FALSE; + } + + switch( p_item->i_type ) + { + case CONFIG_ITEM_BOOL: + case CONFIG_ITEM_INTEGER: + if( p_item->psz_text ) + fprintf( file, "# %s (%s)\n", p_item->psz_text, + (p_item->i_type == CONFIG_ITEM_BOOL) ? + _("boolean") : _("integer") ); + if( i_value == p_item->orig.i ) + fputc ('#', file); + fprintf( file, "%s=%i\n", p_item->psz_name, i_value ); + + p_item->saved.i = i_value; + break; + + case CONFIG_ITEM_KEY: + if( p_item->psz_text ) + fprintf( file, "# %s (%s)\n", p_item->psz_text, + _("key") ); + if( i_value == p_item->orig.i ) + fputc ('#', file); + psz_key = ConfigKeyToString( i_value ); + fprintf( file, "%s=%s\n", p_item->psz_name, + psz_key ? psz_key : "" ); + free (psz_key); + + p_item->saved.i = i_value; + break; + + case CONFIG_ITEM_FLOAT: + if( p_item->psz_text ) + fprintf( file, "# %s (%s)\n", p_item->psz_text, + _("float") ); + if( f_value == p_item->orig.f ) + fputc ('#', file); + fprintf( file, "%s=%f\n", p_item->psz_name, (double)f_value ); + + p_item->saved.f = f_value; + break; + + default: + if( p_item->psz_text ) + fprintf( file, "# %s (%s)\n", p_item->psz_text, + _("string") ); + if( (!psz_value && !p_item->orig.psz) || + (psz_value && p_item->orig.psz && + !strcmp( psz_value, p_item->orig.psz )) ) + fputc ('#', file); + fprintf( file, "%s=%s\n", p_item->psz_name, + psz_value ?: "" ); + + if( b_autosave && !p_item->b_autosave ) break; + + free ((char *)p_item->saved.psz); + if( (psz_value && p_item->orig.psz && + strcmp( psz_value, p_item->orig.psz )) || + !psz_value || !p_item->orig.psz) + p_item->saved.psz = strdupnull (psz_value); + else + p_item->saved.psz = NULL; + } + } + + fputc ('\n', file); + } + + vlc_list_release( p_list ); + + /* + * Restore old settings from the config in file + */ + fputs( p_bigbuffer, file ); + free( p_bigbuffer ); + + fclose( file ); + vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); + + return 0; +} + +int config_AutoSaveConfigFile( vlc_object_t *p_this ) +{ + vlc_list_t *p_list; + int i_index, i_count; + + if( !p_this ) return -1; + + /* Check if there's anything to save */ + vlc_mutex_lock( &p_this->p_libvlc->config_lock ); + p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + i_count = p_list->i_count; + for( i_index = 0; i_index < i_count; i_index++ ) + { + module_t *p_parser = (module_t *)p_list->p_values[i_index].p_object ; + module_config_t *p_item, *p_end; + + if( !p_parser->i_config_items ) continue; + + for( p_item = p_parser->p_config, p_end = p_item + p_parser->confsize; + p_item < p_end; + p_item++ ) + { + if( p_item->b_autosave && p_item->b_dirty ) break; + } + break; + } + vlc_list_release( p_list ); + vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); + + if( i_index == i_count ) return VLC_SUCCESS; + return SaveConfigFile( p_this, 0, VLC_TRUE ); +} + +int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name ) +{ + return SaveConfigFile( p_this, psz_module_name, VLC_FALSE ); +} + +/** + * Get the user's configuration file + */ +char *config_GetConfigFile( libvlc_int_t *p_libvlc ) +{ + char *psz_configfile; + if( asprintf( &psz_configfile, "%s" DIR_SEP CONFIG_FILE, + p_libvlc->psz_configdir ) == -1 ) + return NULL; + return psz_configfile; +} + +/** + * Get the user's configuration file when given with the --config option + */ +char *config_GetCustomConfigFile( libvlc_int_t *p_libvlc ) +{ + char *psz_configfile = config_GetPsz( p_libvlc, "config" ); + if( psz_configfile != NULL ) + { + if( psz_configfile[0] == '~' && psz_configfile[1] == '/' ) + { + /* This is incomplete: we should also support the ~cmassiot/ syntax */ + char *psz_buf; + if( asprintf( &psz_buf, "%s/%s", p_libvlc->psz_homedir, + psz_configfile + 2 ) == -1 ) + { + free( psz_configfile ); + return NULL; + } + free( psz_configfile ); + psz_configfile = psz_buf; + } + } + return psz_configfile; +} + +int ConfigStringToKey( const char *psz_key ) +{ + int i_key = 0; + unsigned int i; + const char *psz_parser = strchr( psz_key, '-' ); + while( psz_parser && psz_parser != psz_key ) + { + for( i = 0; i < sizeof(vlc_modifiers) / sizeof(key_descriptor_t); i++ ) + { + if( !strncasecmp( vlc_modifiers[i].psz_key_string, psz_key, + strlen( vlc_modifiers[i].psz_key_string ) ) ) + { + i_key |= vlc_modifiers[i].i_key_code; + } + } + psz_key = psz_parser + 1; + psz_parser = strchr( psz_key, '-' ); + } + for( i = 0; i < sizeof(vlc_keys) / sizeof( key_descriptor_t ); i++ ) + { + if( !strcasecmp( vlc_keys[i].psz_key_string, psz_key ) ) + { + i_key |= vlc_keys[i].i_key_code; + break; + } + } + return i_key; +} + +char *ConfigKeyToString( int i_key ) +{ + char *psz_key = malloc( 100 ); + char *p; + size_t index; + + if ( !psz_key ) + { + return NULL; + } + *psz_key = '\0'; + p = psz_key; + + for( index = 0; index < (sizeof(vlc_modifiers) / sizeof(key_descriptor_t)); + index++ ) + { + if( i_key & vlc_modifiers[index].i_key_code ) + { + p += sprintf( p, "%s-", vlc_modifiers[index].psz_key_string ); + } + } + for( index = 0; index < (sizeof(vlc_keys) / sizeof( key_descriptor_t)); + index++) + { + if( (int)( i_key & ~KEY_MODIFIER ) == vlc_keys[index].i_key_code ) + { + p += sprintf( p, "%s", vlc_keys[index].psz_key_string ); + break; + } + } + return psz_key; +} + diff --git a/src/config/intf.c b/src/config/intf.c new file mode 100644 index 0000000000..5f29460a88 --- /dev/null +++ b/src/config/intf.c @@ -0,0 +1,206 @@ +/***************************************************************************** + * intf.c: interface configuration handling + ***************************************************************************** + * Copyright (C) 2001-2007 the VideoLAN team + * $Id$ + * + * Authors: Gildas Bazin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * 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" +#endif + +#if defined(HAVE_GETPWUID) +# include /* getpwuid() */ +#endif + +#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 "configuration.h" +#include "modules/modules.h" + +/* 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; +} + diff --git a/src/libvlc-common.c b/src/libvlc-common.c index 2d2abcbf5d..f7d162048b 100644 --- a/src/libvlc-common.c +++ b/src/libvlc-common.c @@ -37,7 +37,7 @@ #include #include "modules/modules.h" -#include "modules/configuration.h" +#include "config/config.h" #include /* ENOMEM */ #include /* sprintf() */ diff --git a/src/modules/configuration.c b/src/modules/configuration.c deleted file mode 100644 index eb779e24a6..0000000000 --- a/src/modules/configuration.c +++ /dev/null @@ -1,2214 +0,0 @@ -/***************************************************************************** - * configuration.c management of the modules configuration - ***************************************************************************** - * Copyright (C) 2001-2007 the VideoLAN team - * $Id$ - * - * Authors: Gildas Bazin - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * 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" -#endif - -#if defined(HAVE_GETPWUID) -# include /* getpwuid() */ -#endif - -#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 "configuration.h" -#include "modules/modules.h" - -static int ConfigStringToKey( const char * ); -static char *ConfigKeyToString( int ); - -static inline char *strdupnull (const char *src) -{ - if (src == NULL) - return NULL; - return strdup (src); -} - -static inline char *_strdupnull (const char *src) -{ - if (src == NULL) - return NULL; - return strdup (_(src)); -} - -/* Item types that use a string value (i.e. serialized in the module cache) */ -int IsConfigStringType (int type) -{ - static const unsigned char config_types[] = - { - 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 - }; - - /* NOTE: this needs to be changed if we ever get more than 255 types */ - return memchr (config_types, type, sizeof (config_types)) != NULL; -} - - -static int IsConfigIntegerType (int type) -{ - static const unsigned char config_types[] = - { - CONFIG_ITEM_INTEGER, CONFIG_ITEM_KEY, CONFIG_ITEM_BOOL, - CONFIG_CATEGORY, CONFIG_SUBCATEGORY - }; - - return memchr (config_types, type, sizeof (config_types)) != NULL; -} - - -static inline int IsConfigFloatType (int type) -{ - return type == CONFIG_ITEM_FLOAT; -} - - -/***************************************************************************** - * config_GetType: get the type of a variable (bool, int, float, string) - ***************************************************************************** - * This function is used to get the type of a variable from its name. - * Beware, this is quite slow. - *****************************************************************************/ -int __config_GetType( vlc_object_t *p_this, const char *psz_name ) -{ - module_config_t *p_config; - int i_type; - - p_config = config_FindConfig( p_this, psz_name ); - - /* sanity checks */ - if( !p_config ) - { - return 0; - } - - switch( p_config->i_type ) - { - case CONFIG_ITEM_BOOL: - i_type = VLC_VAR_BOOL; - break; - - case CONFIG_ITEM_INTEGER: - case CONFIG_ITEM_KEY: - i_type = VLC_VAR_INTEGER; - break; - - case CONFIG_ITEM_FLOAT: - i_type = VLC_VAR_FLOAT; - break; - - case CONFIG_ITEM_MODULE: - case CONFIG_ITEM_MODULE_CAT: - case CONFIG_ITEM_MODULE_LIST: - case CONFIG_ITEM_MODULE_LIST_CAT: - i_type = VLC_VAR_MODULE; - break; - - case CONFIG_ITEM_STRING: - i_type = VLC_VAR_STRING; - break; - - case CONFIG_ITEM_PASSWORD: - i_type = VLC_VAR_STRING; - break; - - case CONFIG_ITEM_FILE: - i_type = VLC_VAR_FILE; - break; - - case CONFIG_ITEM_DIRECTORY: - i_type = VLC_VAR_DIRECTORY; - break; - - default: - i_type = 0; - break; - } - - return i_type; -} - -/***************************************************************************** - * config_GetInt: get the value of an int variable - ***************************************************************************** - * This function is used to get the value of variables which are internally - * represented by an integer (CONFIG_ITEM_INTEGER and - * CONFIG_ITEM_BOOL). - *****************************************************************************/ -int __config_GetInt( vlc_object_t *p_this, const char *psz_name ) -{ - module_config_t *p_config; - - p_config = config_FindConfig( p_this, psz_name ); - - /* sanity checks */ - if( !p_config ) - { - msg_Err( p_this, "option %s does not exist", psz_name ); - return -1; - } - - if (!IsConfigIntegerType (p_config->i_type)) - { - msg_Err( p_this, "option %s does not refer to an int", psz_name ); - return -1; - } - - return p_config->value.i; -} - -/***************************************************************************** - * config_GetFloat: get the value of a float variable - ***************************************************************************** - * This function is used to get the value of variables which are internally - * represented by a float (CONFIG_ITEM_FLOAT). - *****************************************************************************/ -float __config_GetFloat( vlc_object_t *p_this, const char *psz_name ) -{ - module_config_t *p_config; - - p_config = config_FindConfig( p_this, psz_name ); - - /* sanity checks */ - if( !p_config ) - { - msg_Err( p_this, "option %s does not exist", psz_name ); - return -1; - } - - if (!IsConfigFloatType (p_config->i_type)) - { - msg_Err( p_this, "option %s does not refer to a float", psz_name ); - return -1; - } - - return p_config->value.f; -} - -/***************************************************************************** - * config_GetPsz: get the string value of a string variable - ***************************************************************************** - * This function is used to get the value of variables which are internally - * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, - * CONFIG_ITEM_DIRECTORY, CONFIG_ITEM_PASSWORD, and CONFIG_ITEM_MODULE). - * - * Important note: remember to free() the returned char* because it's a - * duplicate of the actual value. It isn't safe to return a pointer to the - * actual value as it can be modified at any time. - *****************************************************************************/ -char * __config_GetPsz( vlc_object_t *p_this, const char *psz_name ) -{ - module_config_t *p_config; - - p_config = config_FindConfig( p_this, psz_name ); - - /* sanity checks */ - if( !p_config ) - { - msg_Err( p_this, "option %s does not exist", psz_name ); - return NULL; - } - - if (!IsConfigStringType (p_config->i_type)) - { - msg_Err( p_this, "option %s does not refer to a string", psz_name ); - return NULL; - } - - /* return a copy of the string */ - vlc_mutex_lock( p_config->p_lock ); - char *psz_value = strdupnull (p_config->value.psz); - vlc_mutex_unlock( p_config->p_lock ); - - return psz_value; -} - -/***************************************************************************** - * config_PutPsz: set the string value of a string variable - ***************************************************************************** - * This function is used to set the value of variables which are internally - * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, - * CONFIG_ITEM_DIRECTORY, CONFIG_ITEM_PASSWORD, and CONFIG_ITEM_MODULE). - *****************************************************************************/ -void __config_PutPsz( vlc_object_t *p_this, - const char *psz_name, const char *psz_value ) -{ - module_config_t *p_config; - vlc_value_t oldval, val; - - p_config = config_FindConfig( p_this, psz_name ); - - - /* sanity checks */ - if( !p_config ) - { - msg_Warn( p_this, "option %s does not exist", psz_name ); - return; - } - - if (!IsConfigStringType (p_config->i_type)) - { - msg_Err( p_this, "option %s does not refer to a string", psz_name ); - return; - } - - vlc_mutex_lock( p_config->p_lock ); - - /* backup old value */ - oldval.psz_string = (char *)p_config->value.psz; - - if ((psz_value != NULL) && *psz_value) - p_config->value.psz = strdup (psz_value); - else - p_config->value.psz = NULL; - - p_config->b_dirty = VLC_TRUE; - - val.psz_string = (char *)p_config->value.psz; - - vlc_mutex_unlock( p_config->p_lock ); - - if( p_config->pf_callback ) - { - p_config->pf_callback( p_this, psz_name, oldval, val, - p_config->p_callback_data ); - } - - /* free old string */ - if( oldval.psz_string ) free( oldval.psz_string ); -} - -/***************************************************************************** - * config_PutInt: set the integer value of an int variable - ***************************************************************************** - * This function is used to set the value of variables which are internally - * represented by an integer (CONFIG_ITEM_INTEGER and - * CONFIG_ITEM_BOOL). - *****************************************************************************/ -void __config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value ) -{ - module_config_t *p_config; - vlc_value_t oldval, val; - - p_config = config_FindConfig( p_this, psz_name ); - - /* sanity checks */ - if( !p_config ) - { - msg_Warn( p_this, "option %s does not exist", psz_name ); - return; - } - - if (!IsConfigIntegerType (p_config->i_type)) - { - msg_Err( p_this, "option %s does not refer to an int", psz_name ); - return; - } - - /* backup old value */ - oldval.i_int = p_config->value.i; - - /* if i_min == i_max == 0, then do not use them */ - if ((p_config->min.i == 0) && (p_config->max.i == 0)) - { - p_config->value.i = i_value; - } - else if (i_value < p_config->min.i) - { - p_config->value.i = p_config->min.i; - } - else if (i_value > p_config->max.i) - { - p_config->value.i = p_config->max.i; - } - else - { - p_config->value.i = i_value; - } - - p_config->b_dirty = VLC_TRUE; - - val.i_int = p_config->value.i; - - if( p_config->pf_callback ) - { - p_config->pf_callback( p_this, psz_name, oldval, val, - p_config->p_callback_data ); - } -} - -/***************************************************************************** - * config_PutFloat: set the value of a float variable - ***************************************************************************** - * This function is used to set the value of variables which are internally - * represented by a float (CONFIG_ITEM_FLOAT). - *****************************************************************************/ -void __config_PutFloat( vlc_object_t *p_this, - const char *psz_name, float f_value ) -{ - module_config_t *p_config; - vlc_value_t oldval, val; - - p_config = config_FindConfig( p_this, psz_name ); - - /* sanity checks */ - if( !p_config ) - { - msg_Warn( p_this, "option %s does not exist", psz_name ); - return; - } - - if (!IsConfigFloatType (p_config->i_type)) - { - msg_Err( p_this, "option %s does not refer to a float", psz_name ); - return; - } - - /* backup old value */ - oldval.f_float = p_config->value.f; - - /* if f_min == f_max == 0, then do not use them */ - if ((p_config->min.f == 0) && (p_config->max.f == 0)) - { - p_config->value.f = f_value; - } - else if (f_value < p_config->min.f) - { - p_config->value.f = p_config->min.f; - } - else if (f_value > p_config->max.f) - { - p_config->value.f = p_config->max.f; - } - else - { - p_config->value.f = f_value; - } - - p_config->b_dirty = VLC_TRUE; - - val.f_float = p_config->value.f; - - if( p_config->pf_callback ) - { - p_config->pf_callback( p_this, psz_name, oldval, val, - p_config->p_callback_data ); - } -} - -/***************************************************************************** - * config_FindConfig: find the config structure associated with an option. - ***************************************************************************** - * FIXME: This function really needs to be optimized. - * FIXME: And now even more. - *****************************************************************************/ -module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name ) -{ - vlc_list_t *p_list; - int i_index; - - if( !psz_name ) return NULL; - - p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); - - for( i_index = 0; i_index < p_list->i_count; i_index++ ) - { - 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; - - for( p_item = p_parser->p_config, p_end = p_item + p_parser->confsize; - p_item < p_end; - p_item++ ) - { - if( p_item->i_type & CONFIG_HINT ) - /* ignore hints */ - continue; - if( !strcmp( psz_name, p_item->psz_name ) ) - { - vlc_list_release( p_list ); - return p_item; - } - } - } - - vlc_list_release( p_list ); - - return NULL; -} - -/***************************************************************************** - * config_FindModule: find a specific module structure. - *****************************************************************************/ -module_t *config_FindModule( vlc_object_t *p_this, const char *psz_name ) -{ - vlc_list_t *p_list; - module_t *p_module, *p_result = NULL; - int i_index; - - if( !psz_name ) return NULL; - - p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); - - for( i_index = 0; i_index < p_list->i_count; i_index++ ) - { - p_module = (module_t *)p_list->p_values[i_index].p_object; - if( !strcmp( p_module->psz_object_name, psz_name ) ) - { - p_result = p_module; - break; - } - } - - vlc_list_release( p_list ); - - return p_result; -} - -/***************************************************************************** - * 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. - ***************************************************************************** - * This function frees all the data duplicated by config_Duplicate. - *****************************************************************************/ -void config_Free( module_t *p_module ) -{ - int i; - - for (size_t j = 0; j < p_module->confsize; j++) - { - 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 ); - - if (IsConfigStringType (p_item->i_type)) - { - free ((char *)p_item->value.psz); - free ((char *)p_item->orig.psz); - free ((char *)p_item->saved.psz); - } - - if( p_item->i_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 ); - } - - if( p_item->i_action ) - { - for( i = 0; i < p_item->i_action; i++ ) - { - free( (char*) 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 ); - } - } - - if (p_module->p_config != NULL) - { - free (p_module->p_config); - p_module->p_config = NULL; - } -} - -/***************************************************************************** - * config_SetCallbacks: sets callback functions in the duplicate p_config. - ***************************************************************************** - * 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 duplicate callbacks each time we reload the module. - *****************************************************************************/ -void config_SetCallbacks( module_config_t *p_new, module_config_t *p_orig, - size_t n ) -{ - for (size_t i = 0; i < n; i++) - { - p_new->pf_callback = p_orig->pf_callback; - p_new++; - p_orig++; - } -} - -/***************************************************************************** - * config_UnsetCallbacks: unsets callback functions in the duplicate p_config. - ***************************************************************************** - * We simply undo what we did in config_SetCallbacks. - *****************************************************************************/ -void config_UnsetCallbacks( module_config_t *p_new, size_t n ) -{ - for (size_t i = 0; i < n; i++) - { - p_new->pf_callback = NULL; - p_new++; - } -} - -/***************************************************************************** - * config_ResetAll: reset the configuration data for all the modules. - *****************************************************************************/ -void __config_ResetAll( vlc_object_t *p_this ) -{ - 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 ); - - p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); - - for( i_index = 0; i_index < p_list->i_count; i_index++ ) - { - 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; - else - if (IsConfigFloatType (p_module->p_config[i].i_type)) - p_module->p_config[i].value.f = p_module->p_config[i].orig.f; - else - if (IsConfigStringType (p_module->p_config[i].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); - } - } - } - - vlc_list_release( p_list ); - vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); -} - - -static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode ) -{ - char *psz_filename = p_obj->p_libvlc->psz_configfile; - FILE *p_stream; - - if( !psz_filename ) - { - psz_filename = config_GetConfigFile( p_obj->p_libvlc ); - } - - msg_Dbg( p_obj, "opening config file (%s)", psz_filename ); - - p_stream = utf8_fopen( psz_filename, mode ); - if( p_stream == NULL && errno != ENOENT ) - { - msg_Err( p_obj, "cannot open config file (%s): %m", - psz_filename ); - - } -#if !( defined(WIN32) || defined(__APPLE__) || defined(SYS_BEOS) ) - else if( p_stream == NULL && errno == ENOENT && mode[0] == 'r' ) - { - /* This is the fallback for pre XDG Base Directory - * Specification configs */ - char *psz_old; - if( asprintf( &psz_old, "%s" DIR_SEP CONFIG_DIR DIR_SEP CONFIG_FILE, - p_obj->p_libvlc->psz_homedir ) != -1 ) - { - p_stream = utf8_fopen( psz_old, mode ); - if( p_stream ) - { - /* Old config file found. We want to write it at the - * new location now. */ - msg_Info( p_obj->p_libvlc, "Found old config file at %s. " - "VLC will now use %s.", psz_old, psz_filename ); - char *psz_readme; - if( asprintf(&psz_readme,"%s"DIR_SEP CONFIG_DIR DIR_SEP"README", - p_obj->p_libvlc->psz_homedir ) != -1 ) - { - FILE *p_readme = utf8_fopen( psz_readme, "wt" ); - if( p_readme ) - { - fputs( "The VLC media player configuration folder has " - "moved to comply with the XDG Base " - "Directory Specification version 0.6. Your " - "configuration has been copied to the new " - "location (", p_readme ); - fputs( p_obj->p_libvlc->psz_configdir, p_readme ); - fputs( "). You can delete this directory and " - "all its contents.", p_readme ); - fclose( p_readme ); - } - free( psz_readme ); - } - } - free( psz_old ); - } - } -#endif - else if( p_stream != NULL ) - { - p_obj->p_libvlc->psz_configfile = psz_filename; - } - - return p_stream; -} - - -static int strtoi (const char *str) -{ - char *end; - long l; - - errno = 0; - l = strtol (str, &end, 0); - - if (!errno) - { - if ((l > INT_MAX) || (l < INT_MIN)) - errno = ERANGE; - if (*end) - errno = EINVAL; - } - return (int)l; -} - - -/***************************************************************************** - * config_LoadConfigFile: loads the configuration file. - ***************************************************************************** - * This function is called to load the config options stored in the config - * file. - *****************************************************************************/ -int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name ) -{ - vlc_list_t *p_list; - FILE *file; - - file = config_OpenConfigFile (p_this, "rt"); - if (file == NULL) - return VLC_EGENERIC; - - /* Acquire config file lock */ - vlc_mutex_lock( &p_this->p_libvlc->config_lock ); - - /* Look for the selected module, if NULL then save everything */ - p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); - - /* Look for UTF-8 Byte Order Mark */ - char * (*convert) (const char *) = strdupnull; - char bom[3]; - - if ((fread (bom, 1, 3, file) != 3) - || memcmp (bom, "\xEF\xBB\xBF", 3)) - { - convert = FromLocaleDup; - rewind (file); /* no BOM, rewind */ - } - - module_t *module = NULL; - char line[1024], section[1022]; - section[0] = '\0'; - - while (fgets (line, 1024, file) != NULL) - { - /* Ignore comments and empty lines */ - switch (line[0]) - { - case '#': - case '\n': - case '\0': - continue; - } - - if (line[0] == '[') - { - char *ptr = strchr (line, ']'); - if (ptr == NULL) - continue; /* syntax error; */ - *ptr = '\0'; - - /* New section ( = a given module) */ - strcpy (section, line + 1); - module = NULL; - - if ((psz_module_name == NULL) - || (strcmp (psz_module_name, section) == 0)) - { - for (int i = 0; i < p_list->i_count; i++) - { - module_t *m = (module_t *)p_list->p_values[i].p_object; - - if ((strcmp (section, m->psz_object_name) == 0) - && (m->i_config_items > 0)) /* ignore config-less modules */ - { - module = m; - if (psz_module_name != NULL) - msg_Dbg (p_this, - "loading config for module \"%s\"", - section); - break; - } - } - } - - continue; - } - - if (module == NULL) - continue; /* no need to parse if there is no matching module */ - - char *ptr = strchr (line, '\n'); - if (ptr != NULL) - *ptr = '\0'; - - /* look for option name */ - const char *psz_option_name = line; - - ptr = strchr (line, '='); - if (ptr == NULL) - continue; /* syntax error */ - - *ptr = '\0'; - const char *psz_option_value = ptr + 1; - - /* try to match this option with one of the module's options */ - for (size_t i = 0; i < module->confsize; i++) - { - module_config_t *p_item = module->p_config + i; - - if ((p_item->i_type & CONFIG_HINT) - || strcmp (p_item->psz_name, psz_option_name)) - continue; - - /* We found it */ - errno = 0; - - switch( p_item->i_type ) - { - case CONFIG_ITEM_BOOL: - case CONFIG_ITEM_INTEGER: - { - long l = strtoi (psz_option_value); - if (errno) - msg_Warn (p_this, "Integer value (%s) for %s: %m", - psz_option_value, psz_option_name); - else - p_item->saved.i = p_item->value.i = (int)l; - break; - } - - case CONFIG_ITEM_FLOAT: - if( !*psz_option_value ) - break; /* ignore empty option */ - p_item->value.f = (float)i18n_atof( psz_option_value); - p_item->saved.f = p_item->value.f; - break; - - case CONFIG_ITEM_KEY: - if( !*psz_option_value ) - break; /* ignore empty option */ - p_item->value.i = ConfigStringToKey(psz_option_value); - p_item->saved.i = p_item->value.i; - break; - - default: - vlc_mutex_lock( p_item->p_lock ); - - /* free old string */ - free( (char*) p_item->value.psz ); - free( (char*) p_item->saved.psz ); - - p_item->value.psz = convert (psz_option_value); - p_item->saved.psz = strdupnull (p_item->value.psz); - - vlc_mutex_unlock( p_item->p_lock ); - break; - } - - break; - } - } - - if (ferror (file)) - { - msg_Err (p_this, "error reading configuration: %m"); - clearerr (file); - } - fclose (file); - - vlc_list_release( p_list ); - - vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); - return 0; -} - -/***************************************************************************** - * config_CreateDir: Create configuration directory if it doesn't exist. - *****************************************************************************/ -int config_CreateDir( vlc_object_t *p_this, const char *psz_dirname ) -{ - if( !psz_dirname && !*psz_dirname ) return -1; - - if( utf8_mkdir( psz_dirname, 0700 ) == 0 ) - return 0; - - switch( errno ) - { - case EEXIST: - return 0; - - case ENOENT: - { - /* Let's try to create the parent directory */ - char psz_parent[strlen( psz_dirname ) + 1], *psz_end; - strcpy( psz_parent, psz_dirname ); - - psz_end = strrchr( psz_parent, DIR_SEP_CHAR ); - if( psz_end && psz_end != psz_parent ) - { - *psz_end = '\0'; - if( config_CreateDir( p_this, psz_parent ) == 0 ) - { - if( !utf8_mkdir( psz_dirname, 0700 ) ) - return 0; - } - } - } - } - - msg_Err( p_this, "could not create %s: %m", psz_dirname ); - return -1; -} - -/***************************************************************************** - * config_SaveConfigFile: Save a module's config options. - ***************************************************************************** - * This will save the specified module's config options to the config file. - * If psz_module_name is NULL then we save all the modules config options. - * It's no use to save the config options that kept their default values, so - * we'll try to be a bit clever here. - * - * When we save we mustn't delete the config options of the modules that - * haven't been loaded. So we cannot just create a new config file with the - * config structures we've got in memory. - * I don't really know how to deal with this nicely, so I will use a completly - * dumb method ;-) - * I will load the config file in memory, but skipping all the sections of the - * modules we want to save. Then I will create a brand new file, dump the file - * loaded in memory and then append the sections of the modules we want to - * save. - * Really stupid no ? - *****************************************************************************/ -static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name, - vlc_bool_t b_autosave ) -{ - module_t *p_parser; - vlc_list_t *p_list; - FILE *file; - char p_line[1024], *p_index2; - int i_sizebuf = 0; - char *p_bigbuffer, *p_index; - vlc_bool_t b_backup; - int i_index; - - /* Acquire config file lock */ - vlc_mutex_lock( &p_this->p_libvlc->config_lock ); - - if( p_this->p_libvlc->psz_configfile == NULL ) - { - const char *psz_configdir = p_this->p_libvlc->psz_configdir; - if( !psz_configdir ) /* XXX: This should never happen */ - { - msg_Err( p_this, "no configuration directory defined" ); - vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); - return -1; - } - - config_CreateDir( p_this, psz_configdir ); - } - - file = config_OpenConfigFile( p_this, "rt" ); - if( file != NULL ) - { - /* look for file size */ - fseek( file, 0L, SEEK_END ); - i_sizebuf = ftell( file ); - fseek( file, 0L, SEEK_SET ); - } - - p_bigbuffer = p_index = malloc( i_sizebuf+1 ); - if( !p_bigbuffer ) - { - msg_Err( p_this, "out of memory" ); - if( file ) fclose( file ); - vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); - return -1; - } - p_bigbuffer[0] = 0; - - /* List all available modules */ - p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); - - /* backup file into memory, we only need to backup the sections we won't - * save later on */ - b_backup = 0; - while( file && fgets( p_line, 1024, file ) ) - { - if( (p_line[0] == '[') && (p_index2 = strchr(p_line,']'))) - { - - /* we found a section, check if we need to do a backup */ - for( i_index = 0; i_index < p_list->i_count; i_index++ ) - { - p_parser = (module_t *)p_list->p_values[i_index].p_object ; - - if( ((p_index2 - &p_line[1]) - == (int)strlen(p_parser->psz_object_name) ) - && !memcmp( &p_line[1], p_parser->psz_object_name, - strlen(p_parser->psz_object_name) ) ) - { - if( !psz_module_name ) - break; - else if( !strcmp( psz_module_name, - p_parser->psz_object_name ) ) - break; - } - } - - if( i_index == p_list->i_count ) - { - /* we don't have this section in our list so we need to back - * it up */ - *p_index2 = 0; -#if 0 - msg_Dbg( p_this, "backing up config for unknown module \"%s\"", - &p_line[1] ); -#endif - *p_index2 = ']'; - - b_backup = 1; - } - else - { - b_backup = 0; - } - } - - /* save line if requested and line is valid (doesn't begin with a - * space, tab, or eol) */ - if( b_backup && (p_line[0] != '\n') && (p_line[0] != ' ') - && (p_line[0] != '\t') ) - { - strcpy( p_index, p_line ); - p_index += strlen( p_line ); - } - } - if( file ) fclose( file ); - - - /* - * Save module config in file - */ - - file = config_OpenConfigFile (p_this, "wt"); - if( !file ) - { - vlc_list_release( p_list ); - free( p_bigbuffer ); - vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); - return -1; - } - - fprintf( file, "\xEF\xBB\xBF###\n### " COPYRIGHT_MESSAGE "\n###\n\n" - "###\n### lines begining with a '#' character are comments\n###\n\n" ); - - /* Look for the selected module, if NULL then save everything */ - for( i_index = 0; i_index < p_list->i_count; i_index++ ) - { - module_config_t *p_item, *p_end; - p_parser = (module_t *)p_list->p_values[i_index].p_object ; - - if( psz_module_name && strcmp( psz_module_name, - p_parser->psz_object_name ) ) - continue; - - if( !p_parser->i_config_items ) - continue; - - if( psz_module_name ) - msg_Dbg( p_this, "saving config for module \"%s\"", - p_parser->psz_object_name ); - - fprintf( file, "[%s]", p_parser->psz_object_name ); - if( p_parser->psz_longname ) - fprintf( file, " # %s\n\n", p_parser->psz_longname ); - else - fprintf( file, "\n\n" ); - - for( p_item = p_parser->p_config, p_end = p_item + p_parser->confsize; - p_item < p_end; - p_item++ ) - { - char *psz_key; - int i_value = p_item->value.i; - float f_value = p_item->value.f; - const char *psz_value = p_item->value.psz; - - if( p_item->i_type & CONFIG_HINT ) - /* ignore hints */ - continue; - /* Ignore deprecated options */ - if( p_item->psz_current ) - continue; - if( p_item->b_unsaveable ) - /*obvious*/ - continue; - - if( b_autosave && !p_item->b_autosave ) - { - i_value = p_item->saved.i; - f_value = p_item->saved.f; - psz_value = p_item->saved.psz; - if( !psz_value ) psz_value = p_item->orig.psz; - } - else - { - p_item->b_dirty = VLC_FALSE; - } - - switch( p_item->i_type ) - { - case CONFIG_ITEM_BOOL: - case CONFIG_ITEM_INTEGER: - if( p_item->psz_text ) - fprintf( file, "# %s (%s)\n", p_item->psz_text, - (p_item->i_type == CONFIG_ITEM_BOOL) ? - _("boolean") : _("integer") ); - if( i_value == p_item->orig.i ) - fputc ('#', file); - fprintf( file, "%s=%i\n", p_item->psz_name, i_value ); - - p_item->saved.i = i_value; - break; - - case CONFIG_ITEM_KEY: - if( p_item->psz_text ) - fprintf( file, "# %s (%s)\n", p_item->psz_text, - _("key") ); - if( i_value == p_item->orig.i ) - fputc ('#', file); - psz_key = ConfigKeyToString( i_value ); - fprintf( file, "%s=%s\n", p_item->psz_name, - psz_key ? psz_key : "" ); - free (psz_key); - - p_item->saved.i = i_value; - break; - - case CONFIG_ITEM_FLOAT: - if( p_item->psz_text ) - fprintf( file, "# %s (%s)\n", p_item->psz_text, - _("float") ); - if( f_value == p_item->orig.f ) - fputc ('#', file); - fprintf( file, "%s=%f\n", p_item->psz_name, (double)f_value ); - - p_item->saved.f = f_value; - break; - - default: - if( p_item->psz_text ) - fprintf( file, "# %s (%s)\n", p_item->psz_text, - _("string") ); - if( (!psz_value && !p_item->orig.psz) || - (psz_value && p_item->orig.psz && - !strcmp( psz_value, p_item->orig.psz )) ) - fputc ('#', file); - fprintf( file, "%s=%s\n", p_item->psz_name, - psz_value ?: "" ); - - if( b_autosave && !p_item->b_autosave ) break; - - free ((char *)p_item->saved.psz); - if( (psz_value && p_item->orig.psz && - strcmp( psz_value, p_item->orig.psz )) || - !psz_value || !p_item->orig.psz) - p_item->saved.psz = strdupnull (psz_value); - else - p_item->saved.psz = NULL; - } - } - - fputc ('\n', file); - } - - vlc_list_release( p_list ); - - /* - * Restore old settings from the config in file - */ - fputs( p_bigbuffer, file ); - free( p_bigbuffer ); - - fclose( file ); - vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); - - return 0; -} - -int config_AutoSaveConfigFile( vlc_object_t *p_this ) -{ - vlc_list_t *p_list; - int i_index, i_count; - - if( !p_this ) return -1; - - /* Check if there's anything to save */ - vlc_mutex_lock( &p_this->p_libvlc->config_lock ); - p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); - i_count = p_list->i_count; - for( i_index = 0; i_index < i_count; i_index++ ) - { - module_t *p_parser = (module_t *)p_list->p_values[i_index].p_object ; - module_config_t *p_item, *p_end; - - if( !p_parser->i_config_items ) continue; - - for( p_item = p_parser->p_config, p_end = p_item + p_parser->confsize; - p_item < p_end; - p_item++ ) - { - if( p_item->b_autosave && p_item->b_dirty ) break; - } - break; - } - vlc_list_release( p_list ); - vlc_mutex_unlock( &p_this->p_libvlc->config_lock ); - - if( i_index == i_count ) return VLC_SUCCESS; - return SaveConfigFile( p_this, 0, VLC_TRUE ); -} - -int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name ) -{ - return SaveConfigFile( p_this, psz_module_name, VLC_FALSE ); -} - -/***************************************************************************** - * config_LoadCmdLine: parse command line - ***************************************************************************** - * Parse command line for configuration options. - * Now that the module_bank has been initialized, we can dynamically - * generate the longopts structure used by getops. We have to do it this way - * because we don't know (and don't want to know) in advance the configuration - * options used (ie. exported) by each module. - *****************************************************************************/ -int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, - const char *ppsz_argv[], - vlc_bool_t b_ignore_errors ) -{ - int i_cmd, i_index, i_opts, i_shortopts, flag, i_verbose = 0; - module_t *p_parser; - vlc_list_t *p_list; - struct option *p_longopts; - int i_modules_index; - - /* Short options */ - module_config_t *pp_shortopts[256]; - char *psz_shortopts; - - /* Set default configuration and copy arguments */ - p_this->p_libvlc->i_argc = *pi_argc; - p_this->p_libvlc->ppsz_argv = ppsz_argv; - -#ifdef __APPLE__ - /* When VLC.app is run by double clicking in Mac OS X, the 2nd arg - * is the PSN - process serial number (a unique PID-ish thingie) - * still ok for real Darwin & when run from command line */ - if ( (*pi_argc > 1) && (strncmp( ppsz_argv[ 1 ] , "-psn" , 4 ) == 0) ) - /* for example -psn_0_9306113 */ - { - /* GDMF!... I can't do this or else the MacOSX window server will - * not pick up the PSN and not register the app and we crash... - * hence the following kludge otherwise we'll get confused w/ argv[1] - * being an input file name */ -#if 0 - ppsz_argv[ 1 ] = NULL; -#endif - *pi_argc = *pi_argc - 1; - pi_argc--; - return 0; - } -#endif - - /* List all modules */ - p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); - - /* - * Generate the longopts and shortopts structures used by getopt_long - */ - - i_opts = 0; - for( i_modules_index = 0; i_modules_index < p_list->i_count; - i_modules_index++ ) - { - p_parser = (module_t *)p_list->p_values[i_modules_index].p_object ; - - /* count the number of exported configuration options (to allocate - * longopts). We also need to allocate space for two options when - * dealing with boolean to allow for --foo and --no-foo */ - i_opts += p_parser->i_config_items - + 2 * p_parser->i_bool_items; - } - - p_longopts = malloc( sizeof(struct option) * (i_opts + 1) ); - if( p_longopts == NULL ) - { - msg_Err( p_this, "out of memory" ); - vlc_list_release( p_list ); - return -1; - } - - psz_shortopts = malloc( sizeof( char ) * (2 * i_opts + 1) ); - if( psz_shortopts == NULL ) - { - msg_Err( p_this, "out of memory" ); - free( p_longopts ); - vlc_list_release( p_list ); - return -1; - } - - /* If we are requested to ignore errors, then we must work on a copy - * of the ppsz_argv array, otherwise getopt_long will reorder it for - * us, ignoring the arity of the options */ - if( b_ignore_errors ) - { - ppsz_argv = (const char**)malloc( *pi_argc * sizeof(char *) ); - if( ppsz_argv == NULL ) - { - msg_Err( p_this, "out of memory" ); - free( psz_shortopts ); - free( p_longopts ); - vlc_list_release( p_list ); - return -1; - } - memcpy( ppsz_argv, p_this->p_libvlc->ppsz_argv, - *pi_argc * sizeof(char *) ); - } - - i_shortopts = 0; - for( i_index = 0; i_index < 256; i_index++ ) - { - pp_shortopts[i_index] = NULL; - } - - /* Fill the p_longopts and psz_shortopts structures */ - i_index = 0; - for( i_modules_index = 0; i_modules_index < p_list->i_count; - i_modules_index++ ) - { - module_config_t *p_item, *p_end; - p_parser = (module_t *)p_list->p_values[i_modules_index].p_object ; - - if( !p_parser->i_config_items ) - continue; - - for( p_item = p_parser->p_config, p_end = p_item + p_parser->confsize; - p_item < p_end; - p_item++ ) - { - /* Ignore hints */ - if( p_item->i_type & CONFIG_HINT ) - continue; - - /* Add item to long options */ - p_longopts[i_index].name = strdup( p_item->psz_name ); - if( p_longopts[i_index].name == NULL ) continue; - p_longopts[i_index].has_arg = - (p_item->i_type == CONFIG_ITEM_BOOL)? - no_argument : required_argument; - p_longopts[i_index].flag = &flag; - p_longopts[i_index].val = 0; - i_index++; - - /* When dealing with bools we also need to add the --no-foo - * option */ - if( p_item->i_type == CONFIG_ITEM_BOOL ) - { - char *psz_name = malloc( strlen(p_item->psz_name) + 3 ); - if( psz_name == NULL ) continue; - strcpy( psz_name, "no" ); - strcat( psz_name, p_item->psz_name ); - - p_longopts[i_index].name = psz_name; - p_longopts[i_index].has_arg = no_argument; - p_longopts[i_index].flag = &flag; - p_longopts[i_index].val = 1; - i_index++; - - psz_name = malloc( strlen(p_item->psz_name) + 4 ); - if( psz_name == NULL ) continue; - strcpy( psz_name, "no-" ); - strcat( psz_name, p_item->psz_name ); - - p_longopts[i_index].name = psz_name; - p_longopts[i_index].has_arg = no_argument; - p_longopts[i_index].flag = &flag; - p_longopts[i_index].val = 1; - i_index++; - } - - /* If item also has a short option, add it */ - if( p_item->i_short ) - { - pp_shortopts[(int)p_item->i_short] = p_item; - psz_shortopts[i_shortopts] = p_item->i_short; - i_shortopts++; - if( p_item->i_type != CONFIG_ITEM_BOOL ) - { - psz_shortopts[i_shortopts] = ':'; - i_shortopts++; - - if( p_item->i_short == 'v' ) - { - psz_shortopts[i_shortopts] = ':'; - i_shortopts++; - } - } - } - } - } - - /* We don't need the module list anymore */ - vlc_list_release( p_list ); - - /* Close the longopts and shortopts structures */ - memset( &p_longopts[i_index], 0, sizeof(struct option) ); - psz_shortopts[i_shortopts] = '\0'; - - /* - * Parse the command line options - */ - opterr = 0; - optind = 0; /* set to 0 to tell GNU getopt to reinitialize */ - while( ( i_cmd = getopt_long( *pi_argc, (char **)ppsz_argv, psz_shortopts, - p_longopts, &i_index ) ) != -1 ) - { - /* A long option has been recognized */ - if( i_cmd == 0 ) - { - module_config_t *p_conf; - char *psz_name = (char *)p_longopts[i_index].name; - - /* Check if we deal with a --nofoo or --no-foo long option */ - if( flag ) psz_name += psz_name[2] == '-' ? 3 : 2; - - /* Store the configuration option */ - p_conf = config_FindConfig( p_this, psz_name ); - if( p_conf ) - { - /* Check if the option is deprecated */ - if( p_conf->psz_current ) - { - if( p_conf->b_strict ) - { - fprintf(stderr, - "Warning: option --%s no longer exists.\n", - p_conf->psz_name); - continue; - } - - fprintf( stderr, - "%s: option --%s is deprecated. Use --%s instead.\n", - b_ignore_errors ? "Warning" : "Error", - p_conf->psz_name, p_conf->psz_current); - if( !b_ignore_errors ) - { - /*free */ - for( i_index = 0; p_longopts[i_index].name; i_index++ ) - free( (char *)p_longopts[i_index].name ); - - free( p_longopts ); - free( psz_shortopts ); - return -1; - } - - psz_name = (char *)p_conf->psz_current; - p_conf = config_FindConfig( p_this, psz_name ); - } - - switch( p_conf->i_type ) - { - case CONFIG_ITEM_STRING: - case CONFIG_ITEM_PASSWORD: - case CONFIG_ITEM_FILE: - case CONFIG_ITEM_DIRECTORY: - case CONFIG_ITEM_MODULE: - case CONFIG_ITEM_MODULE_LIST: - case CONFIG_ITEM_MODULE_LIST_CAT: - case CONFIG_ITEM_MODULE_CAT: - config_PutPsz( p_this, psz_name, optarg ); - break; - case CONFIG_ITEM_INTEGER: - config_PutInt( p_this, psz_name, strtol(optarg, 0, 0)); - break; - case CONFIG_ITEM_FLOAT: - config_PutFloat( p_this, psz_name, (float)atof(optarg) ); - break; - case CONFIG_ITEM_KEY: - config_PutInt( p_this, psz_name, ConfigStringToKey( optarg ) ); - break; - case CONFIG_ITEM_BOOL: - config_PutInt( p_this, psz_name, !flag ); - break; - } - continue; - } - } - - /* A short option has been recognized */ - if( pp_shortopts[i_cmd] != NULL ) - { - switch( pp_shortopts[i_cmd]->i_type ) - { - case CONFIG_ITEM_STRING: - case CONFIG_ITEM_PASSWORD: - case CONFIG_ITEM_FILE: - case CONFIG_ITEM_DIRECTORY: - case CONFIG_ITEM_MODULE: - case CONFIG_ITEM_MODULE_CAT: - case CONFIG_ITEM_MODULE_LIST: - case CONFIG_ITEM_MODULE_LIST_CAT: - config_PutPsz( p_this, pp_shortopts[i_cmd]->psz_name, optarg ); - break; - case CONFIG_ITEM_INTEGER: - if( i_cmd == 'v' ) - { - if( optarg ) - { - if( *optarg == 'v' ) /* eg. -vvv */ - { - i_verbose++; - while( *optarg == 'v' ) - { - i_verbose++; - optarg++; - } - } - else - { - i_verbose += atoi( optarg ); /* eg. -v2 */ - } - } - else - { - i_verbose++; /* -v */ - } - config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name, - i_verbose ); - } - else - { - config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name, - strtol(optarg, 0, 0) ); - } - break; - case CONFIG_ITEM_BOOL: - config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name, 1 ); - break; - } - - continue; - } - - /* Internal error: unknown option */ - if( !b_ignore_errors ) - { - fprintf( stderr, "%s: unknown option" - " or missing mandatory argument ", - p_this->p_libvlc->psz_object_name ); - if( optopt ) - { - fprintf( stderr, "`-%c'\n", optopt ); - } - else - { - fprintf( stderr, "`%s'\n", ppsz_argv[optind-1] ); - } - fprintf( stderr, "Try `%s --help' for more information.\n", - p_this->p_libvlc->psz_object_name ); - - for( i_index = 0; p_longopts[i_index].name; i_index++ ) - free( (char *)p_longopts[i_index].name ); - free( p_longopts ); - free( psz_shortopts ); - return -1; - } - } - - /* Free allocated resources */ - for( i_index = 0; p_longopts[i_index].name; i_index++ ) - free( (char *)p_longopts[i_index].name ); - free( p_longopts ); - free( psz_shortopts ); - if( b_ignore_errors ) free( ppsz_argv ); - - return 0; -} - -/** - * 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 -} - -/** - * Get the user's configuration file - */ -char *config_GetConfigFile( libvlc_int_t *p_libvlc ) -{ - char *psz_configfile; - if( asprintf( &psz_configfile, "%s" DIR_SEP CONFIG_FILE, - p_libvlc->psz_configdir ) == -1 ) - return NULL; - return psz_configfile; -} - -/** - * Get the user's configuration file when given with the --config option - */ -char *config_GetCustomConfigFile( libvlc_int_t *p_libvlc ) -{ - char *psz_configfile = config_GetPsz( p_libvlc, "config" ); - if( psz_configfile != NULL ) - { - if( psz_configfile[0] == '~' && psz_configfile[1] == '/' ) - { - /* This is incomplete: we should also support the ~cmassiot/ syntax */ - char *psz_buf; - if( asprintf( &psz_buf, "%s/%s", p_libvlc->psz_homedir, - psz_configfile + 2 ) == -1 ) - { - free( psz_configfile ); - return NULL; - } - free( psz_configfile ); - psz_configfile = psz_buf; - } - } - return psz_configfile; -} - -static int ConfigStringToKey( const char *psz_key ) -{ - int i_key = 0; - unsigned int i; - const char *psz_parser = strchr( psz_key, '-' ); - while( psz_parser && psz_parser != psz_key ) - { - for( i = 0; i < sizeof(vlc_modifiers) / sizeof(key_descriptor_t); i++ ) - { - if( !strncasecmp( vlc_modifiers[i].psz_key_string, psz_key, - strlen( vlc_modifiers[i].psz_key_string ) ) ) - { - i_key |= vlc_modifiers[i].i_key_code; - } - } - psz_key = psz_parser + 1; - psz_parser = strchr( psz_key, '-' ); - } - for( i = 0; i < sizeof(vlc_keys) / sizeof( key_descriptor_t ); i++ ) - { - if( !strcasecmp( vlc_keys[i].psz_key_string, psz_key ) ) - { - i_key |= vlc_keys[i].i_key_code; - break; - } - } - return i_key; -} - -static char *ConfigKeyToString( int i_key ) -{ - char *psz_key = malloc( 100 ); - char *p; - size_t index; - - if ( !psz_key ) - { - return NULL; - } - *psz_key = '\0'; - p = psz_key; - for( index = 0; index < (sizeof(vlc_modifiers) / sizeof(key_descriptor_t)); - index++ ) - { - if( i_key & vlc_modifiers[index].i_key_code ) - { - p += sprintf( p, "%s-", vlc_modifiers[index].psz_key_string ); - } - } - for( index = 0; index < (sizeof(vlc_keys) / sizeof( key_descriptor_t)); - index++) - { - if( (int)( i_key & ~KEY_MODIFIER ) == vlc_keys[index].i_key_code ) - { - p += sprintf( p, "%s", vlc_keys[index].psz_key_string ); - break; - } - } - return psz_key; -} - -/* 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; -} - diff --git a/src/modules/modules.c b/src/modules/modules.c index bc51f8523f..c07001a268 100644 --- a/src/modules/modules.c +++ b/src/modules/modules.c @@ -76,7 +76,7 @@ # endif #endif -#include "modules/configuration.h" +#include "config/config.h" #include "libvlc.h" #include "vlc_charset.h" diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index 9286a92036..bafc6b8880 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -24,7 +24,7 @@ #include #include #include "playlist_internal.h" -#include "modules/configuration.h" +#include "config/config.h" #include #include