Mercurial > dovecot > core-2.2
changeset 11890:43804bdf697e
doveadm: Code cleanup: Moved "mailbox mutf7" command to separate file.
It's not really a "mail command", so it shouldn't be in the same file as them.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Fri, 23 Jul 2010 15:51:38 +0100 |
parents | 45473cd0e3e6 |
children | 19574f77a021 |
files | src/doveadm/Makefile.am src/doveadm/doveadm-mail-mailbox.c src/doveadm/doveadm-mutf7.c |
diffstat | 3 files changed, 58 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/Makefile.am Fri Jul 23 15:28:24 2010 +0100 +++ b/src/doveadm/Makefile.am Fri Jul 23 15:51:38 2010 +0100 @@ -65,6 +65,7 @@ doveadm-mail-mailbox-status.c \ doveadm-mail-list-iter.c \ doveadm-mail-search.c \ + doveadm-mutf7.c \ doveadm-penalty.c \ doveadm-print.c \ doveadm-print-flow.c \
--- a/src/doveadm/doveadm-mail-mailbox.c Fri Jul 23 15:28:24 2010 +0100 +++ b/src/doveadm/doveadm-mail-mailbox.c Fri Jul 23 15:51:38 2010 +0100 @@ -445,49 +445,6 @@ return cmd_mailbox_subscriptions_alloc(FALSE); } -static void cmd_mailbox_mutf7(int argc, char *argv[]) -{ - string_t *str; - bool from_utf8; - unsigned int i; - int c; - - from_utf8 = TRUE; - while ((c = getopt(argc, argv, "78")) > 0) { - switch (c) { - case '7': - from_utf8 = FALSE; - break; - case '8': - from_utf8 = TRUE; - break; - default: - help(&doveadm_cmd_mailbox_mutf7); - } - } - argv += optind; - - if (argv[0] == NULL) - help(&doveadm_cmd_mailbox_mutf7); - - str = t_str_new(128); - for (i = 0; argv[i] != NULL; i++) { - str_truncate(str, 0); - if (from_utf8) { - if (imap_utf8_to_utf7(argv[i], str) < 0) { - i_error("Mailbox name not valid UTF-8: %s", - argv[i]); - } - } else { - if (imap_utf7_to_utf8(argv[i], str) < 0) { - i_error("Mailbox name not valid mUTF-7: %s", - argv[i]); - } - } - printf("%s\n", str_c(str)); - } -} - struct doveadm_mail_cmd cmd_mailbox_list = { cmd_mailbox_list_alloc, "mailbox list", "[-7|-8] [-s] [<mailbox mask> [...]]" @@ -512,7 +469,3 @@ cmd_mailbox_unsubscribe_alloc, "mailbox unsubscribe", "<mailbox> [...]" }; -struct doveadm_cmd doveadm_cmd_mailbox_mutf7 = { - cmd_mailbox_mutf7, "mailbox mutf7", - "[-7|-8] <name> [...]" -};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/doveadm/doveadm-mutf7.c Fri Jul 23 15:51:38 2010 +0100 @@ -0,0 +1,57 @@ +/* Copyright (c) 2009-2010 Dovecot authors, see the included COPYING file */ + +#include "lib.h" +#include "str.h" +#include "imap-utf7.h" +#include "doveadm.h" + +#include <stdio.h> +#include <unistd.h> + +static void cmd_mailbox_mutf7(int argc, char *argv[]) +{ + string_t *str; + bool from_utf8; + unsigned int i; + int c; + + from_utf8 = TRUE; + while ((c = getopt(argc, argv, "78")) > 0) { + switch (c) { + case '7': + from_utf8 = FALSE; + break; + case '8': + from_utf8 = TRUE; + break; + default: + help(&doveadm_cmd_mailbox_mutf7); + } + } + argv += optind; + + if (argv[0] == NULL) + help(&doveadm_cmd_mailbox_mutf7); + + str = t_str_new(128); + for (i = 0; argv[i] != NULL; i++) { + str_truncate(str, 0); + if (from_utf8) { + if (imap_utf8_to_utf7(argv[i], str) < 0) { + i_error("Mailbox name not valid UTF-8: %s", + argv[i]); + } + } else { + if (imap_utf7_to_utf8(argv[i], str) < 0) { + i_error("Mailbox name not valid mUTF-7: %s", + argv[i]); + } + } + printf("%s\n", str_c(str)); + } +} + +struct doveadm_cmd doveadm_cmd_mailbox_mutf7 = { + cmd_mailbox_mutf7, "mailbox mutf7", + "[-7|-8] <name> [...]" +};