[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-sync-update.c, 1.12, 1.13 mbox-sync.c, 1.30, 1.31

[cras at procontrol.fi]

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

Modified Files:
	mbox-sync-update.c mbox-sync.c 
Log Message:
fixes



Index: mbox-sync-update.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync-update.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mbox-sync-update.c	17 Jun 2004 21:29:20 -0000	1.12
+++ mbox-sync-update.c	17 Jun 2004 23:36:52 -0000	1.13
@@ -208,7 +208,7 @@
 	const char *p, *hdr;
 	size_t pos;
 
-	if (ctx->sync_ctx->dest_first_mail ||
+	if (!ctx->sync_ctx->dest_first_mail ||
 	    ctx->hdr_pos[MBOX_HDR_X_IMAPBASE] == (size_t)-1 ||
 	    ctx->sync_ctx->update_base_uid_last == 0 ||
 	    ctx->sync_ctx->update_base_uid_last < ctx->sync_ctx->base_uid_last)

Index: mbox-sync.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- mbox-sync.c	17 Jun 2004 23:08:48 -0000	1.30
+++ mbox-sync.c	17 Jun 2004 23:36:52 -0000	1.31
@@ -865,7 +865,7 @@
 			&sync_ctx->base_uid_validity,
 			sizeof(sync_ctx->base_uid_validity));
 	}
-	if (sync_ctx->base_uid_last != 0 &&
+	if (sync_ctx->input->eof &&
 	    sync_ctx->next_uid != sync_ctx->hdr->next_uid) {
 		i_assert(sync_ctx->next_uid != 0);
 		mail_index_update_header(sync_ctx->t,
@@ -899,6 +899,8 @@
 	sync_ctx->next_uid = 1;
 	sync_ctx->prev_msg_uid = 0;
 	sync_ctx->seq = sync_ctx->idx_seq = 0;
+
+        sync_ctx->dest_first_mail = TRUE;
 }
 
 static int mbox_sync_do(struct mbox_sync_context *sync_ctx)