Changeset 4100:ee9753cc5ddb for commands.c

Timestamp:

2005-08-01 09:38:00 (3 years ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Report errors occuring in _mutt_save_message. (closes #847)

Files:

• commands.c (modified) (5 diffs)

commands.c

@@ -671 +671 @@
 }
 
-void _mutt_save_message (HEADER *h, CONTEXT *ctx, int delete, int decode, int decrypt)
+int _mutt_save_message (HEADER *h, CONTEXT *ctx, int delete, int decode, int decrypt)
 {
   int cmflags, chflags;
+  int rc;
   
   set_copy_flags (h, decode, decrypt, &cmflags, &chflags);
@@ -680 +681 @@
     mutt_parse_mime_message (Context, h);
 
-  if (mutt_append_message (ctx, Context, h, cmflags, chflags) == 0 && delete)
+  if ((rc = mutt_append_message (ctx, Context, h, cmflags, chflags)) != 0)
+    return rc;
+
+  if (delete)
   {
     mutt_set_flag (Context, h, M_DELETE, 1);
@@ -686 +690 @@
       mutt_set_flag (Context, h, M_TAG, 0);
   }
+  
+  return 0;
 }
 
@@ -806 +812 @@
   {
     if (h)
-      _mutt_save_message(h, &ctx, delete, decode, decrypt);
+    {
+      if (_mutt_save_message(h, &ctx, delete, decode, decrypt) != 0)
+      {
+        mx_close_mailbox (&ctx, NULL);
+        return -1;
+      }
+    }
     else
     {
@@ -814 +826 @@
         {
           mutt_message_hook (Context, Context->hdrs[Context->v2r[i]], M_MESSAGEHOOK);
-          _mutt_save_message(Context->hdrs[Context->v2r[i]],
-                             &ctx, delete, decode, decrypt);
+          if (_mutt_save_message(Context->hdrs[Context->v2r[i]],
+                             &ctx, delete, decode, decrypt) != 0)
+          {
+            mx_close_mailbox (&ctx, NULL);
+            return -1;
+          }
         }
       }