X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=5c2d56e8884367e2d85da7aa3b7ea6066a3ce15c;hp=7021008ee64a558e583684f37e795cfe49841d08;hb=e1b7d32db00ea8afaa1f2ae31bdaa5cb423dda96;hpb=e1c1d33f3726f5cadb2f92d23735dcd1102fbc88 diff --git a/notmuch-show.c b/notmuch-show.c index 7021008e..5c2d56e8 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -340,6 +340,48 @@ signature_status_to_string (GMimeSignatureStatus x) return "unknown"; } + +/* Print signature flags */ +struct key_map_struct { + GMimeSignatureError bit; + const char * string; +}; + +static void +do_format_signature_errors (sprinter_t *sp, struct key_map_struct *key_map, + unsigned int array_map_len, GMimeSignatureError errors) { + sp->map_key (sp, "errors"); + sp->begin_map (sp); + + for (unsigned int i = 0; i < array_map_len; i++) { + if (errors & key_map[i].bit) { + sp->map_key (sp, key_map[i].string); + sp->boolean (sp, TRUE); + } + } + + sp->end (sp); +} + +static void +format_signature_errors (sprinter_t *sp, GMimeSignature *signature) +{ + GMimeSignatureError errors = g_mime_signature_get_errors (signature); + + if (errors == GMIME_SIGNATURE_ERROR_NONE) + return; + + struct key_map_struct key_map[] = { + { GMIME_SIGNATURE_ERROR_EXPSIG, "sig-expired" }, + { GMIME_SIGNATURE_ERROR_NO_PUBKEY, "key-missing"}, + { GMIME_SIGNATURE_ERROR_EXPKEYSIG, "key-expired"}, + { GMIME_SIGNATURE_ERROR_REVKEYSIG, "key-revoked"}, + { GMIME_SIGNATURE_ERROR_UNSUPP_ALGO, "alg-unsupported"}, + }; + + do_format_signature_errors (sp, key_map, ARRAY_SIZE(key_map), errors); +} + /* Signature status sprinter (GMime 2.6) */ static void format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node) @@ -404,10 +446,14 @@ format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node) } } - GMimeSignatureError errors = g_mime_signature_get_errors (signature); - if (errors != GMIME_SIGNATURE_ERROR_NONE) { - sp->map_key (sp, "errors"); - sp->integer (sp, errors); + if (notmuch_format_version <= 3) { + GMimeSignatureError errors = g_mime_signature_get_errors (signature); + if (errors != GMIME_SIGNATURE_ERROR_NONE) { + sp->map_key (sp, "errors"); + sp->integer (sp, errors); + } + } else { + format_signature_errors (sp, signature); } sp->end (sp); @@ -426,6 +472,7 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node, GMIME_OBJECT (node->envelope_part) : node->part; GMimeContentType *content_type = g_mime_object_get_content_type (meta); const notmuch_bool_t leaf = GMIME_IS_PART (node->part); + GMimeStream *stream = params->out_stream; const char *part_type; int i; @@ -433,13 +480,13 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node, notmuch_message_t *message = node->envelope_file; part_type = "message"; - printf ("\f%s{ id:%s depth:%d match:%d excluded:%d filename:%s\n", - part_type, - notmuch_message_get_message_id (message), - indent, - notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH) ? 1 : 0, - notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED) ? 1 : 0, - notmuch_message_get_filename (message)); + g_mime_stream_printf (stream, "\f%s{ id:%s depth:%d match:%d excluded:%d filename:%s\n", + part_type, + notmuch_message_get_message_id (message), + indent, + notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH) ? 1 : 0, + notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED) ? 1 : 0, + notmuch_message_get_filename (message)); } else { char *content_string; const char *disposition = _get_disposition (meta); @@ -453,14 +500,14 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node, else part_type = "part"; - printf ("\f%s{ ID: %d", part_type, node->part_num); + g_mime_stream_printf (stream, "\f%s{ ID: %d", part_type, node->part_num); if (filename) - printf (", Filename: %s", filename); + g_mime_stream_printf (stream, ", Filename: %s", filename); if (cid) - printf (", Content-id: %s", cid); + g_mime_stream_printf (stream, ", Content-id: %s", cid); content_string = g_mime_content_type_to_string (content_type); - printf (", Content-type: %s\n", content_string); + g_mime_stream_printf (stream, ", Content-type: %s\n", content_string); g_free (content_string); } @@ -470,40 +517,37 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node, char *recipients_string; char *date_string; - printf ("\fheader{\n"); + g_mime_stream_printf (stream, "\fheader{\n"); if (node->envelope_file) - printf ("%s\n", _get_one_line_summary (ctx, node->envelope_file)); - printf ("Subject: %s\n", g_mime_message_get_subject (message)); - printf ("From: %s\n", g_mime_message_get_sender (message)); + g_mime_stream_printf (stream, "%s\n", _get_one_line_summary (ctx, node->envelope_file)); + g_mime_stream_printf (stream, "Subject: %s\n", g_mime_message_get_subject (message)); + g_mime_stream_printf (stream, "From: %s\n", g_mime_message_get_sender (message)); recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO); recipients_string = internet_address_list_to_string (recipients, 0); if (recipients_string) - printf ("To: %s\n", recipients_string); + g_mime_stream_printf (stream, "To: %s\n", recipients_string); g_free (recipients_string); recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC); recipients_string = internet_address_list_to_string (recipients, 0); if (recipients_string) - printf ("Cc: %s\n", recipients_string); + g_mime_stream_printf (stream, "Cc: %s\n", recipients_string); g_free (recipients_string); date_string = g_mime_message_get_date_as_string (message); - printf ("Date: %s\n", date_string); + g_mime_stream_printf (stream, "Date: %s\n", date_string); g_free (date_string); - printf ("\fheader}\n"); + g_mime_stream_printf (stream, "\fheader}\n"); - printf ("\fbody{\n"); + g_mime_stream_printf (stream, "\fbody{\n"); } if (leaf) { if (g_mime_content_type_is_type (content_type, "text", "*") && !g_mime_content_type_is_type (content_type, "text", "html")) { - GMimeStream *stream_stdout = g_mime_stream_file_new (stdout); - g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE); - show_text_part_content (node->part, stream_stdout, 0); - g_object_unref(stream_stdout); + show_text_part_content (node->part, stream, 0); } else { char *content_string = g_mime_content_type_to_string (content_type); - printf ("Non-text part: %s\n", content_string); + g_mime_stream_printf (stream, "Non-text part: %s\n", content_string); g_free (content_string); } } @@ -512,9 +556,9 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node, format_part_text (ctx, sp, mime_node_child (node, i), indent, params); if (GMIME_IS_MESSAGE (node->part)) - printf ("\fbody}\n"); + g_mime_stream_printf (stream, "\fbody}\n"); - printf ("\f%s}\n", part_type); + g_mime_stream_printf (stream, "\f%s}\n", part_type); return NOTMUCH_STATUS_SUCCESS; } @@ -741,7 +785,7 @@ format_part_mbox (const void *ctx, unused (sprinter_t *sp), mime_node_t *node, static notmuch_status_t format_part_raw (unused (const void *ctx), unused (sprinter_t *sp), mime_node_t *node, unused (int indent), - unused (const notmuch_show_params_t *params)) + const notmuch_show_params_t *params) { if (node->envelope_file) { /* Special case the entire message to avoid MIME parsing. */ @@ -781,13 +825,7 @@ format_part_raw (unused (const void *ctx), unused (sprinter_t *sp), return NOTMUCH_STATUS_SUCCESS; } - GMimeStream *stream_stdout; - GMimeStream *stream_filter = NULL; - - stream_stdout = g_mime_stream_file_new (stdout); - g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE); - - stream_filter = g_mime_stream_filter_new (stream_stdout); + GMimeStream *stream_filter = g_mime_stream_filter_new (params->out_stream); if (GMIME_IS_PART (node->part)) { /* For leaf parts, we emit only the transfer-decoded @@ -810,9 +848,6 @@ format_part_raw (unused (const void *ctx), unused (sprinter_t *sp), if (stream_filter) g_object_unref (stream_filter); - if (stream_stdout) - g_object_unref(stream_stdout); - return NOTMUCH_STATUS_SUCCESS; } @@ -913,7 +948,7 @@ do_show_single (void *ctx, return 1; if (count != 1) { - fprintf (stderr, "Error: search term did not match precisely one message (matched %d messages).\n", count); + fprintf (stderr, "Error: search term did not match precisely one message (matched %u messages).\n", count); return 1; } @@ -1167,6 +1202,8 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) formatter = formatters[format]; sprinter = formatter->new_sprinter(config, stdout); + params.out_stream = g_mime_stream_stdout_new (); + /* If a single message is requested we do not use search_excludes. */ if (single_message) { ret = do_show_single (config, query, formatter, sprinter, ¶ms); @@ -1200,6 +1237,9 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) } DONE: + g_mime_stream_flush (params.out_stream); + g_object_unref (params.out_stream); + notmuch_crypto_cleanup (¶ms.crypto); notmuch_query_destroy (query); notmuch_database_destroy (notmuch);