summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLemonBoy <thatlemon@gmail.com>2015-11-09 18:39:13 +0100
committerLemonBoy <thatlemon@gmail.com>2015-11-09 18:42:49 +0100
commit3d9b9d473fdd2ec6af367df27cfc26a90a3f4375 (patch)
tree69c100a2b8bfc6c8f7db083b3644de08e78afaf4
parent1006fee8027936c68e0f0b2f8dae766ad090764a (diff)
downloadirssi-3d9b9d473fdd2ec6af367df27cfc26a90a3f4375.zip
Strip the trailing whitespace from /join commands.
Fixes #99 for great good.
-rw-r--r--src/core/commands.c2
-rw-r--r--src/fe-common/core/fe-channels.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/commands.c b/src/core/commands.c
index 0fb373c7..88d1208c 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -751,7 +751,7 @@ int cmd_get_params(const char *data, gpointer *free_me, int count, ...)
/* strip the trailing whitespace */
if (count & PARAM_FLAG_STRIP_TRAILING_WS) {
- arg = g_strchomp (arg);
+ arg = g_strchomp(arg);
}
} else {
arg = (count & PARAM_FLAG_NOQUOTES) ?
diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index a171596d..046d641a 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -122,7 +122,8 @@ static void cmd_join(const char *data, SERVER_REC *server)
void *free_arg;
if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
- PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_GETREST,
+ PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_GETREST |
+ PARAM_FLAG_STRIP_TRAILING_WS,
"join", &optlist, &pdata))
return;