[dovecot-cvs] dovecot/src/lib-storage/index/mbox istream-raw-mbox.c, 1.20, 1.21 mbox-sync.c, 1.68, 1.69

[cras at dovecot.org]

Update of /home/cvs/dovecot/src/lib-storage/index/mbox
In directory talvi:/tmp/cvs-serv6810/lib-storage/index/mbox

Modified Files:
	istream-raw-mbox.c mbox-sync.c 
Log Message:
Fixed parsing empty messages.



Index: istream-raw-mbox.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/mbox/istream-raw-mbox.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- istream-raw-mbox.c	22 Aug 2004 12:20:31 -0000	1.20
+++ istream-raw-mbox.c	22 Aug 2004 12:28:57 -0000	1.21
@@ -450,7 +450,7 @@
 	i_stream_seek(rstream->input, rstream->from_offset);
 
 	rstream->eof = FALSE;
-	rstream->istream.istream.eof = TRUE;
+	rstream->istream.istream.eof = FALSE;
 }
 
 int istream_raw_mbox_seek(struct istream *stream, uoff_t offset)
@@ -461,7 +461,7 @@
 
 	rstream->corrupted = FALSE;
 	rstream->eof = FALSE;
-	rstream->istream.istream.eof = TRUE;
+	rstream->istream.istream.eof = FALSE;
 
 	if (rstream->mail_size != (uoff_t)-1 &&
 	    rstream->hdr_offset + rstream->mail_size == offset) {

Index: mbox-sync.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- mbox-sync.c	22 Aug 2004 12:20:31 -0000	1.68
+++ mbox-sync.c	22 Aug 2004 12:28:57 -0000	1.69
@@ -135,7 +135,8 @@
 	}
 
 	mbox_sync_parse_next_mail(sync_ctx->input, mail_ctx);
-	i_assert(sync_ctx->input->v_offset != mail_ctx->from_offset);
+	i_assert(sync_ctx->input->v_offset != mail_ctx->from_offset ||
+		 sync_ctx->input->eof);
 
 	mail_ctx->mail.body_size =
 		istream_raw_mbox_get_body_size(sync_ctx->input,