X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Futil.c;h=1f02969853079d8f1fc798144a32fc197c007759;hb=1dc7032b59cc5b91d70076ed228bda8caf65a7f3;hp=0e842b1d4889689747ac62a33de8951e897d5c07;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d;p=apps%2Fmadmutt.git

diff --git a/imap/util.c b/imap/util.c
index 0e842b1..1f02969 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -13,14 +13,16 @@
 
 #include "config.h"
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 #include "mx.h"                 /* for M_IMAP */
+#include "ascii.h"
 #include "url.h"
 #include "imap_private.h"
 #include "mutt_ssl.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
 #include "lib/debug.h"
 
 #include <stdlib.h>
@@ -56,7 +58,7 @@ int imap_expand_path (char *path, size_t len)
   url.path = mx.mbox;
 
   rc = url_ciss_tostring (&url, path, len, U_DECODE_PASSWD);
-  FREE (&mx.mbox);
+  p_delete(&mx.mbox);
 
   return rc;
 }
@@ -98,8 +100,8 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
   url_parse_ciss (&url, c);
 
   if (!(url.scheme == U_IMAP || url.scheme == U_IMAPS) ||
-      mutt_account_fromurl (&mx->account, &url) < 0) {
-    FREE (&c);
+      mutt_account_fromurl (&mx->account, &url) < 0 || !*mx->account.host) {
+    p_delete(&c);
     return -1;
   }
 
@@ -108,7 +110,7 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
   if (url.scheme == U_IMAPS)
     mx->account.flags |= M_ACCT_SSL;
 
-  FREE (&c);
+  p_delete(&c);
 
   if ((mx->account.flags & M_ACCT_SSL) && !(mx->account.flags & M_ACCT_PORT))
     mx->account.port = ImapsPort;
@@ -143,7 +145,7 @@ void imap_pretty_mailbox (char *path)
           if (target.mbox[hlen] == *delim)
             home_match = 1;
     }
-    FREE (&home.mbox);
+    p_delete(&home.mbox);
   }
 
   /* do the '=' substitution */
@@ -164,7 +166,7 @@ void imap_pretty_mailbox (char *path)
     url_ciss_tostring (&url, path, 1024, 0);
   }
 
-  FREE (&target.mbox);
+  p_delete(&target.mbox);
 }
 
 /* -- library functions -- */
@@ -188,7 +190,7 @@ void imap_error (const char *where, const char *msg)
  *   Returns NULL on failure (no mem) */
 IMAP_DATA *imap_new_idata (void)
 {
-  return safe_calloc (1, sizeof (IMAP_DATA));
+  return p_new(IMAP_DATA, 1);
 }
 
 /* imap_free_idata: Release and clear storage in an IMAP_DATA structure. */
@@ -197,10 +199,10 @@ void imap_free_idata (IMAP_DATA ** idata)
   if (!idata)
     return;
 
-  FREE (&(*idata)->capstr);
+  p_delete(&(*idata)->capstr);
   mutt_free_list (&(*idata)->flags);
-  FREE (&((*idata)->cmd.buf));
-  FREE (idata);
+  p_delete(&((*idata)->cmd.buf));
+  p_delete(idata);
 }
 
 /*
@@ -429,7 +431,7 @@ void imap_munge_mbox_name (char *dest, size_t dlen, const char *src)
 
   imap_quote_string (dest, dlen, buf);
 
-  FREE (&buf);
+  p_delete(&buf);
 }
 
 void imap_unmunge_mbox_name (char *s)
@@ -444,7 +446,7 @@ void imap_unmunge_mbox_name (char *s)
     strncpy (s, buf, str_len (s));
   }
 
-  FREE (&buf);
+  p_delete(&buf);
 }
 
 /* imap_wordcasecmp: find word a in word list b */
@@ -494,12 +496,12 @@ void imap_keepalive (void)
         if (idata->ctx)
           ctx = idata->ctx;
         else {
-          ctx = safe_calloc (1, sizeof (CONTEXT));
+          ctx = p_new(CONTEXT, 1);
           ctx->data = idata;
         }
         imap_check_mailbox (ctx, NULL, 1);
         if (!idata->ctx)
-          FREE (&ctx);
+          p_delete(&ctx);
       }
     }
 
@@ -515,9 +517,11 @@ int imap_wait_keepalive (pid_t pid)
   int rc;
 
   short imap_passive = option (OPTIMAPPASSIVE);
+  int imap_askreconnect = quadoption (OPT_IMAPRECONNECT);
 
   set_option (OPTIMAPPASSIVE);
   set_option (OPTKEEPQUIET);
+  set_quadoption (OPT_IMAPRECONNECT, M_NO);
 
   sigprocmask (SIG_SETMASK, NULL, &oldmask);
 
@@ -546,6 +550,7 @@ int imap_wait_keepalive (pid_t pid)
   unset_option (OPTKEEPQUIET);
   if (!imap_passive)
     unset_option (OPTIMAPPASSIVE);
+  set_quadoption (OPT_IMAPRECONNECT, imap_askreconnect);
 
   return rc;
 }