lib-storage: Factor in sanitize_box_name()

diff --git a/src/lib-storage/fail-mailbox.c b/src/lib-storage/fail-mailbox.c
index 07ace29231b00760a0cdd68b77dd3b58825874a2..2ba1b7a604564df86fba105dd2458d537a724dc2 100644 (file)
--- a/src/lib-storage/fail-mailbox.c
+++ b/src/lib-storage/fail-mailbox.c
@@ -2,7 +2,6 @@
 
 #include "lib.h"
 #include "array.h"
-#include "str-sanitize.h"
 #include "mail-storage-private.h"
 #include "mailbox-list-private.h"
 #include "fail-mail-storage.h"

diff --git a/src/lib-storage/list/mail-storage-list-index-rebuild.c b/src/lib-storage/list/mail-storage-list-index-rebuild.c
index 1e4f4627e75a529050722dd66b30132d26630ec9..1d56eebc6032dcd960a924618b947c70a5cbe027 100644 (file)
--- a/src/lib-storage/list/mail-storage-list-index-rebuild.c
+++ b/src/lib-storage/list/mail-storage-list-index-rebuild.c
@@ -154,7 +154,7 @@ mail_storage_list_remove_duplicate(struct mail_storage_list_index_rebuild_ctx *c
 
        e_debug(ctx->storage->event,
                "Removing duplicate mailbox '%s' in favor of mailbox '%s'",
-               str_sanitize(delete_name, 128), str_sanitize(keep_name, 128));
+               mailbox_name_sanitize(delete_name), mailbox_name_sanitize(keep_name));
 
        if (mailbox_list_index_sync_delete(rebuild_ns->list_sync_ctx,
                                           delete_name, TRUE) < 0) {

diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index 8b92aa88eab67a11ac3294432ef771c391397ffb..c4b567aedcebf53bf0e64a347c3f9314dfb9a487 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -4,6 +4,7 @@
 #include "module-context.h"
 #include "unichar.h"
 #include "file-lock.h"
+#include "str-sanitize.h"
 #include "mail-storage.h"
 #include "mail-storage-hooks.h"
 #include "mail-storage-settings.h"
@@ -906,6 +907,11 @@ void mailbox_save_context_deinit(struct mail_save_context *ctx);
 void mailbox_sync_notify(struct mailbox *box, uint32_t uid,
                         enum mailbox_sync_type sync_type);
 
+static inline const char *mailbox_name_sanitize(const char *name)
+{
+       return str_sanitize(name, 128);
+}
+
 /* for unit testing */
 int mailbox_verify_name(struct mailbox *box);
 

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 559fdc55f34f7d9d0a1203e473c4797f8d9c674e..d3d46afbe7405c0ba35f975c44ce17df7138e7c1 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -6,7 +6,6 @@
 #include "llist.h"
 #include "mail-storage.h"
 #include "str.h"
-#include "str-sanitize.h"
 #include "sha1.h"
 #include "unichar.h"
 #include "hex-binary.h"
@@ -607,7 +606,8 @@ void mailbox_set_critical(struct mailbox *box, const char *fmt, ...)
        va_start(va, fmt);
        T_BEGIN {
                mail_storage_set_critical(box->storage, "Mailbox %s: %s",
-                       box->vname, t_strdup_vprintf(fmt, va));
+                       mailbox_name_sanitize(box->vname),
+                       t_strdup_vprintf(fmt, va));
        } T_END;
        va_end(va);
 }
@@ -1250,7 +1250,7 @@ static int mailbox_verify_name_int(struct mailbox *box)
        if (!mailbox_verify_name_prefix(box->list->ns, &vname, &error)) {
                mail_storage_set_error(box->storage, MAIL_ERROR_PARAMS,
                        t_strdup_printf("Invalid mailbox name '%s': %s",
-                                       str_sanitize(vname, 80), error));
+                                       mailbox_name_sanitize(vname), error));
                return -1;
        }