From: Timo Sirainen <tss@iki.fi>
Date: Tue, 29 Jun 2004 13:18:21 +0000 (+0300)
Subject: no_partial_rewrite was incorrectly set always
X-Git-Tag: 1.1.alpha1~3851
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cfe26f4e03a7b2b74a53438a24656a0357aa4fe;p=thirdparty%2Fdovecot%2Fcore.git

no_partial_rewrite was incorrectly set always

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/mbox/mbox-sync-parse.c b/src/lib-storage/index/mbox/mbox-sync-parse.c
index 6f9cfbc701..18a45aaffc 100644
--- a/src/lib-storage/index/mbox/mbox-sync-parse.c
+++ b/src/lib-storage/index/mbox/mbox-sync-parse.c
@@ -382,18 +382,20 @@ void mbox_sync_parse_next_mail(struct istream *input,
 			line_start_pos = str_len(ctx->header);
 			str_append(ctx->header, hdr->name);
 			str_append(ctx->header, ": ");
-		}
 
-		if (ctx->header_first_change == (size_t)-1 &&
-		    hdr->full_value_offset != str_len(ctx->header)) {
-			/* whitespaces around ':' are non-standard. either
-			   there's whitespace before ':' or none after.
-			   if we're going to rewrite this message, we can't
-			   do it partially from here after as offsets won't
-			   match. this shouldn't happen pretty much ever, so
-			   don't try to optimize this - just rewrite the whole
-			   thing. */
-			ctx->no_partial_rewrite = TRUE;
+			if (ctx->header_first_change == (size_t)-1 &&
+			    hdr->full_value_offset - hdr->name_offset !=
+			    str_len(ctx->header) - line_start_pos) {
+				/* whitespaces around ':' are non-standard.
+				   either there's whitespace before ':' or none
+				   after. if we're going to rewrite this
+				   message, we can't do it partially from here
+				   after as offsets won't match. this shouldn't
+				   happen pretty much ever, so don't try to
+				   optimize this - just rewrite the whole
+				   thing. */
+				ctx->no_partial_rewrite = TRUE;
+			}
 		}
 
 		func = header_func_find(hdr->name);