#if defined(USE_SSL) || defined(USE_GNUTLS)
# include "mutt_ssl.h"
#endif
+#include "buffy.h"
#include "lib/mem.h"
#include "lib/intl.h"
static void imap_set_flag (IMAP_DATA * idata, int aclbit, int flag,
const char *str, char *flags, size_t flsize);
-/* imap_access: Check permissions on an IMAP mailbox. */
+/* 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)
{
IMAP_DATA *idata;
if (!(idata = imap_conn_find (&mx.account,
option (OPTIMAPPASSIVE) ? M_IMAP_CONN_NONEW :
0))) {
- FREE (&mx.mbox);
+ mem_free (&mx.mbox);
return -1;
}
imap_fix_path (idata, mx.mbox, mailbox, sizeof (mailbox));
- FREE (&mx.mbox);
+
+ /* we may already be in the folder we're checking */
+ if (!ascii_strcmp(idata->mailbox, mx.mbox)) {
+ mem_free (&mx.mbox);
+ return 0;
+ }
+
+ mem_free (&mx.mbox);
imap_munge_mbox_name (mbox, sizeof (mbox), mailbox);
- /* TODO: ACL checks. Right now we assume if it exists we can mess with it. */
if (mutt_bit_isset (idata->capabilities, IMAP4REV1))
snprintf (buf, sizeof (buf), "STATUS %s (UIDVALIDITY)", mbox);
else if (mutt_bit_isset (idata->capabilities, STATUS))
if (!(idata = imap_conn_find (&mx.account,
option (OPTIMAPPASSIVE) ? M_IMAP_CONN_NONEW
: 0))) {
- FREE (&mx.mbox);
+ mem_free (&mx.mbox);
return -1;
}
}
if (idata->cache[cacheno].uid == HEADER_DATA (h)->uid &&
idata->cache[cacheno].path) {
unlink (idata->cache[cacheno].path);
- FREE (&idata->cache[cacheno].path);
+ mem_free (&idata->cache[cacheno].path);
}
imap_free_header_data (&h->data);
else
mutt_account_unsetpass (&idata->conn->account);
- FREE (&idata->capstr);
+ mem_free (&idata->capstr);
}
if (idata->state == IMAP_AUTHENTICATED)
imap_get_delim (idata);
idata->state = IMAP_CONNECTED;
if (imap_cmd_step (idata) != IMAP_CMD_CONTINUE) {
- mutt_error (_("Unexpected response received from server: %s"),
- idata->cmd.buf);
- mutt_sleep (1);
-
mutt_socket_close (idata->conn);
idata->state = IMAP_DISCONNECTED;
return -1;
goto bail;
#if defined(USE_SSL) || defined(USE_GNUTLS)
/* Attempt STARTTLS if available and desired. */
- if (mutt_bit_isset (idata->capabilities, STARTTLS) && !idata->conn->ssf) {
+ if (!idata->conn->ssf && (option(OPTSSLFORCETLS) ||
+ mutt_bit_isset (idata->capabilities, STARTTLS))) {
int rc;
- if ((rc = query_quadoption (OPT_SSLSTARTTLS,
- _("Secure connection with TLS?"))) == -1)
+ if (option (OPTSSLFORCETLS))
+ rc = M_YES;
+ else if ((rc = query_quadoption (OPT_SSLSTARTTLS,
+ _("Secure connection with TLS?"))) == -1)
goto err_close_conn;
if (rc == M_YES) {
if ((rc = imap_exec (idata, "STARTTLS", IMAP_CMD_FAIL_OK)) == -1)
}
}
}
+
+ if (option(OPTSSLFORCETLS) && ! idata->conn->ssf) {
+ mutt_error _("Encrypted connection unavailable");
+ mutt_sleep (1);
+ goto err_close_conn;
+ }
#endif
}
else if (ascii_strncasecmp ("* PREAUTH", idata->cmd.buf, 9) == 0) {
idata->state = IMAP_AUTHENTICATED;
if (imap_check_capabilities (idata) != 0)
goto bail;
- FREE (&idata->capstr);
+ mem_free (&idata->capstr);
}
else {
imap_error ("imap_open_connection()", buf);
mutt_socket_close (idata->conn);
idata->state = IMAP_DISCONNECTED;
bail:
- FREE (&idata->capstr);
+ mem_free (&idata->capstr);
return -1;
}
/* Clean up path and replace the one in the ctx */
imap_fix_path (idata, mx.mbox, buf, sizeof (buf));
- FREE (&(idata->mailbox));
- idata->mailbox = safe_strdup (buf);
+ mem_free (&(idata->mailbox));
+ idata->mailbox = str_dup (buf);
imap_qualify_path (buf, sizeof (buf), &mx, idata->mailbox);
- FREE (&(ctx->path));
- ctx->path = safe_strdup (buf);
+ mem_free (&(ctx->path));
+ ctx->path = str_dup (buf);
idata->ctx = ctx;
}
ctx->hdrmax = count;
- ctx->hdrs = safe_calloc (count, sizeof (HEADER *));
- ctx->v2r = safe_calloc (count, sizeof (int));
+ ctx->hdrs = mem_calloc (count, sizeof (HEADER *));
+ ctx->v2r = mem_calloc (count, sizeof (int));
ctx->msgcount = 0;
if (count && (imap_read_headers (idata, 0, count - 1) < 0)) {
mutt_error _("Error opening mailbox");
}
debug_print (2, ("msgcount is %d\n", ctx->msgcount));
- FREE (&mx.mbox);
+ mem_free (&mx.mbox);
return 0;
fail:
if (idata->state == IMAP_SELECTED)
idata->state = IMAP_AUTHENTICATED;
fail_noidata:
- FREE (&mx.mbox);
+ mem_free (&mx.mbox);
return -1;
}
{
CONNECTION *conn;
IMAP_DATA *idata;
- char buf[LONG_STRING], mbox[LONG_STRING];
+ char buf[LONG_STRING];
char mailbox[LONG_STRING];
- int r;
IMAP_MBOX mx;
if (imap_parse_path (ctx->path, &mx))
/* in APPEND mode, we appear to hijack an existing IMAP connection -
* ctx is brand new and mostly empty */
- if (!(idata = imap_conn_find (&(mx.account), 0)))
- goto fail;
+ if (!(idata = imap_conn_find (&(mx.account), 0))) {
+ mem_free(&mx.mbox);
+ return (-1);
+ }
conn = idata->conn;
ctx->magic = M_IMAP;
ctx->data = idata;
- /* check mailbox existance */
-
imap_fix_path (idata, mx.mbox, mailbox, sizeof (mailbox));
- imap_munge_mbox_name (mbox, sizeof (mbox), mailbox);
-
- if (mutt_bit_isset (idata->capabilities, IMAP4REV1))
- snprintf (buf, sizeof (buf), "STATUS %s (UIDVALIDITY)", mbox);
- else if (mutt_bit_isset (idata->capabilities, STATUS))
- /* We have no idea what the other guy wants. UW imapd 8.3 wants this
- * (but it does not work if another mailbox is selected) */
- snprintf (buf, sizeof (buf), "STATUS %s (UID-VALIDITY)", mbox);
- else {
- /* STATUS not supported */
- mutt_message _("Unable to append to IMAP mailboxes at this server");
+ mem_free(&mx.mbox);
- goto fail;
- }
-
- r = imap_exec (idata, buf, IMAP_CMD_FAIL_OK);
- if (r == -2) {
- /* command failed cause folder doesn't exist */
- snprintf (buf, sizeof (buf), _("Create %s?"), mailbox);
- if (option (OPTCONFIRMCREATE) && mutt_yesorno (buf, 1) < 1)
- goto fail;
+ /* really we should also check for W_OK */
+ if (!imap_access (ctx->path, F_OK))
+ return 0;
- if (imap_create_mailbox (idata, mailbox) < 0)
- goto fail;
- }
- else if (r == -1)
- /* Hmm, some other failure */
- goto fail;
+ snprintf (buf, sizeof (buf), _("Create %s?"), mailbox);
+ if (option (OPTCONFIRMCREATE) && mutt_yesorno (buf, 1) < 1)
+ return -1;
- FREE (&mx.mbox);
- return 0;
+ if (imap_create_mailbox (idata, mailbox) < 0)
+ return -1;
-fail:
- FREE (&mx.mbox);
- return -1;
+ return (0);
}
/* imap_logout: Gracefully log out of server. */
idata->status = IMAP_BYE;
imap_cmd_start (idata, "LOGOUT");
while (imap_cmd_step (idata) == IMAP_CMD_CONTINUE);
- FREE (&idata->cmd.buf);
- FREE (&idata);
+ mem_free (&idata->cmd.buf);
+ mem_free (&idata);
}
/*
{
if (mutt_bit_isset (idata->rights, aclbit))
if (flag)
- safe_strcat (flags, flsize, str);
+ str_cat (flags, flsize, str);
}
/* imap_make_msg_set: make an IMAP4rev1 UID message set out of a set of
int started = 0;
/* make copy of header pointers to sort in natural order */
- hdrs = safe_calloc (idata->ctx->msgcount, sizeof (HEADER *));
+ hdrs = mem_calloc (idata->ctx->msgcount, sizeof (HEADER *));
memcpy (hdrs, idata->ctx->hdrs, idata->ctx->msgcount * sizeof (HEADER *));
if (Sort != SORT_ORDER) {
}
}
- FREE (&hdrs);
+ mem_free (&hdrs);
return count;
}
return -1;
}
- /* CLOSE purges deleted messages. If we don't want to purge them, we must
- * tell imap_close_mailbox not to issue the CLOSE command */
- if (expunge)
- idata->noclose = 0;
- else
- idata->noclose = 1;
-
/* This function is only called when the calling code expects the context
* to be changed. */
imap_allow_reopen (ctx);
/* if the message has been rethreaded or attachments have been deleted
* we delete the message and reupload it.
* This works better if we're expunging, of course. */
- if (ctx->hdrs[n]->refs_changed || ctx->hdrs[n]->irt_changed ||
+ 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)
idata->reopen |= IMAP_EXPUNGE_EXPECTED;
if (imap_exec (idata, "EXPUNGE", 0) != 0) {
imap_error (_("imap_sync_mailbox: EXPUNGE failed"), idata->cmd.buf);
- rc = -1;
+ rc = imap_reconnect (ctx);
goto out;
}
}
+ if (expunge && ctx->closing) {
+ if (imap_exec (idata, "CLOSE", 0))
+ mutt_error (_("CLOSE failed"));
+ idata->state = IMAP_AUTHENTICATED;
+ }
+
rc = 0;
out:
if (cmd.data)
- FREE (&cmd.data);
+ mem_free (&cmd.data);
if (appendctx) {
mx_fastclose_mailbox (appendctx);
- FREE (&appendctx);
+ mem_free (&appendctx);
}
return rc;
}
-/* imap_close_mailbox: issue close command if neccessary, reset IMAP_DATA */
+/* imap_close_mailbox: clean up IMAP data in CONTEXT */
void imap_close_mailbox (CONTEXT * ctx)
{
IMAP_DATA *idata;
if (!idata)
return;
- if ((idata->status != IMAP_FATAL) &&
- (idata->state == IMAP_SELECTED) && (ctx == idata->ctx)) {
- if (!(idata->noclose) && imap_exec (idata, "CLOSE", 0))
- mutt_error (_("CLOSE failed"));
+ if (ctx == idata->ctx) {
+ if (idata->state != IMAP_FATAL && idata->state == IMAP_SELECTED) {
+ /* mx_close_mailbox won't sync if there are no deleted messages
+ * and the mailbox is unchanged, so we may have to close here */
+ if (!ctx->deleted && imap_exec (idata, "CLOSE", 0))
+ mutt_error (_("CLOSE failed"));
+ idata->state = IMAP_AUTHENTICATED;
+ }
idata->reopen &= IMAP_REOPEN_ALLOW;
- idata->state = IMAP_AUTHENTICATED;
- FREE (&(idata->mailbox));
+ mem_free (&(idata->mailbox));
mutt_free_list (&idata->flags);
idata->ctx = NULL;
}
for (i = 0; i < IMAP_CACHE_LEN; i++) {
if (idata->cache[i].path) {
unlink (idata->cache[i].path);
- FREE (&idata->cache[i].path);
+ mem_free (&idata->cache[i].path);
}
}
}
connflags = M_IMAP_CONN_NONEW;
if (!(idata = imap_conn_find (&(mx.account), connflags))) {
- FREE (&mx.mbox);
+ mem_free (&mx.mbox);
return -1;
}
conn = idata->conn;
imap_fix_path (idata, mx.mbox, buf, sizeof (buf));
- FREE (&mx.mbox);
+ mem_free (&mx.mbox);
imap_munge_mbox_name (mbox, sizeof (mbox), buf);
strfcpy (mbox_unquoted, buf, sizeof (mbox_unquoted));
* command on a mailbox that you have selected
*/
- if (safe_strcmp (mbox_unquoted, idata->mailbox) == 0
+ if (str_cmp (mbox_unquoted, idata->mailbox) == 0
|| (ascii_strcasecmp (mbox_unquoted, "INBOX") == 0
- && safe_strcasecmp (mbox_unquoted, idata->mailbox) == 0)) {
+ && str_casecmp (mbox_unquoted, idata->mailbox) == 0)) {
strfcpy (buf, "NOOP", sizeof (buf));
}
else if (mutt_bit_isset (idata->capabilities, IMAP4REV1) ||
/* 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 (safe_strncmp (mbox_unquoted, s, safe_strlen (mbox_unquoted)) == 0
- || safe_strncmp (mbox, s, safe_strlen (mbox)) == 0) {
+ if (str_ncmp (mbox_unquoted, s, str_len (mbox_unquoted)) == 0
+ || str_ncmp (mbox, s, str_len (mbox)) == 0) {
s = imap_next_word (s);
s = imap_next_word (s);
if (isdigit ((unsigned char) *s)) {
if (imap_exec (idata, buf, 0) < 0)
goto fail;
- FREE (&mx.mbox);
+ mem_free (&mx.mbox);
return 0;
fail:
- FREE (&mx.mbox);
+ mem_free (&mx.mbox);
return -1;
}
+/* 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 pos = start;
+
+ while (pos < dlen && dest[pos] && dest[pos] == src[pos])
+ pos++;
+ dest[pos] = '\0';
+
+ return 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) {
+ BUFFY* mailbox;
+ CONNECTION* conn;
+ int rc = -1;
+ int matchlen;
+ int i = 0;
+
+ matchlen = str_len (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 (rc) {
+ strfcpy (dest, mailbox->path, len);
+ rc = 0;
+ } else
+ longest_common_prefix (dest, mailbox->path, matchlen, len);
+ }
+ }
+
+ for (conn = mutt_socket_head (); conn->next; conn = conn->next) {
+ ciss_url_t url;
+ char urlstr[LONG_STRING];
+
+ if (conn->account.type != M_ACCT_TYPE_IMAP)
+ continue;
+
+ mutt_account_tourl (&conn->account, &url);
+ /* FIXME: how to handle multiple users on the same host? */
+ url.user = NULL;
+ url.path = NULL;
+ url_ciss_tostring (&url, urlstr, sizeof (urlstr), 0);
+ if (!str_ncmp (dest, urlstr, matchlen)) {
+ if (rc) {
+ strfcpy (dest, urlstr, len);
+ rc = 0;
+ } else
+ longest_common_prefix (dest, urlstr, matchlen, len);
+ }
+ }
+
+ return rc;
+}
+
/* imap_complete: given a partial IMAP folder path, return a string which
* adds as much to the path as is unique */
-int imap_complete (char *dest, size_t dlen, char *path)
-{
+int imap_complete (char *dest, size_t dlen, char *path) {
CONNECTION *conn;
IMAP_DATA *idata;
char list[LONG_STRING];
char completion[LONG_STRING];
int clen, matchlen = 0;
int completions = 0;
- int pos = 0;
IMAP_MBOX mx;
- /* verify passed in path is an IMAP path */
- if (imap_parse_path (path, &mx)) {
- debug_print (2, ("bad path %s\n", path));
- return -1;
+ if (imap_parse_path (path, &mx) || !mx.mbox) {
+ strfcpy (dest, path, dlen);
+ return imap_complete_hosts (dest, dlen);
}
- /* don't open a new socket just for completion */
- if (!(idata = imap_conn_find (&(mx.account), M_IMAP_CONN_NONEW)))
- goto fail;
+ /* don't open a new socket just for completion. Instead complete over
+ * known mailboxes/hooks/etc */
+ if (!(idata = imap_conn_find (&(mx.account), M_IMAP_CONN_NONEW))) {
+ mem_free (&mx.mbox);
+ strfcpy (dest, path, dlen);
+ return imap_complete_hosts (dest, dlen);
+ }
conn = idata->conn;
/* reformat path for IMAP list, and append wildcard */
/* if the folder isn't selectable, append delimiter to force browse
* to enter it on second tab. */
if (noselect) {
- clen = safe_strlen (list_word);
+ clen = str_len (list_word);
list_word[clen++] = delim;
list_word[clen] = '\0';
}
/* copy in first word */
if (!completions) {
strfcpy (completion, list_word, sizeof (completion));
- matchlen = safe_strlen (completion);
+ matchlen = str_len (completion);
completions++;
continue;
}
- pos = 0;
- while (pos < matchlen && list_word[pos] &&
- completion[pos] == list_word[pos])
- pos++;
- completion[pos] = '\0';
- matchlen = pos;
-
+ matchlen = longest_common_prefix (completion, list_word, 0, matchlen);
completions++;
}
}
imap_qualify_path (dest, dlen, &mx, completion);
mutt_pretty_mailbox (dest);
- FREE (&mx.mbox);
+ mem_free (&mx.mbox);
return 0;
}
-fail:
- FREE (&mx.mbox);
return -1;
}
projects / apps / madmutt.git / blobdiff