* configuration.c management of the modules configuration
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: configuration.c,v 1.37 2002/08/15 12:11:15 sam Exp $
+ * $Id: configuration.c,v 1.51 2003/02/20 01:52:47 sigmunau Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
#include <stdio.h> /* sprintf() */
#include <stdlib.h> /* free(), strtol() */
#include <string.h> /* strdup() */
-#include <errno.h> /* errno */
+#ifdef HAVE_ERRNO_H
+# include <errno.h> /* errno */
+#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h> /* getuid() */
# include <getopt.h> /* getopt() */
# endif
#else
-# include "GNUgetopt/getopt.h"
+# include "../extras/getopt.h"
#endif
#if defined(HAVE_GETPWUID)
-#include <pwd.h> /* getpwuid() */
+# include <pwd.h> /* getpwuid() */
#endif
-#include <sys/stat.h>
-#include <sys/types.h>
+#if defined( HAVE_SYS_STAT_H )
+# include <sys/stat.h>
+#endif
+#if defined( HAVE_SYS_TYPES_H )
+# include <sys/types.h>
+#endif
+#if defined( WIN32 ) && !defined( UNDER_CE )
+# include <direct.h>
+#endif
/*****************************************************************************
* config_GetInt: get the value of an int variable
* represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE,
* and CONFIG_ITEM_MODULE).
*****************************************************************************/
-void __config_PutPsz( vlc_object_t *p_this,
+void __config_PutPsz( vlc_object_t *p_this,
const char *psz_name, const char *psz_value )
{
module_config_t *p_config;
return;
}
- p_config->i_value = 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;
+ }
if( p_config->pf_callback )
{
return;
}
- p_config->f_value = 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;
+ }
if( p_config->pf_callback )
{
*****************************************************************************/
module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name )
{
- vlc_list_t *p_list;
- module_t **pp_parser;
+ vlc_list_t *p_list;
+ module_t *p_parser;
module_config_t *p_item;
+ int i_index;
if( !psz_name ) return NULL;
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( i_index = 0; i_index < p_list->i_count; i_index++ )
{
- if( !(*pp_parser)->i_config_items )
+ p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+
+ if( !p_parser->i_config_items )
continue;
- for( p_item = (*pp_parser)->p_config;
+ for( p_item = p_parser->p_config;
p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
p_module->p_config[i].i_type = p_orig[i].i_type;
p_module->p_config[i].i_short = p_orig[i].i_short;
p_module->p_config[i].i_value = p_orig[i].i_value;
+ p_module->p_config[i].i_min = p_orig[i].i_min;
+ p_module->p_config[i].i_max = p_orig[i].i_max;
p_module->p_config[i].f_value = p_orig[i].f_value;
+ p_module->p_config[i].f_min = p_orig[i].f_min;
+ p_module->p_config[i].f_max = p_orig[i].f_max;
p_module->p_config[i].b_dirty = p_orig[i].b_dirty;
+ p_module->p_config[i].b_advanced = p_orig[i].b_advanced;
p_module->p_config[i].psz_type = p_orig[i].psz_type ?
strdup( _(p_orig[i].psz_type) ) : NULL;
p_module->p_config[i].ppsz_list[j] = NULL;
}
- /* the callback pointer is only valid when the module is loaded so this
- * value is set in module_activate() and reset in module_deactivate() */
- p_module->p_config[i].pf_callback = NULL;
+ p_module->p_config[i].pf_callback = p_orig[i].pf_callback;
}
}
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 );
- }
+ {
+ 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 );
*****************************************************************************/
int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{
- vlc_list_t *p_list;
- module_t **pp_parser;
+ 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;
+ int i_index;
psz_homedir = p_this->p_vlc->psz_homedir;
if( !psz_homedir )
/* Look for the selected module, if NULL then save everything */
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( 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, (*pp_parser)->psz_object_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((*pp_parser)->psz_object_name))
- && !memcmp( &line[1], (*pp_parser)->psz_object_name,
- strlen((*pp_parser)->psz_object_name) ) )
+ && (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) ) )
{
#if 0
msg_Dbg( p_this, "loading config for module \"%s\"",
- (*pp_parser)->psz_object_name );
+ p_parser->psz_object_name );
#endif
break;
*p_index = (char)0;
psz_option_value = p_index + 1;
- if( !(*pp_parser)->i_config_items )
+ if( !p_parser->i_config_items )
{
continue;
}
/* try to match this option with one of the module's options */
- for( p_item = (*pp_parser)->p_config;
+ for( p_item = p_parser->p_config;
p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
}
}
-
+
vlc_list_release( p_list );
fclose( file );
*
* 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
*****************************************************************************/
int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{
- module_t **pp_parser;
+ module_t *p_parser;
vlc_list_t *p_list;
module_config_t *p_item;
FILE *file;
char *p_bigbuffer, *p_index;
vlc_bool_t b_backup;
char *psz_filename, *psz_homedir;
+ int i_index;
/* Acquire config file lock */
vlc_mutex_lock( &p_this->p_vlc->config_lock );
}
sprintf( psz_filename, "%s/" CONFIG_DIR, psz_homedir );
-#ifndef WIN32
- if( mkdir( psz_filename, 0755 ) && errno != EEXIST )
-#else
+#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 )
-#endif
+# else
+ if( mkdir( psz_filename, 0755 ) && errno != EEXIST )
+# endif
{
msg_Err( p_this, "could not create %s (%s)",
psz_filename, strerror(errno) );
}
+#else
+ if( mkdir( psz_filename ) )
+ {
+ msg_Err( p_this, "could not create %s", psz_filename );
+ }
+
+#endif
+
strcat( psz_filename, "/" CONFIG_FILE );
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 );
{
/* we found a section, check if we need to do a backup */
- for( pp_parser = (module_t **)p_list->pp_objects ;
- *pp_parser ;
- pp_parser++ )
+ 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])
- == strlen((*pp_parser)->psz_object_name) ) &&
- !memcmp( &p_line[1], (*pp_parser)->psz_object_name,
- strlen((*pp_parser)->psz_object_name) ) )
+ == (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,
- (*pp_parser)->psz_object_name ) )
+ p_parser->psz_object_name ) )
break;
}
}
- if( !(*pp_parser) )
+ if( i_index == p_list->i_count )
{
/* we don't have this section in our list so we need to back
* it up */
fprintf( file, "###\n### " COPYRIGHT_MESSAGE "\n###\n\n" );
/* Look for the selected module, if NULL then save everything */
- for( pp_parser = (module_t **)p_list->pp_objects ;
- *pp_parser ;
- pp_parser++ )
+ 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,
- (*pp_parser)->psz_object_name ) )
+ p_parser->psz_object_name ) )
continue;
- if( !(*pp_parser)->i_config_items )
+ if( !p_parser->i_config_items )
continue;
msg_Dbg( p_this, "saving config for module \"%s\"",
- (*pp_parser)->psz_object_name );
+ p_parser->psz_object_name );
- fprintf( file, "[%s]", (*pp_parser)->psz_object_name );
- if( (*pp_parser)->psz_longname )
- fprintf( file, " # %s\n\n", (*pp_parser)->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 = (*pp_parser)->p_config;
+ for( p_item = p_parser->p_config;
p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
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, flag;
- module_t **pp_parser;
+ 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];
*/
i_opts = 0;
- for( pp_parser = (module_t **)p_list->pp_objects ;
- *pp_parser ;
- pp_parser++ )
+ 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 too options when
* dealing with boolean to allow for --foo and --no-foo */
- i_opts += (*pp_parser)->i_config_items
- + 2 * (*pp_parser)->i_bool_items;
+ i_opts += p_parser->i_config_items
+ + 2 * p_parser->i_bool_items;
}
p_longopts = malloc( sizeof(struct option) * (i_opts + 1) );
/* Fill the p_longopts and psz_shortopts structures */
i_index = 0;
- for( pp_parser = (module_t **)p_list->pp_objects ;
- *pp_parser ;
- pp_parser++ )
+ for( i_modules_index = 0; i_modules_index < p_list->i_count;
+ i_modules_index++ )
{
- if( !(*pp_parser)->i_config_items )
+ p_parser = (module_t *)p_list->p_values[i_modules_index].p_object ;
+
+ if( !p_parser->i_config_items )
continue;
- for( p_item = (*pp_parser)->p_config;
+ for( p_item = p_parser->p_config;
p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
{
psz_shortopts[i_shortopts] = ':';
i_shortopts++;
+
+ if( p_item->i_short == 'v' )
+ {
+ psz_shortopts[i_shortopts] = ':';
+ i_shortopts++;
+ }
}
}
}
config_PutPsz( p_this, pp_shortopts[i_cmd]->psz_name, optarg );
break;
case CONFIG_ITEM_INTEGER:
- config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name,
- atoi(optarg));
+ 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 CONFIG_ITEM_BOOL:
config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name, 1 );
/* Internal error: unknown option */
if( !b_ignore_errors )
{
- fprintf( stderr, "unknown option `%s'\n", ppsz_argv[optind-1] );
+ 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 );
struct passwd *p_pw = NULL;
#endif
-#ifdef WIN32
+#if defined(WIN32) || defined(UNDER_CE)
typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD,
LPTSTR );
# define CSIDL_FLAG_CREATE 0x8000
projects / vlc / blobdiff