doveadm mailbox convert renamed to doveadm mailbox mutf7.

--HG--
branch : HEAD

diff --git a/src/doveadm/doveadm-mail-mailbox.c b/src/doveadm/doveadm-mail-mailbox.c
index e983a76f7527f49ce8d2d76d98bcc4f408ede49c..f975e6758f0240e4fb9469fe5a505a6d9ea9e050 100644 (file)
--- a/src/doveadm/doveadm-mail-mailbox.c
+++ b/src/doveadm/doveadm-mail-mailbox.c
@@ -435,7 +435,7 @@ static struct doveadm_mail_cmd_context *cmd_mailbox_unsubscribe_alloc(void)
        return cmd_mailbox_subscriptions_alloc(FALSE);
 }
 
-static void cmd_mailbox_convert(int argc, char *argv[])
+static void cmd_mailbox_mutf7(int argc, char *argv[])
 {
        string_t *str;
        bool from_utf8;
@@ -452,13 +452,13 @@ static void cmd_mailbox_convert(int argc, char *argv[])
                        from_utf8 = TRUE;
                        break;
                default:
-                       help(&doveadm_cmd_mailbox_convert);
+                       help(&doveadm_cmd_mailbox_mutf7);
                }
        }
        argv += optind;
 
        if (argv[0] == NULL)
-               help(&doveadm_cmd_mailbox_convert);
+               help(&doveadm_cmd_mailbox_mutf7);
 
        str = t_str_new(128);
        for (i = 0; argv[i] != NULL; i++) {
@@ -502,7 +502,7 @@ struct doveadm_mail_cmd cmd_mailbox_unsubscribe = {
        cmd_mailbox_unsubscribe_alloc, "mailbox unsubscribe",
        "<mailbox> [...]"
 };
-struct doveadm_cmd doveadm_cmd_mailbox_convert = {
-       cmd_mailbox_convert, "mailbox convert",
+struct doveadm_cmd doveadm_cmd_mailbox_mutf7 = {
+       cmd_mailbox_mutf7, "mailbox mutf7",
        "[-7|-8] <name> [...]", NULL
 };

diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index d2103b59403f45b6a58c090ae9f6c28829a0dc5b..a83826a2d187fd664807a42441e9f8a3824c4861 100644 (file)
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -275,7 +275,7 @@ static struct doveadm_cmd *doveadm_commands[] = {
        &doveadm_cmd_who,
        &doveadm_cmd_penalty,
        &doveadm_cmd_kick,
-       &doveadm_cmd_mailbox_convert
+       &doveadm_cmd_mailbox_mutf7
 };
 
 int main(int argc, char *argv[])

diff --git a/src/doveadm/doveadm.h b/src/doveadm/doveadm.h
index a51fd2c563e4e543e55b0ff61a5c3ed3191ac5da..9c0318fa3a6b31eef2086b84447e1b6a1477e21d 100644 (file)
--- a/src/doveadm/doveadm.h
+++ b/src/doveadm/doveadm.h
@@ -23,7 +23,7 @@ extern struct doveadm_cmd doveadm_cmd_pw;
 extern struct doveadm_cmd doveadm_cmd_who;
 extern struct doveadm_cmd doveadm_cmd_penalty;
 extern struct doveadm_cmd doveadm_cmd_kick;
-extern struct doveadm_cmd doveadm_cmd_mailbox_convert;
+extern struct doveadm_cmd doveadm_cmd_mailbox_mutf7;
 
 extern bool doveadm_verbose, doveadm_debug;