Handle correctly g_get_home_dir() returning NULL, assume it's the current

directory then.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2968 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-10-19 17:48:10 +00:00 committed by cras
commit fe4cdce6e6
2 changed files with 19 additions and 5 deletions

View file

@ -159,6 +159,7 @@ void core_init_paths(int argc, char *argv[])
{ "home", 0, POPT_ARG_STRING, NULL, 0, "Irssi home dir location (~/.irssi)", "PATH" },
{ NULL, '\0', 0, NULL }
};
const char *home;
char *str;
int n, len;
@ -191,8 +192,13 @@ void core_init_paths(int argc, char *argv[])
args_register(options);
if (irssi_dir == NULL)
irssi_dir = g_strdup_printf(IRSSI_DIR_FULL, g_get_home_dir());
if (irssi_dir == NULL) {
home = g_get_home_dir();
if (home == NULL)
home = ".";
irssi_dir = g_strdup_printf(IRSSI_DIR_FULL, home);
}
if (irssi_config_file == NULL)
irssi_config_file = g_strdup_printf("%s/"IRSSI_HOME_CONFIG, irssi_dir);