the ‘kids don't do this at home’ commit.

[apps/madmutt.git] / lib-mx / mx.c

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index 3d10313..96dab2c 100644 (file)
--- a/lib-mx/mx.c
+++ b/lib-mx/mx.c
@@ -17,6 +17,7 @@
 #include <lib-ui/sidebar.h>
 
 #include "mutt.h"
 #include <lib-ui/sidebar.h>
 
 #include "mutt.h"

+#include "pattern.h"

 #include "buffy.h"
 #include "mx.h"
 #include "mbox.h"
 #include "buffy.h"
 #include "mx.h"
 #include "mbox.h"


@@ -60,8 +61,8 @@ static mx_t const *mxfmts[] = {
 static int invoke_dotlock (const char *path, int flags, int retry)
 {
   char cmd[LONG_STRING + _POSIX_PATH_MAX];
 static int invoke_dotlock (const char *path, int flags, int retry)
 {
   char cmd[LONG_STRING + _POSIX_PATH_MAX];

-  char f[SHORT_STRING + _POSIX_PATH_MAX];
-  char r[SHORT_STRING];
+  char f[STRING + _POSIX_PATH_MAX];
+  char r[STRING];

 
   if (flags & DL_FL_RETRY)
     snprintf (r, sizeof (r), "-r %d ", retry ? MAXLOCKATTEMPT : 0);
 
   if (flags & DL_FL_RETRY)
     snprintf (r, sizeof (r), "-r %d ", retry ? MAXLOCKATTEMPT : 0);


@@ -430,7 +431,7 @@ static int mx_open_mailbox_append (CONTEXT * ctx, int flags)
         mutt_perror (ctx->path);
       else {
         mutt_error (_("Couldn't lock %s\n"), ctx->path);
         mutt_perror (ctx->path);
       else {
         mutt_error (_("Couldn't lock %s\n"), ctx->path);

-        safe_fclose (&ctx->fp);
+        m_fclose(&ctx->fp);

       }
       return (-1);
     }
       }
       return (-1);
     }


@@ -566,9 +567,8 @@ void mx_fastclose_mailbox (CONTEXT * ctx)
 
   p_delete(&ctx->path);
   p_delete(&ctx->pattern);
 
   p_delete(&ctx->path);
   p_delete(&ctx->pattern);

-  if (ctx->limit_pattern)
-    mutt_pattern_free (&ctx->limit_pattern);
-  safe_fclose (&ctx->fp);
+  pattern_list_wipe(&ctx->limit_pattern);
+  m_fclose(&ctx->fp);

   p_clear(ctx, 1);
 }
 
   p_clear(ctx, 1);
 }
 


@@ -644,7 +644,7 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint)
   int isSpool = 0;
   CONTEXT f;
   char mbox[_POSIX_PATH_MAX];
   int isSpool = 0;
   CONTEXT f;
   char mbox[_POSIX_PATH_MAX];

-  char buf[SHORT_STRING];
+  char buf[STRING];

 
   if (!ctx)
     return 0;
 
   if (!ctx)
     return 0;


@@ -960,7 +960,7 @@ static int _mx_sync_mailbox (CONTEXT * ctx, int *index_hint)
   }
 
   if (ctx->deleted) {
   }
 
   if (ctx->deleted) {

-    char buf[SHORT_STRING];
+    char buf[STRING];

 
     snprintf (buf, sizeof (buf), ctx->deleted == 1
               ? _("Purge %d deleted message?") :
 
     snprintf (buf, sizeof (buf), ctx->deleted == 1
               ? _("Purge %d deleted message?") :


@@ -1190,7 +1190,7 @@ int mx_close_message (MESSAGE ** msg)
       || (*msg)->magic == M_NNTP
 #endif
     ) {
       || (*msg)->magic == M_NNTP
 #endif
     ) {

-    r = safe_fclose (&(*msg)->fp);
+    r = m_fclose(&(*msg)->fp);

   }
   else
     (*msg)->fp = NULL;
   }
   else
     (*msg)->fp = NULL;