Mercurial > dovecot > original-hg > dovecot-1.2

changeset 542:14da2c45cdc7 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support W=rfc822.size flag in maildir file name.
author Timo Sirainen <tss@iki.fi>
date Mon, 28 Oct 2002 10:32:30 +0200
parents c8aaf80bc89f
children 52fd3d82e59a
files src/lib-index/mail-index-update.c src/lib-index/maildir/maildir-build.c
diffstat 2 files changed, 59 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-index/mail-index-update.c	Mon Oct 28 10:12:29 2002 +0200
+++ b/src/lib-index/mail-index-update.c	Mon Oct 28 10:32:30 2002 +0200
@@ -340,11 +340,11 @@
 {
 	HeaderUpdateContext ctx;
 	MessagePart *part;
-	MessageSize hdr_size;
+	MessageSize hdr_size, body_size;
 	Pool pool;
 	const char *value;
 	size_t size;
-	uoff_t start_offset, uoff_size;
+	uoff_t start_offset;
 
 	ctx.update = update;
 	ctx.envelope_pool = NULL;
@@ -389,28 +389,9 @@
 					     update_header_func, &ctx);
 		}
 
-		/* update our sizes */
-		update->index->update_field_raw(update, DATA_HDR_HEADER_SIZE,
-			&part->header_size.physical_size,
-			sizeof(part->header_size.physical_size));
-		update->index->update_field_raw(update, DATA_HDR_BODY_SIZE,
-			&part->body_size.physical_size,
-			sizeof(part->body_size.physical_size));
-
-		uoff_size = part->header_size.virtual_size +
-			part->body_size.virtual_size;
-		update->index->update_field_raw(update, DATA_HDR_VIRTUAL_SIZE,
-						&uoff_size, sizeof(uoff_size));
-
-		/* update binary flags */
-		if (part->header_size.virtual_size ==
-		    part->header_size.physical_size)
-			update->rec->index_flags |=
-				INDEX_MAIL_FLAG_BINARY_HEADER;
-
-		if (part->body_size.virtual_size ==
-		    part->body_size.physical_size)
-			update->rec->index_flags |= INDEX_MAIL_FLAG_BINARY_BODY;
+		/* save sizes */
+		hdr_size = part->header_size;
+		body_size = part->body_size;
 
 		/* don't save both BODY + BODYSTRUCTURE since BODY can be
 		   generated from BODYSTRUCTURE. FIXME: However that takes
@@ -452,13 +433,16 @@
 		message_parse_header(NULL, inbuf, &hdr_size,
 				     update_header_func, &ctx);
 
-		update->index->update_field_raw(update, DATA_HDR_HEADER_SIZE,
-			&hdr_size.physical_size,
-			sizeof(hdr_size.physical_size));
-
-		uoff_size = inbuf->v_size - inbuf->v_offset;
-		update->index->update_field_raw(update, DATA_HDR_BODY_SIZE,
-						&uoff_size, sizeof(uoff_size));
+		body_size.physical_size = inbuf->v_size - inbuf->v_offset;
+		if (body_size.physical_size == 0)
+                        body_size.virtual_size = 0;
+		else if (update->data_hdr.virtual_size == 0)
+			body_size.virtual_size = (uoff_t)-1;
+		else {
+			body_size.virtual_size =
+				update->data_hdr.virtual_size -
+				hdr_size.virtual_size;
+		}
 	}
 
 	if (ctx.envelope != NULL) {
@@ -470,4 +454,29 @@
 
 		pool_unref(ctx.envelope_pool);
 	}
+
+	/* update physical sizes */
+	update->index->update_field_raw(update, DATA_HDR_HEADER_SIZE,
+					&hdr_size.physical_size,
+					sizeof(hdr_size.physical_size));
+	update->index->update_field_raw(update, DATA_HDR_BODY_SIZE,
+					&body_size.physical_size,
+					sizeof(body_size.physical_size));
+
+	/* update virtual size if we know it */
+	if (body_size.virtual_size != (uoff_t)-1) {
+		uoff_t virtual_size;
+
+		virtual_size = hdr_size.virtual_size + body_size.virtual_size;
+		update->index->update_field_raw(update, DATA_HDR_VIRTUAL_SIZE,
+						&virtual_size,
+						sizeof(virtual_size));
+	}
+
+
+	/* update binary flags. */
+	if (hdr_size.virtual_size == hdr_size.physical_size)
+		update->rec->index_flags |= INDEX_MAIL_FLAG_BINARY_HEADER;
+	if (body_size.virtual_size == body_size.physical_size)
+		update->rec->index_flags |= INDEX_MAIL_FLAG_BINARY_BODY;
 }
--- a/src/lib-index/maildir/maildir-build.c	Mon Oct 28 10:12:29 2002 +0200
+++ b/src/lib-index/maildir/maildir-build.c	Mon Oct 28 10:32:30 2002 +0200
@@ -17,6 +17,8 @@
 	MailIndexRecord *rec;
 	MailIndexUpdate *update;
 	struct stat st;
+	uoff_t virtual_size;
+	const char *p;
 	int failed;
 
 	i_assert(path != NULL);
@@ -35,6 +37,23 @@
 
 	update = index->update_begin(index, rec);
 
+	/* set virtual size if found from file name */
+	p = strstr(fname, ",W=");
+	if (p != NULL) {
+		p += 3;
+		virtual_size = 0;
+		while (*p >= '0' && *p <= '9') {
+			virtual_size = virtual_size * 10 + (*p - '0');
+			p++;
+		}
+
+		if (*p == ':' || *p == ',' || *p == '\0') {
+			index->update_field_raw(update, DATA_HDR_VIRTUAL_SIZE,
+						&virtual_size,
+						sizeof(virtual_size));
+		}
+	}
+
 	/* set internal date */
 	if (fd != -1 && fstat(fd, &st) == 0) {
 		index->update_field_raw(update, DATA_HDR_INTERNAL_DATE,