#include "config.h"
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.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>
url.path = mx.mbox;
rc = url_ciss_tostring (&url, path, len, U_DECODE_PASSWD);
- mem_free (&mx.mbox);
+ p_delete(&mx.mbox);
return rc;
}
mx->account.port = ImapPort;
mx->account.type = M_ACCT_TYPE_IMAP;
- c = str_dup (path);
+ c = m_strdup(path);
url_parse_ciss (&url, c);
if (!(url.scheme == U_IMAP || url.scheme == U_IMAPS) ||
- mutt_account_fromurl (&mx->account, &url) < 0) {
- mem_free (&c);
+ mutt_account_fromurl (&mx->account, &url) < 0 || !*mx->account.host) {
+ p_delete(&c);
return -1;
}
- mx->mbox = str_dup (url.path);
+ mx->mbox = m_strdup(url.path);
if (url.scheme == U_IMAPS)
mx->account.flags |= M_ACCT_SSL;
- mem_free (&c);
+ p_delete(&c);
if ((mx->account.flags & M_ACCT_SSL) && !(mx->account.flags & M_ACCT_PORT))
mx->account.port = ImapsPort;
if (imap_parse_path (path, &target) < 0)
return;
- tlen = str_len (target.mbox);
+ tlen = m_strlen(target.mbox);
/* check whether we can do '=' substitution */
if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
- hlen = str_len (home.mbox);
+ hlen = m_strlen(home.mbox);
if (tlen && mutt_account_match (&home.account, &target.account) &&
- !str_ncmp (home.mbox, target.mbox, hlen)) {
+ !m_strncmp(home.mbox, target.mbox, hlen)) {
if (!hlen)
home_match = 1;
else
if (target.mbox[hlen] == *delim)
home_match = 1;
}
- mem_free (&home.mbox);
+ p_delete(&home.mbox);
}
/* do the '=' substitution */
url_ciss_tostring (&url, path, 1024, 0);
}
- mem_free (&target.mbox);
+ p_delete(&target.mbox);
}
/* -- library functions -- */
* Returns NULL on failure (no mem) */
IMAP_DATA *imap_new_idata (void)
{
- return mem_calloc (1, sizeof (IMAP_DATA));
+ return p_new(IMAP_DATA, 1);
}
/* imap_free_idata: Release and clear storage in an IMAP_DATA structure. */
if (!idata)
return;
- mem_free (&(*idata)->capstr);
+ p_delete(&(*idata)->capstr);
mutt_free_list (&(*idata)->flags);
- mem_free (&((*idata)->cmd.buf));
- mem_free (idata);
+ p_delete(&((*idata)->cmd.buf));
+ p_delete(idata);
}
/*
int x = 0;
if (!mailbox || !*mailbox) {
- strfcpy (path, "INBOX", plen);
+ m_strcpy(path, plen, "INBOX");
return path;
}
s++;
}
- SKIPWS (s);
- return s;
+ return vskipspaces(s);
}
/* imap_parse_date: date is of the form: DD-MMM-YYYY HH:MM:SS +ZZzz */
{
char *buf;
- buf = str_dup (src);
+ buf = m_strdup(src);
imap_utf7_encode (&buf);
imap_quote_string (dest, dlen, buf);
- mem_free (&buf);
+ p_delete(&buf);
}
void imap_unmunge_mbox_name (char *s)
imap_unquote_string (s);
- buf = str_dup (s);
+ buf = m_strdup(s);
if (buf) {
imap_utf7_decode (&buf);
- strncpy (s, buf, str_len (s));
+ m_strcpy(s, m_strlen(s) + 1, buf);
}
- mem_free (&buf);
+ p_delete(&buf);
}
/* imap_wordcasecmp: find word a in word list b */
if (idata->ctx)
ctx = idata->ctx;
else {
- ctx = mem_calloc (1, sizeof (CONTEXT));
+ ctx = p_new(CONTEXT, 1);
ctx->data = idata;
}
imap_check_mailbox (ctx, NULL, 1);
if (!idata->ctx)
- mem_free (&ctx);
+ p_delete(&ctx);
}
}
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);
unset_option (OPTKEEPQUIET);
if (!imap_passive)
unset_option (OPTIMAPPASSIVE);
+ set_quadoption (OPT_IMAPRECONNECT, imap_askreconnect);
return rc;
}