maildir: Always add S=size to filenames.

It's necessary for using zlib plugin and doesn't hurt much anyway.

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/maildir/maildir-copy.c b/src/lib-storage/index/maildir/maildir-copy.c
index 14b15bfae5cd731c158a44891fd95b20891882cc..18a1887fe6783969a68dc79771386bf10a5bbf3a 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-copy.c
+++ b/src/lib-storage/index/maildir/maildir-copy.c
@@ -84,8 +84,7 @@ static int do_hardlink(struct maildir_mailbox *mbox, const char *path,
        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 --git a/src/lib-storage/index/maildir/maildir-save.c b/src/lib-storage/index/maildir/maildir-save.c
index 55592148ed1af700178be6caab855523d8d88dbe..b5230f80e62767465544ef1b72636c4a199723f4 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-save.c
+++ b/src/lib-storage/index/maildir/maildir-save.c
@@ -227,8 +227,7 @@ maildir_get_updated_filename(struct maildir_save_context *ctx,
 {
        const char *basename = mf->basename;
 
-       if (ctx->mbox->storage->save_size_in_filename &&
-           mf->size != (uoff_t)-1 && !mf->preserve_filename) {
+       if (mf->size != (uoff_t)-1 && !mf->preserve_filename) {
                basename = t_strdup_printf("%s,%c=%"PRIuUOFF_T, basename,
                                           MAILDIR_EXTRA_FILE_SIZE, mf->size);
        }

diff --git a/src/lib-storage/index/maildir/maildir-storage.h b/src/lib-storage/index/maildir/maildir-storage.h
index 240f151346172cf6c430c8760434c2bbd054f0c7..93afb6528ae1564f790c3d284c7ff723f00c26f3 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-storage.h
+++ b/src/lib-storage/index/maildir/maildir-storage.h
@@ -72,8 +72,6 @@ struct maildir_storage {
        const char *temp_prefix;
 
        uint32_t maildir_list_ext_id;
-
-       unsigned int save_size_in_filename:1;
 };
 
 struct maildir_mailbox {

diff --git a/src/plugins/quota/quota-storage.c b/src/plugins/quota/quota-storage.c
index d1b1932d5718fecf7c8c81f7ce6b92024065966c..0c63de15b7afb11d3147aef7beff1699ab0a4bcc 100644 (file)
--- a/src/plugins/quota/quota-storage.c
+++ b/src/plugins/quota/quota-storage.c
@@ -489,18 +489,6 @@ void quota_mail_user_created(struct mail_user *user)
        }
 }
 
-static void quota_maildir_storage_set(struct mail_storage *storage)
-{
-       /* FIXME: a bit ugly location for this code. */
-       if (strcmp(storage->name, "maildir") == 0) {
-               /* For newly generated filenames add ,S=size. */
-               struct maildir_storage *mstorage =
-                       (struct maildir_storage *)storage;
-
-               mstorage->save_size_in_filename = TRUE;
-       }
-}
-
 void quota_mail_storage_created(struct mail_storage *storage)
 {
        union mail_storage_module_context *qstorage;
@@ -510,7 +498,6 @@ void quota_mail_storage_created(struct mail_storage *storage)
        storage->v.mailbox_alloc = quota_mailbox_alloc;
 
        MODULE_CONTEXT_SET_SELF(storage, quota_storage_module, qstorage);
-       quota_maildir_storage_set(storage);
 }
 
 static struct quota_root *