/* general IMAP utility functions */
-#include "config.h"
-
-#include <lib-lib/mem.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-lib/macros.h>
-#include "lib/debug.h"
-
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
+#include <lib-lib/lib-lib.h>
#include <signal.h>
#include <netdb.h>
-#include <netinet/in.h>
+#include <lib-mx/mx.h>
-#include <errno.h>
+#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 */
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");
ImapsPort = ntohs (service->s_port);
else
ImapsPort = IMAP_SSL_PORT;
- debug_print (3, ("Using default IMAPS port %d\n", ImapsPort));
}
/* Defaults */
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) ||
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;
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
return;
p_delete(&(*idata)->capstr);
- mutt_free_list (&(*idata)->flags);
+ string_list_wipe(&(*idata)->flags);
p_delete(&((*idata)->cmd.buf));
p_delete(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;
}
s++;
}
- SKIPWS (s);
- return s;
+ return vskipspaces(s);
}
/* imap_parse_date: date is of the form: DD-MMM-YYYY HH:MM:SS +ZZzz */
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 != '-')
+ t.tm_mday = strtol(s, &s, 10);
+ if (*s++ != '-')
return 0;
- s++;
- t.tm_mon = mutt_check_month (s);
+ t.tm_mon = mutt_check_month(s);
s += 3;
- if (*s != '-')
+ 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 != ' ')
+ t.tm_year = strtol(s, &s, 10) - 1900;
+ if (*s++ != ' ')
return 0;
- s++;
/* time */
- t.tm_hour = (s[0] - '0') * 10 + (s[1] - '0');
- s += 2;
- if (*s != ':')
+ t.tm_hour = strtol(s, &s, 10);
+ if (*s++ != ':')
return 0;
- s++;
- t.tm_min = (s[0] - '0') * 10 + (s[1] - '0');
- s += 2;
- if (*s != ':')
+ t.tm_min = strtol(s, &s, 10);
+ if (*s++ != ':')
return 0;
- s++;
- t.tm_sec = (s[0] - '0') * 10 + (s[1] - '0');
- s += 2;
- if (*s != ' ')
+ t.tm_sec = strtol(s, &s, 10);
+ if (*s++ != ' ')
return 0;
- s++;
/* timezone */
- tz = ((s[1] - '0') * 10 + (s[2] - '0')) * 3600 +
- ((s[3] - '0') * 10 + (s[4] - '0')) * 60;
+ tz = strtol(s + 1, NULL, 10);
+ tz = (tz / 100) * 3600 + (tz % 100) * 60;
if (s[0] == '+')
tz = -tz;
{
char *buf;
- buf = str_dup (src);
+ buf = m_strdup(src);
imap_utf7_encode (&buf);
imap_quote_string (dest, dlen, buf);
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);
}
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;
*
*/
-static RETSIGTYPE alrm_handler (int sig)
+static RETSIGTYPE alrm_handler (int sig __attribute__((unused)))
{
/* empty */
}
projects / apps / madmutt.git / blobdiff