dovecot-1.2: maildir: Always add S=size to filenames.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/9af9343084d4
changeset: 9507:9af9343084d4
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Dec 15 14:05:06 2009 -0500
description:
maildir: Always add S=size to filenames.
It's necessary for using zlib plugin and doesn't hurt much anyway.

diffstat:

2 files changed, 2 insertions(+), 4 deletions(-)
src/lib-storage/index/maildir/maildir-copy.c |    3 +--
src/lib-storage/index/maildir/maildir-save.c |    3 +--

diffs (26 lines):

diff -r 09bed694c6ca -r 9af9343084d4 src/lib-storage/index/maildir/maildir-copy.c
--- a/src/lib-storage/index/maildir/maildir-copy.c	Mon Dec 14 15:12:18 2009 -0500
+++ b/src/lib-storage/index/maildir/maildir-copy.c	Tue Dec 15 14:05:06 2009 -0500
@@ -84,8 +84,7 @@ static int do_hardlink(struct maildir_ma
 	int ret;
 
 	if (!ctx->preserve_filename) {
-		if (mbox->storage->save_size_in_filename &&
-		    !ctx->size_set) {
+		if (!ctx->size_set) {
 			if ((ret = do_save_mail_size(mbox, path, ctx)) <= 0)
 				return ret;
 		}
diff -r 09bed694c6ca -r 9af9343084d4 src/lib-storage/index/maildir/maildir-save.c
--- a/src/lib-storage/index/maildir/maildir-save.c	Mon Dec 14 15:12:18 2009 -0500
+++ b/src/lib-storage/index/maildir/maildir-save.c	Tue Dec 15 14:05:06 2009 -0500
@@ -215,8 +215,7 @@ maildir_get_updated_filename(struct mail
 {
 	const char *basename = mf->basename;
 
-	if (ctx->mbox->storage->save_size_in_filename &&
-	    mf->size != (uoff_t)-1) {
+	if (mf->size != (uoff_t)-1) {
 		basename = t_strdup_printf("%s,%c=%"PRIuUOFF_T, basename,
 					   MAILDIR_EXTRA_FILE_SIZE, mf->size);
 	}