From: Timo Sirainen <tss@iki.fi>
Date: Fri, 19 Dec 2008 16:08:09 +0000 (+0200)
Subject: dbox maildir migration: Support empty POP3 UIDL = base filename.
X-Git-Tag: 1.2.beta1~161
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a153e172307e8105a8ea2c95d0edaf2c25cd77dc;p=thirdparty%2Fdovecot%2Fcore.git

dbox maildir migration: Support empty POP3 UIDL = base filename.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/dbox/dbox-file-maildir.c b/src/lib-storage/index/dbox/dbox-file-maildir.c
index d157d3ea46..f2ceb6832b 100644
--- a/src/lib-storage/index/dbox/dbox-file-maildir.c
+++ b/src/lib-storage/index/dbox/dbox-file-maildir.c
@@ -111,6 +111,14 @@ const char *dbox_file_maildir_metadata_get(struct dbox_file *file,
 		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: