From: Timo Sirainen <tss@iki.fi>
Date: Wed, 9 Jun 2010 18:22:23 +0000 (+0100)
Subject: imap: STATUS (X-GUID) added extra space to result.
X-Git-Tag: 2.0.beta6~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5451d98c4891f77c2c51e63bb0843e27336ccf1;p=thirdparty%2Fdovecot%2Fcore.git

imap: STATUS (X-GUID) added extra space to result.

--HG--
branch : HEAD
---

diff --git a/src/imap/imap-status.c b/src/imap/imap-status.c
index 2325b49e8e..df6cb54294 100644
--- a/src/imap/imap-status.c
+++ b/src/imap/imap-status.c
@@ -107,12 +107,14 @@ void imap_status_send(struct client *client, const char *mailbox,
 {
 	const struct mailbox_status *status = &result->status;
 	string_t *str;
+	unsigned int prefix_len;
 
 	str = t_str_new(128);
 	str_append(str, "* STATUS ");
         imap_quote_append_string(str, mailbox, FALSE);
 	str_append(str, " (");
 
+	prefix_len = str_len(str);
 	if ((items->mailbox_items & STATUS_MESSAGES) != 0)
 		str_printfa(str, "MESSAGES %u ", status->messages);
 	if ((items->mailbox_items & STATUS_RECENT) != 0)
@@ -136,7 +138,7 @@ void imap_status_send(struct client *client, const char *mailbox,
 			    mail_guid_128_to_string(result->mailbox_guid));
 	}
 
-	if (items != 0)
+	if (str_len(str) != prefix_len)
 		str_truncate(str, str_len(str)-1);
 	str_append_c(str, ')');