filename | src/config.c |
changeset | 866:86cd01c2b2d3 |
prev | 759:f16975739abc |
next | 1015:ad448bedc48a |
author | nkeynes |
date | Tue Mar 24 11:15:57 2009 +0000 (15 years ago) |
permissions | -rw-r--r-- |
last change | Add preliminary implementation of the GDB remote debugging server - attaches to either or both the SH4 and ARM |
file | annotate | diff | log | raw |
1.1 --- a/src/config.c Mon Jul 21 01:01:39 2008 +00001.2 +++ b/src/config.c Tue Mar 24 11:15:57 2009 +00001.3 @@ -69,14 +69,18 @@1.4 lxdream_config_save_filename = g_strdup_printf("%s/.%s", home, DEFAULT_CONFIG_FILENAME);1.5 }1.6 if( lxdream_config_load_filename == NULL ) {1.7 + char *sysconfig = g_strdup_printf("%s/%s", get_sysconf_path(), DEFAULT_CONFIG_FILENAME);1.8 if( access(lxdream_config_save_filename, R_OK) == 0 ) {1.9 lxdream_config_load_filename = g_strdup(lxdream_config_save_filename);1.10 - } else if( access( PACKAGE_CONF_DIR "/" DEFAULT_CONFIG_FILENAME, R_OK ) == 0 ) {1.11 - lxdream_config_load_filename = g_strdup(PACKAGE_CONF_DIR "/" DEFAULT_CONFIG_FILENAME);1.12 + g_free(sysconfig);1.13 + } else if( access( sysconfig, R_OK ) == 0 ) {1.14 + lxdream_config_load_filename = sysconfig;1.15 } else if( access( "./" DEFAULT_CONFIG_FILENAME, R_OK ) == 0 ) {1.16 lxdream_config_load_filename = g_strdup("./" DEFAULT_CONFIG_FILENAME);1.17 + g_free(sysconfig);1.18 } else {1.19 lxdream_config_load_filename = g_strdup(lxdream_config_save_filename);1.20 + g_free(sysconfig);1.21 result = FALSE;1.22 }1.23 }
.