diff options
| author | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2018-03-10 13:11:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-10 13:11:09 +0100 |
| commit | 6a3a3873e9a8d905a9ed3a2656792cb94223155f (patch) | |
| tree | 1704047853c97c6bd6873d3f2baa92f17ce5d535 | |
| parent | 1178f753cf07cbbfd000d6b0fccf5a5dd7b54b5b (diff) | |
| parent | 76d958a87fea1d744f45a9e022cf980752c7ea73 (diff) | |
| download | irssi-6a3a3873e9a8d905a9ed3a2656792cb94223155f.zip | |
Merge pull request #857 from LemonBoy/config-case
Compare channels/networks fields case-insensitively
| -rw-r--r-- | src/core/channels-setup.c | 9 | ||||
| -rw-r--r-- | src/core/servers-setup.c | 11 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c index 4966d77d..8002646d 100644 --- a/src/core/channels-setup.c +++ b/src/core/channels-setup.c @@ -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; } diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c index 9492c58c..2a92a367 100644 --- a/src/core/servers-setup.c +++ b/src/core/servers-setup.c @@ -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; } |