[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-sync-rewrite.c, 1.53, 1.54 mbox-sync-update.c, 1.38, 1.39

[cras at dovecot.org]

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

Modified Files:
	mbox-sync-rewrite.c mbox-sync-update.c 
Log Message:
X-IMAPbase's uid-last offset was remembered wrong in some cases. Added also
an extra assert.



Index: mbox-sync-rewrite.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync-rewrite.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- mbox-sync-rewrite.c	4 Jul 2005 11:32:28 -0000	1.53
+++ mbox-sync-rewrite.c	19 Aug 2005 16:01:16 -0000	1.54
@@ -218,6 +218,7 @@
 	/* we wrote the first mail. update last-uid offset so we can find
 	   it later */
 	i_assert(ctx->last_uid_value_start_pos != 0);
+	i_assert(ctx->hdr_pos[MBOX_HDR_X_IMAPBASE] != (size_t)-1);
 
 	ctx->sync_ctx->base_uid_last_offset = hdr_offset +
 		ctx->hdr_pos[MBOX_HDR_X_IMAPBASE] +

Index: mbox-sync-update.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync-update.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- mbox-sync-update.c	7 Aug 2005 11:28:13 -0000	1.38
+++ mbox-sync-update.c	19 Aug 2005 16:01:16 -0000	1.39
@@ -332,8 +332,7 @@
 	str = t_str_new(200);
 	str_printfa(str, "%u ", sync_ctx->base_uid_validity);
 
-	ctx->last_uid_value_start_pos =
-		str_len(str) - ctx->hdr_pos[MBOX_HDR_X_IMAPBASE];
+	ctx->last_uid_value_start_pos = str_len(str);
 	ctx->imapbase_updated = TRUE;
 	str_printfa(str, "%010u", sync_ctx->next_uid - 1);