X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Futil.c;h=16aa75f04dd38978de783ce62f7364d719ef7b38;hp=63dd769eeab928e5036cc857a477cb665cf6b7d9;hb=e0571c496935f226abe4a22921b5b4e10d1481e8;hpb=ecaab35b973fbceb58b5ed174971c82762cc0199 diff --git a/imap/util.c b/imap/util.c index 63dd769..16aa75f 100644 --- a/imap/util.c +++ b/imap/util.c @@ -11,58 +11,16 @@ /* general IMAP utility functions */ -#include "config.h" - -#include -#include - -#include "mutt.h" -#include "mx.h" /* for M_IMAP */ -#include "url.h" -#include "imap_private.h" -#include "mutt_ssl.h" - -#include -#include "lib/debug.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); - p_delete(&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 */ @@ -80,7 +38,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"); @@ -88,7 +45,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 */ @@ -108,11 +64,11 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx) mx->mbox = m_strdup(url.path); if (url.scheme == U_IMAPS) - mx->account.flags |= M_ACCT_SSL; + mx->account.has_ssl = 1; 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; @@ -137,7 +93,7 @@ void imap_pretty_mailbox (char *path) 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) && - !str_ncmp (home.mbox, target.mbox, hlen)) { + !m_strncmp(home.mbox, target.mbox, hlen)) { if (!hlen) home_match = 1; else @@ -190,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 p_new(IMAP_DATA, 1); + 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; - - p_delete(&(*idata)->capstr); - mutt_free_list (&(*idata)->flags); - p_delete(&((*idata)->cmd.buf)); - p_delete(idata); + if (*idata) { + p_delete(&(*idata)->capstr); + string_list_wipe(&(*idata)->flags); + buffer_wipe(&((*idata)->cmd.buf)); + p_delete(idata); + } } /* @@ -214,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; } @@ -292,59 +250,21 @@ 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) { - 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); + setlocale(LC_TIME, loc); + return mutt_mktime(&tm, 1); } /* imap_qualify_path: make an absolute IMAP folder target, given IMAP_MBOX @@ -443,7 +363,7 @@ void imap_unmunge_mbox_name (char *s) buf = m_strdup(s); if (buf) { imap_utf7_decode (&buf); - strncpy (s, buf, m_strlen(s)); + m_strcpy(s, m_strlen(s) + 1, buf); } p_delete(&buf); @@ -452,12 +372,12 @@ void imap_unmunge_mbox_name (char *s) /* 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; @@ -475,7 +395,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 */ }