X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Futil.c;h=abcbe2be39c1e868087c615caf2fa08c7b3f85cd;hp=9c69ebffe278457c13fbe0219860918ba2d9f033;hb=ac1ea3143e61def7fc9000bee6d0d59d56c5b997;hpb=96d53ff49c308769efbf708e1e65819077cb7af6 diff --git a/imap/util.c b/imap/util.c index 9c69ebf..abcbe2b 100644 --- a/imap/util.c +++ b/imap/util.c @@ -11,56 +11,17 @@ /* general IMAP utility functions */ -#include "config.h" +#include +#include +#include #include "mutt.h" #include "mx.h" /* for M_IMAP */ -#include "url.h" #include "imap_private.h" -#include "mutt_ssl.h" - -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/debug.h" - -#include -#include - -#include -#include -#include -#include -#include - -#include +#include /* -- public functions -- */ -/* imap_expand_path: IMAP implementation of mutt_expand_path. Rewrite - * an IMAP path in canonical and absolute form. - * Inputs: a buffer containing an IMAP path, and the number of bytes in - * that buffer. - * Outputs: The buffer is rewritten in place with the canonical IMAP path. - * Returns 0 on success, or -1 if imap_parse_path chokes or url_ciss_tostring - * fails, which it might if there isn't enough room in the buffer. */ -int imap_expand_path (char *path, size_t len) -{ - IMAP_MBOX mx; - ciss_url_t url; - int rc; - - if (imap_parse_path (path, &mx) < 0) - return -1; - - mutt_account_tourl (&mx.account, &url); - url.path = mx.mbox; - - rc = url_ciss_tostring (&url, path, len, U_DECODE_PASSWD); - FREE (&mx.mbox); - - return rc; -} - /* imap_parse_path: given an IMAP mailbox name, return host, port * and a path IMAP servers will recognise. * mx.mbox is malloc'd, caller must free it */ @@ -78,7 +39,6 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx) ImapPort = ntohs (service->s_port); else ImapPort = IMAP_PORT; - debug_print (3, ("Using default IMAP port %d\n", ImapPort)); } if (!ImapsPort) { service = getservbyname ("imaps", "tcp"); @@ -86,7 +46,6 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx) ImapsPort = ntohs (service->s_port); else ImapsPort = IMAP_SSL_PORT; - debug_print (3, ("Using default IMAPS port %d\n", ImapsPort)); } /* Defaults */ @@ -94,26 +53,21 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx) mx->account.port = ImapPort; mx->account.type = M_ACCT_TYPE_IMAP; - c = safe_strdup (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) { - FREE (&c); + mutt_account_fromurl (&mx->account, &url) < 0 || !*mx->account.host) { + p_delete(&c); return -1; } - mx->mbox = safe_strdup (url.path); + mx->mbox = m_strdup(url.path); if (url.scheme == U_IMAPS) mx->account.flags |= M_ACCT_SSL; - FREE (&c); - -#if defined(USE_SSL) || defined(USE_GNUTLS) - if (option (OPTIMAPFORCESSL)) - mx->account.flags |= M_ACCT_SSL; -#endif + p_delete(&c); if ((mx->account.flags & M_ACCT_SSL) && !(mx->account.flags & M_ACCT_PORT)) mx->account.port = ImapsPort; @@ -135,12 +89,12 @@ void imap_pretty_mailbox (char *path) if (imap_parse_path (path, &target) < 0) return; - tlen = mutt_strlen (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 = mutt_strlen (home.mbox); + hlen = m_strlen(home.mbox); if (tlen && mutt_account_match (&home.account, &target.account) && - !safe_strncmp (home.mbox, target.mbox, hlen)) { + !m_strncmp(home.mbox, target.mbox, hlen)) { if (!hlen) home_match = 1; else @@ -148,7 +102,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 */ @@ -169,7 +123,7 @@ void imap_pretty_mailbox (char *path) url_ciss_tostring (&url, path, 1024, 0); } - FREE (&target.mbox); + p_delete(&target.mbox); } /* -- library functions -- */ @@ -193,7 +147,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. */ @@ -202,10 +156,10 @@ void imap_free_idata (IMAP_DATA ** idata) if (!idata) return; - FREE (&(*idata)->capstr); - mutt_free_list (&(*idata)->flags); - FREE (&((*idata)->cmd.buf)); - FREE (idata); + p_delete(&(*idata)->capstr); + string_list_wipe(&(*idata)->flags); + p_delete(&((*idata)->cmd.buf)); + p_delete(idata); } /* @@ -217,12 +171,12 @@ void imap_free_idata (IMAP_DATA ** idata) * Moreover, IMAP servers may dislike the path ending with the delimiter. */ char *imap_fix_path (IMAP_DATA * idata, char *mailbox, char *path, - size_t plen) + ssize_t plen) { int x = 0; if (!mailbox || !*mailbox) { - strfcpy (path, "INBOX", plen); + m_strcpy(path, plen, "INBOX"); return path; } @@ -295,8 +249,7 @@ char *imap_next_word (char *s) s++; } - SKIPWS (s); - return s; + return vskipspaces(s); } /* imap_parse_date: date is of the form: DD-MMM-YYYY HH:MM:SS +ZZzz */ @@ -429,12 +382,12 @@ void imap_munge_mbox_name (char *dest, size_t dlen, const char *src) { char *buf; - buf = safe_strdup (src); + buf = m_strdup(src); imap_utf7_encode (&buf); imap_quote_string (dest, dlen, buf); - FREE (&buf); + p_delete(&buf); } void imap_unmunge_mbox_name (char *s) @@ -443,13 +396,13 @@ void imap_unmunge_mbox_name (char *s) imap_unquote_string (s); - buf = safe_strdup (s); + buf = m_strdup(s); if (buf) { imap_utf7_decode (&buf); - strncpy (s, buf, mutt_strlen (s)); + m_strcpy(s, m_strlen(s) + 1, buf); } - FREE (&buf); + p_delete(&buf); } /* imap_wordcasecmp: find word a in word list b */ @@ -478,7 +431,7 @@ int imap_wordcasecmp (const char *a, const char *b) * */ -static RETSIGTYPE alrm_handler (int sig) +static RETSIGTYPE alrm_handler (int sig __attribute__((unused))) { /* empty */ } @@ -499,12 +452,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); } } @@ -520,9 +473,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); @@ -551,6 +506,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; }