dovecot-2.0: doveadm: Code cleanup: Moved "mailbox mutf7" comman...
dovecot at dovecot.org
dovecot at dovecot.org
Fri Jul 23 17:51:42 EEST 2010
details: http://hg.dovecot.org/dovecot-2.0/rev/43804bdf697e
changeset: 11890:43804bdf697e
user: Timo Sirainen <tss at iki.fi>
date: Fri Jul 23 15:51:38 2010 +0100
description:
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.
diffstat:
src/doveadm/Makefile.am | 1 +
src/doveadm/doveadm-mail-mailbox.c | 47 -----------------------
src/doveadm/doveadm-mutf7.c | 57 ++++++++++++++++++++++++++++
3 files changed, 58 insertions(+), 47 deletions(-)
diffs (133 lines):
diff -r 45473cd0e3e6 -r 43804bdf697e src/doveadm/Makefile.am
--- 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 \
diff -r 45473cd0e3e6 -r 43804bdf697e src/doveadm/doveadm-mail-mailbox.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> [...]"
-};
diff -r 45473cd0e3e6 -r 43804bdf697e src/doveadm/doveadm-mutf7.c
--- /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> [...]"
+};
More information about the dovecot-cvs
mailing list