X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=show-message.c;h=c90f310ca3c45b77b412b2ded67239e9e566b4c8;hp=05ced9c421c5ec780563312765ea43fa2a5f87df;hb=8b18efe171ef80cbb238a9446137c39908755d2d;hpb=6ce2bf68f53fec4302121763e588c33c7cd86a9c

diff --git a/show-message.c b/show-message.c
index 05ced9c4..c90f310c 100644
--- a/show-message.c
+++ b/show-message.c
@@ -22,53 +22,125 @@
 
 #include "notmuch-client.h"
 
+typedef struct show_message_state {
+    int part_count;
+    int in_zone;
+} show_message_state_t;
+
 static void
-show_message_part (GMimeObject *part, int *part_count,
-		   void (*show_part) (GMimeObject *part, int *part_count))
+show_message_part (GMimeObject *part,
+		   show_message_state_t *state,
+		   const notmuch_show_format_t *format,
+		   notmuch_show_params_t *params,
+		   int first)
 {
+    int selected;
+    state->part_count += 1;
+
+    if (! (GMIME_IS_PART (part) || GMIME_IS_MULTIPART (part) || GMIME_IS_MESSAGE_PART (part))) {
+	fprintf (stderr, "Warning: Not displaying unknown mime part: %s.\n",
+		 g_type_name (G_OBJECT_TYPE (part)));
+	return;
+    }
+
+    selected = (params->part <= 0 || state->part_count == params->part);
+
+    if (selected || state->in_zone) {
+	if (!first && (params->part <= 0 || state->in_zone))
+	    fputs (format->part_sep, stdout);
+
+	if (format->part_start)
+	    format->part_start (part, &(state->part_count));
+    }
+
+    /* handle PGP/MIME parts */
+    if (GMIME_IS_MULTIPART (part) && params->cryptoctx) {
+	GMimeMultipart *multipart = GMIME_MULTIPART (part);
+	GError* err = NULL;
+
+	if (GMIME_IS_MULTIPART_SIGNED (part))
+	{
+	    if ( g_mime_multipart_get_count (multipart) != 2 ) {
+		/* this violates RFC 3156 section 5, so we won't bother with it. */
+		fprintf (stderr,
+			 "Error: %d part(s) for a multipart/signed message (should be exactly 2)\n",
+			 g_mime_multipart_get_count (multipart));
+	    } else {
+		/* For some reason the GMimeSignatureValidity returned
+		 * here is not a const (inconsistent with that
+		 * returned by
+		 * g_mime_multipart_encrypted_get_signature_validity,
+		 * and therefore needs to be properly disposed of.
+		 * Hopefully the API will become more consistent. */
+		GMimeSignatureValidity *sigvalidity = g_mime_multipart_signed_verify (GMIME_MULTIPART_SIGNED (part), params->cryptoctx, &err);
+		if (!sigvalidity) {
+		    fprintf (stderr, "Failed to verify signed part: %s\n", (err ? err->message : "no error explanation given"));
+		}
+		if ((selected || state->in_zone) && format->part_sigstatus)
+		    format->part_sigstatus (sigvalidity);
+		/* extract only data part, and ignore signature part */
+		part = g_mime_multipart_get_part (multipart, 0);
+		if (sigvalidity)
+		    g_mime_signature_validity_free (sigvalidity);
+	    }
+	}
+
+	if (err)
+	    g_error_free (err);
+    }
+    /* end handle PGP/MIME parts */
+
+    if (selected || state->in_zone)
+	format->part_content (part);
+
     if (GMIME_IS_MULTIPART (part)) {
 	GMimeMultipart *multipart = GMIME_MULTIPART (part);
 	int i;
 
+	if (selected)
+	    state->in_zone = 1;
+
 	for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
 	    show_message_part (g_mime_multipart_get_part (multipart, i),
-			       part_count, show_part);
+			       state, format, params, i == 0);
 	}
-	return;
-    }
 
-    if (GMIME_IS_MESSAGE_PART (part)) {
-	GMimeMessage *mime_message;
+	if (selected)
+	    state->in_zone = 0;
+
+    } else if (GMIME_IS_MESSAGE_PART (part)) {
+	GMimeMessage *mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
 
-	mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
+	if (selected)
+	    state->in_zone = 1;
 
 	show_message_part (g_mime_message_get_mime_part (mime_message),
-			   part_count, show_part);
+			   state, format, params, TRUE);
 
-	return;
+	if (selected)
+	    state->in_zone = 0;
     }
 
-    if (! (GMIME_IS_PART (part))) {
-	fprintf (stderr, "Warning: Not displaying unknown mime part: %s.\n",
-		 g_type_name (G_OBJECT_TYPE (part)));
-	return;
+    if (selected || state->in_zone) {
+	if (format->part_end)
+	    format->part_end (part);
     }
-
-    *part_count = *part_count + 1;
-
-    (*show_part) (part, part_count);
 }
 
 notmuch_status_t
 show_message_body (const char *filename,
-		   void (*show_part) (GMimeObject *part, int *part_count))
+		   const notmuch_show_format_t *format,
+		   notmuch_show_params_t *params)
 {
     GMimeStream *stream = NULL;
     GMimeParser *parser = NULL;
     GMimeMessage *mime_message = NULL;
     notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
     FILE *file = NULL;
-    int part_count = 0;
+    show_message_state_t state;
+
+    state.part_count = 0;
+    state.in_zone = 0;
 
     file = fopen (filename, "r");
     if (! file) {
@@ -85,7 +157,10 @@ show_message_body (const char *filename,
     mime_message = g_mime_parser_construct_message (parser);
 
     show_message_part (g_mime_message_get_mime_part (mime_message),
-		       &part_count, show_part);
+		       &state,
+		       format,
+		       params,
+		       TRUE);
 
   DONE:
     if (mime_message)