Mercurial > dovecot > core-2.2

changeset 20523:7838bc17ed04

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doveadm fetch: Fixed body.snippet.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Thu, 14 Jul 2016 06:53:54 -0500
parents 2c0956060e6d
children 46d7324c8246
files src/doveadm/doveadm-mail-fetch.c
diffstat 1 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/doveadm/doveadm-mail-fetch.c	Wed Jul 13 15:10:57 2016 -0500
+++ b/src/doveadm/doveadm-mail-fetch.c	Thu Jul 14 06:53:54 2016 -0500
@@ -546,7 +546,10 @@
 		name = t_str_lcase(*fields);
 
 		doveadm_print_header_simple(name);
-		if (strncmp(name, "hdr.", 4) == 0) {
+		if ((field = fetch_field_find(name)) != NULL) {
+			ctx->wanted_fields |= field->wanted_fields;
+			array_append(&ctx->fields, field, 1);
+		} else if (strncmp(name, "hdr.", 4) == 0) {
 			name += 4;
 			hdr_field.name = name;
 			array_append(&ctx->fields, &hdr_field, 1);
@@ -566,13 +569,8 @@
 			ctx->wanted_fields |= imap_msgpart_get_fetch_data(msgpart);
 			imap_msgpart_free(&msgpart);
 		} else {
-			field = fetch_field_find(name);
-			if (field == NULL) {
-				print_fetch_fields();
-				i_fatal("Unknown fetch field: %s", name);
-			}
-			ctx->wanted_fields |= field->wanted_fields;
-			array_append(&ctx->fields, field, 1);
+			print_fetch_fields();
+			i_fatal("Unknown fetch field: %s", name);
 		}
 	}
 	array_append_zero(&ctx->header_fields);