"version 0.6. Your\nconfiguration has been "
"copied to the new location:\n%s\nYou can "
"delete this directory and all its contents.",
- libvlc_priv(p_obj->p_libvlc)->psz_configdir);
+ psz_filename);
fclose( p_readme );
}
free( psz_readme );
if( libvlc_priv (p_this->p_libvlc)->psz_configfile == NULL )
{
- const char *psz_configdir =
- libvlc_priv(p_this->p_libvlc)->psz_configdir;
+ char *psz_configdir = config_GetUserConfDir();
if( !psz_configdir ) /* XXX: This should never happen */
{
msg_Err( p_this, "no configuration directory defined" );
}
config_CreateDir( p_this, psz_configdir );
+ free( psz_configdir );
}
file = config_OpenConfigFile( p_this, "rt" );
*/
char *config_GetConfigFile( libvlc_int_t *p_libvlc )
{
+ char *psz_dir = config_GetUserConfDir();
char *psz_configfile;
- if( asprintf( &psz_configfile, "%s" DIR_SEP CONFIG_FILE,
- libvlc_priv (p_libvlc)->psz_configdir ) == -1 )
- return NULL;
+
+ if( asprintf( &psz_configfile, "%s" DIR_SEP CONFIG_FILE, psz_dir ) == -1 )
+ psz_configfile = NULL;
+ free( psz_dir );
return psz_configfile;
}
/* Set the config file stuff */
p_libvlc->psz_homedir = config_GetHomeDir();
- priv->psz_configdir = config_GetUserConfDir();
priv->psz_datadir = config_GetUserDataDir();
priv->psz_configfile = config_GetCustomConfigFile( p_libvlc );
module_EndBank( p_libvlc );
FREENULL( p_libvlc->psz_homedir );
- free( priv->psz_configdir );
free( priv->psz_datadir );
FREENULL( priv->psz_configfile );
var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action,
/* Configuration */
vlc_mutex_t config_lock; ///< config file lock
char * psz_configfile; ///< location of config file
- char *psz_configdir; ///< user configuration directory
char *psz_datadir; ///< user data directory
/* There is no real reason to keep a list of items, but not to break