[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-sync-rewrite.c, 1.10, 1.11 mbox-sync.c, 1.17, 1.18

[cras at procontrol.fi]

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

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



Index: mbox-sync-rewrite.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync-rewrite.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mbox-sync-rewrite.c	14 Jun 2004 04:30:32 -0000	1.10
+++ mbox-sync-rewrite.c	14 Jun 2004 04:54:05 -0000	1.11
@@ -394,7 +394,7 @@
 				// FIXME: error handling
 				ret = -1;
 			}
-			mails[1].from_offset -= offset - end_offset;
+			mails[1].from_offset -= end_offset - start_offset;
 			idx++;
 
 			start_offset += offset - end_offset;

Index: mbox-sync.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- mbox-sync.c	14 Jun 2004 04:30:32 -0000	1.17
+++ mbox-sync.c	14 Jun 2004 04:54:05 -0000	1.18
@@ -203,14 +203,18 @@
 		    struct mail_index_transaction *t, buffer_t *mails_buf,
 		    uint32_t seq1, uint32_t seq2)
 {
-	uint32_t extra_idx = ibox->mbox_extra_idx;
 	const struct mbox_sync_mail *mails;
+	uint32_t extra_idx = ibox->mbox_extra_idx;
+	uint64_t offset;
 
 	mails = buffer_get_modifyable_data(mails_buf, NULL);
 
 	for (; seq1 <= seq2; seq1++, mails++) {
-		uint64_t offset = mails->from_offset;
-		mail_index_update_extra_rec(t, seq1, extra_idx, &offset);
+		if (mails->uid != 0) {
+			offset = mails->from_offset;
+			mail_index_update_extra_rec(t, seq1, extra_idx,
+						    &offset);
+		}
 	}
 }