cli/show: emit headers after emitting body

[notmuch] / notmuch-show.c

diff --git a/notmuch-show.c b/notmuch-show.c
index 65167c2f7851b0aab3fb811be1294b65bbaf4e21..0816a5e1b8c786fdb70b0bc29d796c60403084a7 100644 (file)
--- 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 "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)
 
 static const char *
 _get_tags_as_string (const void *ctx, notmuch_message_t *message)


@@ -618,15 +619,44 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,
        sp->begin_map (sp);
        format_message_sprinter (sp, node->envelope_file);
 
        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), true, include_html);
            sp->end (sp);
        }
        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);
        }

+
+       if (notmuch_format_version >= 4) {
+           const _notmuch_message_crypto_t *msg_crypto = mime_node_get_message_crypto_status (node);
+           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);
+                   }
+                   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");
+                   sp->end (sp);
+               }
+           }
+           sp->end (sp);
+       }
+
+       sp->map_key (sp, "headers");
+       format_headers_sprinter (sp, GMIME_MESSAGE (node->part), false);
+

        sp->end (sp);
        return;
     }
        sp->end (sp);
        return;
     }


@@ -758,7 +788,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;
     notmuch_message_t *message = node->envelope_file;
 
     const char *filename;

-    FILE *file;
+    gzFile file;

     const char *from;
 
     time_t date;
     const char *from;
 
     time_t date;


@@ -766,14 +796,14 @@ format_part_mbox (const void *ctx, unused (sprinter_t *sp), mime_node_t *node,
     char date_asctime[26];
 
     char *line = NULL;
     char date_asctime[26];
 
     char *line = NULL;

-    size_t line_size;
+    ssize_t line_size;

     ssize_t line_len;
 
     if (!message)
        INTERNAL_ERROR ("format_part_mbox requires a root part");
 
     filename = notmuch_message_get_filename (message);
     ssize_t line_len;
 
     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));
     if (file == NULL) {
        fprintf (stderr, "Failed to open %s: %s\n",
                 filename, strerror (errno));


@@ -789,7 +819,7 @@ format_part_mbox (const void *ctx, unused (sprinter_t *sp), mime_node_t *node,
 
     printf ("From %s %s", from, date_asctime);
 
 
     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);
        if (_is_from_line (line))
            putchar ('>');
        printf ("%s", line);


@@ -797,7 +827,7 @@ format_part_mbox (const void *ctx, unused (sprinter_t *sp), mime_node_t *node,
 
     printf ("\n");
 
 
     printf ("\n");
 

-    fclose (file);
+    gzclose (file);

 
     return NOTMUCH_STATUS_SUCCESS;
 }
 
     return NOTMUCH_STATUS_SUCCESS;
 }


@@ -810,39 +840,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;
     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];
        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");
 
        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));
            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);
                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);
     }
 
     GMimeStream *stream_filter = g_mime_stream_filter_new (params->out_stream);