X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=6ef33085acb1060934940c6db55b5ef1b6764e34;hp=0200b9c4a4cd28fe7126d83b5b0045c82037e9bb;hb=33382c2b5ba2537952a60ea378feff36961e4713;hpb=36f7fe5a1c83f3f0dd8fc883db558ab058b974f3 diff --git a/notmuch-show.c b/notmuch-show.c index 0200b9c4..9779cfa5 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -13,132 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/ . + * along with this program. If not, see https://www.gnu.org/licenses/ . * * Author: Carl Worth */ #include "notmuch-client.h" - -static void -format_message_text (unused (const void *ctx), - notmuch_message_t *message, - int indent); -static void -format_headers_text (const void *ctx, - notmuch_message_t *message); - -static void -format_headers_message_part_text (GMimeMessage *message); - -static void -format_part_start_text (GMimeObject *part, - int *part_count); - -static void -format_part_content_text (GMimeObject *part); - -static void -format_part_end_text (GMimeObject *part); - -static const notmuch_show_format_t format_text = { - "", - "\fmessage{ ", format_message_text, - "\fheader{\n", format_headers_text, format_headers_message_part_text, "\fheader}\n", - "\fbody{\n", - format_part_start_text, - NULL, - NULL, - format_part_content_text, - format_part_end_text, - "", - "\fbody}\n", - "\fmessage}\n", "", - "" -}; - -static void -format_message_json (const void *ctx, - notmuch_message_t *message, - unused (int indent)); -static void -format_headers_json (const void *ctx, - notmuch_message_t *message); - -static void -format_headers_message_part_json (GMimeMessage *message); - -static void -format_part_start_json (unused (GMimeObject *part), - int *part_count); - -static void -format_part_encstatus_json (int status); - -static void -format_part_sigstatus_json (const GMimeSignatureValidity* validity); - -static void -format_part_content_json (GMimeObject *part); - -static void -format_part_end_json (GMimeObject *part); - -static const notmuch_show_format_t format_json = { - "[", - "{", format_message_json, - "\"headers\": {", format_headers_json, format_headers_message_part_json, "}", - ", \"body\": [", - format_part_start_json, - format_part_encstatus_json, - format_part_sigstatus_json, - format_part_content_json, - format_part_end_json, - ", ", - "]", - "}", ", ", - "]" -}; - -static void -format_message_mbox (const void *ctx, - notmuch_message_t *message, - unused (int indent)); - -static const notmuch_show_format_t format_mbox = { - "", - "", format_message_mbox, - "", NULL, NULL, "", - "", - NULL, - NULL, - NULL, - NULL, - NULL, - "", - "", - "", "", - "" -}; - -static void -format_part_content_raw (GMimeObject *part); - -static const notmuch_show_format_t format_raw = { - "", - "", NULL, - "", NULL, format_headers_message_part_text, "\n", - "", - NULL, - NULL, - NULL, - format_part_content_raw, - NULL, - "", - "", - "", "", - "" -}; +#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) @@ -154,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", @@ -186,44 +68,73 @@ _get_one_line_summary (const void *ctx, notmuch_message_t *message) from, relative_date, tags); } -static void -format_message_text (unused (const void *ctx), notmuch_message_t *message, int indent) +static const char * +_get_disposition (GMimeObject *meta) { - printf ("id:%s depth:%d match:%d filename:%s\n", - notmuch_message_get_message_id (message), - indent, - notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH), - notmuch_message_get_filename (message)); + GMimeContentDisposition *disposition; + + disposition = g_mime_object_get_content_disposition (meta); + if (! disposition) + return NULL; + + return g_mime_content_disposition_get_disposition (disposition); } +/* Emit a sequence of key/value pairs for the metadata of message. + * The caller should begin a map before calling this. */ static void -format_message_json (const void *ctx, notmuch_message_t *message, unused (int indent)) +format_message_sprinter (sprinter_t *sp, notmuch_message_t *message) { + /* Any changes to the JSON or S-Expression format should be + * reflected in the file devel/schemata. */ + + void *local = talloc_new (NULL); notmuch_tags_t *tags; - int first = 1; - void *ctx_quote = talloc_new (ctx); time_t date; const char *relative_date; + sp->map_key (sp, "id"); + sp->string (sp, notmuch_message_get_message_id (message)); + + sp->map_key (sp, "match"); + sp->boolean (sp, notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH)); + + sp->map_key (sp, "excluded"); + sp->boolean (sp, notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED)); + + sp->map_key (sp, "filename"); + if (notmuch_format_version >= 3) { + notmuch_filenames_t *filenames; + + sp->begin_list (sp); + for (filenames = notmuch_message_get_filenames (message); + notmuch_filenames_valid (filenames); + notmuch_filenames_move_to_next (filenames)) { + sp->string (sp, notmuch_filenames_get (filenames)); + } + notmuch_filenames_destroy (filenames); + sp->end (sp); + } else { + sp->string (sp, notmuch_message_get_filename (message)); + } + + sp->map_key (sp, "timestamp"); date = notmuch_message_get_date (message); - relative_date = notmuch_time_relative_date (ctx, date); + sp->integer (sp, date); - printf ("\"id\": %s, \"match\": %s, \"filename\": %s, \"timestamp\": %ld, \"date_relative\": \"%s\", \"tags\": [", - json_quote_str (ctx_quote, notmuch_message_get_message_id (message)), - notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH) ? "true" : "false", - json_quote_str (ctx_quote, notmuch_message_get_filename (message)), - date, relative_date); + sp->map_key (sp, "date_relative"); + relative_date = notmuch_time_relative_date (local, date); + sp->string (sp, relative_date); + sp->map_key (sp, "tags"); + sp->begin_list (sp); for (tags = notmuch_message_get_tags (message); notmuch_tags_valid (tags); notmuch_tags_move_to_next (tags)) - { - printf("%s%s", first ? "" : ",", - json_quote_str (ctx_quote, notmuch_tags_get (tags))); - first = 0; - } - printf("], "); - talloc_free (ctx_quote); + sp->string (sp, notmuch_tags_get (tags)); + sp->end (sp); + + talloc_free (local); } /* Extract just the email address from the contents of a From: @@ -236,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) @@ -259,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 @@ -284,187 +195,129 @@ _is_from_line (const char *line) return 0; } -/* Print a message in "mboxrd" format as documented, for example, - * here: - * - * http://qmail.org/qmail-manual-html/man5/mbox.html - */ -static void -format_message_mbox (const void *ctx, - notmuch_message_t *message, - unused (int indent)) +void +format_headers_sprinter (sprinter_t *sp, GMimeMessage *message, + bool reply, const _notmuch_message_crypto_t *msg_crypto) { - const char *filename; - FILE *file; - const char *from; + /* Any changes to the JSON or S-Expression format should be + * reflected in the file devel/schemata. */ - time_t date; - struct tm date_gmtime; - char date_asctime[26]; + char *recipients_string; + const char *reply_to_string; + void *local = talloc_new (sp); - char *line = NULL; - size_t line_size; - ssize_t line_len; + sp->begin_map (sp); - filename = notmuch_message_get_filename (message); - file = fopen (filename, "r"); - if (file == NULL) { - fprintf (stderr, "Failed to open %s: %s\n", - filename, strerror (errno)); - return; - } + sp->map_key (sp, "Subject"); + if (msg_crypto && msg_crypto->payload_subject) { + sp->string (sp, msg_crypto->payload_subject); + } else + sp->string (sp, g_mime_message_get_subject (message)); - from = notmuch_message_get_header (message, "from"); - from = _extract_email_address (ctx, from); + sp->map_key (sp, "From"); + sp->string (sp, g_mime_message_get_from_string (message)); - date = notmuch_message_get_date (message); - gmtime_r (&date, &date_gmtime); - asctime_r (&date_gmtime, date_asctime); - - printf ("From %s %s", from, date_asctime); - - while ((line_len = getline (&line, &line_size, file)) != -1 ) { - if (_is_from_line (line)) - putchar ('>'); - printf ("%s", line); + 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); } - printf ("\n"); - - fclose (file); -} - - -static void -format_headers_text (const void *ctx, notmuch_message_t *message) -{ - const char *headers[] = { - "Subject", "From", "To", "Cc", "Bcc", "Date" - }; - const char *name, *value; - unsigned int i; + 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); + } - printf ("%s\n", _get_one_line_summary (ctx, message)); + 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); + } - for (i = 0; i < ARRAY_SIZE (headers); i++) { - name = headers[i]; - value = notmuch_message_get_header (message, name); - if (value && strlen (value)) - printf ("%s: %s\n", name, value); + 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); } -} -static void -format_headers_message_part_text (GMimeMessage *message) -{ - InternetAddressList *recipients; - const char *recipients_string; - - printf ("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); - 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); - printf ("Subject: %s\n", g_mime_message_get_subject (message)); - printf ("Date: %s\n", g_mime_message_get_date_as_string (message)); -} + if (reply) { + sp->map_key (sp, "In-reply-to"); + sp->string (sp, g_mime_object_get_header (GMIME_OBJECT (message), "In-reply-to")); -static void -format_headers_json (const void *ctx, notmuch_message_t *message) -{ - const char *headers[] = { - "Subject", "From", "To", "Cc", "Bcc", "Date" - }; - const char *name, *value; - unsigned int i; - int first_header = 1; - void *ctx_quote = talloc_new (ctx); - - for (i = 0; i < ARRAY_SIZE (headers); i++) { - name = headers[i]; - value = notmuch_message_get_header (message, name); - if (value) - { - if (!first_header) - fputs (", ", stdout); - first_header = 0; - - printf ("%s: %s", - json_quote_str (ctx_quote, name), - json_quote_str (ctx_quote, value)); - } + sp->map_key (sp, "References"); + sp->string (sp, g_mime_object_get_header (GMIME_OBJECT (message), "References")); + } else { + sp->map_key (sp, "Date"); + sp->string (sp, g_mime_message_get_date_string (sp, message)); } - talloc_free (ctx_quote); -} - -static void -format_headers_message_part_json (GMimeMessage *message) -{ - void *ctx = talloc_new (NULL); - void *ctx_quote = talloc_new (ctx); - InternetAddressList *recipients; - const char *recipients_string; - - printf ("%s: %s", - json_quote_str (ctx_quote, "From"), - json_quote_str (ctx_quote, 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 (", %s: %s", - json_quote_str (ctx_quote, "To"), - json_quote_str (ctx_quote, 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 (", %s: %s", - json_quote_str (ctx_quote, "Cc"), - json_quote_str (ctx_quote, recipients_string)); - printf (", %s: %s", - json_quote_str (ctx_quote, "Subject"), - json_quote_str (ctx_quote, g_mime_message_get_subject (message))); - printf (", %s: %s", - json_quote_str (ctx_quote, "Date"), - json_quote_str (ctx_quote, g_mime_message_get_date_as_string (message))); - - talloc_free (ctx_quote); - talloc_free (ctx); + sp->end (sp); + talloc_free (local); } /* Write a MIME text part out to the given stream. + * + * If (flags & NOTMUCH_SHOW_TEXT_PART_REPLY), this prepends "> " to + * each output line. * * Both line-ending conversion (CRLF->LF) and charset conversion ( -> * UTF-8) will be performed, so it is inappropriate to call this * function with a non-text part. Doing so will trigger an internal * error. */ -static void -show_text_part_content (GMimeObject *part, GMimeStream *stream_out) +void +show_text_part_content (GMimeObject *part, GMimeStream *stream_out, + notmuch_show_text_part_flags flags) { 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); - g_mime_stream_filter_add(GMIME_STREAM_FILTER (stream_filter), - g_mime_filter_crlf_new (FALSE, FALSE)); + 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"); @@ -479,343 +332,697 @@ show_text_part_content (GMimeObject *part, GMimeStream *stream_out) } - wrapper = g_mime_part_get_content_object (GMIME_PART (part)); + if (flags & NOTMUCH_SHOW_TEXT_PART_REPLY) { + GMimeFilter *reply_filter; + reply_filter = g_mime_filter_reply_new (true); + if (reply_filter) { + g_mime_stream_filter_add (GMIME_STREAM_FILTER (stream_filter), + reply_filter); + g_object_unref (reply_filter); + } + } + 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); } -static const char* -signer_status_to_string (GMimeSignerStatus x) +static const char * +signature_status_to_string (GMimeSignatureStatus status) { - switch (x) { - case GMIME_SIGNER_STATUS_NONE: - return "none"; - case GMIME_SIGNER_STATUS_GOOD: - return "good"; - case GMIME_SIGNER_STATUS_BAD: + if (g_mime_signature_status_bad (status)) return "bad"; - case GMIME_SIGNER_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 { + GMimeSignatureStatus bit; + const char *string; +}; + static void -format_part_start_text (GMimeObject *part, int *part_count) +do_format_signature_errors (sprinter_t *sp, struct key_map_struct *key_map, + unsigned int array_map_len, GMimeSignatureStatus errors) { - GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part); + sp->map_key (sp, "errors"); + sp->begin_map (sp); - if (disposition && - strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) - { - printf ("\fattachment{ ID: %d", *part_count); + 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); + } + } - } else { + sp->end (sp); +} - printf ("\fpart{ ID: %d", *part_count); - } +static void +format_signature_errors (sprinter_t *sp, GMimeSignature *signature) +{ + GMimeSignatureStatus errors = g_mime_signature_get_status (signature); + + if (! (errors & GMIME_SIGNATURE_STATUS_ERROR_MASK)) + return; + + struct key_map_struct key_map[] = { + { 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); } +/* Signature status sprinter */ static void -format_part_content_text (GMimeObject *part) +format_part_sigstatus_sprinter (sprinter_t *sp, GMimeSignatureList *siglist) { - const char *cid = g_mime_object_get_content_id (part); - GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); + /* Any changes to the JSON or S-Expression format should be + * reflected in the file devel/schemata. */ - if (GMIME_IS_PART (part)) - { - const char *filename = g_mime_part_get_filename (GMIME_PART (part)); - if (filename) - printf (", Filename: %s", filename); + sp->begin_list (sp); + + if (! siglist) { + sp->end (sp); + return; } - if (cid) - printf (", Content-id: %s", cid); + int i; + for (i = 0; i < g_mime_signature_list_length (siglist); i++) { + GMimeSignature *signature = g_mime_signature_list_get_signature (siglist, i); - printf (", Content-type: %s\n", g_mime_content_type_to_string (content_type)); + sp->begin_map (sp); - 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 (part, stream_stdout); - g_object_unref(stream_stdout); - } - else if (g_mime_content_type_is_type (content_type, "multipart", "*") || - g_mime_content_type_is_type (content_type, "message", "rfc822")) - { - /* Do nothing for multipart since its content will be printed - * when recursing. */ - } - else - { - printf ("Non-text part: %s\n", - g_mime_content_type_to_string (content_type)); + /* status */ + GMimeSignatureStatus status = g_mime_signature_get_status (signature); + sp->map_key (sp, "status"); + sp->string (sp, signature_status_to_string (status)); + + GMimeCertificate *certificate = g_mime_signature_get_certificate (signature); + if (g_mime_signature_status_good (status)) { + if (certificate) { + sp->map_key (sp, "fingerprint"); + sp->string (sp, g_mime_certificate_get_fingerprint (certificate)); + } + /* these dates are seconds since the epoch; should we + * provide a more human-readable format string? */ + time_t created = g_mime_signature_get_created (signature); + if (created != -1) { + sp->map_key (sp, "created"); + sp->integer (sp, created); + } + time_t expires = g_mime_signature_get_expires (signature); + if (expires > 0) { + sp->map_key (sp, "expires"); + sp->integer (sp, expires); + } + if (certificate) { + const char *uid = g_mime_certificate_get_valid_userid (certificate); + if (uid) { + sp->map_key (sp, "userid"); + sp->string (sp, uid); + } + } + } else if (certificate) { + const char *key_id = g_mime_certificate_get_fpr16 (certificate); + if (key_id) { + sp->map_key (sp, "keyid"); + sp->string (sp, key_id); + } + } + + if (notmuch_format_version <= 3) { + GMimeSignatureStatus errors = g_mime_signature_get_status (signature); + if (g_mime_signature_status_error (errors)) { + sp->map_key (sp, "errors"); + sp->integer (sp, errors); + } + } else { + format_signature_errors (sp, signature); + } + + sp->end (sp); } + + sp->end (sp); } -static void -format_part_end_text (GMimeObject *part) +static notmuch_status_t +format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node, + int indent, const notmuch_show_params_t *params) { - GMimeContentDisposition *disposition; + /* 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 ; + GMimeContentType *content_type = g_mime_object_get_content_type (meta); + const bool leaf = GMIME_IS_PART (node->part); + GMimeStream *stream = params->out_stream; + const char *part_type; + int i; + + if (node->envelope_file) { + notmuch_message_t *message = node->envelope_file; + + part_type = "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); + const char *cid = g_mime_object_get_content_id (meta); + const char *filename = leaf ? ( + g_mime_part_get_filename (GMIME_PART (node->part)) ) : NULL ; + + if (disposition && + strcasecmp (disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) + part_type = "attachment"; + else + part_type = "part"; - disposition = g_mime_object_get_content_disposition (part); - if (disposition && - strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) - { - printf ("\fattachment}\n"); + g_mime_stream_printf (stream, "\f%s{ ID: %d", part_type, node->part_num); + if (filename) + g_mime_stream_printf (stream, ", Filename: %s", filename); + if (cid) + g_mime_stream_printf (stream, ", Content-id: %s", cid); + + 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); } - else - { - printf ("\fpart}\n"); + + if (GMIME_IS_MESSAGE (node->part)) { + GMimeMessage *message = GMIME_MESSAGE (node->part); + char *recipients_string; + char *date_string; + + g_mime_stream_printf (stream, "\fheader{\n"); + 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_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_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_string (node, message); + g_mime_stream_printf (stream, "Date: %s\n", 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"); } -} -static void -format_part_start_json (unused (GMimeObject *part), int *part_count) -{ - printf ("{\"id\": %d", *part_count); + if (leaf) { + if (g_mime_content_type_is_type (content_type, "text", "*") && + (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_get_mime_type (content_type); + g_mime_stream_printf (stream, "Non-text part: %s\n", content_string); + g_free (content_string); + } + } + + for (i = 0; i < node->nchildren; i++) + format_part_text (ctx, sp, mime_node_child (node, i), indent, params); + + if (GMIME_IS_MESSAGE (node->part)) + g_mime_stream_printf (stream, "\fbody}\n"); + + g_mime_stream_printf (stream, "\f%s}\n", part_type); + + return NOTMUCH_STATUS_SUCCESS; } static void -format_part_encstatus_json (int status) +format_omitted_part_meta_sprinter (sprinter_t *sp, GMimeObject *meta, GMimePart *part) { - printf (", \"encstatus\": [{\"status\": "); - if (status) { - printf ("\"good\""); - } else { - printf ("\"bad\""); + 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 (part); + GMimeStream *stream = g_mime_data_wrapper_get_stream (wrapper); + ssize_t content_length = g_mime_stream_length (stream); + + if (content_charset != NULL) { + sp->map_key (sp, "content-charset"); + sp->string (sp, content_charset); + } + if (cte != NULL) { + sp->map_key (sp, "content-transfer-encoding"); + sp->string (sp, cte); + } + if (content_length >= 0) { + sp->map_key (sp, "content-length"); + sp->integer (sp, content_length); } - printf ("}]"); } -static void -format_part_sigstatus_json (const GMimeSignatureValidity* validity) +void +format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node, + bool output_body, + bool include_html) { - printf (", \"sigstatus\": ["); + /* 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); + + if (output_body) { + sp->map_key (sp, "body"); + sp->begin_list (sp); + 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); - if (!validity) { - printf ("]"); + sp->end (sp); return; } - const GMimeSigner *signer = g_mime_signature_validity_get_signers (validity); - int first = 1; - void *ctx_quote = talloc_new (NULL); + /* 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; + 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; + int nclose = 0; + int i; - while (signer) { - if (first) - first = 0; - else - printf (", "); + sp->begin_map (sp); - printf ("{"); + sp->map_key (sp, "id"); + sp->integer (sp, node->part_num); - /* status */ - printf ("\"status\": %s", - json_quote_str (ctx_quote, - signer_status_to_string (signer->status))); - - if (signer->status == GMIME_SIGNER_STATUS_GOOD) - { - if (signer->fingerprint) - printf (", \"fingerprint\": %s", json_quote_str (ctx_quote, signer->fingerprint)); - /* these dates are seconds since the epoch; should we - * provide a more human-readable format string? */ - if (signer->created) - printf (", \"created\": %d", (int) signer->created); - if (signer->expires) - printf (", \"expires\": %d", (int) signer->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 ((signer->name) && (signer->trust)) { - if ((signer->trust == GMIME_SIGNER_TRUST_FULLY) || (signer->trust == GMIME_SIGNER_TRUST_ULTIMATE)) - printf (", \"userid\": %s", json_quote_str (ctx_quote, signer->name)); - } - } else { - if (signer->keyid) - printf (", \"keyid\": %s", json_quote_str (ctx_quote, signer->keyid)); - } - if (signer->errors != GMIME_SIGNER_ERROR_NONE) { - printf (", \"errors\": %x", signer->errors); - } - - printf ("}"); - signer = signer->next; + if (node->decrypt_attempted) { + sp->map_key (sp, "encstatus"); + sp->begin_list (sp); + sp->begin_map (sp); + sp->map_key (sp, "status"); + sp->string (sp, node->decrypt_success ? "good" : "bad"); + sp->end (sp); + sp->end (sp); } - printf ("]"); + if (node->verify_attempted) { + sp->map_key (sp, "sigstatus"); + format_part_sigstatus_sprinter (sp, node->sig_list); + } + + sp->map_key (sp, "content-type"); + content_string = g_mime_content_type_get_mime_type (content_type); + sp->string (sp, content_string); + g_free (content_string); + + if (disposition) { + sp->map_key (sp, "content-disposition"); + sp->string (sp, disposition); + } + + if (cid) { + sp->map_key (sp, "content-id"); + sp->string (sp, cid); + } - talloc_free (ctx_quote); + if (filename) { + sp->map_key (sp, "filename"); + sp->string (sp, filename); + } + + if (GMIME_IS_PART (node->part)) { + /* For non-HTML text parts, we include the content in the + * JSON. Since JSON must be Unicode, we handle charset + * decoding here and do not report a charset to the caller. + * For text/html parts, we do not include the content unless + * the --include-html option has been passed. If a html part + * is not included, it can be requested directly. This makes + * charset decoding the responsibility on the caller so we + * report the charset for text/html parts. + */ + if (g_mime_content_type_is_type (content_type, "text", "*") && + (include_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); + part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory)); + sp->map_key (sp, "content"); + sp->string_len (sp, (char *) part_content->data, part_content->len); + g_object_unref (stream_memory); + } else { + format_omitted_part_meta_sprinter (sp, meta, GMIME_PART (node->part)); + } + } else if (GMIME_IS_MULTIPART (node->part)) { + sp->map_key (sp, "content"); + sp->begin_list (sp); + nclose = 1; + } else if (GMIME_IS_MESSAGE (node->part)) { + sp->map_key (sp, "content"); + sp->begin_list (sp); + sp->begin_map (sp); + + sp->map_key (sp, "headers"); + format_headers_sprinter (sp, GMIME_MESSAGE (node->part), false, NULL); + + sp->map_key (sp, "body"); + sp->begin_list (sp); + nclose = 3; + } + + for (i = 0; i < node->nchildren; i++) + format_part_sprinter (ctx, sp, mime_node_child (node, i), true, include_html); + + /* Close content structures */ + for (i = 0; i < nclose; i++) + sp->end (sp); + /* Close part map */ + sp->end (sp); } -static void -format_part_content_json (GMimeObject *part) +static notmuch_status_t +format_part_sprinter_entry (const void *ctx, sprinter_t *sp, + mime_node_t *node, unused (int indent), + const notmuch_show_params_t *params) { - GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); - GMimeStream *stream_memory = g_mime_stream_mem_new (); - const char *cid = g_mime_object_get_content_id (part); - void *ctx = talloc_new (NULL); - GByteArray *part_content; + format_part_sprinter (ctx, sp, node, params->output_body, params->include_html); - printf (", \"content-type\": %s", - json_quote_str (ctx, g_mime_content_type_to_string (content_type))); + return NOTMUCH_STATUS_SUCCESS; +} - if (cid != NULL) - printf(", \"content-id\": %s", json_quote_str (ctx, cid)); +/* Print a message in "mboxrd" format as documented, for example, + * here: + * + * http://qmail.org/qmail-manual-html/man5/mbox.html + */ +static notmuch_status_t +format_part_mbox (const void *ctx, unused (sprinter_t *sp), mime_node_t *node, + unused (int indent), + unused (const notmuch_show_params_t *params)) +{ + notmuch_message_t *message = node->envelope_file; - if (GMIME_IS_PART (part)) - { - const char *filename = g_mime_part_get_filename (GMIME_PART (part)); - if (filename) - printf (", \"filename\": %s", json_quote_str (ctx, filename)); - } + const char *filename; + gzFile file; + const char *from; + + time_t date; + struct tm date_gmtime; + char date_asctime[26]; + + char *line = NULL; + ssize_t line_size; + ssize_t line_len; - if (g_mime_content_type_is_type (content_type, "text", "*") && - !g_mime_content_type_is_type (content_type, "text", "html")) - { - show_text_part_content (part, stream_memory); - part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory)); + if (! message) + INTERNAL_ERROR ("format_part_mbox requires a root part"); - printf (", \"content\": %s", json_quote_chararray (ctx, (char *) part_content->data, part_content->len)); - } - else if (g_mime_content_type_is_type (content_type, "multipart", "*")) - { - printf (", \"content\": ["); + filename = notmuch_message_get_filename (message); + file = gzopen (filename, "r"); + if (file == NULL) { + fprintf (stderr, "Failed to open %s: %s\n", + filename, strerror (errno)); + return NOTMUCH_STATUS_FILE_ERROR; } - else if (g_mime_content_type_is_type (content_type, "message", "rfc822")) - { - printf (", \"content\": [{"); + + from = notmuch_message_get_header (message, "from"); + from = _extract_email_address (ctx, from); + + date = notmuch_message_get_date (message); + gmtime_r (&date, &date_gmtime); + asctime_r (&date_gmtime, date_asctime); + + printf ("From %s %s", from, date_asctime); + + while ((line_len = gz_getline (message, &line, &line_size, file)) != UTIL_EOF ) { + if (_is_from_line (line)) + putchar ('>'); + printf ("%s", line); } - talloc_free (ctx); - if (stream_memory) - g_object_unref (stream_memory); + printf ("\n"); + + gzclose (file); + + return NOTMUCH_STATUS_SUCCESS; } -static void -format_part_end_json (GMimeObject *part) +static notmuch_status_t +format_part_raw (unused (const void *ctx), unused (sprinter_t *sp), + mime_node_t *node, unused (int indent), + const notmuch_show_params_t *params) { - GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); + if (node->envelope_file) { + /* Special case the entire message to avoid MIME parsing. */ + const char *filename; + GMimeStream *stream = NULL; + ssize_t ssize; + char buf[4096]; + notmuch_status_t ret = NOTMUCH_STATUS_FILE_ERROR; - if (g_mime_content_type_is_type (content_type, "multipart", "*")) - printf ("]"); - else if (g_mime_content_type_is_type (content_type, "message", "rfc822")) - printf ("}]"); + filename = notmuch_message_get_filename (node->envelope_file); + if (filename == NULL) { + fprintf (stderr, "Error: Cannot get message filename.\n"); + goto DONE; + } - printf ("}"); -} + stream = g_mime_stream_gzfile_open (filename); + if (stream == NULL) { + fprintf (stderr, "Error: Cannot open file %s: %s\n", filename, strerror (errno)); + goto DONE; + } -static void -format_part_content_raw (GMimeObject *part) -{ - if (! GMIME_IS_PART (part)) - return; + 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); + goto DONE; + } - GMimeStream *stream_stdout; - GMimeStream *stream_filter = NULL; - GMimeDataWrapper *wrapper; + if (ssize > 0 && fwrite (buf, ssize, 1, stdout) != 1) { + fprintf (stderr, "Error: Write %ld chars to stdout failed\n", ssize); + goto DONE; + } + } - stream_stdout = g_mime_stream_file_new (stdout); - g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE); + ret = NOTMUCH_STATUS_SUCCESS; - stream_filter = g_mime_stream_filter_new (stream_stdout); + /* XXX This DONE is just for the special case of a node in a single file */ + DONE: + if (stream) + g_object_unref (stream); - wrapper = g_mime_part_get_content_object (GMIME_PART (part)); + return ret; + } - if (wrapper && stream_filter) - g_mime_data_wrapper_write_to_stream (wrapper, stream_filter); + 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 + * body. */ + GMimeDataWrapper *wrapper; + wrapper = g_mime_part_get_content (GMIME_PART (node->part)); + + if (wrapper && stream_filter) + g_mime_data_wrapper_write_to_stream (wrapper, stream_filter); + } else { + /* Write out the whole part. For message parts (the root + * part and embedded message parts), this will be the + * message including its headers (but not the + * encapsulating part's headers). For multipart parts, + * this will include the headers. */ + if (stream_filter) + g_mime_object_write_to_stream (node->part, NULL, stream_filter); + } if (stream_filter) g_object_unref (stream_filter); - if (stream_stdout) - g_object_unref(stream_stdout); + return NOTMUCH_STATUS_SUCCESS; } -static void +static notmuch_status_t show_message (void *ctx, const notmuch_show_format_t *format, + sprinter_t *sp, notmuch_message_t *message, int indent, notmuch_show_params_t *params) { - if (params->part <= 0) { - fputs (format->message_start, stdout); - if (format->message) - format->message(ctx, message, indent); - - fputs (format->header_start, stdout); - if (format->header) - format->header(ctx, message); - fputs (format->header_end, stdout); - - fputs (format->body_start, stdout); - } + 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 (format->part_content) - show_message_body (message, format, params); + if (params->crypto.decrypt == NOTMUCH_DECRYPT_TRUE) + session_key_count_error = notmuch_message_count_properties (message, "session-key", &session_keys); - if (params->part <= 0) { - fputs (format->body_end, stdout); - - fputs (format->message_end, stdout); + status = mime_node_open (local, message, &(params->crypto), &root); + if (status) + goto DONE; + 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; } -static void +static notmuch_status_t show_messages (void *ctx, const notmuch_show_format_t *format, + sprinter_t *sp, notmuch_messages_t *messages, int indent, notmuch_show_params_t *params) { notmuch_message_t *message; - notmuch_bool_t match; - int first_set = 1; + bool match; + bool excluded; int next_indent; + notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS; - fputs (format->message_set_start, stdout); + sp->begin_list (sp); for (; notmuch_messages_valid (messages); - notmuch_messages_move_to_next (messages)) - { - if (!first_set) - fputs (format->message_set_sep, stdout); - first_set = 0; - - fputs (format->message_set_start, stdout); + notmuch_messages_move_to_next (messages)) { + sp->begin_list (sp); message = notmuch_messages_get (messages); match = notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH); + excluded = notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED); next_indent = indent; - if (match || params->entire_thread) { - show_message (ctx, format, message, indent, params); + if ((match && (! excluded || ! params->omit_excluded)) || params->entire_thread) { + status = show_message (ctx, format, sp, message, indent, params); + if (status && ! res) + res = status; next_indent = indent + 1; - - fputs (format->message_set_sep, stdout); + } else { + sp->null (sp); } - show_messages (ctx, - format, - notmuch_message_get_replies (message), - next_indent, - params); + status = show_messages (ctx, + format, sp, + notmuch_message_get_replies (message), + next_indent, + params); + if (status && ! res) + res = status; notmuch_message_destroy (message); - fputs (format->message_set_end, stdout); + sp->end (sp); } - fputs (format->message_set_end, stdout); + sp->end (sp); + + return res; } /* Formatted output of single message */ @@ -823,17 +1030,27 @@ static int do_show_single (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; + unsigned int count; - if (notmuch_query_count_messages (query) != 1) { - fprintf (stderr, "Error: search term did not match precisely one message.\n"); + status = notmuch_query_count_messages (query, &count); + if (print_status_query ("notmuch show", query, status)) + return 1; + + if (count != 1) { + fprintf (stderr, "Error: search term did not match precisely one message (matched %u messages).\n", count); return 1; } - messages = notmuch_query_search_messages (query); + status = notmuch_query_search_messages (query, &messages); + if (print_status_query ("notmuch show", query, status)) + return 1; + message = notmuch_messages_get (messages); if (message == NULL) { @@ -843,40 +1060,8 @@ do_show_single (void *ctx, notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH, 1); - /* Special case for --format=raw of full single message, just cat out file */ - if (params->raw && 0 == params->part) { - - const char *filename; - FILE *file; - size_t size; - char buf[4096]; - - filename = notmuch_message_get_filename (message); - if (filename == NULL) { - fprintf (stderr, "Error: Cannot message filename.\n"); - return 1; - } - - file = fopen (filename, "r"); - if (file == NULL) { - fprintf (stderr, "Error: Cannot open file %s: %s\n", filename, strerror (errno)); - return 1; - } - - while (!feof (file)) { - size = fread (buf, 1, sizeof (buf), file); - (void) fwrite (buf, size, 1, stdout); - } - - fclose (file); - - } else { - - show_message (ctx, format, message, 0, params); - - } - - return 0; + return show_message (ctx, format, sp, message, 0, params) + != NOTMUCH_STATUS_SUCCESS; } /* Formatted output of threads */ @@ -884,19 +1069,23 @@ static int do_show (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; - int first_toplevel = 1; + notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS; + + status = notmuch_query_search_threads (query, &threads); + if (print_status_query ("notmuch show", query, status)) + return 1; - fputs (format->message_set_start, stdout); + sp->begin_list (sp); - for (threads = notmuch_query_search_threads (query); + 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); @@ -905,142 +1094,239 @@ do_show (void *ctx, INTERNAL_ERROR ("Thread %s has no toplevel messages.\n", notmuch_thread_get_thread_id (thread)); - if (!first_toplevel) - fputs (format->message_set_sep, stdout); - first_toplevel = 0; - - show_messages (ctx, format, messages, 0, params); + status = show_messages (ctx, format, sp, messages, 0, params); + if (status && ! res) + res = status; notmuch_thread_destroy (thread); } - fputs (format->message_set_end, stdout); + sp->end (sp); - return 0; + return res != NOTMUCH_STATUS_SUCCESS; } +enum { + NOTMUCH_FORMAT_NOT_SPECIFIED, + NOTMUCH_FORMAT_JSON, + NOTMUCH_FORMAT_SEXP, + NOTMUCH_FORMAT_TEXT, + NOTMUCH_FORMAT_MBOX, + NOTMUCH_FORMAT_RAW +}; + +static const notmuch_show_format_t format_json = { + .new_sprinter = sprinter_json_create, + .part = format_part_sprinter_entry, +}; + +static const notmuch_show_format_t format_sexp = { + .new_sprinter = sprinter_sexp_create, + .part = format_part_sprinter_entry, +}; + +static const notmuch_show_format_t format_text = { + .new_sprinter = sprinter_text_create, + .part = format_part_text, +}; + +static const notmuch_show_format_t format_mbox = { + .new_sprinter = sprinter_text_create, + .part = format_part_mbox, +}; + +static const notmuch_show_format_t format_raw = { + .new_sprinter = sprinter_text_create, + .part = format_part_raw, +}; + +static const notmuch_show_format_t *formatters[] = { + [NOTMUCH_FORMAT_JSON] = &format_json, + [NOTMUCH_FORMAT_SEXP] = &format_sexp, + [NOTMUCH_FORMAT_TEXT] = &format_text, + [NOTMUCH_FORMAT_MBOX] = &format_mbox, + [NOTMUCH_FORMAT_RAW] = &format_raw, +}; + int -notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) +notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) { - notmuch_config_t *config; notmuch_database_t *notmuch; notmuch_query_t *query; char *query_string; - char *opt; - const notmuch_show_format_t *format = &format_text; - notmuch_show_params_t params; - int mbox = 0; - int format_specified = 0; - int i; + int opt_index, ret; + const notmuch_show_format_t *formatter; + sprinter_t *sprinter; + notmuch_show_params_t params = { + .part = -1, + .omit_excluded = true, + .output_body = true, + .crypto = { .decrypt = NOTMUCH_DECRYPT_AUTO }, + }; + int format = NOTMUCH_FORMAT_NOT_SPECIFIED; + bool exclude = true; + bool entire_thread_set = false; + bool single_message; + + notmuch_opt_desc_t options[] = { + { .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_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); + if (opt_index < 0) + return EXIT_FAILURE; + + notmuch_process_shared_options (argv[0]); + + /* explicit decryption implies verification */ + if (params.crypto.decrypt == NOTMUCH_DECRYPT_NOSTASH || + params.crypto.decrypt == NOTMUCH_DECRYPT_TRUE) + params.crypto.verify = true; - params.entire_thread = 0; - params.raw = 0; - params.part = -1; - params.cryptoctx = NULL; - params.decrypt = 0; + /* specifying a part implies single message display */ + single_message = params.part >= 0; - argc--; argv++; /* skip subcommand argument */ + if (format == NOTMUCH_FORMAT_NOT_SPECIFIED) { + /* if part was requested and format was not specified, use format=raw */ + if (params.part >= 0) + format = NOTMUCH_FORMAT_RAW; + else + format = NOTMUCH_FORMAT_TEXT; + } - for (i = 0; i < argc && argv[i][0] == '-'; i++) { - if (strcmp (argv[i], "--") == 0) { - i++; - break; + if (format == NOTMUCH_FORMAT_MBOX) { + if (params.part > 0) { + fprintf (stderr, "Error: specifying parts is incompatible with mbox output format.\n"); + return EXIT_FAILURE; } - if (STRNCMP_LITERAL (argv[i], "--format=") == 0) { - opt = argv[i] + sizeof ("--format=") - 1; - if (strcmp (opt, "text") == 0) { - format = &format_text; - } else if (strcmp (opt, "json") == 0) { - format = &format_json; - params.entire_thread = 1; - } else if (strcmp (opt, "mbox") == 0) { - format = &format_mbox; - mbox = 1; - } else if (strcmp (opt, "raw") == 0) { - format = &format_raw; - params.raw = 1; - } else { - fprintf (stderr, "Invalid value for --format: %s\n", opt); - return 1; - } - format_specified = 1; - } else if (STRNCMP_LITERAL (argv[i], "--part=") == 0) { - params.part = atoi(argv[i] + sizeof ("--part=") - 1); - } else if (STRNCMP_LITERAL (argv[i], "--entire-thread") == 0) { - params.entire_thread = 1; - } else if ((STRNCMP_LITERAL (argv[i], "--verify") == 0) || - (STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) { - if (params.cryptoctx == NULL) { - GMimeSession* session = g_object_new(g_mime_session_get_type(), NULL); - if (NULL == (params.cryptoctx = g_mime_gpg_context_new(session, "gpg"))) - fprintf (stderr, "Failed to construct gpg context.\n"); - else - g_mime_gpg_context_set_always_trust((GMimeGpgContext*)params.cryptoctx, FALSE); - g_object_unref (session); - session = NULL; - } - if (STRNCMP_LITERAL (argv[i], "--decrypt") == 0) - params.decrypt = 1; + } else if (format == NOTMUCH_FORMAT_RAW) { + /* raw format only supports single message display */ + single_message = true; + } + + notmuch_exit_if_unsupported_format (); + + /* Default is entire-thread = false except for format=json and + * format=sexp. */ + if (! entire_thread_set && + (format == NOTMUCH_FORMAT_JSON || format == NOTMUCH_FORMAT_SEXP)) + params.entire_thread = true; + + if (! params.output_body) { + if (params.part > 0) { + fprintf (stderr, "Warning: --body=false is incompatible with --part > 0. Disabling.\n"); + params.output_body = true; } else { - fprintf (stderr, "Unrecognized option: %s\n", argv[i]); - return 1; + if (format != NOTMUCH_FORMAT_TEXT && + format != NOTMUCH_FORMAT_JSON && + format != NOTMUCH_FORMAT_SEXP) + fprintf (stderr, + "Warning: --body=false only implemented for format=text, format=json and format=sexp\n"); } } - argc -= i; - argv += i; - - config = notmuch_config_open (ctx, NULL, NULL); - if (config == NULL) - return 1; + if (params.include_html && + (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 (ctx, argc, argv); + query_string = query_string_from_args (config, argc - opt_index, argv + opt_index); if (query_string == NULL) { fprintf (stderr, "Out of memory\n"); - return 1; - } - - if (mbox && params.part > 0) { - fprintf (stderr, "Error: specifying parts is incompatible with mbox output format.\n"); - return 1; + return EXIT_FAILURE; } if (*query_string == '\0') { fprintf (stderr, "Error: notmuch show requires at least one search term.\n"); - return 1; + return EXIT_FAILURE; } - notmuch = notmuch_database_open (notmuch_config_get_database_path (config), - NOTMUCH_DATABASE_MODE_READ_ONLY); - if (notmuch == NULL) - return 1; + 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), + mode, ¬much)) + return EXIT_FAILURE; + + notmuch_exit_if_unmatched_db_uuid (notmuch); query = notmuch_query_create (notmuch, query_string); if (query == NULL) { fprintf (stderr, "Out of memory\n"); - return 1; + return EXIT_FAILURE; } - /* if part was requested and format was not specified, use format=raw */ - if (params.part >= 0 && !format_specified) - format = &format_raw; + /* Create structure printer. */ + formatter = formatters[format]; + sprinter = formatter->new_sprinter (config, stdout); - /* If --format=raw specified without specifying part, we can only - * output single message, so set part=0 */ - if (params.raw && params.part < 0) - params.part = 0; + params.out_stream = g_mime_stream_stdout_new (); - if (params.part >= 0) - return do_show_single (ctx, query, format, ¶ms); - else - return do_show (ctx, query, format, ¶ms); + /* If a single message is requested we do not use search_excludes. */ + if (single_message) { + ret = do_show_single (config, query, formatter, sprinter, ¶ms); + } else { + /* We always apply set the exclude flag. The + * exclude=true|false option controls whether or not we return + * threads that only match in an excluded message */ + const char **search_exclude_tags; + size_t search_exclude_tags_length; + unsigned int i; + notmuch_status_t status; + + search_exclude_tags = notmuch_config_get_search_exclude_tags + (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]); + if (status && status != NOTMUCH_STATUS_IGNORED) { + print_status_query ("notmuch show", query, status); + ret = -1; + goto DONE; + } + } - notmuch_query_destroy (query); - notmuch_database_close (notmuch); + if (exclude == false) { + notmuch_query_set_omit_excluded (query, false); + params.omit_excluded = false; + } + + ret = do_show (config, query, formatter, sprinter, ¶ms); + } - if (params.cryptoctx) - g_object_unref(params.cryptoctx); + 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); - return 0; + return ret ? EXIT_FAILURE : EXIT_SUCCESS; }