/* Support for IMAP4rev1, with the occasional nod to IMAP 4. */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
-#include "ascii.h"
-#include "buffer.h"
#include "mx.h"
#include "globals.h"
#include "sort.h"
#include "message.h"
#include "imap_private.h"
#if defined(USE_SSL) || defined(USE_GNUTLS)
-# include "mutt_ssl.h"
+# include <lib-sys/mutt_ssl.h>
#endif
#include "buffy.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
-#include "lib/debug.h"
-
-#include <unistd.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
/* imap forward declarations */
static int imap_get_delim (IMAP_DATA * idata);
-static char *imap_get_flags (LIST ** hflags, char *s);
+static char *imap_get_flags (string_list_t ** hflags, char *s);
static int imap_check_acl (IMAP_DATA * idata);
static int imap_check_capabilities (IMAP_DATA * idata);
static void imap_set_flag (IMAP_DATA * idata, int aclbit, int flag,
/* imap_access: Check permissions on an IMAP mailbox.
* TODO: ACL checks. Right now we assume if it exists we can
* mess with it. */
-int imap_access (const char *path, int flags)
+int imap_access (const char *path, int flags __attribute__ ((unused)))
{
IMAP_DATA *idata;
IMAP_MBOX mx;
else if (mutt_bit_isset (idata->capabilities, STATUS))
snprintf (buf, sizeof (buf), "STATUS %s (UID-VALIDITY)", mbox);
else {
- debug_print (2, ("STATUS not supported?\n"));
return -1;
}
if (imap_exec (idata, buf, IMAP_CMD_FAIL_OK) < 0) {
- debug_print (1, ("Can't check STATUS of %s\n", mbox));
return -1;
}
int r = 0;
- debug_print (2, ("reading %ld bytes\n", bytes));
-
for (pos = 0; pos < bytes; pos++) {
if (mutt_socket_readchar (idata->conn, &c) != 1) {
- debug_print (1, ("error during read, %ld bytes read\n", pos));
idata->status = IMAP_FATAL;
return -1;
fputc (c, fp);
if (bar && !(pos % 1024))
mutt_progress_bar (bar, pos);
-#ifdef DEBUG
- if (DebugFile && DebugLevel >= IMAP_LOG_LTRL)
- fputc (c, DebugFile);
-#endif
}
return 0;
h = idata->ctx->hdrs[i];
if (h->index == -1) {
- debug_print (2, ("Expunging message UID %d.\n", HEADER_DATA (h)->uid));
-
h->active = 0;
/* free cached body from disk, if neccessary */
* than getting the delim wrong */
idata->delim = '/';
- imap_cmd_start (idata, "LIST \"\" \"\"");
+ imap_cmd_start (idata, "string_list_t \"\" \"\"");
do {
if ((rc = imap_cmd_step (idata)) != IMAP_CMD_CONTINUE)
break;
s = imap_next_word (idata->cmd.buf);
- if (ascii_strncasecmp ("LIST", s, 4) == 0) {
+ if (ascii_strncasecmp ("string_list_t", s, 4) == 0) {
s = imap_next_word (s);
s = imap_next_word (s);
if (s && s[0] == '\"' && s[1] && s[2] == '\"')
}
while (rc == IMAP_CMD_CONTINUE);
- if (rc != IMAP_CMD_OK) {
- debug_print (1, ("failed.\n"));
- return -1;
- }
-
- debug_print (2, ("Delimiter: %c\n", idata->delim));
-
return -1;
}
if (idata->state == IMAP_CONNECTED) {
if (!imap_authenticate (idata)) {
idata->state = IMAP_AUTHENTICATED;
- if (idata->conn->ssf)
- debug_print (2, ("Communication encrypted at %d bits\n", idata->conn->ssf));
}
else
mutt_account_unsetpass (&idata->conn->account);
/* imap_get_flags: Make a simple list out of a FLAGS response.
* return stream following FLAGS response */
-static char *imap_get_flags (LIST ** hflags, char *s)
+static char *imap_get_flags (string_list_t ** hflags, char *s)
{
- LIST *flags;
+ string_list_t *flags;
char *flag_word;
char ctmp;
/* sanity-check string */
if (ascii_strncasecmp ("FLAGS", s, 5) != 0) {
- debug_print (1, ("not a FLAGS response: %s\n", s));
return NULL;
}
- s += 5;
- SKIPWS (s);
+ s = vskipspaces(s + 5);
if (*s != '(') {
- debug_print (1, ("bogus FLAGS response: %s\n", s));
return NULL;
}
/* create list, update caller's flags handle */
- flags = mutt_new_list ();
+ flags = string_item_new();
*hflags = flags;
while (*s && *s != ')') {
- s++;
- SKIPWS (s);
+ s = vskipspaces(s + 1);
flag_word = s;
while (*s && (*s != ')') && !ISSPACE (*s))
s++;
/* note bad flags response */
if (*s != ')') {
- debug_print (1, ("Unterminated FLAGS response: %s\n", s));
- mutt_free_list (hflags);
+ string_list_wipe(hflags);
return NULL;
}
/* Clean up path and replace the one in the ctx */
imap_fix_path (idata, mx.mbox, buf, sizeof (buf));
p_delete(&(idata->mailbox));
- idata->mailbox = str_dup (buf);
+ idata->mailbox = m_strdup(buf);
imap_qualify_path (buf, sizeof (buf), &mx, idata->mailbox);
p_delete(&(ctx->path));
- ctx->path = str_dup (buf);
+ ctx->path = m_strdup(buf);
idata->ctx = ctx;
if (ascii_strncasecmp ("FLAGS", pc, 5) == 0) {
/* don't override PERMANENTFLAGS */
if (!idata->flags) {
- debug_print (2, ("Getting mailbox FLAGS\n"));
if ((pc = imap_get_flags (&(idata->flags), pc)) == NULL)
goto fail;
}
}
/* PERMANENTFLAGS are massaged to look like FLAGS, then override FLAGS */
else if (ascii_strncasecmp ("OK [PERMANENTFLAGS", pc, 18) == 0) {
- debug_print (2, ("Getting mailbox PERMANENTFLAGS\n"));
/* safe to call on NULL */
- mutt_free_list (&(idata->flags));
+ string_list_wipe(&(idata->flags));
/* skip "OK [PERMANENT" so syntax is the same as FLAGS */
pc += 13;
if ((pc = imap_get_flags (&(idata->flags), pc)) == NULL)
#ifdef USE_HCACHE
/* save UIDVALIDITY for the header cache */
else if (ascii_strncasecmp ("OK [UIDVALIDITY", pc, 14) == 0) {
- debug_print (2, ("Getting mailbox UIDVALIDITY\n"));
pc += 3;
pc = imap_next_word (pc);
if (!ascii_strncasecmp
(imap_get_qualifier (idata->cmd.buf), "[READ-ONLY]", 11)
&& !mutt_bit_isset (idata->capabilities, ACL)) {
- debug_print (2, ("Mailbox is read-only.\n"));
ctx->readonly = 1;
}
-#ifdef DEBUG
- /* dump the mailbox flags we've found */
- if (DebugLevel > 2) {
- if (!idata->flags)
- debug_print (3, ("No folder flags found\n"));
- else {
- LIST *t = idata->flags;
-
- debug_print (3, ("Mailbox flags:\n"));
-
- t = t->next;
- while (t) {
- debug_print (3, ("[%s]\n", t->data));
- t = t->next;
- }
- }
- }
-#endif
-
if (mutt_bit_isset (idata->capabilities, ACL)) {
if (imap_check_acl (idata))
goto fail;
}
ctx->hdrmax = count;
- ctx->hdrs = mem_calloc (count, sizeof (HEADER *));
- ctx->v2r = mem_calloc (count, sizeof (int));
+ ctx->hdrs = p_new(HEADER *, count);
+ ctx->v2r = p_new(int, count);
ctx->msgcount = 0;
if (count && (imap_read_headers (idata, 0, count - 1) < 0)) {
mutt_error _("Error opening mailbox");
goto fail;
}
- debug_print (2, ("msgcount is %d\n", ctx->msgcount));
p_delete(&mx.mbox);
return 0;
/*
int imap_close_connection (CONTEXT *ctx)
{
- debug_print (1, (debugfile, "imap_close_connection(): closing connection\n"));
if (CTX_DATA->status != IMAP_BYE)
{
mutt_message _("Closing connection to IMAP server...");
/* imap_set_flag: append str to flags if we currently have permission
* according to aclbit */
-static void imap_set_flag (IMAP_DATA * idata, int aclbit, int flag,
- const char *str, char *flags, size_t flsize)
+static void imap_set_flag(IMAP_DATA *idata, int aclbit, int flag,
+ const char *str, char *flags, size_t flsize)
{
- if (mutt_bit_isset (idata->rights, aclbit))
- if (flag)
- str_cat (flags, flsize, str);
+ if (mutt_bit_isset(idata->rights, aclbit)) {
+ if (flag)
+ m_strcat(flags, flsize, str);
+ }
}
/* imap_make_msg_set: make an IMAP4rev1 UID message set out of a set of
HEADER **hdrs; /* sorted local copy */
int count = 0; /* number of messages in message set */
int match = 0; /* whether current message matches flag condition */
- unsigned int setstart = 0; /* start of current message range */
+ int setstart = 0; /* start of current message range */
int n;
short oldsort; /* we clobber reverse, must restore it */
int started = 0;
/* make copy of header pointers to sort in natural order */
- hdrs = mem_calloc (idata->ctx->msgcount, sizeof (HEADER *));
- memcpy (hdrs, idata->ctx->hdrs, idata->ctx->msgcount * sizeof (HEADER *));
+ hdrs = p_dup(idata->ctx->hdrs, idata->ctx->msgcount);
if (Sort != SORT_ORDER) {
oldsort = Sort;
if (mutt_bit_isset (idata->rights, ACL_WRITE))
imap_add_keywords (flags, hdr, idata->flags, sizeof (flags));
- str_skip_trailws (flags);
+ m_strrtrim(flags);
/* UW-IMAP is OK with null flags, Cyrus isn't. The only solution is to
* explicitly revoke all system flags (if we have permission) */
imap_set_flag (idata, ACL_WRITE, 1, "\\Answered ", flags, sizeof (flags));
imap_set_flag (idata, ACL_DELETE, 1, "\\Deleted ", flags, sizeof (flags));
- str_skip_trailws (flags);
+ m_strrtrim(flags);
mutt_buffer_addstr (cmd, " -FLAGS.SILENT (");
} else
idata = (IMAP_DATA *) ctx->data;
if (idata->state != IMAP_SELECTED) {
- debug_print (2, ("no mailbox selected\n"));
return -1;
}
if ((rc = imap_check_mailbox (ctx, index_hint, 0)) != 0)
return rc;
- memset (&cmd, 0, sizeof (cmd));
+ p_clear(&cmd, 1);
/* if we are expunging anyway, we can do deleted messages very quickly... */
if (expunge && mutt_bit_isset (idata->rights, ACL_DELETE)) {
* This works better if we're expunging, of course. */
if ((ctx->hdrs[n]->env && (ctx->hdrs[n]->env->refs_changed || ctx->hdrs[n]->env->irt_changed)) ||
ctx->hdrs[n]->attach_del) {
- debug_print (3, ("Attachments to be deleted, falling back to _mutt_save_message\n"));
if (!appendctx)
appendctx = mx_open_mailbox (ctx->path, M_APPEND | M_QUIET, NULL);
- if (!appendctx) {
- debug_print (1, ("Error opening mailbox in append mode\n"));
- }
- else
+ if (appendctx) {
_mutt_save_message (ctx->hdrs[n], appendctx, 1, 0, 0);
+ }
}
if (imap_sync_message (idata, ctx->hdrs[n], &cmd, &err_continue) < 0) {
idata->reopen &= IMAP_REOPEN_ALLOW;
p_delete(&(idata->mailbox));
- mutt_free_list (&idata->flags);
+ string_list_wipe(&idata->flags);
idata->ctx = NULL;
}
* 0 no change
* -1 error
*/
-int imap_check_mailbox (CONTEXT * ctx, int *index_hint, int force)
+int imap_check_mailbox (CONTEXT * ctx, int *index_hint __attribute__ ((unused)), int force)
{
/* overload keyboard timeout to avoid many mailbox checks in a row.
* Most users don't like having to wait exactly when they press a key. */
p_delete(&mx.mbox);
imap_munge_mbox_name (mbox, sizeof (mbox), buf);
- strfcpy (mbox_unquoted, buf, sizeof (mbox_unquoted));
+ m_strcpy(mbox_unquoted, sizeof(mbox_unquoted), buf);
/* The draft IMAP implementor's guide warns againts using the STATUS
* command on a mailbox that you have selected
*/
- if (str_cmp (mbox_unquoted, idata->mailbox) == 0
+ if (m_strcmp(mbox_unquoted, idata->mailbox) == 0
|| (ascii_strcasecmp (mbox_unquoted, "INBOX") == 0
- && str_casecmp (mbox_unquoted, idata->mailbox) == 0)) {
- strfcpy (buf, "NOOP", sizeof (buf));
+ && m_strcasecmp(mbox_unquoted, idata->mailbox) == 0)) {
+ m_strcpy(buf, sizeof(buf), "NOOP");
}
else if (mutt_bit_isset (idata->capabilities, IMAP4REV1) ||
mutt_bit_isset (idata->capabilities, STATUS)) {
/* The mailbox name may or may not be quoted here. We could try to
* munge the server response and compare with quoted (or vise versa)
* but it is probably more efficient to just strncmp against both. */
- if (str_ncmp (mbox_unquoted, s, str_len (mbox_unquoted)) == 0
- || str_ncmp (mbox, s, str_len (mbox)) == 0) {
+ if (m_strncmp(mbox_unquoted, s, m_strlen(mbox_unquoted)) == 0
+ || m_strncmp(mbox, s, m_strlen(mbox)) == 0) {
s = imap_next_word (s);
s = imap_next_word (s);
if (isdigit ((unsigned char) *s)) {
if (*s != '0') {
msgcount = atoi (s);
- debug_print (2, ("%d new messages in %s\n", msgcount, path));
}
}
}
- else
- debug_print (1, ("STATUS response doesn't match requested mailbox.\n"));
}
}
while (rc == IMAP_CMD_CONTINUE);
mutt_buffer_addch (buf, ' ');
/* and field */
- *delim = ':';
- delim++;
- SKIPWS(delim);
+ *delim++ = ':';
+ delim = vskipspaces(delim);
imap_quote_string (term, sizeof (term), delim);
mutt_buffer_addstr (buf, term);
break;
if (!do_search (pat, 1))
return 0;
- memset (&buf, 0, sizeof (buf));
+ p_clear(&buf, 1);
mutt_buffer_addstr (&buf, "UID SEARCH ");
if (imap_compile_search (pat, &buf) < 0) {
p_delete(&buf.data);
/* all this listing/browsing is a mess. I don't like that name is a pointer
* into idata->buf (used to be a pointer into the passed in buffer, just
* as bad), nor do I like the fact that the fetch is done here. This
- * code can't possibly handle non-LIST untagged responses properly.
+ * code can't possibly handle non-string_list_t untagged responses properly.
* FIXME. ?! */
int imap_parse_list_response (IMAP_DATA * idata, char **name, int *noselect,
int *noinferiors, char *delim)
return -1;
s = imap_next_word (idata->cmd.buf);
- if ((ascii_strncasecmp ("LIST", s, 4) == 0) ||
+ if ((ascii_strncasecmp ("string_list_t", s, 4) == 0) ||
(ascii_strncasecmp ("LSUB", s, 4) == 0)) {
*noselect = 0;
*noinferiors = 0;
imap_fix_path (idata, mx.mbox, buf, sizeof (buf));
if (option (OPTIMAPCHECKSUBSCRIBED)) {
- memset (&token, 0, sizeof (token));
+ p_clear(&token, 1);
err.data = errstr;
err.dsize = sizeof (errstr);
snprintf (mbox, sizeof (mbox), "%smailboxes \"%s\"",
subscribe ? "" : "un", path);
- if (mutt_parse_rc_line (mbox, &token, &err))
- debug_print (1, ("Error adding subscribed mailbox: %s\n", errstr));
+ mutt_parse_rc_line (mbox, &token, &err);
p_delete(&token.data);
}
/* trim dest to the length of the longest prefix it shares with src,
* returning the length of the trimmed string */
static int longest_common_prefix (char *dest, const char* src,
- int start, size_t dlen) {
+ int start, ssize_t dlen) {
int pos = start;
while (pos < dlen && dest[pos] && dest[pos] == src[pos])
/* look for IMAP URLs to complete from defined mailboxes. Could be extended
* to complete over open connections and account/folder hooks too. */
-static int imap_complete_hosts (char *dest, size_t len) {
+static int imap_complete_hosts (char *dest, ssize_t len) {
BUFFY* mailbox;
CONNECTION* conn;
int rc = -1;
int matchlen;
int i = 0;
- matchlen = str_len (dest);
+ matchlen = m_strlen(dest);
if (list_empty (Incoming))
return (-1);
for (i = 0; i < Incoming->length; i++) {
mailbox = (BUFFY*) Incoming->data[i];
- if (!str_ncmp (dest, mailbox->path, matchlen)) {
+ if (!m_strncmp(dest, mailbox->path, matchlen)) {
if (rc) {
- strfcpy (dest, mailbox->path, len);
+ m_strcpy(dest, len, mailbox->path);
rc = 0;
} else
longest_common_prefix (dest, mailbox->path, matchlen, len);
url.user = NULL;
url.path = NULL;
url_ciss_tostring (&url, urlstr, sizeof (urlstr), 0);
- if (!str_ncmp (dest, urlstr, matchlen)) {
+ if (!m_strncmp(dest, urlstr, matchlen)) {
if (rc) {
- strfcpy (dest, urlstr, len);
+ m_strcpy(dest, len, urlstr);
rc = 0;
} else
longest_common_prefix (dest, urlstr, matchlen, len);
IMAP_MBOX mx;
if (imap_parse_path (path, &mx) || !mx.mbox) {
- strfcpy (dest, path, dlen);
+ m_strcpy(dest, dlen, path);
return imap_complete_hosts (dest, dlen);
}
* known mailboxes/hooks/etc */
if (!(idata = imap_conn_find (&(mx.account), M_IMAP_CONN_NONEW))) {
p_delete(&mx.mbox);
- strfcpy (dest, path, dlen);
+ m_strcpy(dest, dlen, path);
return imap_complete_hosts (dest, dlen);
}
conn = idata->conn;
/* fire off command */
snprintf (buf, sizeof (buf), "%s \"\" \"%s%%\"",
- option (OPTIMAPLSUB) ? "LSUB" : "LIST", list);
+ option (OPTIMAPLSUB) ? "LSUB" : "string_list_t", list);
imap_cmd_start (idata, buf);
/* and see what the results are */
- strfcpy (completion, NONULL (mx.mbox), sizeof (completion));
+ m_strcpy(completion, sizeof(completion), NONULL(mx.mbox));
do {
if (imap_parse_list_response (idata, &list_word, &noselect, &noinferiors,
&delim))
/* if the folder isn't selectable, append delimiter to force browse
* to enter it on second tab. */
if (noselect) {
- clen = str_len (list_word);
+ clen = m_strlen(list_word);
list_word[clen++] = delim;
list_word[clen] = '\0';
}
/* copy in first word */
if (!completions) {
- strfcpy (completion, list_word, sizeof (completion));
- matchlen = str_len (completion);
+ m_strcpy(completion, sizeof(completion), list_word);
+ matchlen = m_strlen(completion);
completions++;
continue;
}
projects / apps / madmutt.git / blobdiff