X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=ea465dec7aa65e7385dd8b3e2170da1c1f79d2a7;hp=e317d19855e9eed69483b051a04de4c7749ac62d;hb=f6cb896bc4c0bafca1acd5ac3fb45169cd893e29;hpb=44df403ccd2fa637dfa543f749a949454245b182 diff --git a/notmuch-show.c b/notmuch-show.c index e317d198..ea465dec 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -77,6 +77,20 @@ static const show_format_t format_json = { "]" }; +static void +format_message_mbox (const void *ctx, + notmuch_message_t *message, + unused (int indent)); + +static const show_format_t format_mbox = { + "", + "", format_message_mbox, + "", NULL, "", + "", NULL, "", + "", "", + "" +}; + static const char * _get_tags_as_string (const void *ctx, notmuch_message_t *message) { @@ -145,7 +159,7 @@ format_message_json (const void *ctx, notmuch_message_t *message, unused (int in date = notmuch_message_get_date (message); relative_date = notmuch_time_relative_date (ctx, date); - printf ("\"id\": %s, \"match\": %s, \"filename\": %s, \"date_unix\": %ld, \"date_relative\": \"%s\", \"tags\": [", + 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)), @@ -163,6 +177,112 @@ format_message_json (const void *ctx, notmuch_message_t *message, unused (int in talloc_free (ctx_quote); } +/* Extract just the email address from the contents of a From: + * header. */ +static const char * +_extract_email_address (const void *ctx, const char *from) +{ + InternetAddressList *addresses; + InternetAddress *address; + InternetAddressMailbox *mailbox; + const char *email = "MAILER-DAEMON"; + + addresses = internet_address_list_parse_string (from); + + /* Bail if there is no address here. */ + if (addresses == NULL || internet_address_list_length (addresses) < 1) + goto DONE; + + /* Otherwise, just use the first address. */ + address = internet_address_list_get_address (addresses, 0); + + /* The From header should never contain an address group rather + * than a mailbox. So bail if it does. */ + if (! INTERNET_ADDRESS_IS_MAILBOX (address)) + goto DONE; + + mailbox = INTERNET_ADDRESS_MAILBOX (address); + email = internet_address_mailbox_get_addr (mailbox); + email = talloc_strdup (ctx, email); + + DONE: + /* XXX: How to free addresses here? */ + return email; + } + +/* Return 1 if 'line' is an mbox From_ line---that is, a line + * beginning with zero or more '>' characters followed by the + * characters 'F', 'r', 'o', 'm', and space. + * + * Any characters at all may appear after that in the line. + */ +static int +_is_from_line (const char *line) +{ + const char *s = line; + + if (line == NULL) + return 0; + + while (*s == '>') + s++; + + if (STRNCMP_LITERAL (s, "From ") == 0) + return 1; + else + 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)) +{ + const char *filename; + FILE *file; + const char *from; + + time_t date; + struct tm date_gmtime; + char date_asctime[26]; + + char *line = NULL; + size_t line_size; + ssize_t line_len; + + 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; + } + + 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 = getline (&line, &line_size, file)) != -1 ) { + if (_is_from_line (line)) + putchar ('>'); + printf ("%s", line); + } + + printf ("\n"); + + fclose (file); +} + static void format_headers_text (const void *ctx, notmuch_message_t *message) { @@ -221,13 +341,19 @@ show_part_content (GMimeObject *part, GMimeStream *stream_out) charset = g_mime_object_get_content_type_parameter (part, "charset"); if (stream_out) { - 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)); + 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)); if (charset) { - g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter), - g_mime_filter_charset_new(charset, "UTF-8")); - } + GMimeFilter *charset_filter; + charset_filter = g_mime_filter_charset_new (charset, "UTF-8"); + /* This result can be NULL for things like "unknown-8bit". + * Don't set a NULL filter as that makes GMime print + * annoying assertion-failure messages on stderr. */ + if (charset_filter) + g_mime_stream_filter_add (GMIME_STREAM_FILTER (stream_filter), + charset_filter); + } } wrapper = g_mime_part_get_content_object (GMIME_PART (part)); @@ -326,7 +452,7 @@ format_part_json (GMimeObject *part, int *part_count) show_part_content (part, stream_memory); part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory)); - printf (", \"content\": %s", json_quote_str (ctx, (char *) part_content->data)); + printf (", \"content\": %s", json_quote_chararray (ctx, (char *) part_content->data, part_content->len)); } fputs ("}", stdout); @@ -430,6 +556,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) } else if (strcmp (opt, "json") == 0) { format = &format_json; entire_thread = 1; + } else if (strcmp (opt, "mbox") == 0) { + format = &format_mbox; } else { fprintf (stderr, "Invalid value for --format: %s\n", opt); return 1;