X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fconfig%2Ffile.c;h=097a699e157b5a41382c54757a2d7524eb230057;hb=a79ab1f65d837721fc83236d7aba0808c0c17c05;hp=6acc176cc02b029c075048b19dd282b8c4f1385e;hpb=493b65493f4a8ccc830597e7ab08950961c2380e;p=vlc diff --git a/src/config/file.c b/src/config/file.c index 6acc176cc0..097a699e15 100644 --- a/src/config/file.c +++ b/src/config/file.c @@ -16,20 +16,15 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include -#include "../libvlc.h" -#include "vlc_charset.h" -#include "vlc_keys.h" - #include /* errno */ #include #include @@ -37,15 +32,18 @@ #include #ifdef __APPLE__ # include -#else +#elif defined(HAVE_USELOCALE) #include #endif +#include +#include "../libvlc.h" +#include "vlc_charset.h" +#include "vlc_keys.h" + #include "configuration.h" #include "modules/modules.h" -static char *ConfigKeyToString( int ); - static inline char *strdupnull (const char *src) { return src ? strdup (src) : NULL; @@ -59,7 +57,7 @@ static char *config_GetConfigFile( vlc_object_t *obj ) char *psz_file = config_GetPsz( obj, "config" ); if( psz_file == NULL ) { - char *psz_dir = config_GetUserConfDir(); + char *psz_dir = config_GetUserDir( VLC_CONFIG_DIR ); if( asprintf( &psz_file, "%s" DIR_SEP CONFIG_FILE, psz_dir ) == -1 ) psz_file = NULL; @@ -88,9 +86,12 @@ static FILE *config_OpenConfigFile( vlc_object_t *p_obj ) { /* This is the fallback for pre XDG Base Directory * Specification configs */ + char *home = config_GetUserDir(VLC_HOME_DIR); char *psz_old; - if( asprintf( &psz_old, "%s" DIR_SEP CONFIG_DIR DIR_SEP CONFIG_FILE, - config_GetHomeDir() ) != -1 ) + + if( home != NULL + && asprintf( &psz_old, "%s/.vlc/" CONFIG_FILE, + home ) != -1 ) { p_stream = utf8_fopen( psz_old, "rt" ); if( p_stream ) @@ -100,8 +101,8 @@ static FILE *config_OpenConfigFile( vlc_object_t *p_obj ) msg_Info( p_obj->p_libvlc, "Found old config file at %s. " "VLC will now use %s.", psz_old, psz_filename ); char *psz_readme; - if( asprintf(&psz_readme,"%s"DIR_SEP CONFIG_DIR DIR_SEP"README", - config_GetHomeDir() ) != -1 ) + if( asprintf(&psz_readme,"%s/.vlc/README", + home ) != -1 ) { FILE *p_readme = utf8_fopen( psz_readme, "wt" ); if( p_readme ) @@ -117,9 +118,14 @@ static FILE *config_OpenConfigFile( vlc_object_t *p_obj ) } free( psz_readme ); } + /* Remove the old configuration file so that --reset-config + * can work properly. Fortunately, Linux allows removing + * open files - with most filesystems. */ + unlink( psz_old ); } free( psz_old ); } + free( home ); } #endif free( psz_filename ); @@ -354,7 +360,7 @@ int config_CreateDir( vlc_object_t *p_this, const char *psz_dirname ) } static int -config_Write (FILE *file, const char *type, const char *desc, +config_Write (FILE *file, const char *desc, const char *type, bool comment, const char *name, const char *fmt, ...) { va_list ap; @@ -381,8 +387,8 @@ config_Write (FILE *file, const char *type, const char *desc, static int config_PrepareDir (vlc_object_t *obj) { - char *psz_configdir = config_GetUserConfDir (); - if (psz_configdir == NULL) /* XXX: This should never happen */ + char *psz_configdir = config_GetUserDir (VLC_CONFIG_DIR); + if (psz_configdir == NULL) return -1; int ret = config_CreateDir (obj, psz_configdir); @@ -430,12 +436,18 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name, file = config_OpenConfigFile( p_this ); if( file != NULL ) { - /* look for file size */ - fseek( file, 0L, SEEK_END ); - i_sizebuf = ftell( file ); - fseek( file, 0L, SEEK_SET ); - if( i_sizebuf >= LONG_MAX ) - i_sizebuf = 0; + struct stat st; + + /* Some users make vlcrc read-only to prevent changes. + * The atomic replacement scheme breaks this "feature", + * so we check for read-only by hand. */ + if (fstat (fileno (file), &st) + || !(st.st_mode & S_IWUSR)) + { + msg_Err (p_this, "configuration file is read-only"); + goto error; + } + i_sizebuf = ( st.st_size < LONG_MAX ) ? st.st_size : 0; } p_bigbuffer = p_index = malloc( i_sizebuf+1 ); @@ -674,7 +686,8 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name, #ifndef WIN32 fdatasync (fd); /* Flush from OS */ /* Atomically replace the file... */ - rename (temporary, permanent); + if (utf8_rename (temporary, permanent)) + utf8_unlink (temporary); /* (...then synchronize the directory, err, TODO...) */ /* ...and finally close the file */ vlc_mutex_unlock (&lock); @@ -683,7 +696,8 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name, #ifdef WIN32 /* Windows cannot remove open files nor overwrite existing ones */ utf8_unlink (permanent); - rename (temporary, permanent); + if (utf8_rename (temporary, permanent)) + utf8_unlink (temporary); vlc_mutex_unlock (&lock); #endif @@ -734,66 +748,3 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name ) { return SaveConfigFile( p_this, psz_module_name, false ); } - -int ConfigStringToKey( const char *psz_key ) -{ - int i_key = 0; - unsigned int i; - 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++ ) - { - if( !strncasecmp( vlc_modifiers[i].psz_key_string, psz_key, - strlen( vlc_modifiers[i].psz_key_string ) ) ) - { - i_key |= vlc_modifiers[i].i_key_code; - } - } - psz_key = psz_parser + 1; - psz_parser = strchr( psz_key, '-' ); - } - for( i = 0; i < sizeof(vlc_keys) / sizeof( key_descriptor_t ); i++ ) - { - if( !strcasecmp( vlc_keys[i].psz_key_string, psz_key ) ) - { - i_key |= vlc_keys[i].i_key_code; - break; - } - } - return i_key; -} - -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(vlc_modifiers) / sizeof(key_descriptor_t)); - index++ ) - { - if( i_key & vlc_modifiers[index].i_key_code ) - { - p += sprintf( p, "%s-", vlc_modifiers[index].psz_key_string ); - } - } - for( index = 0; index < (sizeof(vlc_keys) / sizeof( key_descriptor_t)); - index++) - { - if( (int)( i_key & ~KEY_MODIFIER ) == vlc_keys[index].i_key_code ) - { - p += sprintf( p, "%s", vlc_keys[index].psz_key_string ); - break; - } - } - return psz_key; -} -