changeset 78:0d8bfff71b80 HEAD

yet more mbox fix fixes
author Timo Sirainen <tss@iki.fi>
date Wed, 28 Aug 2002 23:30:32 +0300
parents 51b449a2a56b
children d1407cb2b39b
files src/lib-index/mbox/mbox-append.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-index/mbox/mbox-append.c	Wed Aug 28 23:24:06 2002 +0300
+++ b/src/lib-index/mbox/mbox-append.c	Wed Aug 28 23:30:32 2002 +0300
@@ -29,9 +29,10 @@
 {
 	unsigned char *msg;
 	unsigned int i, size, startpos, vsize;
+	int lastmsg;
 
 	/* read until "[\r]\nFrom " is found */
-	startpos = i = vsize = 0;
+	startpos = i = vsize = 0; lastmsg = TRUE;
 	while (io_buffer_read_data(inbuf, &msg, &size, startpos) >= 0) {
 		for (i = startpos; i < size; i++) {
 			if (msg[i] == '\n') {
@@ -57,6 +58,7 @@
 
 		if (i < size) {
 			startpos = i;
+                        lastmsg = FALSE;
 			break;
 		}
 
@@ -69,7 +71,7 @@
 		}
 	}
 
-	if (i == startpos && startpos > 0) {
+	if (lastmsg && startpos > 0) {
 		/* end of file, remove the last [\r]\n */
 		if (msg[startpos-1] == '\n')
 			startpos--;