#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/debug.h"
#include <stdlib.h>
#include <ctype.h>
url.path = mx.mbox;
rc = url_ciss_tostring (&url, path, len, U_DECODE_PASSWD);
- FREE (&mx.mbox);
+ mem_free (&mx.mbox);
return rc;
}
static unsigned short ImapPort = 0;
static unsigned short ImapsPort = 0;
struct servent *service;
- char tmp[128];
ciss_url_t url;
char *c;
- int n;
if (!ImapPort) {
service = getservbyname ("imap", "tcp");
ImapPort = ntohs (service->s_port);
else
ImapPort = IMAP_PORT;
- dprint (3, (debugfile, "Using default IMAP port %d\n", ImapPort));
+ debug_print (3, ("Using default IMAP port %d\n", ImapPort));
}
if (!ImapsPort) {
service = getservbyname ("imaps", "tcp");
ImapsPort = ntohs (service->s_port);
else
ImapsPort = IMAP_SSL_PORT;
- dprint (3, (debugfile, "Using default IMAPS port %d\n", ImapsPort));
+ debug_print (3, ("Using default IMAPS port %d\n", ImapsPort));
}
/* Defaults */
mx->account.port = ImapPort;
mx->account.type = M_ACCT_TYPE_IMAP;
- c = safe_strdup (path);
+ c = str_dup (path);
url_parse_ciss (&url, c);
- if (url.scheme == U_IMAP || url.scheme == U_IMAPS) {
- if (mutt_account_fromurl (&mx->account, &url) < 0) {
- FREE (&c);
- return -1;
- }
-
- mx->mbox = safe_strdup (url.path);
-
- if (url.scheme == U_IMAPS)
- mx->account.flags |= M_ACCT_SSL;
- FREE (&c);
+ if (!(url.scheme == U_IMAP || url.scheme == U_IMAPS) ||
+ mutt_account_fromurl (&mx->account, &url) < 0) {
+ mem_free (&c);
+ return -1;
}
- /* old PINE-compatibility code */
- else {
- FREE (&c);
- if (sscanf (path, "{%127[^}]}", tmp) != 1)
- return -1;
- c = strchr (path, '}');
- if (!c)
- return -1;
- else
- /* walk past closing '}' */
- mx->mbox = safe_strdup (c + 1);
-
- if ((c = strrchr (tmp, '@'))) {
- *c = '\0';
- strfcpy (mx->account.user, tmp, sizeof (mx->account.user));
- strfcpy (tmp, c + 1, sizeof (tmp));
- mx->account.flags |= M_ACCT_USER;
- }
-
- if ((n = sscanf (tmp, "%127[^:/]%127s", mx->account.host, tmp)) < 1) {
- dprint (1, (debugfile, "imap_parse_path: NULL host in %s\n", path));
- FREE (&mx->mbox);
- return -1;
- }
+ mx->mbox = str_dup (url.path);
- if (n > 1) {
- if (sscanf (tmp, ":%hu%127s", &(mx->account.port), tmp) >= 1)
- mx->account.flags |= M_ACCT_PORT;
- if (sscanf (tmp, "/%s", tmp) == 1) {
- if (!ascii_strncmp (tmp, "ssl", 3))
- mx->account.flags |= M_ACCT_SSL;
- else {
- dprint (1,
- (debugfile,
- "imap_parse_path: Unknown connection type in %s\n", path));
- FREE (&mx->mbox);
- return -1;
- }
- }
- }
- }
-
-#if defined(USE_SSL) || defined(USE_GNUTLS)
- if (option (OPTIMAPFORCESSL))
+ if (url.scheme == U_IMAPS)
mx->account.flags |= M_ACCT_SSL;
-#endif
+
+ mem_free (&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 = safe_strlen (target.mbox);
+ tlen = str_len (target.mbox);
/* check whether we can do '=' substitution */
if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
- hlen = safe_strlen (home.mbox);
+ hlen = str_len (home.mbox);
if (tlen && mutt_account_match (&home.account, &target.account) &&
- !safe_strncmp (home.mbox, target.mbox, hlen)) {
+ !str_ncmp (home.mbox, target.mbox, hlen)) {
if (!hlen)
home_match = 1;
else
if (target.mbox[hlen] == *delim)
home_match = 1;
}
- FREE (&home.mbox);
+ mem_free (&home.mbox);
}
/* do the '=' substitution */
url_ciss_tostring (&url, path, 1024, 0);
}
- FREE (&target.mbox);
+ mem_free (&target.mbox);
}
/* -- library functions -- */
* Returns NULL on failure (no mem) */
IMAP_DATA *imap_new_idata (void)
{
- return safe_calloc (1, sizeof (IMAP_DATA));
+ return mem_calloc (1, sizeof (IMAP_DATA));
}
/* imap_free_idata: Release and clear storage in an IMAP_DATA structure. */
if (!idata)
return;
- FREE (&(*idata)->capstr);
+ mem_free (&(*idata)->capstr);
mutt_free_list (&(*idata)->flags);
- FREE (&((*idata)->cmd.buf));
- FREE (idata);
+ mem_free (&((*idata)->cmd.buf));
+ mem_free (idata);
}
/*
{
char *buf;
- buf = safe_strdup (src);
+ buf = str_dup (src);
imap_utf7_encode (&buf);
imap_quote_string (dest, dlen, buf);
- FREE (&buf);
+ mem_free (&buf);
}
void imap_unmunge_mbox_name (char *s)
imap_unquote_string (s);
- buf = safe_strdup (s);
+ buf = str_dup (s);
if (buf) {
imap_utf7_decode (&buf);
- strncpy (s, buf, safe_strlen (s));
+ strncpy (s, buf, str_len (s));
}
- FREE (&buf);
+ mem_free (&buf);
}
/* imap_wordcasecmp: find word a in word list b */
if (idata->ctx)
ctx = idata->ctx;
else {
- ctx = safe_calloc (1, sizeof (CONTEXT));
+ ctx = mem_calloc (1, sizeof (CONTEXT));
ctx->data = idata;
}
imap_check_mailbox (ctx, NULL, 1);
if (!idata->ctx)
- FREE (&ctx);
+ mem_free (&ctx);
}
}