* configuration.c management of the modules configuration
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: configuration.c,v 1.28 2002/06/01 18:04:49 sam Exp $
+ * $Id: configuration.c,v 1.39 2002/09/29 18:19:53 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
# include <getopt.h> /* getopt() */
# endif
#else
-# include "GNUgetopt/getopt.h"
+# include "extras/GNUgetopt/getopt.h"
#endif
#if defined(HAVE_GETPWUID)
* 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_GetInt( vlc_object_t *p_this, const char *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_BOOL) )
{
msg_Err( p_this, "option %s does not refer to an int", psz_name );
return -1;
* 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_GetFloat( vlc_object_t *p_this, const char *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 )
{
msg_Err( p_this, "option %s does not refer to a float", psz_name );
return -1;
* 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_MODULE).
+ * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE,
+ * 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_GetPsz( vlc_object_t *p_this, const char *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_MODULE) )
+ if( (p_config->i_type!=CONFIG_ITEM_STRING) &&
+ (p_config->i_type!=CONFIG_ITEM_FILE) &&
+ (p_config->i_type!=CONFIG_ITEM_MODULE) )
{
msg_Err( p_this, "option %s does not refer to a string", psz_name );
return NULL;
* 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_MODULE).
+ * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE,
+ * and CONFIG_ITEM_MODULE).
*****************************************************************************/
void __config_PutPsz( vlc_object_t *p_this,
- const char *psz_name, char *psz_value )
+ const char *psz_name, const char *psz_value )
{
module_config_t *p_config;
msg_Err( 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_MODULE) )
+ if( (p_config->i_type!=CONFIG_ITEM_STRING) &&
+ (p_config->i_type!=CONFIG_ITEM_FILE) &&
+ (p_config->i_type!=CONFIG_ITEM_MODULE) )
{
msg_Err( p_this, "option %s does not refer to a string", psz_name );
return;
* 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_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value )
{
msg_Err( 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_BOOL) )
{
msg_Err( p_this, "option %s does not refer to an int", psz_name );
return;
* 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_PutFloat( vlc_object_t *p_this,
const char *psz_name, float f_value )
msg_Err( 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 )
{
msg_Err( p_this, "option %s does not refer to a float", psz_name );
return;
* 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 )
{
- module_t *p_module;
+ vlc_list_t *p_list;
+ module_t **pp_parser;
module_config_t *p_item;
if( !psz_name ) return NULL;
- for( p_module = p_this->p_vlc->module_bank.first ;
- p_module != NULL ;
- p_module = p_module->next )
+ p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+
+ for( pp_parser = (module_t **)p_list->pp_objects ;
+ *pp_parser ;
+ pp_parser++ )
{
- for( p_item = p_module->p_config;
- p_item->i_type != MODULE_CONFIG_HINT_END;
+ if( !(*pp_parser)->i_config_items )
+ continue;
+
+ for( p_item = (*pp_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;
}
*****************************************************************************/
void config_Duplicate( module_t *p_module, module_config_t *p_orig )
{
- int i, i_lines = 1;
+ int i, j, i_lines = 1;
module_config_t *p_item;
/* Calculate the structure length */
p_module->i_config_items = 0;
p_module->i_bool_items = 0;
- for( p_item = p_orig; p_item->i_type != MODULE_CONFIG_HINT_END; p_item++ )
+ for( p_item = p_orig; p_item->i_type != CONFIG_HINT_END; p_item++ )
{
i_lines++;
- if( p_item->i_type & MODULE_CONFIG_ITEM )
+ if( p_item->i_type & CONFIG_ITEM )
{
p_module->i_config_items++;
}
- if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL )
+ if( p_item->i_type == CONFIG_ITEM_BOOL )
{
p_module->i_bool_items++;
}
return;
}
- /* Initialize the global lock */
- vlc_mutex_init( p_module, &p_module->config_lock );
-
/* Do the duplication job */
for( i = 0; i < i_lines ; i++ )
{
p_module->p_config[i].f_value = p_orig[i].f_value;
p_module->p_config[i].b_dirty = p_orig[i].b_dirty;
+ 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 ?
p_module->p_config[i].psz_longtext = p_orig[i].psz_longtext ?
strdup( _(p_orig[i].psz_longtext) ) : NULL;
p_module->p_config[i].psz_value = p_orig[i].psz_value ?
- strdup( _(p_orig[i].psz_value) ) : NULL;
+ strdup( p_orig[i].psz_value ) : NULL;
- p_module->p_config[i].p_lock = &p_module->config_lock;
+ p_module->p_config[i].p_lock = &p_module->object_lock;
- /* the callback pointer is only valid when the module is loaded so this
- * value is set in ActivateModule() and reset in DeactivateModule() */
- p_module->p_config[i].pf_callback = NULL;
+ /* duplicate the string list */
+ p_module->p_config[i].ppsz_list = NULL;
+ if( p_orig[i].ppsz_list )
+ {
+ for( j = 0; p_orig[i].ppsz_list[j]; j++ );
+ p_module->p_config[i].ppsz_list = malloc( (j+1) *sizeof(char *) );
+ if( p_module->p_config[i].ppsz_list )
+ {
+ for( j = 0; p_orig[i].ppsz_list[j]; 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;
+ }
+
+ p_module->p_config[i].pf_callback = p_orig[i].pf_callback;
}
}
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 != MODULE_CONFIG_HINT_END ; p_item++ )
+ 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->ppsz_list )
+ {
+ for( i = 0; p_item->ppsz_list[i]; i++ )
+ free(p_item->ppsz_list[i]);
+ free( p_item->ppsz_list );
+ }
}
free( p_module->p_config );
p_module->p_config = NULL;
-
- /* Remove the global lock */
- vlc_mutex_destroy( &p_module->config_lock );
}
/*****************************************************************************
*****************************************************************************/
void config_SetCallbacks( module_config_t *p_new, module_config_t *p_orig )
{
- while( p_new->i_type != MODULE_CONFIG_HINT_END )
+ while( p_new->i_type != CONFIG_HINT_END )
{
p_new->pf_callback = p_orig->pf_callback;
p_new++;
*****************************************************************************/
void config_UnsetCallbacks( module_config_t *p_new )
{
- while( p_new->i_type != MODULE_CONFIG_HINT_END )
+ while( p_new->i_type != CONFIG_HINT_END )
{
p_new->pf_callback = NULL;
p_new++;
*****************************************************************************/
int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{
- module_t *p_module;
+ vlc_list_t *p_list;
+ module_t **pp_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_this->p_vlc->config_lock );
-
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( strlen("/" CONFIG_DIR "/" CONFIG_FILE) +
if( !psz_filename )
{
msg_Err( p_this, "out of memory" );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
return -1;
}
sprintf( psz_filename, "%s/" CONFIG_DIR "/" CONFIG_FILE, psz_homedir );
msg_Dbg( p_this, "opening config file %s", psz_filename );
+ /* Acquire config file lock */
+ vlc_mutex_lock( &p_this->p_vlc->config_lock );
+
file = fopen( psz_filename, "rt" );
if( !file )
{
}
/* Look for the selected module, if NULL then save everything */
- for( p_module = p_this->p_vlc->module_bank.first ; p_module != NULL ;
- p_module = p_module->next )
+ p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+
+ for( pp_parser = (module_t **)p_list->pp_objects ;
+ *pp_parser ;
+ pp_parser++ )
{
if( psz_module_name
- && strcmp( psz_module_name, p_module->psz_object_name ) )
+ && strcmp( psz_module_name, (*pp_parser)->psz_object_name ) )
{
continue;
}
rewind( file );
while( fgets( line, 1024, file ) )
{
- if( (line[0] == '[') && (p_index = strchr(line,']')) &&
- (p_index - &line[1] == strlen(p_module->psz_object_name) ) &&
- !memcmp( &line[1], p_module->psz_object_name,
- strlen(p_module->psz_object_name) ) )
+ if( (line[0] == '[')
+ && (p_index = strchr(line,']'))
+ && (p_index - &line[1] == strlen((*pp_parser)->psz_object_name))
+ && !memcmp( &line[1], (*pp_parser)->psz_object_name,
+ strlen((*pp_parser)->psz_object_name) ) )
{
- msg_Dbg( p_this, "loading config for module <%s>",
- p_module->psz_object_name );
+#if 0
+ msg_Dbg( p_this, "loading config for module \"%s\"",
+ (*pp_parser)->psz_object_name );
+#endif
break;
}
*p_index = (char)0;
psz_option_value = p_index + 1;
+ if( !(*pp_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 = (*pp_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;
/* 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);
- msg_Dbg( p_this, "found <%s> option %s=%i",
- p_module->psz_object_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);
- msg_Dbg( p_this, "found <%s> option %s=%f",
- p_module->psz_object_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;
default:
vlc_mutex_unlock( p_item->p_lock );
- msg_Dbg( p_this, "found <%s> option %s=%s",
- p_module->psz_object_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;
}
}
}
+ vlc_list_release( p_list );
+
fclose( file );
free( psz_filename );
*****************************************************************************/
int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{
- module_t *p_module;
+ module_t **pp_parser;
+ vlc_list_t *p_list;
module_config_t *p_item;
FILE *file;
char p_line[1024], *p_index2;
}
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;
{
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_this->p_vlc->module_bank.first; p_module != NULL;
- p_module = p_module->next )
+ for( pp_parser = (module_t **)p_list->pp_objects ;
+ *pp_parser ;
+ pp_parser++ )
{
if( ((p_index2 - &p_line[1])
- == strlen(p_module->psz_object_name) ) &&
- !memcmp( &p_line[1], p_module->psz_object_name,
- strlen(p_module->psz_object_name) ) )
+ == strlen((*pp_parser)->psz_object_name) ) &&
+ !memcmp( &p_line[1], (*pp_parser)->psz_object_name,
+ strlen((*pp_parser)->psz_object_name) ) )
{
if( !psz_module_name )
break;
else if( !strcmp( psz_module_name,
- p_module->psz_object_name ) )
+ (*pp_parser)->psz_object_name ) )
break;
}
}
- if( !p_module )
+ if( !(*pp_parser) )
{
/* we don't have this section in our list so we need to back
* it up */
*p_index2 = 0;
- msg_Dbg( p_this, "backing up config for unknown module <%s>",
+ msg_Dbg( p_this, "backing up config for unknown module \"%s\"",
&p_line[1] );
*p_index2 = ']';
msg_Warn( p_this, "could not open config file %s for writing",
psz_filename );
free( psz_filename );
+ 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_this->p_vlc->module_bank.first ; p_module != NULL ;
- p_module = p_module->next )
+ for( pp_parser = (module_t **)p_list->pp_objects ;
+ *pp_parser ;
+ pp_parser++ )
{
if( psz_module_name && strcmp( psz_module_name,
- p_module->psz_object_name ) )
+ (*pp_parser)->psz_object_name ) )
continue;
- if( !p_module->i_config_items )
+ if( !(*pp_parser)->i_config_items )
continue;
- msg_Dbg( p_this, "saving config for module <%s>",
- p_module->psz_object_name );
+ msg_Dbg( p_this, "saving config for module \"%s\"",
+ (*pp_parser)->psz_object_name );
- fprintf( file, "[%s]", p_module->psz_object_name );
- if( p_module->psz_longname )
- fprintf( file, " # %s\n\n", p_module->psz_longname );
+ fprintf( file, "[%s]", (*pp_parser)->psz_object_name );
+ if( (*pp_parser)->psz_longname )
+ fprintf( file, " # %s\n\n", (*pp_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 = (*pp_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;
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) ?
+ (p_item->i_type == CONFIG_ITEM_BOOL) ?
_("boolean") : _("integer") );
fprintf( file, "%s=%i\n", p_item->psz_name, p_item->i_value );
break;
- case MODULE_CONFIG_ITEM_FLOAT:
+ case CONFIG_ITEM_FLOAT:
if( p_item->psz_text )
fprintf( file, "# %s (%s)\n", p_item->psz_text,
_("float") );
fprintf( file, "\n" );
}
+ vlc_list_release( p_list );
/*
* Restore old settings from the config in file
vlc_bool_t b_ignore_errors )
{
int i_cmd, i_index, i_opts, i_shortopts, flag;
- module_t *p_module;
+ module_t **pp_parser;
+ vlc_list_t *p_list;
module_config_t *p_item;
struct option *p_longopts;
}
#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( p_module = p_this->p_vlc->module_bank.first;
- p_module != NULL ;
- p_module = p_module->next )
+ for( pp_parser = (module_t **)p_list->pp_objects ;
+ *pp_parser ;
+ pp_parser++ )
{
/* count the number of exported configuration options (to allocate
* longopts). We also need to allocate space for too options when
* dealing with boolean to allow for --foo and --no-foo */
- i_opts += (p_module->i_config_items + p_module->i_bool_items);
+ i_opts += (*pp_parser)->i_config_items
+ + 2 * (*pp_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;
}
{
msg_Err( p_this, "out of memory" );
free( p_longopts );
+ vlc_list_release( p_list );
return -1;
}
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,
/* Fill the p_longopts and psz_shortopts structures */
i_index = 0;
- for( p_module = p_this->p_vlc->module_bank.first ;
- p_module != NULL ;
- p_module = p_module->next )
+ for( pp_parser = (module_t **)p_list->pp_objects ;
+ *pp_parser ;
+ pp_parser++ )
{
- for( p_item = p_module->p_config;
- p_item->i_type != MODULE_CONFIG_HINT_END;
+ if( !(*pp_parser)->i_config_items )
+ continue;
+
+ for( p_item = (*pp_parser)->p_config;
+ p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
/* Ignore hints */
- if( p_item->i_type & MODULE_CONFIG_HINT )
+ 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 == MODULE_CONFIG_ITEM_BOOL)?
+ (p_item->i_type == CONFIG_ITEM_BOOL)?
no_argument : required_argument;
p_longopts[i_index].flag = &flag;
p_longopts[i_index].val = 0;
/* When dealing with bools we also need to add the --no-foo
* option */
- if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL )
+ if( p_item->i_type == CONFIG_ITEM_BOOL )
{
- char *psz_name = malloc( strlen(p_item->psz_name) + 4 );
+ 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 );
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++;
}
}
+ /* 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';
module_config_t *p_conf;
char *psz_name = (char *)p_longopts[i_index].name;
- /* Check if we deal with a --no-foo long option */
- if( flag ) psz_name += 3;
+ /* 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 ) switch( p_conf->i_type )
{
- case MODULE_CONFIG_ITEM_STRING:
- case MODULE_CONFIG_ITEM_FILE:
- case MODULE_CONFIG_ITEM_MODULE:
+ case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_MODULE:
config_PutPsz( p_this, psz_name, optarg );
break;
- case MODULE_CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_INTEGER:
config_PutInt( p_this, psz_name, atoi(optarg));
break;
- case MODULE_CONFIG_ITEM_FLOAT:
+ case CONFIG_ITEM_FLOAT:
config_PutFloat( p_this, psz_name, (float)atof(optarg) );
break;
- case MODULE_CONFIG_ITEM_BOOL:
+ case CONFIG_ITEM_BOOL:
config_PutInt( p_this, psz_name, !flag );
break;
}
{
switch( pp_shortopts[i_cmd]->i_type )
{
- case MODULE_CONFIG_ITEM_STRING:
- case MODULE_CONFIG_ITEM_FILE:
- case MODULE_CONFIG_ITEM_MODULE:
+ case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_MODULE:
config_PutPsz( p_this, pp_shortopts[i_cmd]->psz_name, optarg );
break;
- case MODULE_CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_INTEGER:
config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name,
atoi(optarg));
break;
- case MODULE_CONFIG_ITEM_BOOL:
+ case CONFIG_ITEM_BOOL:
config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name, 1 );
break;
}
p_homedir = (char *)malloc( MAX_PATH );
if( !p_homedir )
{
-//X intf_ErrMsg( "config error: couldn't malloc p_homedir" );
return NULL;
}
{
if( ( p_tmp = getenv( "TMP" ) ) == NULL )
{
- p_homedir = strdup( "/tmp" );
+ p_tmp = "/tmp";
}
- else p_homedir = strdup( p_tmp );
-
-//X intf_ErrMsg( "config error: unable to get home directory, "
-//X "using %s instead", p_homedir );
-
}
- else p_homedir = strdup( p_tmp );
+
+ p_homedir = strdup( p_tmp );
}
#if defined(HAVE_GETPWUID)
else
projects / vlc / blobdiff