X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fconfiguration.c;h=441834f2635e241fb5531ecd64eff8649c207f73;hb=e53ac062b4ad2228ce69d11c481a0f0f17368159;hp=1cc3b25457a98cee03d97f33364e53c52d0f0362;hpb=497e82b19b78872f6e68ca5bf27f795dd09dbba2;p=vlc diff --git a/src/misc/configuration.c b/src/misc/configuration.c index 1cc3b25457..441834f263 100644 --- a/src/misc/configuration.c +++ b/src/misc/configuration.c @@ -2,7 +2,7 @@ * configuration.c management of the modules configuration ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: configuration.c,v 1.17 2002/04/21 18:32:12 sam Exp $ + * $Id: configuration.c,v 1.67 2003/11/05 00:39:17 gbazin Exp $ * * Authors: Gildas Bazin * @@ -21,12 +21,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ -#include +#include +#include "vlc_keys.h" #include /* sprintf() */ #include /* free(), strtol() */ #include /* strdup() */ -#include /* errno */ +#ifdef HAVE_ERRNO_H +# include /* errno */ +#endif #ifdef HAVE_UNISTD_H # include /* getuid() */ @@ -37,40 +40,105 @@ # include /* getopt() */ # endif #else -# include "GNUgetopt/getopt.h" +# include "../extras/getopt.h" #endif #if defined(HAVE_GETPWUID) -#include /* getpwuid() */ +# include /* getpwuid() */ +#endif + +#if defined( HAVE_SYS_STAT_H ) +# include #endif +#if defined( HAVE_SYS_TYPES_H ) +# include +#endif +#if defined( WIN32 ) && !defined( UNDER_CE ) +# include +#endif + + +static int ConfigStringToKey( char * ); +static char *ConfigKeyToString( int ); + +/***************************************************************************** + * 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: + i_type = VLC_VAR_INTEGER; + break; + + case CONFIG_ITEM_FLOAT: + i_type = VLC_VAR_FLOAT; + break; + + case CONFIG_ITEM_MODULE: + case CONFIG_ITEM_STRING: + 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; + } -#include -#include + return i_type; +} /***************************************************************************** - * config_GetIntVariable: get the value of an int variable + * 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 (MODULE_CONFIG_ITEM_INTEGER and - * MODULE_CONFIG_ITEM_BOOL). + * represented by an integer (CONFIG_ITEM_INTEGER and + * CONFIG_ITEM_BOOL). *****************************************************************************/ -int config_GetIntVariable( const char *psz_name ) +int __config_GetInt( vlc_object_t *p_this, const char *psz_name ) { module_config_t *p_config; - p_config = config_FindConfig( psz_name ); + p_config = config_FindConfig( p_this, psz_name ); /* sanity checks */ if( !p_config ) { - intf_ErrMsg( "config error: option %s doesn't exist", psz_name ); + msg_Err( p_this, "option %s does not exist", psz_name ); return -1; } - if( (p_config->i_type!=MODULE_CONFIG_ITEM_INTEGER) && - (p_config->i_type!=MODULE_CONFIG_ITEM_BOOL) ) + if( (p_config->i_type!=CONFIG_ITEM_INTEGER) && + (p_config->i_type!=CONFIG_ITEM_KEY) && + (p_config->i_type!=CONFIG_ITEM_BOOL) ) { - intf_ErrMsg( "config error: option %s doesn't refer to an int", - psz_name ); + msg_Err( p_this, "option %s does not refer to an int", psz_name ); return -1; } @@ -78,27 +146,26 @@ int config_GetIntVariable( const char *psz_name ) } /***************************************************************************** - * config_GetFloatVariable: get the value of a float variable + * 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 (MODULE_CONFIG_ITEM_FLOAT). + * represented by a float (CONFIG_ITEM_FLOAT). *****************************************************************************/ -float config_GetFloatVariable( const char *psz_name ) +float __config_GetFloat( vlc_object_t *p_this, const char *psz_name ) { module_config_t *p_config; - p_config = config_FindConfig( psz_name ); + p_config = config_FindConfig( p_this, psz_name ); /* sanity checks */ if( !p_config ) { - intf_ErrMsg( "config error: option %s doesn't exist", psz_name ); + msg_Err( p_this, "option %s does not exist", psz_name ); return -1; } - if( p_config->i_type != MODULE_CONFIG_ITEM_FLOAT ) + if( p_config->i_type != CONFIG_ITEM_FLOAT ) { - intf_ErrMsg( "config error: option %s doesn't refer to a float", - psz_name ); + msg_Err( p_this, "option %s does not refer to a float", psz_name ); return -1; } @@ -106,35 +173,35 @@ float config_GetFloatVariable( const char *psz_name ) } /***************************************************************************** - * config_GetPszVariable: get the string value of a string variable + * 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 (MODULE_CONFIG_ITEM_STRING, MODULE_CONFIG_ITEM_FILE, - * and MODULE_CONFIG_ITEM_PLUGIN). + * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, + * CONFIG_ITEM_DIRECTORY, and CONFIG_ITEM_MODULE). * - * Important note: remember to free() the returned char* because it 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. + * 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_GetPszVariable( const char *psz_name ) +char * __config_GetPsz( vlc_object_t *p_this, const char *psz_name ) { module_config_t *p_config; char *psz_value = NULL; - p_config = config_FindConfig( psz_name ); + p_config = config_FindConfig( p_this, psz_name ); /* sanity checks */ if( !p_config ) { - intf_ErrMsg( "config error: option %s doesn't exist", psz_name ); + msg_Err( p_this, "option %s does not exist", psz_name ); return NULL; } - if( (p_config->i_type!=MODULE_CONFIG_ITEM_STRING) && - (p_config->i_type!=MODULE_CONFIG_ITEM_FILE) && - (p_config->i_type!=MODULE_CONFIG_ITEM_PLUGIN) ) + if( (p_config->i_type!=CONFIG_ITEM_STRING) && + (p_config->i_type!=CONFIG_ITEM_FILE) && + (p_config->i_type!=CONFIG_ITEM_DIRECTORY) && + (p_config->i_type!=CONFIG_ITEM_MODULE) ) { - intf_ErrMsg( "config error: option %s doesn't refer to a string", - psz_name ); + msg_Err( p_this, "option %s does not refer to a string", psz_name ); return NULL; } @@ -147,134 +214,243 @@ char * config_GetPszVariable( const char *psz_name ) } /***************************************************************************** - * config_PutPszVariable: set the string value of a string variable + * 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 (MODULE_CONFIG_ITEM_STRING, MODULE_CONFIG_ITEM_FILE, - * and MODULE_CONFIG_ITEM_PLUGIN). + * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, + * CONFIG_ITEM_DIRECTORY, and CONFIG_ITEM_MODULE). *****************************************************************************/ -void config_PutPszVariable( const char *psz_name, char *psz_value ) +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( psz_name ); + p_config = config_FindConfig( p_this, psz_name ); /* sanity checks */ if( !p_config ) { - intf_ErrMsg( "config error: option %s doesn't exist", psz_name ); + msg_Warn( p_this, "option %s does not exist", psz_name ); return; } - if( (p_config->i_type!=MODULE_CONFIG_ITEM_STRING) && - (p_config->i_type!=MODULE_CONFIG_ITEM_FILE) && - (p_config->i_type!=MODULE_CONFIG_ITEM_PLUGIN) ) + if( (p_config->i_type!=CONFIG_ITEM_STRING) && + (p_config->i_type!=CONFIG_ITEM_FILE) && + (p_config->i_type!=CONFIG_ITEM_DIRECTORY) && + (p_config->i_type!=CONFIG_ITEM_MODULE) ) { - intf_ErrMsg( "config error: option %s doesn't refer to a string", - psz_name ); + msg_Err( p_this, "option %s does not refer to a string", psz_name ); return; } vlc_mutex_lock( p_config->p_lock ); - /* free old string */ - if( p_config->psz_value ) free( p_config->psz_value ); + /* backup old value */ + oldval.psz_string = p_config->psz_value; - if( psz_value ) p_config->psz_value = strdup( psz_value ); + if( psz_value && *psz_value ) p_config->psz_value = strdup( psz_value ); else p_config->psz_value = NULL; + val.psz_string = p_config->psz_value; + 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_PutIntVariable: set the integer value of an int variable + * 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 (MODULE_CONFIG_ITEM_INTEGER and - * MODULE_CONFIG_ITEM_BOOL). + * represented by an integer (CONFIG_ITEM_INTEGER and + * CONFIG_ITEM_BOOL). *****************************************************************************/ -void config_PutIntVariable( const char *psz_name, int i_value ) +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( psz_name ); + p_config = config_FindConfig( p_this, psz_name ); /* sanity checks */ if( !p_config ) { - intf_ErrMsg( "config error: option %s doesn't exist", psz_name ); + msg_Warn( p_this, "option %s does not exist", psz_name ); return; } - if( (p_config->i_type!=MODULE_CONFIG_ITEM_INTEGER) && - (p_config->i_type!=MODULE_CONFIG_ITEM_BOOL) ) + if( (p_config->i_type!=CONFIG_ITEM_INTEGER) && + (p_config->i_type!=CONFIG_ITEM_KEY) && + (p_config->i_type!=CONFIG_ITEM_BOOL) ) { - intf_ErrMsg( "config error: option %s doesn't refer to an int", - psz_name ); + msg_Err( p_this, "option %s does not refer to an int", psz_name ); return; } - p_config->i_value = i_value; + /* backup old value */ + oldval.i_int = p_config->i_value; + + /* if i_min == i_max == 0, then do not use them */ + if ((p_config->i_min == 0) && (p_config->i_max == 0)) + { + p_config->i_value = i_value; + } + else if (i_value < p_config->i_min) + { + p_config->i_value = p_config->i_min; + } + else if (i_value > p_config->i_max) + { + p_config->i_value = p_config->i_max; + } + else + { + p_config->i_value = i_value; + } + + val.i_int = p_config->i_value; + + if( p_config->pf_callback ) + { + p_config->pf_callback( p_this, psz_name, oldval, val, + p_config->p_callback_data ); + } } /***************************************************************************** - * config_PutFloatVariable: set the value of a float variable + * 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 (MODULE_CONFIG_ITEM_FLOAT). + * represented by a float (CONFIG_ITEM_FLOAT). *****************************************************************************/ -void config_PutFloatVariable( const char *psz_name, float f_value ) +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( psz_name ); + p_config = config_FindConfig( p_this, psz_name ); /* sanity checks */ if( !p_config ) { - intf_ErrMsg( "config error: option %s doesn't exist", psz_name ); + msg_Warn( p_this, "option %s does not exist", psz_name ); return; } - if( p_config->i_type != MODULE_CONFIG_ITEM_FLOAT ) + if( p_config->i_type != CONFIG_ITEM_FLOAT ) { - intf_ErrMsg( "config error: option %s doesn't refer to a float", - psz_name ); + msg_Err( p_this, "option %s does not refer to a float", psz_name ); return; } - p_config->f_value = f_value; + /* backup old value */ + oldval.f_float = p_config->f_value; + + /* if f_min == f_max == 0, then do not use them */ + if ((p_config->f_min == 0) && (p_config->f_max == 0)) + { + p_config->f_value = f_value; + } + else if (f_value < p_config->f_min) + { + p_config->f_value = p_config->f_min; + } + else if (f_value > p_config->f_max) + { + p_config->f_value = p_config->f_max; + } + else + { + p_config->f_value = f_value; + } + + val.f_float = p_config->f_value; + + 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( const char *psz_name ) +module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name ) { - module_t *p_module; + vlc_list_t *p_list; + module_t *p_parser; module_config_t *p_item; + int i_index; if( !psz_name ) return NULL; - for( p_module = p_module_bank->first ; - p_module != NULL ; - p_module = p_module->next ) + p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + + for( i_index = 0; i_index < p_list->i_count; i_index++ ) { - for( p_item = p_module->p_config; - p_item->i_type != MODULE_CONFIG_HINT_END; + 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_item->i_type != CONFIG_HINT_END; p_item++ ) { - if( p_item->i_type & MODULE_CONFIG_HINT ) + 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. ***************************************************************************** @@ -282,48 +458,221 @@ module_config_t *config_FindConfig( const char *psz_name ) * 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. *****************************************************************************/ -module_config_t *config_Duplicate( module_config_t *p_orig ) +void config_Duplicate( module_t *p_module, module_config_t *p_orig ) { - int i, i_lines; - module_config_t *p_config; + int i, j, i_lines = 1; + module_config_t *p_item; /* Calculate the structure length */ - for( p_config = p_orig, i_lines = 1; - p_config->i_type != MODULE_CONFIG_HINT_END; - p_config++, i_lines++ ); + p_module->i_config_items = 0; + p_module->i_bool_items = 0; + + for( p_item = p_orig; p_item->i_type != CONFIG_HINT_END; p_item++ ) + { + i_lines++; + + 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_config = (module_config_t *)malloc( sizeof(module_config_t) * i_lines ); - if( p_config == NULL ) + p_module->p_config = (module_config_t *)malloc( sizeof(module_config_t) + * i_lines ); + if( p_module->p_config == NULL ) { - intf_ErrMsg( "config error: can't duplicate p_config" ); - return( NULL ); + msg_Err( p_module, "config error: can't duplicate p_config" ); + return; } /* Do the duplication job */ for( i = 0; i < i_lines ; i++ ) { - p_config[i].i_type = p_orig[i].i_type; - p_config[i].i_short = p_orig[i].i_short; - p_config[i].i_value = p_orig[i].i_value; - p_config[i].f_value = p_orig[i].f_value; - p_config[i].b_dirty = p_orig[i].b_dirty; + p_module->p_config[i] = p_orig[i]; - p_config[i].psz_name = p_orig[i].psz_name ? - strdup( _(p_orig[i].psz_name) ) : NULL; - p_config[i].psz_text = p_orig[i].psz_text ? + p_module->p_config[i].psz_type = p_orig[i].psz_type ? + strdup( p_orig[i].psz_type ) : NULL; + p_module->p_config[i].psz_name = p_orig[i].psz_name ? + strdup( p_orig[i].psz_name ) : NULL; + p_module->p_config[i].psz_text = p_orig[i].psz_text ? strdup( _(p_orig[i].psz_text) ) : NULL; - p_config[i].psz_longtext = p_orig[i].psz_longtext ? + p_module->p_config[i].psz_longtext = p_orig[i].psz_longtext ? strdup( _(p_orig[i].psz_longtext) ) : NULL; - p_config[i].psz_value = p_orig[i].psz_value ? - strdup( _(p_orig[i].psz_value) ) : NULL; + p_module->p_config[i].psz_value = p_orig[i].psz_value ? + strdup( p_orig[i].psz_value ) : NULL; + p_module->p_config[i].psz_value_orig = p_orig[i].psz_value ? + strdup( p_orig[i].psz_value ) : NULL; + + 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] = + strdup( 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 = + malloc( (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] = + strdup( _(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]; + } + } + } - /* the callback pointer is only valid when the module is loaded so this - * value is set in ActivateModule() and reset in DeactivateModule() */ - p_config[i].p_callback = NULL; + p_module->p_config[i].pf_callback = p_orig[i].pf_callback; } +} - return p_config; +/***************************************************************************** + * 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 ) +{ + module_config_t *p_item = p_module->p_config; + int i; + + if( p_item == NULL ) + { + return; + } + + for( ; p_item->i_type != CONFIG_HINT_END ; p_item++ ) + { + if( p_item->psz_type ) + free( p_item->psz_type ); + + if( p_item->psz_name ) + free( p_item->psz_name ); + + if( p_item->psz_text ) + free( p_item->psz_text ); + + if( p_item->psz_longtext ) + free( p_item->psz_longtext ); + + if( p_item->psz_value ) + free( p_item->psz_value ); + + if( p_item->psz_value_orig ) + free( p_item->psz_value_orig ); + + 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( p_item->ppsz_list[i] ); + if( p_item->ppsz_list_text && p_item->ppsz_list_text[i] ) + free( p_item->ppsz_list_text[i] ); + } + if( p_item->ppsz_list ) free( p_item->ppsz_list ); + if( p_item->ppsz_list_text ) free( p_item->ppsz_list_text ); + if( p_item->pi_list ) free( p_item->pi_list ); + } + } + + free( p_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 ) +{ + while( p_new->i_type != CONFIG_HINT_END ) + { + 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 ) +{ + while( p_new->i_type != CONFIG_HINT_END ) + { + 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, i; + vlc_list_t *p_list; + module_t *p_module; + + /* Acquire config file lock */ + vlc_mutex_lock( &p_this->p_vlc->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( i = 0; p_module->p_config[i].i_type != CONFIG_HINT_END; i++ ) + { + p_module->p_config[i].i_value = p_module->p_config[i].i_value_orig; + p_module->p_config[i].f_value = p_module->p_config[i].f_value_orig; + if( p_module->p_config[i].psz_value ) + free( p_module->p_config[i].psz_value ); + p_module->p_config[i].psz_value = + p_module->p_config[i].psz_value_orig ? + strdup( p_module->p_config[i].psz_value_orig ) : NULL; + } + } + + vlc_list_release( p_list ); + vlc_mutex_unlock( &p_this->p_vlc->config_lock ); } /***************************************************************************** @@ -332,67 +681,86 @@ module_config_t *config_Duplicate( module_config_t *p_orig ) * This function is called to load the config options stored in the config * file. *****************************************************************************/ -int config_LoadConfigFile( const char *psz_module_name ) +int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name ) { - module_t *p_module; + vlc_list_t *p_list; + module_t *p_parser; module_config_t *p_item; FILE *file; char line[1024]; char *p_index, *psz_option_name, *psz_option_value; - char *psz_filename, *psz_homedir; - - /* Acquire config file lock */ - vlc_mutex_lock( &p_main->config_lock ); + char *psz_filename, *psz_homedir, *psz_configfile; + int i_index; - psz_homedir = p_main->psz_homedir; - if( !psz_homedir ) + psz_configfile = p_this->p_vlc->psz_configfile; + if( !psz_configfile || !psz_configfile ) { - intf_ErrMsg( "config error: p_main->psz_homedir is null" ); - vlc_mutex_unlock( &p_main->config_lock ); - return -1; + psz_homedir = p_this->p_vlc->psz_homedir; + if( !psz_homedir ) + { + msg_Err( p_this, "psz_homedir is null" ); + return -1; + } + psz_filename = (char *)malloc( sizeof("/" CONFIG_DIR "/" CONFIG_FILE) + + strlen(psz_homedir) ); + if( psz_filename ) + sprintf( psz_filename, "%s/" CONFIG_DIR "/" CONFIG_FILE, + psz_homedir ); } - psz_filename = (char *)malloc( strlen("/" CONFIG_DIR "/" CONFIG_FILE) + - strlen(psz_homedir) + 1 ); + else + { + psz_filename = strdup( psz_configfile ); + } + if( !psz_filename ) { - intf_ErrMsg( "config error: couldn't malloc psz_filename" ); - vlc_mutex_unlock( &p_main->config_lock ); + msg_Err( p_this, "out of memory" ); return -1; } - sprintf( psz_filename, "%s/" CONFIG_DIR "/" CONFIG_FILE, psz_homedir ); - intf_WarnMsg( 5, "config: opening config file %s", psz_filename ); + msg_Dbg( p_this, "opening config file %s", psz_filename ); - file = fopen( psz_filename, "r" ); + /* Acquire config file lock */ + vlc_mutex_lock( &p_this->p_vlc->config_lock ); + + file = fopen( psz_filename, "rt" ); if( !file ) { - intf_WarnMsg( 1, "config: couldn't open config file %s for reading (%s)", - psz_filename, strerror(errno) ); + msg_Warn( p_this, "config file %s does not exist yet", psz_filename ); free( psz_filename ); - vlc_mutex_unlock( &p_main->config_lock ); + vlc_mutex_unlock( &p_this->p_vlc->config_lock ); return -1; } /* Look for the selected module, if NULL then save everything */ - for( p_module = p_module_bank->first ; p_module != NULL ; - p_module = p_module->next ) + 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_parser = (module_t *)p_list->p_values[i_index].p_object ; - if( psz_module_name && strcmp( psz_module_name, p_module->psz_name ) ) + if( psz_module_name + && strcmp( psz_module_name, p_parser->psz_object_name ) ) + { continue; + } /* The config file is organized in sections, one per module. Look for * the interesting section ( a section is of the form [foo] ) */ - rewind( file ); + fseek( file, 0L, SEEK_SET ); while( fgets( line, 1024, file ) ) { - if( (line[0] == '[') && (p_index = strchr(line,']')) && - (p_index - &line[1] == strlen(p_module->psz_name) ) && - !memcmp( &line[1], p_module->psz_name, - strlen(p_module->psz_name) ) ) + if( (line[0] == '[') + && (p_index = strchr(line,']')) + && (p_index - &line[1] + == (int)strlen(p_parser->psz_object_name)) + && !memcmp( &line[1], p_parser->psz_object_name, + strlen(p_parser->psz_object_name) ) ) { - intf_WarnMsg( 5, "config: loading config for module <%s>", - p_module->psz_name ); +#if 0 + msg_Dbg( p_this, "loading config for module \"%s\"", + p_parser->psz_object_name ); +#endif break; } @@ -405,7 +773,8 @@ int config_LoadConfigFile( const char *psz_module_name ) if( line[0] == '[' ) break; /* end of section */ /* ignore comments or empty lines */ - if( (line[0] == '#') || (line[0] == (char)0) ) continue; + if( (line[0] == '#') || (line[0] == '\n') || (line[0] == (char)0) ) + continue; /* get rid of line feed */ if( line[strlen(line)-1] == '\n' ) @@ -420,12 +789,17 @@ int config_LoadConfigFile( const char *psz_module_name ) *p_index = (char)0; psz_option_value = p_index + 1; + if( !p_parser->i_config_items ) + { + continue; + } + /* try to match this option with one of the module's options */ - for( p_item = p_module->p_config; - p_item->i_type != MODULE_CONFIG_HINT_END; + for( p_item = p_parser->p_config; + p_item->i_type != CONFIG_HINT_END; p_item++ ) { - if( p_item->i_type & MODULE_CONFIG_HINT ) + if( p_item->i_type & CONFIG_HINT ) /* ignore hints */ continue; @@ -434,23 +808,30 @@ int config_LoadConfigFile( const char *psz_module_name ) /* We found it */ switch( p_item->i_type ) { - case MODULE_CONFIG_ITEM_BOOL: - case MODULE_CONFIG_ITEM_INTEGER: + case CONFIG_ITEM_BOOL: + case CONFIG_ITEM_INTEGER: if( !*psz_option_value ) break; /* ignore empty option */ p_item->i_value = atoi( psz_option_value); - intf_WarnMsg( 7, "config: found <%s> option %s=%i", - p_module->psz_name, - p_item->psz_name, p_item->i_value ); +#if 0 + msg_Dbg( p_this, "option \"%s\", value %i", + p_item->psz_name, p_item->i_value ); +#endif break; - case MODULE_CONFIG_ITEM_FLOAT: + case CONFIG_ITEM_FLOAT: if( !*psz_option_value ) break; /* ignore empty option */ p_item->f_value = (float)atof( psz_option_value); - intf_WarnMsg( 7, "config: found <%s> option %s=%f", - p_module->psz_name, p_item->psz_name, - (double)p_item->f_value ); +#if O + msg_Dbg( p_this, "option \"%s\", value %f", + p_item->psz_name, (double)p_item->f_value ); +#endif + break; + case CONFIG_ITEM_KEY: + if( !*psz_option_value ) + break; /* ignore empty option */ + p_item->i_value = ConfigStringToKey( psz_option_value ); break; default: @@ -465,11 +846,11 @@ int config_LoadConfigFile( const char *psz_module_name ) vlc_mutex_unlock( p_item->p_lock ); - intf_WarnMsg( 7, "config: found <%s> option %s=%s", - p_module->psz_name, - p_item->psz_name, - p_item->psz_value != NULL ? - p_item->psz_value : "(NULL)" ); +#if 0 + msg_Dbg( p_this, "option \"%s\", value \"%s\"", + p_item->psz_name, + p_item->psz_value ? p_item->psz_value : "" ); +#endif break; } } @@ -477,11 +858,13 @@ int config_LoadConfigFile( const char *psz_module_name ) } } - + + vlc_list_release( p_list ); + fclose( file ); free( psz_filename ); - vlc_mutex_unlock( &p_main->config_lock ); + vlc_mutex_unlock( &p_this->p_vlc->config_lock ); return 0; } @@ -494,9 +877,9 @@ int config_LoadConfigFile( const char *psz_module_name ) * 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 plugins that + * 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. + * 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 @@ -505,77 +888,117 @@ int config_LoadConfigFile( const char *psz_module_name ) * save. * Really stupid no ? *****************************************************************************/ -int config_SaveConfigFile( const char *psz_module_name ) +int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name ) { - module_t *p_module; + module_t *p_parser; + vlc_list_t *p_list; module_config_t *p_item; FILE *file; char p_line[1024], *p_index2; int i_sizebuf = 0; char *p_bigbuffer, *p_index; - boolean_t b_backup; - char *psz_filename, *psz_homedir; + vlc_bool_t b_backup; + char *psz_filename, *psz_homedir, *psz_configfile; + int i_index; /* Acquire config file lock */ - vlc_mutex_lock( &p_main->config_lock ); + vlc_mutex_lock( &p_this->p_vlc->config_lock ); - psz_homedir = p_main->psz_homedir; - if( !psz_homedir ) + psz_configfile = p_this->p_vlc->psz_configfile; + if( !psz_configfile || !psz_configfile ) { - intf_ErrMsg( "config error: p_main->psz_homedir is null" ); - vlc_mutex_unlock( &p_main->config_lock ); - return -1; - } - psz_filename = (char *)malloc( strlen("/" CONFIG_DIR "/" CONFIG_FILE) + - strlen(psz_homedir) + 1 ); - if( !psz_filename ) - { - intf_ErrMsg( "config error: couldn't malloc psz_filename" ); - vlc_mutex_unlock( &p_main->config_lock ); - return -1; - } - sprintf( psz_filename, "%s/" CONFIG_DIR, psz_homedir ); + psz_homedir = p_this->p_vlc->psz_homedir; + if( !psz_homedir ) + { + msg_Err( p_this, "psz_homedir is null" ); + vlc_mutex_unlock( &p_this->p_vlc->config_lock ); + return -1; + } + psz_filename = (char *)malloc( sizeof("/" CONFIG_DIR "/" CONFIG_FILE) + + strlen(psz_homedir) ); + + if( psz_filename ) + sprintf( psz_filename, "%s/" CONFIG_DIR, psz_homedir ); + + if( !psz_filename ) + { + msg_Err( p_this, "out of memory" ); + vlc_mutex_unlock( &p_this->p_vlc->config_lock ); + return -1; + } + +#if defined( UNDER_CE ) + { + wchar_t psz_new[ MAX_PATH ]; + MultiByteToWideChar( CP_ACP, 0, psz_filename, -1, psz_new, + MAX_PATH ); + if( CreateDirectory( psz_new, NULL ) ) + { + msg_Err( p_this, "could not create %s", psz_filename ); + } + } + +#elif defined( HAVE_ERRNO_H ) +# if defined( WIN32 ) + if( mkdir( psz_filename ) && errno != EEXIST ) +# else + if( mkdir( psz_filename, 0755 ) && errno != EEXIST ) +# endif + { + msg_Err( p_this, "could not create %s (%s)", + psz_filename, strerror(errno) ); + } -#ifndef WIN32 - if( mkdir( psz_filename, 0755 ) && errno != EEXIST ) #else - if( mkdir( psz_filename ) && errno != EEXIST ) + if( mkdir( psz_filename ) ) + { + msg_Err( p_this, "could not create %s", psz_filename ); + } + #endif + + strcat( psz_filename, "/" CONFIG_FILE ); + } + else { - intf_ErrMsg( "config error: couldn't create %s (%s)", - psz_filename, strerror(errno) ); + psz_filename = strdup( psz_configfile ); + if( !psz_filename ) + { + msg_Err( p_this, "out of memory" ); + vlc_mutex_unlock( &p_this->p_vlc->config_lock ); + return -1; + } } - strcat( psz_filename, "/" CONFIG_FILE ); - + msg_Dbg( p_this, "opening config file %s", psz_filename ); - intf_WarnMsg( 5, "config: opening config file %s", psz_filename ); - - file = fopen( psz_filename, "r" ); + file = fopen( psz_filename, "rt" ); if( !file ) { - intf_WarnMsg( 1, "config: couldn't open config file %s for reading (%s)", - psz_filename, strerror(errno) ); + msg_Warn( p_this, "config file %s does not exist yet", psz_filename ); } else { /* look for file size */ - fseek( file, 0, SEEK_END ); + fseek( file, 0L, SEEK_END ); i_sizebuf = ftell( file ); - rewind( file ); + fseek( file, 0L, SEEK_SET ); } p_bigbuffer = p_index = malloc( i_sizebuf+1 ); if( !p_bigbuffer ) { - intf_ErrMsg( "config error: couldn't malloc bigbuffer" ); + msg_Err( p_this, "out of memory" ); if( file ) fclose( file ); free( psz_filename ); - vlc_mutex_unlock( &p_main->config_lock ); + vlc_mutex_unlock( &p_this->p_vlc->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; @@ -583,28 +1006,32 @@ int config_SaveConfigFile( const char *psz_module_name ) { if( (p_line[0] == '[') && (p_index2 = strchr(p_line,']'))) { + /* we found a section, check if we need to do a backup */ - for( p_module = p_module_bank->first; p_module != NULL; - p_module = p_module->next ) + for( i_index = 0; i_index < p_list->i_count; i_index++ ) { - if( ((p_index2 - &p_line[1]) == strlen(p_module->psz_name) ) && - !memcmp( &p_line[1], p_module->psz_name, - strlen(p_module->psz_name) ) ) + 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_module->psz_name ) ) + else if( !strcmp( psz_module_name, + p_parser->psz_object_name ) ) break; } } - if( !p_module ) + 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; - intf_WarnMsg( 5, "config: backing up config for " - "unknown module <%s>", &p_line[1] ); + msg_Dbg( p_this, "backing up config for unknown module \"%s\"", + &p_line[1] ); *p_index2 = ']'; b_backup = 1; @@ -631,67 +1058,89 @@ int config_SaveConfigFile( const char *psz_module_name ) * Save module config in file */ - file = fopen( psz_filename, "w" ); + file = fopen( psz_filename, "wt" ); if( !file ) { - intf_WarnMsg( 1, "config: couldn't open config file %s for writing", - psz_filename ); + msg_Warn( p_this, "could not open config file %s for writing", + psz_filename ); free( psz_filename ); - vlc_mutex_unlock( &p_main->config_lock ); + vlc_list_release( p_list ); + vlc_mutex_unlock( &p_this->p_vlc->config_lock ); return -1; } fprintf( file, "###\n### " COPYRIGHT_MESSAGE "\n###\n\n" ); /* Look for the selected module, if NULL then save everything */ - for( p_module = p_module_bank->first ; p_module != NULL ; - p_module = p_module->next ) + 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( psz_module_name && strcmp( psz_module_name, p_module->psz_name ) ) + if( psz_module_name && strcmp( psz_module_name, + p_parser->psz_object_name ) ) continue; - if( !p_module->i_config_items ) + if( !p_parser->i_config_items ) continue; - intf_WarnMsg( 5, "config: saving config for module <%s>", - p_module->psz_name ); - - fprintf( file, "[%s]\n", p_module->psz_name ); + msg_Dbg( p_this, "saving config for module \"%s\"", + p_parser->psz_object_name ); - if( p_module->psz_longname ) - fprintf( file, "###\n### %s\n###\n", p_module->psz_longname ); + 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_module->p_config; - p_item->i_type != MODULE_CONFIG_HINT_END; + for( p_item = p_parser->p_config; + p_item->i_type != CONFIG_HINT_END; p_item++ ) { - if( p_item->i_type & MODULE_CONFIG_HINT ) + char *psz_key; + if( p_item->i_type & CONFIG_HINT ) /* ignore hints */ continue; switch( p_item->i_type ) { - case MODULE_CONFIG_ITEM_BOOL: - case MODULE_CONFIG_ITEM_INTEGER: + 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 == MODULE_CONFIG_ITEM_BOOL) ? - _("") : _("") ); - fprintf( file, "%s=%i\n", p_item->psz_name, - p_item->i_value ); + fprintf( file, "# %s (%s)\n", p_item->psz_text, + (p_item->i_type == CONFIG_ITEM_BOOL) ? + _("boolean") : _("integer") ); + if( p_item->i_value == p_item->i_value_orig ) + fprintf( file, "#" ); + fprintf( file, "%s=%i\n", p_item->psz_name, p_item->i_value ); break; - - case MODULE_CONFIG_ITEM_FLOAT: + case CONFIG_ITEM_KEY: if( p_item->psz_text ) - fprintf( file, _("# %s \n"), p_item->psz_text ); + fprintf( file, "# %s (%s)\n", p_item->psz_text, + _("key") ); + psz_key = ConfigKeyToString( p_item->i_value ); + fprintf( file, "%s=%s\n", p_item->psz_name, + psz_key ? psz_key : "" ); + if ( psz_key ) free( psz_key ); + break; + + case CONFIG_ITEM_FLOAT: + if( p_item->psz_text ) + fprintf( file, "# %s (%s)\n", p_item->psz_text, + _("float") ); + if( p_item->f_value == p_item->f_value_orig ) + fprintf( file, "#" ); fprintf( file, "%s=%f\n", p_item->psz_name, (double)p_item->f_value ); break; default: if( p_item->psz_text ) - fprintf( file, _("# %s \n"), p_item->psz_text ); + fprintf( file, "# %s (%s)\n", p_item->psz_text, + _("string") ); + if( (!p_item->psz_value && !p_item->psz_value_orig) || + (p_item->psz_value && p_item->psz_value_orig && + !strcmp( p_item->psz_value, p_item->psz_value_orig )) ) + fprintf( file, "#" ); fprintf( file, "%s=%s\n", p_item->psz_name, p_item->psz_value ? p_item->psz_value : "" ); } @@ -700,6 +1149,7 @@ int config_SaveConfigFile( const char *psz_module_name ) fprintf( file, "\n" ); } + vlc_list_release( p_list ); /* * Restore old settings from the config in file @@ -709,7 +1159,7 @@ int config_SaveConfigFile( const char *psz_module_name ) fclose( file ); free( psz_filename ); - vlc_mutex_unlock( &p_main->config_lock ); + vlc_mutex_unlock( &p_this->p_vlc->config_lock ); return 0; } @@ -723,23 +1173,23 @@ int config_SaveConfigFile( const char *psz_module_name ) * 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( int *pi_argc, char *ppsz_argv[], - boolean_t b_ignore_errors ) +int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[], + vlc_bool_t b_ignore_errors ) { - int i_cmd, i_index, i_opts, i_shortopts; - module_t *p_module; + int i_cmd, i_index, i_opts, i_shortopts, flag, i_verbose = 0; + module_t *p_parser; + vlc_list_t *p_list; module_config_t *p_item; 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_main->i_argc = *pi_argc; - p_main->ppsz_argv = ppsz_argv; - - p_main->p_channel = NULL; + p_this->p_vlc->i_argc = *pi_argc; + p_this->p_vlc->ppsz_argv = ppsz_argv; #ifdef SYS_DARWIN /* When vlc.app is run by double clicking in Mac OS X, the 2nd arg @@ -757,80 +1207,150 @@ int config_LoadCmdLine( int *pi_argc, char *ppsz_argv[], #endif *pi_argc = *pi_argc - 1; pi_argc--; - return( 0 ); + return 0; } #endif + /* List all modules */ + p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + /* - * Generate the longopts and shortopts structure used by getopt_long + * Generate the longopts and shortopts structures used by getopt_long */ i_opts = 0; - for( p_module = p_module_bank->first; - p_module != NULL ; - p_module = p_module->next ) + 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). */ - i_opts += p_module->i_config_items; + * longopts). We also need to allocate space for too 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 ) { - intf_ErrMsg( "config error: couldn't allocate p_longopts" ); - return( -1 ); + 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 ) { - intf_ErrMsg( "config error: couldn't allocate psz_shortopts" ); + msg_Err( p_this, "out of memory" ); free( p_longopts ); - return( -1 ); + 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 = (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_vlc->ppsz_argv, + *pi_argc * sizeof(char *) ); } - psz_shortopts[0] = 'v'; - i_shortopts = 1; + i_shortopts = 0; for( i_index = 0; i_index < 256; i_index++ ) { pp_shortopts[i_index] = NULL; } - /* Fill the longopts structure */ + /* Fill the p_longopts and psz_shortopts structures */ i_index = 0; - for( p_module = p_module_bank->first ; - p_module != NULL ; - p_module = p_module->next ) + for( i_modules_index = 0; i_modules_index < p_list->i_count; + i_modules_index++ ) { - for( p_item = p_module->p_config; - p_item->i_type != MODULE_CONFIG_HINT_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_item->i_type != CONFIG_HINT_END; p_item++ ) { - if( p_item->i_type & MODULE_CONFIG_HINT ) - /* ignore hints */ + /* Ignore hints */ + if( p_item->i_type & CONFIG_HINT ) continue; - p_longopts[i_index].name = p_item->psz_name; + + /* 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 == MODULE_CONFIG_ITEM_BOOL)? + (p_item->i_type == CONFIG_ITEM_BOOL)? no_argument : required_argument; - p_longopts[i_index].flag = 0; + 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 != MODULE_CONFIG_ITEM_BOOL ) + 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++; + } } } - i_index++; } } + /* 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'; @@ -847,26 +1367,33 @@ int config_LoadCmdLine( int *pi_argc, char *ppsz_argv[], 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_longopts[i_index].name ); + p_conf = config_FindConfig( p_this, psz_name ); - switch( p_conf->i_type ) + if( p_conf ) switch( p_conf->i_type ) { - case MODULE_CONFIG_ITEM_STRING: - case MODULE_CONFIG_ITEM_FILE: - case MODULE_CONFIG_ITEM_PLUGIN: - config_PutPszVariable( p_longopts[i_index].name, optarg ); + case CONFIG_ITEM_STRING: + case CONFIG_ITEM_FILE: + case CONFIG_ITEM_DIRECTORY: + case CONFIG_ITEM_MODULE: + config_PutPsz( p_this, psz_name, optarg ); + break; + case CONFIG_ITEM_INTEGER: + config_PutInt( p_this, psz_name, atoi(optarg)); break; - case MODULE_CONFIG_ITEM_INTEGER: - config_PutIntVariable( p_longopts[i_index].name, atoi(optarg)); + case CONFIG_ITEM_FLOAT: + config_PutFloat( p_this, psz_name, (float)atof(optarg) ); break; - case MODULE_CONFIG_ITEM_FLOAT: - config_PutFloatVariable( p_longopts[i_index].name, - (float)atof(optarg) ); + case CONFIG_ITEM_KEY: + config_PutInt( p_this, psz_name, ConfigStringToKey( optarg ) ); break; - case MODULE_CONFIG_ITEM_BOOL: - config_PutIntVariable( p_longopts[i_index].name, 1 ); + case CONFIG_ITEM_BOOL: + config_PutInt( p_this, psz_name, !flag ); break; } @@ -878,52 +1405,82 @@ int config_LoadCmdLine( int *pi_argc, char *ppsz_argv[], { switch( pp_shortopts[i_cmd]->i_type ) { - case MODULE_CONFIG_ITEM_STRING: - case MODULE_CONFIG_ITEM_FILE: - case MODULE_CONFIG_ITEM_PLUGIN: - config_PutPszVariable( pp_shortopts[i_cmd]->psz_name, optarg ); + case CONFIG_ITEM_STRING: + case CONFIG_ITEM_FILE: + case CONFIG_ITEM_DIRECTORY: + case CONFIG_ITEM_MODULE: + config_PutPsz( p_this, pp_shortopts[i_cmd]->psz_name, optarg ); break; - case MODULE_CONFIG_ITEM_INTEGER: - config_PutIntVariable( pp_shortopts[i_cmd]->psz_name, - atoi(optarg)); + 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, + atoi(optarg) ); + } break; - case MODULE_CONFIG_ITEM_BOOL: - config_PutIntVariable( pp_shortopts[i_cmd]->psz_name, 1 ); + case CONFIG_ITEM_BOOL: + config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name, 1 ); break; } continue; } - /* Either it's a -v or it's an unknown short option */ - if( i_cmd == 'v' ) - { - p_main->i_warning_level++; - continue; - } - /* Internal error: unknown option */ if( !b_ignore_errors ) { - intf_ErrMsg( "config error: unknown option `%s'", - ppsz_argv[optind-1] ); - intf_Msg( "Try `%s --help' for more information.\n", - p_main->psz_arg0 ); + fprintf( stderr, "%s: unknown option ", + p_this->p_vlc->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_vlc->psz_object_name ); free( p_longopts ); free( psz_shortopts ); - return( -1 ); + return -1; } } - if( p_main->i_warning_level < 0 ) - { - p_main->i_warning_level = 0; - } - + /* 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 ); - return( 0 ); + if( b_ignore_errors ) free( ppsz_argv ); + + return 0; } /***************************************************************************** @@ -941,6 +1498,44 @@ char *config_GetHomeDir( void ) struct passwd *p_pw = NULL; #endif +#if defined(WIN32) || defined(UNDER_CE) + typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD, + LPTSTR ); +# define CSIDL_FLAG_CREATE 0x8000 +# define CSIDL_APPDATA 0x1A +# define SHGFP_TYPE_CURRENT 0 + + HINSTANCE shfolder_dll; + SHGETFOLDERPATH SHGetFolderPath ; + + /* load the shfolder dll to retrieve SHGetFolderPath */ + if( ( shfolder_dll = LoadLibrary("shfolder.dll") ) != NULL ) + { + SHGetFolderPath = (void *)GetProcAddress( shfolder_dll, + "SHGetFolderPathA" ); + if ( SHGetFolderPath != NULL ) + { + p_homedir = (char *)malloc( MAX_PATH ); + if( !p_homedir ) + { + return NULL; + } + + /* get the "Application Data" folder for the current user */ + if( S_OK == SHGetFolderPath( NULL, + CSIDL_APPDATA | CSIDL_FLAG_CREATE, + NULL, SHGFP_TYPE_CURRENT, + p_homedir ) ) + { + FreeLibrary( shfolder_dll ); + return p_homedir; + } + free( p_homedir ); + } + FreeLibrary( shfolder_dll ); + } +#endif + #if defined(HAVE_GETPWUID) if( ( p_pw = getpwuid( getuid() ) ) == NULL ) #endif @@ -949,15 +1544,11 @@ char *config_GetHomeDir( void ) { if( ( p_tmp = getenv( "TMP" ) ) == NULL ) { - p_homedir = strdup( "/tmp" ); + p_tmp = "/tmp"; } - else p_homedir = strdup( p_tmp ); - - intf_ErrMsg( "config error: unable to get home directory, " - "using %s instead", p_homedir ); - } - else p_homedir = strdup( p_tmp ); + + p_homedir = strdup( p_tmp ); } #if defined(HAVE_GETPWUID) else @@ -968,3 +1559,65 @@ char *config_GetHomeDir( void ) return p_homedir; } + + +static int ConfigStringToKey( char *psz_key ) +{ + int i_key = 0; + unsigned int i; + char *psz_parser = strchr( psz_key, '-' ); + while( psz_parser && psz_parser != psz_key ) + { + for( i = 0; i < sizeof(modifiers) / sizeof(key_descriptor_t); i++ ) + { + if( !strncasecmp( modifiers[i].psz_key_string, psz_key, + strlen( modifiers[i].psz_key_string ) ) ) + { + i_key |= modifiers[i].i_key_code; + } + } + psz_key = psz_parser + 1; + psz_parser = strchr( psz_key, '-' ); + } + for( i = 0; i < sizeof(keys) / sizeof( key_descriptor_t ); i++ ) + { + if( !strcasecmp( keys[i].psz_key_string, psz_key ) ) + { + i_key |= 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(modifiers) / sizeof(key_descriptor_t)); + index++ ) + { + if( i_key & modifiers[index].i_key_code ) + { + p += sprintf( p, "%s-", modifiers[index].psz_key_string ); + } + } + for( index = 0; index < (sizeof(keys) / sizeof( key_descriptor_t)); + index++) + { + if( (int)( i_key & ~KEY_MODIFIER ) == keys[index].i_key_code ) + { + p += sprintf( p, "%s", keys[index].psz_key_string ); + break; + } + } + return psz_key; +}