"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/doveadm/doveadm-mutf7.c" between
dovecot-2.3.16.tar.gz and dovecot-2.3.17.tar.gz

About: Dovecot is an IMAP and POP3 server, written with security primarily in mind.

doveadm-mutf7.c  (dovecot-2.3.16)	:	doveadm-mutf7.c  (dovecot-2.3.17)
/* Copyright (c) 2009-2018 Dovecot authors, see the included COPYING file */		/* Copyright (c) 2009-2018 Dovecot authors, see the included COPYING file */
#include "lib.h"		#include "lib.h"
#include "str.h"		#include "str.h"
#include "imap-utf7.h"		#include "imap-utf7.h"
#include "doveadm.h"		#include "doveadm.h"
#include <stdio.h>		#include <stdio.h>
#include <unistd.h>		#include <unistd.h>
static void cmd_mailbox_mutf7(int argc, char *argv[])		static void cmd_mailbox_mutf7(struct doveadm_cmd_context *cctx)
{		{
string_t *str;		string_t *str;
bool from_utf8;		const char *const *names;
		bool from_utf8, to_utf8;
unsigned int i;		unsigned int i;
int c;
from_utf8 = TRUE;		if (!doveadm_cmd_param_array(cctx, "name", &names))
while ((c = getopt(argc, argv, "78")) > 0) {		help_ver2(&doveadm_cmd_mailbox_mutf7);
switch (c) {		if (!doveadm_cmd_param_bool(cctx, "from-utf8", &from_utf8)) {
case '7':		if (!doveadm_cmd_param_bool(cctx, "to-utf8", &to_utf8))
from_utf8 = FALSE;
break;
case '8':
from_utf8 = TRUE;		from_utf8 = TRUE;
break;		else
default:		from_utf8 = !to_utf8;
help(&doveadm_cmd_mailbox_mutf7);
}
}		}
argv += optind;
if (argv[0] == NULL)
help(&doveadm_cmd_mailbox_mutf7);
str = t_str_new(128);		str = t_str_new(128);
for (i = 0; argv[i] != NULL; i++) {		for (i = 0; names[i] != NULL; i++) {
str_truncate(str, 0);		str_truncate(str, 0);
if (from_utf8) {		if (from_utf8) {
if (imap_utf8_to_utf7(argv[i], str) < 0) {		if (imap_utf8_to_utf7(names[i], str) < 0) {
i_error("Mailbox name not valid UTF-8: %s",		i_error("Mailbox name not valid UTF-8: %s",
argv[i]);		names[i]);
doveadm_exit_code = EX_DATAERR;		doveadm_exit_code = EX_DATAERR;
}		}
} else {		} else {
if (imap_utf7_to_utf8(argv[i], str) < 0) {		if (imap_utf7_to_utf8(names[i], str) < 0) {
i_error("Mailbox name not valid mUTF-7: %s",		i_error("Mailbox name not valid mUTF-7: %s",
argv[i]);		names[i]);
doveadm_exit_code = EX_DATAERR;		doveadm_exit_code = EX_DATAERR;
}		}
}		}
printf("%s\n", str_c(str));		printf("%s\n", str_c(str));
}		}
}		}
struct doveadm_cmd doveadm_cmd_mailbox_mutf7 = {		struct doveadm_cmd_ver2 doveadm_cmd_mailbox_mutf7 = {
cmd_mailbox_mutf7, "mailbox mutf7",		.name = "mailbox mutf7",
"[-7|-8] <name> [...]"		.cmd = cmd_mailbox_mutf7,
		.usage = "[-7|-8] <name> [...]",
		DOVEADM_CMD_PARAMS_START
		DOVEADM_CMD_PARAM('7', "to-utf8", CMD_PARAM_BOOL, 0)
		DOVEADM_CMD_PARAM('8', "from-utf8", CMD_PARAM_BOOL, 0)
		DOVEADM_CMD_PARAM('\0', "name", CMD_PARAM_ARRAY, CMD_PARAM_FLAG_POSITIONAL)
		DOVEADM_CMD_PARAMS_END
};		};
End of changes. 12 change blocks.
26 lines changed or deleted		23 lines changed or added

---