X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fmx_imap.c;h=0ee9d6330432aa930693608c613e4c2d52c56b72;hb=230399f9632c37b66c1c117a17e8327eae6b3235;hp=2675dff39a2111fe159696b4efe89889b33d7b69;hpb=babaee2b3c92746ec5bd6914222dd9a9eda67285;p=apps%2Fmadmutt.git

diff --git a/imap/mx_imap.c b/imap/mx_imap.c
index 2675dff..0ee9d63 100644
--- a/imap/mx_imap.c
+++ b/imap/mx_imap.c
@@ -9,18 +9,15 @@
 
 #include <sys/stat.h>
 
+#include <lib-lib/lib-lib.h>
+
 #include "mutt.h"
 #include "imap_private.h"
 
 #include "mx.h"
 #include "mx_imap.h"
 
-#include "lib/mem.h"
-#include "lib/str.h"
-
-#include "url.h"
-
-int imap_is_magic (const char* path, struct stat* st) {
+int imap_is_magic (const char* path, struct stat* st __attribute__ ((unused))) {
   url_scheme_t s;
   if (!path || !*path)
     return (-1);
@@ -33,25 +30,39 @@ static int acl_check_imap (CONTEXT* ctx, int bit) {
           mutt_bit_isset (((IMAP_DATA*) ctx->data)->rights, bit));
 }
 
-static int imap_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
+static int imap_open_new_message (MESSAGE * msg,
+                                  CONTEXT * dest __attribute__ ((unused)),
+                                  HEADER * hdr __attribute__ ((unused)))
 {
   char tmp[_POSIX_PATH_MAX];
 
   mutt_mktemp (tmp);
-  if ((msg->fp = safe_fopen (tmp, "w")) == NULL)
+  if ((msg->fp = safe_fopen (tmp, "w")) == NULL) {
+    mutt_perror (tmp);
     return (-1);
-  msg->path = safe_strdup (tmp);
+  }
+  msg->path = m_strdup(tmp);
   return 0;
 }
 
 /* this ugly kludge is required since the last int to
  * imap_check_mailbox() doesn't mean 'lock' but 'force'... */
-static int _imap_check_mailbox (CONTEXT* ctx, int* index_hint, int lock) {
+static int _imap_check_mailbox (CONTEXT* ctx,
+                                int* index_hint,
+                                int lock __attribute__ ((unused))) {
   return (imap_check_mailbox (ctx, index_hint, 0));
 }
 
+static int imap_commit_message (MESSAGE* msg, CONTEXT* ctx) {
+  int r = 0;
+
+  if ((r = safe_fclose (&msg->fp)) == 0)
+    r = imap_append_message (ctx, msg);
+  return (r);
+}
+
 mx_t* imap_reg_mx (void) {
-  mx_t* fmt = safe_calloc (1, sizeof (mx_t));
+  mx_t* fmt = p_new(mx_t, 1);
 
   /* make up mx_t record... */
   fmt->type = M_IMAP;
@@ -63,5 +74,6 @@ mx_t* imap_reg_mx (void) {
   fmt->mx_fastclose_mailbox = imap_close_mailbox;
   fmt->mx_sync_mailbox = imap_sync_mailbox;
   fmt->mx_check_mailbox = _imap_check_mailbox;
+  fmt->mx_commit_message = imap_commit_message;
   return (fmt);
 }