X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Futil.c;h=b6ba3107b45c8d1286a852d5b40d600f62804390;hp=9a632a5a16cba7185c6a4dbcca776113ae1aaf72;hb=819c071fa7efc8dffb4dd92f36f0111227ff692f;hpb=492434e350e3ca2d3330c2589de3f9485929dab7 diff --git a/imap/util.c b/imap/util.c index 9a632a5..b6ba310 100644 --- a/imap/util.c +++ b/imap/util.c @@ -11,55 +11,16 @@ /* general IMAP utility functions */ -#include "config.h" - -#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 -#include - -#include -#include +#include #include #include -#include +#include -#include +#include "mutt.h" +#include "imap_private.h" /* -- 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 */ @@ -68,10 +29,8 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx) 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"); @@ -79,7 +38,6 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx) ImapPort = ntohs (service->s_port); else ImapPort = IMAP_PORT; - dprint (3, (debugfile, "Using default IMAP port %d\n", ImapPort)); } if (!ImapsPort) { service = getservbyname ("imaps", "tcp"); @@ -87,7 +45,6 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx) ImapsPort = ntohs (service->s_port); else ImapsPort = IMAP_SSL_PORT; - dprint (3, (debugfile, "Using default IMAPS port %d\n", ImapsPort)); } /* Defaults */ @@ -95,70 +52,23 @@ 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) { - 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 || !*mx->account.host) { + p_delete(&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; - } + mx->mbox = m_strdup(url.path); - 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; - } + if (url.scheme == U_IMAPS) + mx->account.has_ssl = 1; - 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)) - mx->account.flags |= M_ACCT_SSL; -#endif + p_delete(&c); - if ((mx->account.flags & M_ACCT_SSL) && !(mx->account.flags & M_ACCT_PORT)) + if (mx->account.has_ssl && !mx->account.has_port) mx->account.port = ImapsPort; return 0; @@ -178,12 +88,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_is_imap (Maildir) && !imap_parse_path (Maildir, &home)) { - hlen = mutt_strlen (home.mbox); + if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) { + hlen = m_strlen(home.mbox); if (tlen && mutt_account_match (&home.account, &target.account) && - !mutt_strncmp (home.mbox, target.mbox, hlen)) { + !m_strncmp(home.mbox, target.mbox, hlen)) { if (!hlen) home_match = 1; else @@ -191,7 +101,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 */ @@ -212,7 +122,7 @@ void imap_pretty_mailbox (char *path) url_ciss_tostring (&url, path, 1024, 0); } - FREE (&target.mbox); + p_delete(&target.mbox); } /* -- library functions -- */ @@ -236,19 +146,21 @@ 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)); + IMAP_DATA *res = p_new(IMAP_DATA, 1); + buffer_init(&res->cmd.buf); + res->isnew = 1; + return res; } /* imap_free_idata: Release and clear storage in an IMAP_DATA structure. */ void imap_free_idata (IMAP_DATA ** idata) { - if (!idata) - return; - - FREE (&(*idata)->capstr); - mutt_free_list (&(*idata)->flags); - FREE (&((*idata)->cmd.buf)); - FREE (idata); + if (*idata) { + p_delete(&(*idata)->capstr); + string_list_wipe(&(*idata)->flags); + buffer_wipe(&((*idata)->cmd.buf)); + p_delete(idata); + } } /* @@ -260,12 +172,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; } @@ -338,59 +250,22 @@ 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 */ -time_t imap_parse_date (char *s) +time_t imap_parse_date(char *s) { - struct tm t; - time_t tz; - - t.tm_mday = (s[0] == ' ' ? s[1] - '0' : (s[0] - '0') * 10 + (s[1] - '0')); - s += 2; - if (*s != '-') - return 0; - s++; - t.tm_mon = mutt_check_month (s); - s += 3; - if (*s != '-') - return 0; - s++; - t.tm_year = - (s[0] - '0') * 1000 + (s[1] - '0') * 100 + (s[2] - '0') * 10 + (s[3] - - '0') - - 1900; - s += 4; - if (*s != ' ') - return 0; - s++; - - /* time */ - t.tm_hour = (s[0] - '0') * 10 + (s[1] - '0'); - s += 2; - if (*s != ':') - return 0; - s++; - t.tm_min = (s[0] - '0') * 10 + (s[1] - '0'); - s += 2; - if (*s != ':') - return 0; - s++; - t.tm_sec = (s[0] - '0') * 10 + (s[1] - '0'); - s += 2; - if (*s != ' ') - return 0; - s++; - - /* timezone */ - tz = ((s[1] - '0') * 10 + (s[2] - '0')) * 3600 + - ((s[3] - '0') * 10 + (s[4] - '0')) * 60; - if (s[0] == '+') - tz = -tz; - - return (mutt_mktime (&t, 0) + tz); + struct tm tm; + const char *loc; + time_t tz; + + p_clear(&tm, 1); + loc = setlocale(LC_TIME, "C"); + strptime(s, "%d-%b-%Y %T %z", &tm); + tz = tm.tm_gmtoff; + setlocale(LC_TIME, loc); + return timegm(&tm) + tz; } /* imap_qualify_path: make an absolute IMAP folder target, given IMAP_MBOX @@ -472,12 +347,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) @@ -486,24 +361,24 @@ 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 */ int imap_wordcasecmp (const char *a, const char *b) { - char tmp[SHORT_STRING]; + char tmp[STRING]; char *s = (char *) b; int i; - tmp[SHORT_STRING - 1] = 0; - for (i = 0; i < SHORT_STRING - 2; i++, s++) { + tmp[STRING - 1] = 0; + for (i = 0; i < STRING - 2; i++, s++) { if (!*s || ISSPACE (*s)) { tmp[i] = 0; break; @@ -521,7 +396,7 @@ int imap_wordcasecmp (const char *a, const char *b) * */ -static RETSIGTYPE alrm_handler (int sig) +static void alrm_handler (int sig __attribute__((unused))) { /* empty */ } @@ -542,12 +417,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); } } @@ -563,9 +438,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); @@ -594,6 +471,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; }