dovecot-2.0: doveadm dump: Fixed dumping sdbox/mdbox fields.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/39b33769614b
changeset: 11851:39b33769614b
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Jul 19 12:43:02 2010 +0100
description:
doveadm dump: Fixed dumping sdbox/mdbox fields.

diffstat:

 src/doveadm/doveadm-dump-index.c |  32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

diffs (74 lines):

diff -r cfd15170dff7 -r 39b33769614b src/doveadm/doveadm-dump-index.c
--- a/src/doveadm/doveadm-dump-index.c	Sat Jul 17 19:05:51 2010 +0100
+++ b/src/doveadm/doveadm-dump-index.c	Mon Jul 19 12:43:02 2010 +0100
@@ -32,12 +32,15 @@
 	uint8_t unused[3];
 	uint8_t mailbox_guid[16];
 };
-struct dbox_index_header {
+struct sdbox_index_header {
+	uint32_t rebuild_count;
+	uint8_t mailbox_guid[MAIL_GUID_128_SIZE];
+};
+struct mdbox_index_header {
 	uint32_t map_uid_validity;
-	uint32_t highest_maildir_uid;
-	uint8_t mailbox_guid[16];
+	uint8_t mailbox_guid[MAIL_GUID_128_SIZE];
 };
-struct dbox_mail_index_record {
+struct mdbox_mail_index_record {
 	uint32_t map_uid;
 	uint32_t save_date;
 };
@@ -60,7 +63,7 @@
 	uint32_t real_uid;
 };
 
-struct dbox_mail_index_map_record {
+struct mdbox_mail_index_map_record {
 	uint32_t file_id;
 	uint32_t offset;
 	uint32_t size;
@@ -141,15 +144,22 @@
 		printf(" - mailbox_guid = %s\n",
 		       binary_to_hex(hdr->mailbox_guid,
 				     sizeof(hdr->mailbox_guid)));
-	} else if (strcmp(ext->name, "dbox-hdr") == 0) {
-		const struct dbox_index_header *hdr = data;
+	} else if (strcmp(ext->name, "mdbox-hdr") == 0) {
+		const struct mdbox_index_header *hdr = data;
 
 		printf("header\n");
 		printf(" - map_uid_validity .. = %u\n", hdr->map_uid_validity);
-		printf(" - highest_maildir_uid = %u\n", hdr->highest_maildir_uid);
 		printf(" - mailbox_guid ...... = %s\n",
 		       binary_to_hex(hdr->mailbox_guid,
 				     sizeof(hdr->mailbox_guid)));
+	} else if (strcmp(ext->name, "dbox-hdr") == 0) {
+		const struct sdbox_index_header *hdr = data;
+
+		printf("header\n");
+		printf(" - rebuild_count . = %u\n", hdr->rebuild_count);
+		printf(" - mailbox_guid .. = %s\n",
+		       binary_to_hex(hdr->mailbox_guid,
+				     sizeof(hdr->mailbox_guid)));
 	} else if (strcmp(ext->name, "modseq") == 0) {
 		const struct mail_index_modseq_header *hdr = data;
 
@@ -486,12 +496,12 @@
 			printf("                   : mailbox_id = %u\n", vrec->mailbox_id);
 			printf("                   : real_uid   = %u\n", vrec->real_uid);
 		} else if (strcmp(ext[i].name, "map") == 0) {
-			const struct dbox_mail_index_map_record *mrec = data;
+			const struct mdbox_mail_index_map_record *mrec = data;
 			printf("                   : file_id = %u\n", mrec->file_id);
 			printf("                   : offset  = %u\n", mrec->offset);
 			printf("                   : size    = %u\n", mrec->size);
-		} else if (strcmp(ext[i].name, "dbox") == 0) {
-			const struct dbox_mail_index_record *drec = data;
+		} else if (strcmp(ext[i].name, "mdbox") == 0) {
+			const struct mdbox_mail_index_record *drec = data;
 			printf("                   : map_uid   = %u\n", drec->map_uid);
 			printf("                   : save_date = %u (%s)\n", drec->save_date, unixdate2str(drec->save_date));
 		}