Merged from silc_1_0_branch.

[silc.git] / apps / irssi / src / core / core.c

diff --git a/apps/irssi/src/core/core.c b/apps/irssi/src/core/core.c
index 0deb5090f6b8ce73eec8947bd138f8768becc7ac..7125344ff0bfc08b79db1cdabe509fa39c6d1959 100644 (file)
--- a/apps/irssi/src/core/core.c
+++ b/apps/irssi/src/core/core.c
@@ -155,10 +155,11 @@ static void sig_init_finished(void)
 void core_init_paths(int argc, char *argv[])
 {
        static struct poptOption options[] = {
-               { "config", 0, POPT_ARG_STRING, NULL, 0, "Configuration file location (~/.irssi/config)", "PATH" },
-               { "home", 0, POPT_ARG_STRING, NULL, 0, "Irssi home dir location (~/.irssi)", "PATH" },
+               { "config", 0, POPT_ARG_STRING, NULL, 0, "Configuration file location (~/.silc/config)", "PATH" },
+               { "home", 0, POPT_ARG_STRING, NULL, 0, "Irssi home dir location (~/.silc)", "PATH" },
                { NULL, '\0', 0, NULL }
        };
+       const char *home;
        char *str;
        int n, len;
 
@@ -191,11 +192,15 @@ void core_init_paths(int argc, char *argv[])
 
        args_register(options);
 
-        if (irssi_dir == NULL)
-               irssi_dir = g_strdup_printf(IRSSI_DIR_FULL, 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);
+               irssi_config_file = g_strdup_printf("%s/"IRSSI_HOME_CONFIG, irssi_dir);
 
        session_set_binary(argv[0]);
 }