dovecot-2.1: dovadm mail commands: When mailbox parameter has no...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/200af5e4c44f
changeset: 14389:200af5e4c44f
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Apr 04 09:41:15 2012 +0300
description:
dovadm mail commands: When mailbox parameter has no wildcard, use SEARCH_MAILBOX.

diffstat:

 src/doveadm/doveadm-mail-mailbox.c |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 19e9a83ca8dc -r 200af5e4c44f src/doveadm/doveadm-mail-mailbox.c
--- a/src/doveadm/doveadm-mail-mailbox.c	Wed Apr 04 09:40:24 2012 +0300
+++ b/src/doveadm/doveadm-mail-mailbox.c	Wed Apr 04 09:41:15 2012 +0300
@@ -139,12 +139,18 @@
 {
 	struct mail_search_args *search_args;
 	struct mail_search_arg *arg;
+	enum mail_search_arg_type type;
 	unsigned int i;
 
 	doveadm_mailbox_args_check(args);
 	search_args = mail_search_build_init();
 	for (i = 0; args[i] != NULL; i++) {
-		arg = mail_search_build_add(search_args, SEARCH_MAILBOX_GLOB);
+		if (strchr(args[i], '*') != NULL ||
+		    strchr(args[i], '%') != NULL)
+			type = SEARCH_MAILBOX_GLOB;
+		else
+			type = SEARCH_MAILBOX;
+		arg = mail_search_build_add(search_args, type);
 		arg->value.str = p_strdup(search_args->pool, args[i]);
 	}
 	if (i > 1) {