[dovecot-cvs] dovecot/src/lib-storage/index index-mail.c, 1.32, 1.33 index-search.c, 1.88, 1.89

[cras at procontrol.fi]

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

Modified Files:
	index-mail.c index-search.c 
Log Message:
mailbox_save() and mailbox_copy() functions can now return the saved mail so
it can be immediately queried. Implemented UIDPLUS extension using it.
Maildir implementation missing, so it crashes with it for now.. APPEND with
mbox now doesn't require resyncing the mailbox since it updates indexes
directly.



Index: index-mail.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-mail.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- index-mail.c	15 Jun 2004 02:12:55 -0000	1.32
+++ index-mail.c	20 Jun 2004 03:25:33 -0000	1.33
@@ -546,6 +546,8 @@
 	cache_flags = (data->cached_fields & MAIL_CACHE_INDEX_FLAGS) == 0 ? 0 :
 		mail_cache_get_record_flags(mail->ibox->cache_view, seq);
 
+	mail->mail.seq = seq;
+	mail->mail.uid = rec->uid;
 	mail->mail.has_nuls = (cache_flags & MAIL_INDEX_FLAG_HAS_NULS) != 0;
 	mail->mail.has_no_nuls =
 		(cache_flags & MAIL_INDEX_FLAG_HAS_NO_NULS) != 0;

Index: index-search.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-search.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- index-search.c	23 May 2004 02:18:27 -0000	1.88
+++ index-search.c	20 Jun 2004 03:25:33 -0000	1.89
@@ -821,11 +821,7 @@
 			return NULL;
 		}
 
-		ctx->imail.data.rec = rec;
-		ctx->mail->seq = ctx->seq1++;
-		ctx->mail->uid = rec == NULL ? 0 : rec->uid;
-
-		ret = index_mail_next(&ctx->imail, rec, ctx->mail->seq, TRUE);
+		ret = index_mail_next(&ctx->imail, rec, ctx->seq1++, TRUE);
 		if (ret < 0)
 			break;