aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ClientRead.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/ClientRead.cxx b/src/ClientRead.cxx
index 2bb3c56c0..925e1502d 100644
--- a/src/ClientRead.cxx
+++ b/src/ClientRead.cxx
@@ -21,6 +21,7 @@
#include "ClientInternal.hxx"
#include "Main.hxx"
#include "event/Loop.hxx"
+#include "util/CharUtil.hxx"
#include <assert.h>
#include <string.h>
@@ -35,11 +36,15 @@ Client::OnSocketInput(void *data, size_t length)
TimeoutMonitor::ScheduleSeconds(client_timeout);
+ BufferedSocket::ConsumeInput(newline + 1 - p);
+
+ /* skip whitespace at the end of the line */
+ while (newline > p && IsWhitespaceOrNull(newline[-1]))
+ --newline;
+
/* terminate the string at the end of the line */
*newline = 0;
- BufferedSocket::ConsumeInput(newline + 1 - p);
-
CommandResult result = client_process_line(*this, p);
switch (result) {
case CommandResult::OK: