From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 7 Nov 2019 12:28:56 +0000 (+0200)
Subject: imap: client_args_finished() - support appending more args
X-Git-Tag: 2.3.9~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a869cd496ccd72e75e6dc90ab53dbe2af25a7cc;p=thirdparty%2Fdovecot%2Fcore.git

imap: client_args_finished() - support appending more args
---

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index 6646844fca..6dc784980b 100644
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -783,11 +783,19 @@ void client_args_finished(struct client_command_context *cmd,
 {
 	string_t *str = t_str_new(256);
 
+	if (cmd->args != NULL && cmd->args[0] != '\0') {
+		str_append(str, cmd->args);
+		str_append_c(str, ' ');
+	}
 	imap_write_args(str, args);
 	cmd->args = p_strdup(cmd->pool, str_c(str));
 	event_add_str(cmd->event, "cmd_args", cmd->args);
 
 	str_truncate(str, 0);
+	if (cmd->human_args != NULL && cmd->human_args[0] != '\0') {
+		str_append(str, cmd->human_args);
+		str_append_c(str, ' ');
+	}
 	imap_write_args_for_human(str, args);
 	cmd->human_args = p_strdup(cmd->pool, str_c(str));
 	event_add_str(cmd->event, "cmd_human_args", cmd->human_args);