zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-21 17:42:49 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix typos

Browse source
This commit is contained in:
altffour 2021-01-06 17:42:02 +03:00
commit bfb9ca19f5
No known key found for this signature in database
GPG key ID: B4ADFA86EDF5CCE9
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/core/core.c
View file

@ -70,7 +70,7 @@ int irssi_init_finished;
int sighup_received;
time_t client_start_time;
static char *irssi_dir, *irssi_config_file;
static char *irssi_dir, *irssi_xdg_dir, *irssi_config_file;
static GSList *dialog_type_queue, *dialog_text_queue;
const char *get_irssi_dir(void)
@ -78,6 +78,11 @@ const char *get_irssi_dir(void)
return irssi_dir;
}
const char *get_irssi_xdg_dir(void)
{
return irssi_xdg_dir;
}
/* return full path for ~/.irssi/config */
const char *get_irssi_config(void)
{
@ -191,18 +196,17 @@ void core_preinit(const char *path)
{
char *str;
int len;
const char *home;
if (irssi_dir == NULL) {
irssi_dir = g_build_filename(g_get_user_config_dir(), "irssi", NULL);
if (home == NULL)
if (g_file_test(irssi_dir, G_FILE_TEST_IS_DIR) == FALSE) {
home = ".";
g_free(irssi_dir);
if (g_file_test(irssi_dir, G_FILE_TEST_IS_DIR) == FALSE) {
home = ".";
g_free(irssi_dir);
const char *home;
home = g_get_home_dir();
irssi_dir = g_build_filename(home? home: ".", ".irssi", NULL);
}
home = g_get_home_dir();
irssi_dir = g_build_filename(home ? home : ".", ".irssi", NULL);
}
} else {
str = irssi_dir;
irssi_dir = fix_path(str);
@ -212,7 +216,7 @@ void core_preinit(const char *path)
irssi_dir[len-1] = '\0';
}
if (irssi_config_file == NULL)
irssi_config_file = g_build_filename(irssi_dir, IRSSI_HOME_CONFIG, NULL)
irssi_config_file = g_build_filename(irssi_dir, IRSSI_HOME_CONFIG, NULL);
else {
str = irssi_config_file;
irssi_config_file = fix_path(str);