#include "globals.h"
#include "pattern.h"
#include "sort.h"
-#include "browser.h"
#include "message.h"
#include "imap_private.h"
#include "buffy.h"
if (mod_ssl.force_tls)
rc = M_YES;
- else if (mod_ssl.starttls) {
+ else {
if ((rc = imap_exec (idata, "STARTTLS", IMAP_CMD_FAIL_OK)) == -1)
goto bail;
if (rc != -2) {
- if (mutt_ssl_starttls (idata->conn))
- {
+ if (mutt_ssl_starttls (idata->conn)) {
mutt_error (_("Could not negotiate TLS connection"));
mutt_sleep (1);
goto err_close_conn;
- }
- else {
+ } else {
/* RFC 2595 demands we recheck CAPABILITY after TLS completes. */
if (imap_exec (idata, "CAPABILITY", 0))
goto bail;
if (!(idata = imap_conn_find (&(mx.account), 0))) {
p_delete(&mx.mbox);
- return (-1);
+ return -1;
}
conn = idata->conn;
if (imap_create_mailbox (idata, mailbox) < 0)
return -1;
- return (0);
+ return 0;
}
/* imap_logout: Gracefully log out of server. */
matchlen = m_strlen(dest);
if (!Incoming.len)
- return (-1);
+ return -1;
for (i = 0; i < Incoming.len; i++) {
mailbox = Incoming.arr[i];
if (!m_strncmp(dest, mailbox->path, matchlen)) {
IMAP_DATA *imap_data;
if (!ctx)
- return (-1);
+ return -1;
imap_data = (IMAP_DATA *) ctx->data;
return 0;
}
-int imap_is_magic (const char* path, struct stat* st __attribute__ ((unused))) {
+static int imap_is_magic (const char* path, struct stat* st __attribute__ ((unused))) {
url_scheme_t s;
if (!path || !*path)
- return (-1);
+ return -1;
s = url_check_scheme (NONULL (path));
- return ((s == U_IMAP || s == U_IMAPS) ? M_IMAP : -1);
+ return (s == U_IMAP || s == U_IMAPS) ? M_IMAP : -1;
}
static int acl_check_imap (CONTEXT* ctx, int bit) {
static int _imap_check_mailbox (CONTEXT* ctx,
int* index_hint,
int lock __attribute__ ((unused))) {
- return (imap_check_mailbox (ctx, index_hint, 0));
+ return imap_check_mailbox (ctx, index_hint, 0);
}
static int imap_commit_message (MESSAGE* msg, CONTEXT* ctx) {
if ((r = m_fclose(&msg->fp)) == 0)
r = imap_append_message (ctx, msg);
- return (r);
+ return r;
}
mx_t const imap_mx = {
imap_access,
imap_open_mailbox,
imap_open_new_message,
+ imap_fetch_message,
acl_check_imap,
_imap_check_mailbox,
imap_close_mailbox,