aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Merge pull request #857 from LemonBoy/config-case

Browse Source 
Compare channels/networks fields case-insensitively
This commit is contained in:
ailin-nemui 2018-03-10 13:11:09 +01:00 committed by GitHub
commit 6a3a3873e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/channels-setup.c
View File

@ -37,9 +37,14 @@ static int compare_channel_setup (CONFIG_NODE *node, CHANNEL_SETUP_REC *channel)
name = config_node_get_str(node, "name", NULL);
chatnet = config_node_get_str(node, "chatnet", NULL);
if (g_strcmp0(name, channel->name) != 0 ||
g_strcmp0(chatnet, channel->chatnet) != 0)
if (name == NULL || chatnet == NULL) {
return 0;
}
if (g_ascii_strcasecmp(name, channel->name) != 0 ||
g_ascii_strcasecmp(chatnet, channel->chatnet) != 0) {
return 1;
}
return 0;
}

11
src/core/servers-setup.c
View File

@ -474,10 +474,15 @@ static int compare_server_setup (CONFIG_NODE *node, SERVER_SETUP_REC *server)
chatnet = config_node_get_str(node, "chatnet", NULL);
port = config_node_get_int(node, "port", 0);
if (g_strcmp0(address, server->address) != 0 ||
g_strcmp0(chatnet, server->chatnet) != 0 ||
port != server->port)
if (address == NULL || chatnet == NULL) {
return 0;
}
if (g_ascii_strcasecmp(address, server->address) != 0 ||
g_ascii_strcasecmp(chatnet, server->chatnet) != 0 ||
port != server->port) {
return 1;
}
return 0;
}