From 3d9b9d473fdd2ec6af367df27cfc26a90a3f4375 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Mon, 9 Nov 2015 18:39:13 +0100
Subject: [PATCH] Strip the trailing whitespace from /join commands.

Fixes #99 for great good.
---
 src/core/commands.c              | 2 +-
 src/fe-common/core/fe-channels.c | 3 ++-
 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;