dovecot-1.1: dbox maildir migration: Support empty POP3 UIDL = b...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.1/rev/71a864e83593
changeset: 8064:71a864e83593
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Dec 19 18:07:06 2008 +0200
description:
dbox maildir migration: Support empty POP3 UIDL = base filename.

diffstat:

1 file changed, 9 insertions(+), 1 deletion(-)
src/lib-storage/index/dbox/dbox-file-maildir.c |   10 +++++++++-

diffs (27 lines):

diff -r ca86d12f3409 -r 71a864e83593 src/lib-storage/index/dbox/dbox-file-maildir.c
--- a/src/lib-storage/index/dbox/dbox-file-maildir.c	Fri Dec 19 16:39:19 2008 +0200
+++ b/src/lib-storage/index/dbox/dbox-file-maildir.c	Fri Dec 19 18:07:06 2008 +0200
@@ -66,7 +66,7 @@ const char *dbox_file_maildir_metadata_g
 {
 	struct stat st;
 	uoff_t size;
-	const char *value = NULL;
+	const char *p, *value = NULL;
 
 	switch (key) {
 	case DBOX_METADATA_FLAGS:
@@ -106,6 +106,14 @@ const char *dbox_file_maildir_metadata_g
 		break;
 	case DBOX_METADATA_POP3_UIDL:
 		value = dbox_file_maildir_get_old_metadata(file, 'P');
+		if (value != NULL && *value == '\0') {
+			/* special case: use base filename */
+			p = strchr(file->fname, MAILDIR_INFO_SEP);
+			if (p == NULL)
+				value = file->fname;
+			else
+				value = t_strdup_until(file->fname, p);
+		}
 		break;
 	case DBOX_METADATA_EXPUNGED:
 	case DBOX_METADATA_EXT_REF: