[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-sync.c, 1.114, 1.115

[cras at dovecot.org]

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

Modified Files:
	mbox-sync.c 
Log Message:
one more expunge fix..



Index: mbox-sync.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- mbox-sync.c	25 Oct 2004 22:40:56 -0000	1.114
+++ mbox-sync.c	25 Oct 2004 23:54:51 -0000	1.115
@@ -585,6 +585,7 @@
 			memset(&mail, 0, sizeof(mail));
 			mail.flags = MBOX_EXPUNGED;
 			mail.offset = mail.from_offset =
+				(sync_ctx->dest_first_mail ? 1 : 0) +
 				mail_ctx->mail.from_offset -
 				sync_ctx->expunged_space;
 			mail.space = sync_ctx->expunged_space;
@@ -635,6 +636,7 @@
 		} else {
 			move_diff = mail_ctx->mail.space;
 			extra_space = sync_ctx->space_diff - needed_space;
+			sync_ctx->expunged_space = 0;
 		}
 		last_seq = sync_ctx->seq - 1;
 		buffer_set_used_size(sync_ctx->mails, sync_ctx->mails->used -