Changeset 5422:e2780a423d96

Timestamp:

2008-06-25 22:43:32 (5 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Make mutt_copy_message distinguish between fatal and non-fatal errors.
Non-fatal errors should prevent moving messages, since they indicate
data loss. But mutt should still attempt to display them, since being
able to see some attachments is better than nothing.
Also stop printing out non-PGP material in application/pgp
attachments. Closes #2545, #2912.

Files:

• commands.c (modified) (1 diff)
• copy.c (modified) (1 diff)
• crypt-gpgme.c (modified) (3 diffs)
• handler.c (modified) (1 diff)
• mbox.c (modified) (1 diff)
• pgp.c (modified) (2 diffs)

commands.c

@@ -148 +148 @@
   res = mutt_copy_message (fpout, Context, cur, cmflags,
         (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) | CH_DECODE | CH_FROM);
-  if ((safe_fclose (&fpout) != 0 && errno != EPIPE) || res == -1)
+  if ((safe_fclose (&fpout) != 0 && errno != EPIPE) || res < 0)
   {
     mutt_error (_("Could not copy message"));

copy.c

@@ -719 +719 @@
 }
 
+/* should be made to return -1 on fatal errors, and 1 on non-fatal errors
+ * like partial decode, where it is worth displaying as much as possible */
 int
 mutt_copy_message (FILE *fpout, CONTEXT *src, HEADER *hdr, int flags,

crypt-gpgme.c

@@ -2097 +2097 @@
 
                   {
-                    /* Check wether signatures have been verified.  */
+                    /* Check whether signatures have been verified.  */
                     gpgme_verify_result_t verify_result;
 
@@ -2200 +2200 @@
             }
         }
+#if 0
       else
-        {
-          /* XXX - we may wish to recode here */
-          if (s->prefix)
-            state_puts (s->prefix, s);
-          state_puts (buf, s);
-        }
+      {
+        /* why would we want to display this at all? */
+        /* XXX - we may wish to recode here */
+        if (s->prefix)
+          state_puts (s->prefix, s);
+        state_puts (buf, s);
+      }
+#endif
     }
 
@@ -2215 +2218 @@
       state_attach_puts (_("[-- Error: could not find beginning"
                            " of PGP message! --]\n\n"), s);
-      return -1;
+      return 1;
     }
   dprint (2, (debugfile, "Leaving pgp_application_pgp handler\n"));

handler.c

@@ -1212 +1212 @@
       a->encoding == ENCUUENCODED)
     mutt_free_body (&b);
-  
+
+  /* make failure of a single part non-fatal */
+  if (rc < 0)
+    rc = 1;
   return rc;
 }

mbox.c

@@ -834 +834 @@
       newOffset[i - first].hdr = ftello (fp) + offset;
 
-      if (mutt_copy_message (fp, ctx, ctx->hdrs[i], M_CM_UPDATE, CH_FROM | CH_UPDATE | CH_UPDATE_LEN) == -1)
+      if (mutt_copy_message (fp, ctx, ctx->hdrs[i], M_CM_UPDATE,
+                             CH_FROM | CH_UPDATE | CH_UPDATE_LEN) != 0)
       {
         mutt_perror (tempfile);

pgp.c

@@ -468 +468 @@
       }
     }
+#if 0
     else
     {
+      /* why would we want to display this at all? */
       /* XXX - we may wish to recode here */
       if (s->prefix)
@@ -475 +477 @@
       state_puts (buf, s);
     }
+#endif
   }