#include <vlc/vlc.h>
#include "vlc_keys.h"
+#include "charset.h"
#include <stdio.h> /* sprintf() */
#include <stdlib.h> /* free(), strtol() */
#include <string.h> /* strdup() */
#include <errno.h> /* errno */
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
+
#ifdef HAVE_UNISTD_H
# include <unistd.h> /* getuid() */
#endif
#include <tchar.h>
#endif
-
-static int ConfigStringToKey( char * );
+static int ConfigStringToKey( const char * );
static char *ConfigKeyToString( int );
+static inline void freenull (const void *p)
+{
+ if (p != NULL)
+ free ((void *)p);
+}
+
+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));
+}
+
+
/*****************************************************************************
* config_GetType: get the type of a variable (bool, int, float, string)
*****************************************************************************
msg_Err( p_this, "option %s does not exist", psz_name );
return -1;
}
- if( (p_config->i_type!=CONFIG_ITEM_INTEGER) &&
- (p_config->i_type!=CONFIG_ITEM_KEY) &&
- (p_config->i_type!=CONFIG_ITEM_BOOL) )
+
+ 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->i_value;
+ return p_config->value.i;
}
/*****************************************************************************
msg_Err( p_this, "option %s does not exist", psz_name );
return -1;
}
- if( p_config->i_type != CONFIG_ITEM_FLOAT )
+
+ 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->f_value;
+ return p_config->value.f;
}
/*****************************************************************************
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( p_this, psz_name );
msg_Err( p_this, "option %s does not exist", psz_name );
return NULL;
}
- 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_LIST) &&
- (p_config->i_type!=CONFIG_ITEM_MODULE_LIST_CAT) &&
- (p_config->i_type!=CONFIG_ITEM_MODULE_CAT) &&
- (p_config->i_type!=CONFIG_ITEM_MODULE) )
+
+ 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 );
- if( p_config->psz_value ) psz_value = strdup( p_config->psz_value );
+ char *psz_value = strdupnull (p_config->value.psz);
vlc_mutex_unlock( p_config->p_lock );
return psz_value;
msg_Warn( p_this, "option %s does not exist", psz_name );
return;
}
- 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_LIST) &&
- (p_config->i_type!=CONFIG_ITEM_MODULE_CAT) &&
- (p_config->i_type!=CONFIG_ITEM_MODULE_LIST_CAT) &&
- (p_config->i_type!=CONFIG_ITEM_MODULE) )
+
+ 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 = p_config->psz_value;
+ oldval.psz_string = (char *)p_config->value.psz;
- if( psz_value && *psz_value ) p_config->psz_value = strdup( psz_value );
- else p_config->psz_value = NULL;
+ 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 = p_config->psz_value;
+ val.psz_string = (char *)p_config->value.psz;
vlc_mutex_unlock( p_config->p_lock );
msg_Warn( p_this, "option %s does not exist", psz_name );
return;
}
- if( (p_config->i_type!=CONFIG_ITEM_INTEGER) &&
- (p_config->i_type!=CONFIG_ITEM_KEY) &&
- (p_config->i_type!=CONFIG_ITEM_BOOL) )
+
+ 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->i_value;
+ oldval.i_int = p_config->value.i;
/* if i_min == i_max == 0, then do not use them */
- if ((p_config->i_min == 0) && (p_config->i_max == 0))
+ if ((p_config->min.i == 0) && (p_config->max.i == 0))
{
- p_config->i_value = i_value;
+ p_config->value.i = i_value;
}
- else if (i_value < p_config->i_min)
+ else if (i_value < p_config->min.i)
{
- p_config->i_value = p_config->i_min;
+ p_config->value.i = p_config->min.i;
}
- else if (i_value > p_config->i_max)
+ else if (i_value > p_config->max.i)
{
- p_config->i_value = p_config->i_max;
+ p_config->value.i = p_config->max.i;
}
else
{
- p_config->i_value = i_value;
+ p_config->value.i = i_value;
}
p_config->b_dirty = VLC_TRUE;
- val.i_int = p_config->i_value;
+ val.i_int = p_config->value.i;
if( p_config->pf_callback )
{
msg_Warn( p_this, "option %s does not exist", psz_name );
return;
}
- if( p_config->i_type != CONFIG_ITEM_FLOAT )
+
+ 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->f_value;
+ oldval.f_float = p_config->value.f;
/* if f_min == f_max == 0, then do not use them */
- if ((p_config->f_min == 0) && (p_config->f_max == 0))
+ if ((p_config->min.f == 0) && (p_config->max.f == 0))
{
- p_config->f_value = f_value;
+ p_config->value.f = f_value;
}
- else if (f_value < p_config->f_min)
+ else if (f_value < p_config->min.f)
{
- p_config->f_value = p_config->f_min;
+ p_config->value.f = p_config->min.f;
}
- else if (f_value > p_config->f_max)
+ else if (f_value > p_config->max.f)
{
- p_config->f_value = p_config->f_max;
+ p_config->value.f = p_config->max.f;
}
else
{
- p_config->f_value = f_value;
+ p_config->value.f = f_value;
}
p_config->b_dirty = VLC_TRUE;
- val.f_float = p_config->f_value;
+ val.f_float = p_config->value.f;
if( p_config->pf_callback )
{
* 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.
*****************************************************************************/
-void config_Duplicate( module_t *p_module, module_config_t *p_orig )
+void config_Duplicate( module_t *p_module, const module_config_t *p_orig )
{
int i, j, i_lines = 1;
- module_config_t *p_item;
+ const module_config_t *p_item;
/* Calculate the structure length */
p_module->i_config_items = 0;
{
p_module->p_config[i] = p_orig[i];
- p_module->p_config[i].i_value_orig = p_orig[i].i_value;
- p_module->p_config[i].f_value_orig = p_orig[i].f_value;
- p_module->p_config[i].i_value_saved = p_orig[i].i_value;
- p_module->p_config[i].f_value_saved = p_orig[i].f_value;
- p_module->p_config[i].psz_value_saved = 0;
-
- 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_current = p_orig[i].psz_current?
- strdup( p_orig[i].psz_current ) : NULL;
- p_module->p_config[i].psz_text = p_orig[i].psz_text ?
- strdup( _(p_orig[i].psz_text) ) : NULL;
- 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;
- p_module->p_config[i].psz_value_orig = p_orig[i].psz_value ?
- strdup( p_orig[i].psz_value ) : NULL;
+ 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;
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] = p_orig[i].ppsz_list[j] ?
- strdup( p_orig[i].ppsz_list[j] ) : NULL ;
+ 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 =
- malloc( (p_orig[i].i_list + 1) * sizeof(char *) );
+ 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] = _(p_orig[i].ppsz_list_text[j]) ?
- strdup( _(p_orig[i].ppsz_list_text[j] ) ) : NULL ;
+ 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;
}
}
p_module->p_config[i].ppf_action[j] =
p_orig[i].ppf_action[j];
p_module->p_config[i].ppsz_action_text[j] =
- p_orig[i].ppsz_action_text[j] ?
- strdup( p_orig[i].ppsz_action_text[j] ) : NULL;
+ strdupnull (p_orig[i].ppsz_action_text[j]);
}
}
}
}
+
/*****************************************************************************
* config_Free: frees a duplicated module's configuration data.
*****************************************************************************
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->psz_value_saved )
- free( p_item->psz_value_saved );
+ if (IsConfigStringType (p_item->i_type))
+ {
+ freenull (p_item->value.psz);
+ freenull (p_item->orig.psz);
+ freenull (p_item->saved.psz);
+ }
if( p_item->i_list )
{
module_t *p_module;
/* Acquire config file lock */
- vlc_mutex_lock( &p_this->p_vlc->config_lock );
+ vlc_mutex_lock( &p_this->p_libvlc->config_lock );
p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
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;
+ 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))
+ {
+ freenull (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_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
}
/*****************************************************************************
int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{
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, *psz_configfile;
+ char *p_index;
+ char *psz_filename;
int i_index;
- psz_configfile = p_this->p_vlc->psz_configfile;
+ const char *psz_configfile = p_this->p_libvlc->psz_configfile;
if( !psz_configfile || !psz_configfile )
{
- psz_homedir = p_this->p_vlc->psz_homedir;
+ const char *psz_homedir = p_this->p_libvlc->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 );
+
+ if( asprintf( &psz_filename, "%s" DIR_SEP CONFIG_DIR DIR_SEP CONFIG_FILE,
+ psz_homedir ) == -1 )
+ psz_filename = NULL;
}
else
{
msg_Dbg( p_this, "opening config file %s", psz_filename );
/* Acquire config file lock */
- vlc_mutex_lock( &p_this->p_vlc->config_lock );
+ vlc_mutex_lock( &p_this->p_libvlc->config_lock );
- file = fopen( psz_filename, "rt" );
- if( !file )
+ file = utf8_fopen( psz_filename, "rt" );
+ if( file == NULL )
{
msg_Warn( p_this, "config file %s does not exist yet", psz_filename );
free( psz_filename );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return -1;
}
+ free( psz_filename );
/* Look for the selected module, if NULL then save everything */
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 ;
+ module_t *p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+ char line[1024];
if( psz_module_name
&& strcmp( psz_module_name, p_parser->psz_object_name ) )
/* The config file is organized in sections, one per module. Look for
* the interesting section ( a section is of the form [foo] ) */
fseek( file, 0L, SEEK_SET );
+
+ /* Look for UTF-8 Byte Order Mark */
+ char * (*convert) (const char *) = FromLocaleDup;
+ char bom[3];
+
+ if ((fread (bom, 1, 3, file) == 3)
+ && (memcmp (bom, "\xEF\xBB\xBF", 3) == 0))
+ convert = strdupnull;
+ else
+ rewind (file); // no BOM, rewind
+
while( fgets( line, 1024, file ) )
{
if( (line[0] == '[')
/* Now try to load the options in this section */
while( fgets( line, 1024, file ) )
{
+ const char *psz_option_name, *psz_option_value;
+ module_config_t *p_item;
+
if( line[0] == '[' ) break; /* end of section */
/* ignore comments or empty lines */
case CONFIG_ITEM_INTEGER:
if( !*psz_option_value )
break; /* ignore empty option */
- p_item->i_value = strtol( psz_option_value, 0, 0 );
- p_item->i_value_saved = p_item->i_value;
+ p_item->value.i = strtol( psz_option_value, 0, 0 );
+ p_item->saved.i = p_item->value.i;
#if 0
msg_Dbg( p_this, "option \"%s\", value %i",
p_item->psz_name, p_item->i_value );
case CONFIG_ITEM_FLOAT:
if( !*psz_option_value )
break; /* ignore empty option */
- p_item->f_value = (float)atof( psz_option_value);
- p_item->f_value_saved = p_item->f_value;
+ p_item->value.f = (float)i18n_atof( psz_option_value);
+ p_item->saved.f = p_item->value.f;
#if 0
msg_Dbg( p_this, "option \"%s\", value %f",
p_item->psz_name, (double)p_item->f_value );
case CONFIG_ITEM_KEY:
if( !*psz_option_value )
break; /* ignore empty option */
- p_item->i_value = ConfigStringToKey(psz_option_value);
- p_item->i_value_saved = p_item->i_value;
+ 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 */
- if( p_item->psz_value )
- free( p_item->psz_value );
+ freenull (p_item->value.psz);
- p_item->psz_value = *psz_option_value ?
- strdup( psz_option_value ) : NULL;
+ p_item->value.psz = convert (psz_option_value);
- if( p_item->psz_value_saved )
- free( p_item->psz_value_saved );
- p_item->psz_value_saved = 0;
- 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)))
- p_item->psz_value_saved = p_item->psz_value ?
- strdup( p_item->psz_value ) : 0;
+ freenull (p_item->saved.psz);
+ p_item->saved.psz = NULL;
+
+ if( !p_item->value.psz || !p_item->orig.psz ||
+ (p_item->value.psz && p_item->orig.psz &&
+ strcmp(p_item->value.psz, p_item->orig.psz)))
+ p_item->saved.psz = convert (p_item->value.psz);
vlc_mutex_unlock( p_item->p_lock );
vlc_list_release( p_list );
fclose( file );
- free( psz_filename );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ 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, char *psz_dirname )
+int config_CreateDir( vlc_object_t *p_this, const char *psz_dirname )
{
if( !psz_dirname && !*psz_dirname ) return -1;
-#if defined( UNDER_CE )
- {
- wchar_t psz_new[ MAX_PATH ];
- char psz_mod[MAX_PATH];
- int i = 0;
-
- /* Convert '/' into '\' */
- while( *psz_dirname )
- {
- if( *psz_dirname == '/' ) psz_mod[i] = '\\';
- else psz_mod[i] = *psz_dirname;
- psz_dirname++;
- i++;
- }
- psz_mod[i] = 0;
-
- MultiByteToWideChar( CP_ACP, 0, psz_mod, -1, psz_new, MAX_PATH );
- if( CreateDirectory( psz_new, NULL ) )
- {
- msg_Err( p_this, "could not create %s", psz_mod );
- }
- }
-
-#else
-# if defined( WIN32 )
- if( mkdir( psz_dirname ) && errno != EEXIST )
-# else
- if( mkdir( psz_dirname, 0755 ) && errno != EEXIST )
-# endif
+ if( utf8_mkdir( psz_dirname ) && ( errno != EEXIST ) )
{
msg_Err( p_this, "could not create %s (%s)",
psz_dirname, strerror(errno) );
+ return -1;
}
-#endif
-
return 0;
}
int i_index;
/* Acquire config file lock */
- vlc_mutex_lock( &p_this->p_vlc->config_lock );
+ vlc_mutex_lock( &p_this->p_libvlc->config_lock );
- psz_configfile = p_this->p_vlc->psz_configfile;
+ psz_configfile = p_this->p_libvlc->psz_configfile;
if( !psz_configfile || !psz_configfile )
{
- psz_homedir = p_this->p_vlc->psz_homedir;
+ psz_homedir = p_this->p_libvlc->psz_homedir;
if( !psz_homedir )
{
msg_Err( p_this, "psz_homedir is null" );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->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 );
+ sprintf( psz_filename, "%s" DIR_SEP CONFIG_DIR, psz_homedir );
if( !psz_filename )
{
msg_Err( p_this, "out of memory" );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return -1;
}
config_CreateDir( p_this, psz_filename );
- strcat( psz_filename, "/" CONFIG_FILE );
+ strcat( psz_filename, DIR_SEP CONFIG_FILE );
}
else
{
if( !psz_filename )
{
msg_Err( p_this, "out of memory" );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return -1;
}
}
msg_Dbg( p_this, "opening config file %s", psz_filename );
- file = fopen( psz_filename, "rt" );
+ file = utf8_fopen( psz_filename, "rt" );
if( !file )
{
msg_Warn( p_this, "config file %s does not exist yet", psz_filename );
msg_Err( p_this, "out of memory" );
if( file ) fclose( file );
free( psz_filename );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return -1;
}
p_bigbuffer[0] = 0;
* Save module config in file
*/
- file = fopen( psz_filename, "wt" );
+ file = utf8_fopen( psz_filename, "wt" );
if( !file )
{
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 );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return -1;
}
- fprintf( file, "###\n### " COPYRIGHT_MESSAGE "\n###\n\n" );
+ 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++ )
p_item++ )
{
char *psz_key;
- int i_value = p_item->i_value;
- float f_value = p_item->f_value;
- char *psz_value = p_item->psz_value;
+ 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 */
/* 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->i_value_saved;
- f_value = p_item->f_value_saved;
- psz_value = p_item->psz_value_saved;
- if( !psz_value ) psz_value = p_item->psz_value_orig;
+ 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
{
fprintf( file, "# %s (%s)\n", p_item->psz_text,
(p_item->i_type == CONFIG_ITEM_BOOL) ?
_("boolean") : _("integer") );
- if( i_value == p_item->i_value_orig )
- fprintf( file, "#" );
+ if( i_value == p_item->orig.i )
+ fputc ('#', file);
fprintf( file, "%s=%i\n", p_item->psz_name, i_value );
- p_item->i_value_saved = 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->i_value_orig )
- fprintf( file, "#" );
+ 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 : "" );
- if ( psz_key ) free( psz_key );
+ freenull (psz_key);
- p_item->i_value_saved = i_value;
+ 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->f_value_orig )
- fprintf( file, "#" );
+ if( f_value == p_item->orig.f )
+ fputc ('#', file);
fprintf( file, "%s=%f\n", p_item->psz_name, (double)f_value );
- p_item->f_value_saved = 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->psz_value_orig) ||
- (psz_value && p_item->psz_value_orig &&
- !strcmp( psz_value, p_item->psz_value_orig )) )
- fprintf( file, "#" );
+ 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 ? psz_value : "" );
+ psz_value ?: "" );
if( b_autosave && !p_item->b_autosave ) break;
- if( p_item->psz_value_saved ) free( p_item->psz_value_saved );
- p_item->psz_value_saved = 0;
- if( (psz_value && p_item->psz_value_orig &&
- strcmp( psz_value, p_item->psz_value_orig )) ||
- !psz_value || !p_item->psz_value_orig)
- p_item->psz_value_saved = psz_value ? strdup(psz_value):0;
+ freenull (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;
}
}
- fprintf( file, "\n" );
+ fputc ('\n', file);
}
vlc_list_release( p_list );
fclose( file );
free( psz_filename );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return 0;
}
int i_index, i_count;
/* Check if there's anything to save */
- vlc_mutex_lock( &p_this->p_vlc->config_lock );
+ 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++ )
if( p_item->i_type != CONFIG_HINT_END ) break;
}
vlc_list_release( p_list );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
if( i_index == i_count ) return VLC_SUCCESS;
return SaveConfigFile( p_this, 0, VLC_TRUE );
char *psz_shortopts;
/* Set default configuration and copy arguments */
- p_this->p_vlc->i_argc = *pi_argc;
- p_this->p_vlc->ppsz_argv = ppsz_argv;
+ p_this->p_libvlc->i_argc = *pi_argc;
+ p_this->p_libvlc->ppsz_argv = ppsz_argv;
-#ifdef SYS_DARWIN
- /* When vlc.app is run by double clicking in Mac OS X, the 2nd arg
+#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) )
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
+ * 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;
vlc_list_release( p_list );
return -1;
}
- memcpy( ppsz_argv, p_this->p_vlc->ppsz_argv,
+ memcpy( ppsz_argv, p_this->p_libvlc->ppsz_argv,
*pi_argc * sizeof(char *) );
}
{
if( !strcmp(p_conf->psz_current,"SUPPRESSED") )
{
- if( !b_ignore_errors )
+ if( !b_ignore_errors )
{
fprintf(stderr,
"Warning: option --%s is no longer used.\n",
p_conf = config_FindConfig( p_this, psz_name );
}
- switch( p_conf->i_type )
+ switch( p_conf->i_type )
+ {
+ case CONFIG_ITEM_STRING:
+ 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_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:
- case CONFIG_ITEM_MODULE_CAT:
- config_PutPsz( p_this, psz_name, optarg );
+ config_PutPsz( p_this, pp_shortopts[i_cmd]->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_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( i_cmd == 'v' )
{
- if( *optarg == 'v' ) /* eg. -vvv */
+ if( optarg )
{
- i_verbose++;
- while( *optarg == 'v' )
+ if( *optarg == 'v' ) /* eg. -vvv */
{
i_verbose++;
- optarg++;
+ while( *optarg == 'v' )
+ {
+ i_verbose++;
+ optarg++;
+ }
+ }
+ else
+ {
+ i_verbose += atoi( optarg ); /* eg. -v2 */
}
}
else
{
- i_verbose += atoi( optarg ); /* eg. -v2 */
+ i_verbose++; /* -v */
}
+ config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name,
+ i_verbose );
}
else
{
- i_verbose++; /* -v */
+ config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name,
+ strtol(optarg, 0, 0) );
}
- 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;
+ break;
+ case CONFIG_ITEM_BOOL:
+ config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name, 1 );
+ break;
}
continue;
{
fprintf( stderr, "%s: unknown option"
" or missing mandatory argument ",
- p_this->p_vlc->psz_object_name );
+ p_this->p_libvlc->psz_object_name );
if( optopt )
{
fprintf( stderr, "`-%c'\n", optopt );
fprintf( stderr, "`%s'\n", ppsz_argv[optind-1] );
}
fprintf( stderr, "Try `%s --help' for more information.\n",
- p_this->p_vlc->psz_object_name );
+ 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 );
return 0;
}
+/**
+ * config_GetDataDir: find directory where shared data is installed
+ *
+ * @return a string (always succeeds).
+ */
+const char *config_GetDataDir( const vlc_object_t *p_this )
+{
+#if defined (WIN32) || defined (UNDER_CE)
+ return p_this->p_libvlc_global->psz_vlcpath;
+#elif defined(__APPLE__) || defined (SYS_BEOS)
+ static char path[PATH_MAX] = "";
+
+ if( *path == '\0' )
+ {
+ snprintf( path, sizeof( path ), "%s/share",
+ p_this->p_libvlc_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.
*****************************************************************************
*****************************************************************************/
static char *GetDir( vlc_bool_t b_appdata )
{
- char *p_tmp, *p_homedir = NULL;
+ const char *psz_localhome = NULL;
#if defined(HAVE_GETPWUID)
struct passwd *p_pw = NULL;
#if defined(WIN32) && !defined(UNDER_CE)
typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD,
- LPSTR );
+ LPWSTR );
#ifndef CSIDL_FLAG_CREATE
# define CSIDL_FLAG_CREATE 0x8000
#endif
if( ( shfolder_dll = LoadLibrary( _T("SHFolder.dll") ) ) != NULL )
{
SHGetFolderPath = (void *)GetProcAddress( shfolder_dll,
- _T("SHGetFolderPathA") );
+ _T("SHGetFolderPathW") );
if ( SHGetFolderPath != NULL )
{
- p_homedir = (char *)malloc( MAX_PATH );
- if( !p_homedir ) return 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,
- p_homedir ) )
+ whomedir ) )
{
FreeLibrary( shfolder_dll );
- return p_homedir;
+ return FromWide( whomedir );
}
- free( p_homedir );
- p_homedir = NULL;
}
FreeLibrary( shfolder_dll );
}
# define CSIDL_APPDATA 0x1A
#endif
- wchar_t p_whomedir[MAX_PATH];
+ wchar_t whomedir[MAX_PATH];
/* get the "Application Data" folder for the current user */
- if( SHGetSpecialFolderPath( NULL, p_whomedir, CSIDL_APPDATA, 1 ) )
- {
- p_homedir = (char *)malloc( MAX_PATH );
- if( !p_homedir ) return NULL;
-
- sprintf( p_homedir, "%ls", p_whomedir );
- return p_homedir;
- }
+ if( SHGetSpecialFolderPath( NULL, whomedir, CSIDL_APPDATA, 1 ) )
+ return FromWide( whomedir );
#endif
#if defined(HAVE_GETPWUID)
if( ( p_pw = getpwuid( getuid() ) ) == NULL )
#endif
{
- if( ( p_tmp = getenv( "HOME" ) ) == NULL )
+ psz_localhome = getenv( "HOME" );
+ if( psz_localhome == NULL )
{
- if( ( p_tmp = getenv( "TMP" ) ) == NULL )
- {
- p_tmp = "/tmp";
- }
+ psz_localhome = getenv( "TMP" );
+ if( psz_localhome == NULL )
+ psz_localhome = "/tmp";
}
-
- p_homedir = strdup( p_tmp );
}
#if defined(HAVE_GETPWUID)
else
- {
- p_homedir = strdup( p_pw->pw_dir );
- }
+ psz_localhome = p_pw->pw_dir;
#endif
- return p_homedir;
+ return FromLocaleDup( psz_localhome );
}
char *config_GetHomeDir( void )
}
-static int ConfigStringToKey( char *psz_key )
+static int ConfigStringToKey( const char *psz_key )
{
int i_key = 0;
unsigned int i;
- char *psz_parser = strchr( psz_key, '-' );
+ 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++ )
projects / vlc / blobdiff