X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=ab1cd1446e6f89a4d87cc7fe1c207561afe5f48e;hp=084b7dab78e59423a03137ad57bf18b6a68835e1;hb=f140bbcb40ac2510189329c11ca8ff20650c9eab;hpb=15815d4e4c95e87f0bcabcaeb2577237609a6946 diff --git a/notmuch-show.c b/notmuch-show.c index 084b7dab..ab1cd144 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -21,6 +21,7 @@ #include "notmuch-client.h" #include "gmime-filter-reply.h" #include "sprinter.h" +#include "zlib-extra.h" static const char * _get_tags_as_string (const void *ctx, notmuch_message_t *message) @@ -36,8 +37,7 @@ _get_tags_as_string (const void *ctx, notmuch_message_t *message) for (tags = notmuch_message_get_tags (message); notmuch_tags_valid (tags); - notmuch_tags_move_to_next (tags)) - { + notmuch_tags_move_to_next (tags)) { tag = notmuch_tags_get (tags); result = talloc_asprintf_append (result, "%s%s", @@ -68,12 +68,13 @@ _get_one_line_summary (const void *ctx, notmuch_message_t *message) from, relative_date, tags); } -static const char *_get_disposition(GMimeObject *meta) +static const char * +_get_disposition (GMimeObject *meta) { GMimeContentDisposition *disposition; disposition = g_mime_object_get_content_disposition (meta); - if (!disposition) + if (! disposition) return NULL; return g_mime_content_disposition_get_disposition (disposition); @@ -146,7 +147,7 @@ _extract_email_address (const void *ctx, const char *from) InternetAddressMailbox *mailbox; const char *email = "MAILER-DAEMON"; - addresses = internet_address_list_parse_string (from); + addresses = internet_address_list_parse (NULL, from); /* Bail if there is no address here. */ if (addresses == NULL || internet_address_list_length (addresses) < 1) @@ -169,7 +170,7 @@ _extract_email_address (const void *ctx, const char *from) g_object_unref (addresses); return email; - } +} /* Return 1 if 'line' is an mbox From_ line---that is, a line * beginning with zero or more '>' characters followed by the @@ -196,49 +197,48 @@ _is_from_line (const char *line) void format_headers_sprinter (sprinter_t *sp, GMimeMessage *message, - notmuch_bool_t reply) + bool reply, const _notmuch_message_crypto_t *msg_crypto) { /* Any changes to the JSON or S-Expression format should be * reflected in the file devel/schemata. */ - InternetAddressList *recipients; char *recipients_string; const char *reply_to_string; - char *date_string; + void *local = talloc_new (sp); sp->begin_map (sp); sp->map_key (sp, "Subject"); - sp->string (sp, g_mime_message_get_subject (message)); + if (msg_crypto && msg_crypto->payload_subject) { + sp->string (sp, msg_crypto->payload_subject); + } else + sp->string (sp, g_mime_message_get_subject (message)); sp->map_key (sp, "From"); - sp->string (sp, g_mime_message_get_sender (message)); + sp->string (sp, g_mime_message_get_from_string (message)); - recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO); - recipients_string = internet_address_list_to_string (recipients, 0); + recipients_string = g_mime_message_get_address_string (message, GMIME_ADDRESS_TYPE_TO); if (recipients_string) { sp->map_key (sp, "To"); sp->string (sp, 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); + recipients_string = g_mime_message_get_address_string (message, GMIME_ADDRESS_TYPE_CC); if (recipients_string) { sp->map_key (sp, "Cc"); sp->string (sp, recipients_string); g_free (recipients_string); } - recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_BCC); - recipients_string = internet_address_list_to_string (recipients, 0); + recipients_string = g_mime_message_get_address_string (message, GMIME_ADDRESS_TYPE_BCC); if (recipients_string) { sp->map_key (sp, "Bcc"); sp->string (sp, recipients_string); g_free (recipients_string); } - reply_to_string = g_mime_message_get_reply_to (message); + reply_to_string = g_mime_message_get_reply_to_string (local, message); if (reply_to_string) { sp->map_key (sp, "Reply-To"); sp->string (sp, reply_to_string); @@ -252,12 +252,11 @@ format_headers_sprinter (sprinter_t *sp, GMimeMessage *message, sp->string (sp, g_mime_object_get_header (GMIME_OBJECT (message), "References")); } else { sp->map_key (sp, "Date"); - date_string = g_mime_message_get_date_as_string (message); - sp->string (sp, date_string); - g_free (date_string); + sp->string (sp, g_mime_message_get_date_string (sp, message)); } sp->end (sp); + talloc_free (local); } /* Write a MIME text part out to the given stream. @@ -277,23 +276,48 @@ show_text_part_content (GMimeObject *part, GMimeStream *stream_out, GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); GMimeStream *stream_filter = NULL; GMimeFilter *crlf_filter = NULL; + GMimeFilter *windows_filter = NULL; GMimeDataWrapper *wrapper; const char *charset; if (! g_mime_content_type_is_type (content_type, "text", "*")) INTERNAL_ERROR ("Illegal request to format non-text part (%s) as text.", - g_mime_content_type_to_string (content_type)); + g_mime_content_type_get_mime_type (content_type)); if (stream_out == NULL) return; + charset = g_mime_object_get_content_type_parameter (part, "charset"); + charset = charset ? g_mime_charset_canon_name (charset) : NULL; + wrapper = g_mime_part_get_content (GMIME_PART (part)); + if (wrapper && charset && ! g_ascii_strncasecmp (charset, "iso-8859-", 9)) { + GMimeStream *null_stream = NULL; + GMimeStream *null_stream_filter = NULL; + + /* Check for mislabeled Windows encoding */ + null_stream = g_mime_stream_null_new (); + null_stream_filter = g_mime_stream_filter_new (null_stream); + windows_filter = g_mime_filter_windows_new (charset); + g_mime_stream_filter_add (GMIME_STREAM_FILTER (null_stream_filter), + windows_filter); + g_mime_data_wrapper_write_to_stream (wrapper, null_stream_filter); + charset = g_mime_filter_windows_real_charset ( + (GMimeFilterWindows *) windows_filter); + + if (null_stream_filter) + g_object_unref (null_stream_filter); + if (null_stream) + g_object_unref (null_stream); + /* Keep a reference to windows_filter in order to prevent the + * charset string from deallocation. */ + } + stream_filter = g_mime_stream_filter_new (stream_out); - crlf_filter = g_mime_filter_crlf_new (FALSE, FALSE); - g_mime_stream_filter_add(GMIME_STREAM_FILTER (stream_filter), - crlf_filter); + crlf_filter = g_mime_filter_dos2unix_new (false); + g_mime_stream_filter_add (GMIME_STREAM_FILTER (stream_filter), + crlf_filter); g_object_unref (crlf_filter); - charset = g_mime_object_get_content_type_parameter (part, "charset"); if (charset) { GMimeFilter *charset_filter; charset_filter = g_mime_filter_charset_new (charset, "UTF-8"); @@ -310,7 +334,7 @@ show_text_part_content (GMimeObject *part, GMimeStream *stream_out, if (flags & NOTMUCH_SHOW_TEXT_PART_REPLY) { GMimeFilter *reply_filter; - reply_filter = g_mime_filter_reply_new (TRUE); + reply_filter = g_mime_filter_reply_new (true); if (reply_filter) { g_mime_stream_filter_add (GMIME_STREAM_FILTER (stream_filter), reply_filter); @@ -318,45 +342,46 @@ show_text_part_content (GMimeObject *part, GMimeStream *stream_out, } } - wrapper = g_mime_part_get_content_object (GMIME_PART (part)); if (wrapper && stream_filter) g_mime_data_wrapper_write_to_stream (wrapper, stream_filter); if (stream_filter) - g_object_unref(stream_filter); + g_object_unref (stream_filter); + if (windows_filter) + g_object_unref (windows_filter); } -/* Get signature status string (GMime 2.6) */ -static const char* -signature_status_to_string (GMimeSignatureStatus x) +static const char * +signature_status_to_string (GMimeSignatureStatus status) { - switch (x) { - case GMIME_SIGNATURE_STATUS_GOOD: - return "good"; - case GMIME_SIGNATURE_STATUS_BAD: + if (g_mime_signature_status_bad (status)) return "bad"; - case GMIME_SIGNATURE_STATUS_ERROR: + + if (g_mime_signature_status_error (status)) return "error"; - } + + if (g_mime_signature_status_good (status)) + return "good"; + return "unknown"; } - /* Print signature flags */ struct key_map_struct { - GMimeSignatureError bit; - const char * string; + GMimeSignatureStatus 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) { + unsigned int array_map_len, GMimeSignatureStatus 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->boolean (sp, true); } } @@ -366,34 +391,36 @@ do_format_signature_errors (sprinter_t *sp, struct key_map_struct *key_map, static void format_signature_errors (sprinter_t *sp, GMimeSignature *signature) { - GMimeSignatureError errors = g_mime_signature_get_errors (signature); + GMimeSignatureStatus errors = g_mime_signature_get_status (signature); - if (errors == GMIME_SIGNATURE_ERROR_NONE) + if (! (errors & GMIME_SIGNATURE_STATUS_ERROR_MASK)) 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"}, + { GMIME_SIGNATURE_STATUS_KEY_REVOKED, "key-revoked" }, + { GMIME_SIGNATURE_STATUS_KEY_EXPIRED, "key-expired" }, + { GMIME_SIGNATURE_STATUS_SIG_EXPIRED, "sig-expired" }, + { GMIME_SIGNATURE_STATUS_KEY_MISSING, "key-missing" }, + { GMIME_SIGNATURE_STATUS_CRL_MISSING, "crl-missing" }, + { GMIME_SIGNATURE_STATUS_CRL_TOO_OLD, "crl-too-old" }, + { GMIME_SIGNATURE_STATUS_BAD_POLICY, "bad-policy" }, + { GMIME_SIGNATURE_STATUS_SYS_ERROR, "sys-error" }, + { GMIME_SIGNATURE_STATUS_TOFU_CONFLICT, "tofu-conflict" }, }; - do_format_signature_errors (sp, key_map, ARRAY_SIZE(key_map), errors); + do_format_signature_errors (sp, key_map, ARRAY_SIZE (key_map), errors); } -/* Signature status sprinter (GMime 2.6) */ +/* Signature status sprinter */ static void -format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node) +format_part_sigstatus_sprinter (sprinter_t *sp, GMimeSignatureList *siglist) { /* Any changes to the JSON or S-Expression format should be * reflected in the file devel/schemata. */ - GMimeSignatureList *siglist = node->sig_list; - sp->begin_list (sp); - if (!siglist) { + if (! siglist) { sp->end (sp); return; } @@ -410,7 +437,7 @@ format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node) sp->string (sp, signature_status_to_string (status)); GMimeCertificate *certificate = g_mime_signature_get_certificate (signature); - if (status == GMIME_SIGNATURE_STATUS_GOOD) { + if (g_mime_signature_status_good (status)) { if (certificate) { sp->map_key (sp, "fingerprint"); sp->string (sp, g_mime_certificate_get_fingerprint (certificate)); @@ -427,19 +454,15 @@ format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node) sp->map_key (sp, "expires"); sp->integer (sp, expires); } - /* output user id only if validity is FULL or ULTIMATE. */ - /* note that gmime is using the term "trust" here, which - * is WRONG. It's actually user id "validity". */ if (certificate) { - const char *name = g_mime_certificate_get_name (certificate); - GMimeCertificateTrust trust = g_mime_certificate_get_trust (certificate); - if (name && (trust == GMIME_CERTIFICATE_TRUST_FULLY || trust == GMIME_CERTIFICATE_TRUST_ULTIMATE)) { + const char *uid = g_mime_certificate_get_valid_userid (certificate); + if (uid) { sp->map_key (sp, "userid"); - sp->string (sp, name); + sp->string (sp, uid); } } } else if (certificate) { - const char *key_id = g_mime_certificate_get_key_id (certificate); + const char *key_id = g_mime_certificate_get_fpr16 (certificate); if (key_id) { sp->map_key (sp, "keyid"); sp->string (sp, key_id); @@ -447,8 +470,8 @@ format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node) } if (notmuch_format_version <= 3) { - GMimeSignatureError errors = g_mime_signature_get_errors (signature); - if (errors != GMIME_SIGNATURE_ERROR_NONE) { + GMimeSignatureStatus errors = g_mime_signature_get_status (signature); + if (g_mime_signature_status_error (errors)) { sp->map_key (sp, "errors"); sp->integer (sp, errors); } @@ -457,7 +480,7 @@ format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node) } sp->end (sp); - } + } sp->end (sp); } @@ -468,10 +491,10 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node, { /* The disposition and content-type metadata are associated with * the envelope for message parts */ - GMimeObject *meta = node->envelope_part ? - GMIME_OBJECT (node->envelope_part) : node->part; + GMimeObject *meta = node->envelope_part ? ( + 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); + const bool leaf = GMIME_IS_PART (node->part); GMimeStream *stream = params->out_stream; const char *part_type; int i; @@ -491,8 +514,8 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node, char *content_string; const char *disposition = _get_disposition (meta); const char *cid = g_mime_object_get_content_id (meta); - const char *filename = leaf ? - g_mime_part_get_filename (GMIME_PART (node->part)) : NULL; + const char *filename = leaf ? ( + g_mime_part_get_filename (GMIME_PART (node->part)) ) : NULL; if (disposition && strcasecmp (disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) @@ -506,14 +529,13 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node, if (cid) g_mime_stream_printf (stream, ", Content-id: %s", cid); - content_string = g_mime_content_type_to_string (content_type); + content_string = g_mime_content_type_get_mime_type (content_type); g_mime_stream_printf (stream, ", Content-type: %s\n", content_string); g_free (content_string); } if (GMIME_IS_MESSAGE (node->part)) { GMimeMessage *message = GMIME_MESSAGE (node->part); - InternetAddressList *recipients; char *recipients_string; char *date_string; @@ -521,32 +543,33 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node, if (node->envelope_file) 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); + g_mime_stream_printf (stream, "From: %s\n", g_mime_message_get_from_string (message)); + recipients_string = g_mime_message_get_address_string (message, GMIME_ADDRESS_TYPE_TO); if (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); + recipients_string = g_mime_message_get_address_string (message, GMIME_ADDRESS_TYPE_CC); if (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); + date_string = g_mime_message_get_date_string (node, message); g_mime_stream_printf (stream, "Date: %s\n", date_string); - g_free (date_string); g_mime_stream_printf (stream, "\fheader}\n"); + if (! params->output_body) { + g_mime_stream_printf (stream, "\f%s}\n", part_type); + return NOTMUCH_STATUS_SUCCESS; + } 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")) - { + (params->include_html || + ! g_mime_content_type_is_type (content_type, "text", "html"))) { show_text_part_content (node->part, stream, 0); } else { - char *content_string = g_mime_content_type_to_string (content_type); + char *content_string = g_mime_content_type_get_mime_type (content_type); g_mime_stream_printf (stream, "Non-text part: %s\n", content_string); g_free (content_string); } @@ -568,7 +591,7 @@ format_omitted_part_meta_sprinter (sprinter_t *sp, GMimeObject *meta, GMimePart { const char *content_charset = g_mime_object_get_content_type_parameter (meta, "charset"); const char *cte = g_mime_object_get_header (meta, "content-transfer-encoding"); - GMimeDataWrapper *wrapper = g_mime_part_get_content_object (part); + GMimeDataWrapper *wrapper = g_mime_part_get_content (part); GMimeStream *stream = g_mime_data_wrapper_get_stream (wrapper); ssize_t content_length = g_mime_stream_length (stream); @@ -588,39 +611,90 @@ format_omitted_part_meta_sprinter (sprinter_t *sp, GMimeObject *meta, GMimePart void format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node, - notmuch_bool_t first, notmuch_bool_t output_body, - notmuch_bool_t include_html) + bool output_body, + bool include_html) { /* Any changes to the JSON or S-Expression format should be * reflected in the file devel/schemata. */ if (node->envelope_file) { + const _notmuch_message_crypto_t *msg_crypto = NULL; sp->begin_map (sp); format_message_sprinter (sp, node->envelope_file); - sp->map_key (sp, "headers"); - format_headers_sprinter (sp, GMIME_MESSAGE (node->part), FALSE); - if (output_body) { sp->map_key (sp, "body"); sp->begin_list (sp); - format_part_sprinter (ctx, sp, mime_node_child (node, 0), first, TRUE, include_html); + format_part_sprinter (ctx, sp, mime_node_child (node, 0), true, include_html); sp->end (sp); } + + msg_crypto = mime_node_get_message_crypto_status (node); + if (notmuch_format_version >= 4) { + sp->map_key (sp, "crypto"); + sp->begin_map (sp); + if (msg_crypto->sig_list || + msg_crypto->decryption_status != NOTMUCH_MESSAGE_DECRYPTED_NONE) { + if (msg_crypto->sig_list) { + sp->map_key (sp, "signed"); + sp->begin_map (sp); + sp->map_key (sp, "status"); + format_part_sigstatus_sprinter (sp, msg_crypto->sig_list); + if (msg_crypto->signature_encrypted) { + sp->map_key (sp, "encrypted"); + sp->boolean (sp, msg_crypto->signature_encrypted); + } + if (msg_crypto->payload_subject) { + sp->map_key (sp, "headers"); + sp->begin_list (sp); + sp->string (sp, "Subject"); + sp->end (sp); + } + sp->end (sp); + } + if (msg_crypto->decryption_status != NOTMUCH_MESSAGE_DECRYPTED_NONE) { + sp->map_key (sp, "decrypted"); + sp->begin_map (sp); + sp->map_key (sp, "status"); + sp->string (sp, msg_crypto->decryption_status == NOTMUCH_MESSAGE_DECRYPTED_FULL ? "full" : "partial"); + + if (msg_crypto->payload_subject) { + const char *subject = g_mime_message_get_subject GMIME_MESSAGE (node->part); + if (subject == NULL || strcmp (subject, msg_crypto->payload_subject)) { + /* protected subject differs from the external header */ + sp->map_key (sp, "header-mask"); + sp->begin_map (sp); + sp->map_key (sp, "Subject"); + if (subject == NULL) + sp->null (sp); + else + sp->string (sp, subject); + sp->end (sp); + } + } + sp->end (sp); + } + } + sp->end (sp); + } + + sp->map_key (sp, "headers"); + format_headers_sprinter (sp, GMIME_MESSAGE (node->part), false, msg_crypto); + sp->end (sp); return; } /* The disposition and content-type metadata are associated with * the envelope for message parts */ - GMimeObject *meta = node->envelope_part ? - GMIME_OBJECT (node->envelope_part) : node->part; + GMimeObject *meta = node->envelope_part ? ( + GMIME_OBJECT (node->envelope_part) ) : node->part; GMimeContentType *content_type = g_mime_object_get_content_type (meta); char *content_string; const char *disposition = _get_disposition (meta); const char *cid = g_mime_object_get_content_id (meta); - const char *filename = GMIME_IS_PART (node->part) ? - g_mime_part_get_filename (GMIME_PART (node->part)) : NULL; + const char *filename = GMIME_IS_PART (node->part) ? ( + g_mime_part_get_filename (GMIME_PART (node->part) ) ) : NULL; int nclose = 0; int i; @@ -641,11 +715,11 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node, if (node->verify_attempted) { sp->map_key (sp, "sigstatus"); - format_part_sigstatus_sprinter (sp, node); + format_part_sigstatus_sprinter (sp, node->sig_list); } sp->map_key (sp, "content-type"); - content_string = g_mime_content_type_to_string (content_type); + content_string = g_mime_content_type_get_mime_type (content_type); sp->string (sp, content_string); g_free (content_string); @@ -676,8 +750,7 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node, */ if (g_mime_content_type_is_type (content_type, "text", "*") && (include_html || - ! g_mime_content_type_is_type (content_type, "text", "html"))) - { + ! g_mime_content_type_is_type (content_type, "text", "html"))) { GMimeStream *stream_memory = g_mime_stream_mem_new (); GByteArray *part_content; show_text_part_content (node->part, stream_memory, 0); @@ -698,7 +771,7 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node, sp->begin_map (sp); sp->map_key (sp, "headers"); - format_headers_sprinter (sp, GMIME_MESSAGE (node->part), FALSE); + format_headers_sprinter (sp, GMIME_MESSAGE (node->part), false, NULL); sp->map_key (sp, "body"); sp->begin_list (sp); @@ -706,7 +779,7 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node, } for (i = 0; i < node->nchildren; i++) - format_part_sprinter (ctx, sp, mime_node_child (node, i), i == 0, TRUE, include_html); + format_part_sprinter (ctx, sp, mime_node_child (node, i), true, include_html); /* Close content structures */ for (i = 0; i < nclose; i++) @@ -720,7 +793,7 @@ format_part_sprinter_entry (const void *ctx, sprinter_t *sp, mime_node_t *node, unused (int indent), const notmuch_show_params_t *params) { - format_part_sprinter (ctx, sp, node, TRUE, params->output_body, params->include_html); + format_part_sprinter (ctx, sp, node, params->output_body, params->include_html); return NOTMUCH_STATUS_SUCCESS; } @@ -738,7 +811,7 @@ format_part_mbox (const void *ctx, unused (sprinter_t *sp), mime_node_t *node, notmuch_message_t *message = node->envelope_file; const char *filename; - FILE *file; + gzFile file; const char *from; time_t date; @@ -746,14 +819,14 @@ format_part_mbox (const void *ctx, unused (sprinter_t *sp), mime_node_t *node, char date_asctime[26]; char *line = NULL; - size_t line_size; + ssize_t line_size; ssize_t line_len; - if (!message) + if (! message) INTERNAL_ERROR ("format_part_mbox requires a root part"); filename = notmuch_message_get_filename (message); - file = fopen (filename, "r"); + file = gzopen (filename, "r"); if (file == NULL) { fprintf (stderr, "Failed to open %s: %s\n", filename, strerror (errno)); @@ -769,7 +842,7 @@ format_part_mbox (const void *ctx, unused (sprinter_t *sp), mime_node_t *node, printf ("From %s %s", from, date_asctime); - while ((line_len = getline (&line, &line_size, file)) != -1 ) { + while ((line_len = gz_getline (message, &line, &line_size, file)) != UTIL_EOF ) { if (_is_from_line (line)) putchar ('>'); printf ("%s", line); @@ -777,7 +850,7 @@ format_part_mbox (const void *ctx, unused (sprinter_t *sp), mime_node_t *node, printf ("\n"); - fclose (file); + gzclose (file); return NOTMUCH_STATUS_SUCCESS; } @@ -790,39 +863,44 @@ format_part_raw (unused (const void *ctx), unused (sprinter_t *sp), if (node->envelope_file) { /* Special case the entire message to avoid MIME parsing. */ const char *filename; - FILE *file; - size_t size; + GMimeStream *stream = NULL; + ssize_t ssize; char buf[4096]; + notmuch_status_t ret = NOTMUCH_STATUS_FILE_ERROR; filename = notmuch_message_get_filename (node->envelope_file); if (filename == NULL) { fprintf (stderr, "Error: Cannot get message filename.\n"); - return NOTMUCH_STATUS_FILE_ERROR; + goto DONE; } - file = fopen (filename, "r"); - if (file == NULL) { + stream = g_mime_stream_gzfile_open (filename); + if (stream == NULL) { fprintf (stderr, "Error: Cannot open file %s: %s\n", filename, strerror (errno)); - return NOTMUCH_STATUS_FILE_ERROR; + goto DONE; } - while (!feof (file)) { - size = fread (buf, 1, sizeof (buf), file); - if (ferror (file)) { + while (! g_mime_stream_eos (stream)) { + ssize = g_mime_stream_read (stream, buf, sizeof (buf)); + if (ssize < 0) { fprintf (stderr, "Error: Read failed from %s\n", filename); - fclose (file); - return NOTMUCH_STATUS_FILE_ERROR; + goto DONE; } - if (fwrite (buf, size, 1, stdout) != 1) { - fprintf (stderr, "Error: Write failed\n"); - fclose (file); - return NOTMUCH_STATUS_FILE_ERROR; + if (ssize > 0 && fwrite (buf, ssize, 1, stdout) != 1) { + fprintf (stderr, "Error: Write %ld chars to stdout failed\n", ssize); + goto DONE; } } - fclose (file); - return NOTMUCH_STATUS_SUCCESS; + ret = NOTMUCH_STATUS_SUCCESS; + + /* XXX This DONE is just for the special case of a node in a single file */ + DONE: + if (stream) + g_object_unref (stream); + + return ret; } GMimeStream *stream_filter = g_mime_stream_filter_new (params->out_stream); @@ -831,7 +909,7 @@ format_part_raw (unused (const void *ctx), unused (sprinter_t *sp), /* For leaf parts, we emit only the transfer-decoded * body. */ GMimeDataWrapper *wrapper; - wrapper = g_mime_part_get_content_object (GMIME_PART (node->part)); + wrapper = g_mime_part_get_content (GMIME_PART (node->part)); if (wrapper && stream_filter) g_mime_data_wrapper_write_to_stream (wrapper, stream_filter); @@ -842,7 +920,7 @@ format_part_raw (unused (const void *ctx), unused (sprinter_t *sp), * encapsulating part's headers). For multipart parts, * this will include the headers. */ if (stream_filter) - g_mime_object_write_to_stream (node->part, stream_filter); + g_mime_object_write_to_stream (node->part, NULL, stream_filter); } if (stream_filter) @@ -862,6 +940,11 @@ show_message (void *ctx, void *local = talloc_new (ctx); mime_node_t *root, *part; notmuch_status_t status; + unsigned int session_keys = 0; + notmuch_status_t session_key_count_error = NOTMUCH_STATUS_SUCCESS; + + if (params->crypto.decrypt == NOTMUCH_DECRYPT_TRUE) + session_key_count_error = notmuch_message_count_properties (message, "session-key", &session_keys); status = mime_node_open (local, message, &(params->crypto), &root); if (status) @@ -869,6 +952,19 @@ show_message (void *ctx, part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part)); if (part) status = format->part (local, sp, part, indent, params); + if (params->crypto.decrypt == NOTMUCH_DECRYPT_TRUE && session_key_count_error == NOTMUCH_STATUS_SUCCESS) { + unsigned int new_session_keys = 0; + if (notmuch_message_count_properties (message, "session-key", &new_session_keys) == NOTMUCH_STATUS_SUCCESS && + new_session_keys > session_keys) { + /* try a quiet re-indexing */ + notmuch_indexopts_t *indexopts = notmuch_database_get_default_indexopts (notmuch_message_get_database (message)); + if (indexopts) { + notmuch_indexopts_set_decrypt_policy (indexopts, NOTMUCH_DECRYPT_AUTO); + print_status_message ("Error re-indexing message with --decrypt=stash", + message, notmuch_message_reindex (message, indexopts)); + } + } + } DONE: talloc_free (local); return status; @@ -883,8 +979,8 @@ show_messages (void *ctx, notmuch_show_params_t *params) { notmuch_message_t *message; - notmuch_bool_t match; - notmuch_bool_t excluded; + bool match; + bool excluded; int next_indent; notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS; @@ -892,8 +988,7 @@ show_messages (void *ctx, for (; notmuch_messages_valid (messages); - notmuch_messages_move_to_next (messages)) - { + notmuch_messages_move_to_next (messages)) { sp->begin_list (sp); message = notmuch_messages_get (messages); @@ -903,9 +998,9 @@ show_messages (void *ctx, next_indent = indent; - if ((match && (!excluded || !params->omit_excluded)) || params->entire_thread) { + if ((match && (! excluded || ! params->omit_excluded)) || params->entire_thread) { status = show_message (ctx, format, sp, message, indent, params); - if (status && !res) + if (status && ! res) res = status; next_indent = indent + 1; } else { @@ -917,7 +1012,7 @@ show_messages (void *ctx, notmuch_message_get_replies (message), next_indent, params); - if (status && !res) + if (status && ! res) res = status; notmuch_message_destroy (message); @@ -966,32 +1061,31 @@ do_show_single (void *ctx, notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH, 1); return show_message (ctx, format, sp, message, 0, params) - != NOTMUCH_STATUS_SUCCESS; + != NOTMUCH_STATUS_SUCCESS; } /* Formatted output of threads */ static int -do_show (void *ctx, - notmuch_query_t *query, - const notmuch_show_format_t *format, - sprinter_t *sp, - notmuch_show_params_t *params) +do_show_threaded (void *ctx, + notmuch_query_t *query, + const notmuch_show_format_t *format, + sprinter_t *sp, + notmuch_show_params_t *params) { notmuch_threads_t *threads; notmuch_thread_t *thread; notmuch_messages_t *messages; notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS; - status= notmuch_query_search_threads (query, &threads); + status = notmuch_query_search_threads (query, &threads); if (print_status_query ("notmuch show", query, status)) return 1; sp->begin_list (sp); - for ( ; + for (; notmuch_threads_valid (threads); - notmuch_threads_move_to_next (threads)) - { + notmuch_threads_move_to_next (threads)) { thread = notmuch_threads_get (threads); messages = notmuch_thread_get_toplevel_messages (thread); @@ -1001,7 +1095,7 @@ do_show (void *ctx, notmuch_thread_get_thread_id (thread)); status = show_messages (ctx, format, sp, messages, 0, params); - if (status && !res) + if (status && ! res) res = status; notmuch_thread_destroy (thread); @@ -1013,6 +1107,50 @@ do_show (void *ctx, return res != NOTMUCH_STATUS_SUCCESS; } +static int +do_show_unthreaded (void *ctx, + notmuch_query_t *query, + const notmuch_show_format_t *format, + sprinter_t *sp, + notmuch_show_params_t *params) +{ + notmuch_messages_t *messages; + notmuch_message_t *message; + notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS; + notmuch_bool_t excluded; + + status = notmuch_query_search_messages (query, &messages); + if (print_status_query ("notmuch show", query, status)) + return 1; + + sp->begin_list (sp); + + for (; + notmuch_messages_valid (messages); + notmuch_messages_move_to_next (messages)) { + sp->begin_list (sp); + sp->begin_list (sp); + + message = notmuch_messages_get (messages); + + notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH, TRUE); + excluded = notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED); + + if (!excluded || !params->omit_excluded) { + status = show_message (ctx, format, sp, message, 0, params); + if (status && !res) + res = status; + } else { + sp->null (sp); + } + notmuch_message_destroy (message); + sp->end (sp); + sp->end (sp); + } + sp->end (sp); + return res; +} + enum { NOTMUCH_FORMAT_NOT_SPECIFIED, NOTMUCH_FORMAT_JSON, @@ -1066,35 +1204,42 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) sprinter_t *sprinter; notmuch_show_params_t params = { .part = -1, - .omit_excluded = TRUE, - .output_body = TRUE, + .omit_excluded = true, + .output_body = true, + .crypto = { .decrypt = NOTMUCH_DECRYPT_AUTO }, }; int format = NOTMUCH_FORMAT_NOT_SPECIFIED; - int exclude = TRUE; - - /* This value corresponds to neither true nor false being passed - * on the command line */ - int entire_thread = -1; - notmuch_bool_t single_message; + bool exclude = true; + bool entire_thread_set = false; + bool single_message; + bool unthreaded = FALSE; notmuch_opt_desc_t options[] = { - { NOTMUCH_OPT_KEYWORD, &format, "format", 'f', - (notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON }, - { "text", NOTMUCH_FORMAT_TEXT }, - { "sexp", NOTMUCH_FORMAT_SEXP }, - { "mbox", NOTMUCH_FORMAT_MBOX }, - { "raw", NOTMUCH_FORMAT_RAW }, - { 0, 0 } } }, - { NOTMUCH_OPT_INT, ¬much_format_version, "format-version", 0, 0 }, - { NOTMUCH_OPT_BOOLEAN, &exclude, "exclude", 'x', 0 }, - { NOTMUCH_OPT_BOOLEAN, &entire_thread, "entire-thread", 't', 0 }, - { NOTMUCH_OPT_INT, ¶ms.part, "part", 'p', 0 }, - { NOTMUCH_OPT_BOOLEAN, ¶ms.crypto.decrypt, "decrypt", 'd', 0 }, - { NOTMUCH_OPT_BOOLEAN, ¶ms.crypto.verify, "verify", 'v', 0 }, - { NOTMUCH_OPT_BOOLEAN, ¶ms.output_body, "body", 'b', 0 }, - { NOTMUCH_OPT_BOOLEAN, ¶ms.include_html, "include-html", 0, 0 }, - { NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 }, - { 0, 0, 0, 0, 0 } + { .opt_keyword = &format, .name = "format", .keywords = + (notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON }, + { "text", NOTMUCH_FORMAT_TEXT }, + { "sexp", NOTMUCH_FORMAT_SEXP }, + { "mbox", NOTMUCH_FORMAT_MBOX }, + { "raw", NOTMUCH_FORMAT_RAW }, + { 0, 0 } } }, + { .opt_int = ¬much_format_version, .name = "format-version" }, + { .opt_bool = &exclude, .name = "exclude" }, + { .opt_bool = ¶ms.entire_thread, .name = "entire-thread", + .present = &entire_thread_set }, + { .opt_bool = &unthreaded, .name = "unthreaded" }, + { .opt_int = ¶ms.part, .name = "part" }, + { .opt_keyword = (int *) (¶ms.crypto.decrypt), .name = "decrypt", + .keyword_no_arg_value = "true", .keywords = + (notmuch_keyword_t []){ { "false", NOTMUCH_DECRYPT_FALSE }, + { "auto", NOTMUCH_DECRYPT_AUTO }, + { "true", NOTMUCH_DECRYPT_NOSTASH }, + { "stash", NOTMUCH_DECRYPT_TRUE }, + { 0, 0 } } }, + { .opt_bool = ¶ms.crypto.verify, .name = "verify" }, + { .opt_bool = ¶ms.output_body, .name = "body" }, + { .opt_bool = ¶ms.include_html, .name = "include-html" }, + { .opt_inherit = notmuch_shared_options }, + { } }; opt_index = parse_arguments (argc, argv, options, 1); @@ -1103,9 +1248,10 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) notmuch_process_shared_options (argv[0]); - /* decryption implies verification */ - if (params.crypto.decrypt) - params.crypto.verify = TRUE; + /* explicit decryption implies verification */ + if (params.crypto.decrypt == NOTMUCH_DECRYPT_NOSTASH || + params.crypto.decrypt == NOTMUCH_DECRYPT_TRUE) + params.crypto.verify = true; /* specifying a part implies single message display */ single_message = params.part >= 0; @@ -1125,39 +1271,38 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) } } else if (format == NOTMUCH_FORMAT_RAW) { /* raw format only supports single message display */ - single_message = TRUE; + single_message = true; } notmuch_exit_if_unsupported_format (); - /* Default is entire-thread = FALSE except for format=json and + /* Default is entire-thread = false except for format=json and * format=sexp. */ - if (entire_thread != FALSE && entire_thread != TRUE) { - if (format == NOTMUCH_FORMAT_JSON || format == NOTMUCH_FORMAT_SEXP) - params.entire_thread = TRUE; - else - params.entire_thread = FALSE; - } else { - params.entire_thread = entire_thread; - } + if (! entire_thread_set && + (format == NOTMUCH_FORMAT_JSON || format == NOTMUCH_FORMAT_SEXP)) + params.entire_thread = true; - if (!params.output_body) { + if (! params.output_body) { if (params.part > 0) { fprintf (stderr, "Warning: --body=false is incompatible with --part > 0. Disabling.\n"); - params.output_body = TRUE; + params.output_body = true; } else { - if (format != NOTMUCH_FORMAT_JSON && format != NOTMUCH_FORMAT_SEXP) + if (format != NOTMUCH_FORMAT_TEXT && + format != NOTMUCH_FORMAT_JSON && + format != NOTMUCH_FORMAT_SEXP) fprintf (stderr, - "Warning: --body=false only implemented for format=json and format=sexp\n"); + "Warning: --body=false only implemented for format=text, format=json and format=sexp\n"); } } if (params.include_html && - (format != NOTMUCH_FORMAT_JSON && format != NOTMUCH_FORMAT_SEXP)) { - fprintf (stderr, "Warning: --include-html only implemented for format=json and format=sexp\n"); + (format != NOTMUCH_FORMAT_TEXT && + format != NOTMUCH_FORMAT_JSON && + format != NOTMUCH_FORMAT_SEXP)) { + fprintf (stderr, "Warning: --include-html only implemented for format=text, format=json and format=sexp\n"); } - query_string = query_string_from_args (config, argc-opt_index, argv+opt_index); + query_string = query_string_from_args (config, argc - opt_index, argv + opt_index); if (query_string == NULL) { fprintf (stderr, "Out of memory\n"); return EXIT_FAILURE; @@ -1168,10 +1313,11 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) return EXIT_FAILURE; } - params.crypto.gpgpath = notmuch_config_get_crypto_gpg_path (config); - + notmuch_database_mode_t mode = NOTMUCH_DATABASE_MODE_READ_ONLY; + if (params.crypto.decrypt == NOTMUCH_DECRYPT_TRUE) + mode = NOTMUCH_DATABASE_MODE_READ_WRITE; if (notmuch_database_open (notmuch_config_get_database_path (config), - NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much)) + mode, ¬much)) return EXIT_FAILURE; notmuch_exit_if_unmatched_db_uuid (notmuch); @@ -1184,7 +1330,7 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) /* Create structure printer. */ formatter = formatters[format]; - sprinter = formatter->new_sprinter(config, stdout); + sprinter = formatter->new_sprinter (config, stdout); params.out_stream = g_mime_stream_stdout_new (); @@ -1201,7 +1347,7 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) notmuch_status_t status; search_exclude_tags = notmuch_config_get_search_exclude_tags - (config, &search_exclude_tags_length); + (config, &search_exclude_tags_length); for (i = 0; i < search_exclude_tags_length; i++) { status = notmuch_query_add_tag_exclude (query, search_exclude_tags[i]); @@ -1212,19 +1358,22 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) } } - if (exclude == FALSE) { - notmuch_query_set_omit_excluded (query, FALSE); - params.omit_excluded = FALSE; + if (exclude == false) { + notmuch_query_set_omit_excluded (query, false); + params.omit_excluded = false; } - ret = do_show (config, query, formatter, sprinter, ¶ms); + if (unthreaded) + ret = do_show_unthreaded (config, query, formatter, sprinter, ¶ms); + else + ret = do_show_threaded (config, query, formatter, sprinter, ¶ms); } - DONE: + DONE: g_mime_stream_flush (params.out_stream); g_object_unref (params.out_stream); - notmuch_crypto_cleanup (¶ms.crypto); + _notmuch_crypto_cleanup (¶ms.crypto); notmuch_query_destroy (query); notmuch_database_destroy (notmuch);