X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fimap.c;h=a6bbfb36a5f091f621a7bab37a3b59b21395b522;hp=e426e33b29e175b8c63753e4d5ab3e05d881370a;hb=4f1b1414371cc373f50ca79a888928635a3a3763;hpb=16536d59024177409f49134c3f03f69855c144b9

diff --git a/imap/imap.c b/imap/imap.c
index e426e33..a6bbfb3 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -12,17 +12,15 @@
 /* Support for IMAP4rev1, with the occasional nod to IMAP 4. */
 
 #include <lib-lib/lib-lib.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
-#include "mx.h"
 #include "globals.h"
+#include "pattern.h"
 #include "sort.h"
 #include "browser.h"
 #include "message.h"
 #include "imap_private.h"
-#if defined(USE_SSL) || defined(USE_GNUTLS)
-# include <lib-sys/mutt_ssl.h>
-#endif
 #include "buffy.h"
 
 /* imap forward declarations */
@@ -36,7 +34,7 @@ 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 __attribute__ ((unused)))
+static int imap_access (const char *path, int flags __attribute__ ((unused)))
 {
   IMAP_DATA *idata;
   IMAP_MBOX mx;
@@ -178,7 +176,6 @@ int imap_read_literal (FILE * fp, IMAP_DATA * idata, long bytes, progress_t* bar
       return -1;
     }
 
-#if 1
     if (r == 1 && c != '\n')
       fputc ('\r', fp);
 
@@ -188,7 +185,7 @@ int imap_read_literal (FILE * fp, IMAP_DATA * idata, long bytes, progress_t* bar
     }
     else
       r = 0;
-#endif
+
     fputc (c, fp);
     if (bar && !(pos % 1024))
       mutt_progress_bar (bar, pos);
@@ -238,14 +235,14 @@ static int imap_get_delim (IMAP_DATA * idata)
    * than getting the delim wrong */
   idata->delim = '/';
 
-  imap_cmd_start (idata, "string_list_t \"\" \"\"");
+  imap_cmd_start (idata, "LIST\"\" \"\"");
 
   do {
     if ((rc = imap_cmd_step (idata)) != IMAP_CMD_CONTINUE)
       break;
 
     s = imap_next_word (idata->cmd.buf);
-    if (ascii_strncasecmp ("string_list_t", s, 4) == 0) {
+    if (ascii_strncasecmp ("LIST", s, 4) == 0) {
       s = imap_next_word (s);
       s = imap_next_word (s);
       if (s && s[0] == '\"' && s[1] && s[2] == '\"')
@@ -347,9 +344,9 @@ IMAP_DATA *imap_conn_find (const ACCOUNT * account, int flags)
   if (idata->state == IMAP_CONNECTED) {
     if (!imap_authenticate (idata)) {
       idata->state = IMAP_AUTHENTICATED;
-    }
-    else
+    } else {
       mutt_account_unsetpass (&idata->conn->account);
+    }
 
     p_delete(&idata->capstr);
   }
@@ -383,24 +380,18 @@ int imap_open_connection (IMAP_DATA * idata)
     /* TODO: Parse new tagged CAPABILITY data (* OK [CAPABILITY...]) */
     if (imap_check_capabilities (idata))
       goto bail;
-#if defined(USE_SSL) || defined(USE_GNUTLS)
     /* Attempt STARTTLS if available and desired. */
-    if (!idata->conn->ssf && (option(OPTSSLFORCETLS) || 
+    if (!idata->conn->ssf && (mod_ssl.force_tls ||
                               mutt_bit_isset (idata->capabilities, STARTTLS))) {
       int rc;
 
-      if (option (OPTSSLFORCETLS))
+      if (mod_ssl.force_tls)
         rc = M_YES;
-      else if ((rc = query_quadoption (OPT_SSLSTARTTLS,
-                                       _("Secure connection with TLS?"))) == -1)
-        goto err_close_conn;
-      if (rc == M_YES) {
+      else if (mod_ssl.starttls) {
         if ((rc = imap_exec (idata, "STARTTLS", IMAP_CMD_FAIL_OK)) == -1)
           goto bail;
         if (rc != -2) {
-#if defined (USE_SSL) || defined (USE_GNUTLS)
           if (mutt_ssl_starttls (idata->conn))
-#endif
           {
             mutt_error (_("Could not negotiate TLS connection"));
             mutt_sleep (1);
@@ -415,12 +406,11 @@ int imap_open_connection (IMAP_DATA * idata)
       }
     }
 
-    if (option(OPTSSLFORCETLS) && ! idata->conn->ssf) {
+    if (mod_ssl.force_tls && ! 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;
@@ -488,7 +478,7 @@ static char *imap_get_flags (string_list_t ** hflags, char *s)
   return s;
 }
 
-int imap_open_mailbox (CONTEXT * ctx)
+static int imap_open_mailbox (CONTEXT * ctx)
 {
   CONNECTION *conn;
   IMAP_DATA *idata;
@@ -992,7 +982,7 @@ out:
 }
 
 /* imap_close_mailbox: clean up IMAP data in CONTEXT */
-void imap_close_mailbox (CONTEXT * ctx)
+static void imap_close_mailbox (CONTEXT * ctx)
 {
   IMAP_DATA *idata;
   int i;
@@ -1307,7 +1297,7 @@ int imap_parse_list_response (IMAP_DATA * idata, char **name, int *noselect,
     return -1;
 
   s = imap_next_word (idata->cmd.buf);
-  if ((ascii_strncasecmp ("string_list_t", s, 4) == 0) ||
+  if ((ascii_strncasecmp ("LIST", s, 4) == 0) ||
       (ascii_strncasecmp ("LSUB", s, 4) == 0)) {
     *noselect = 0;
     *noinferiors = 0;
@@ -1434,10 +1424,10 @@ static int imap_complete_hosts (char *dest, ssize_t len) {
   int i = 0;
 
   matchlen = m_strlen(dest);
-  if (list_empty (Incoming))
+  if (!Incoming.len)
     return (-1);
-  for (i = 0; i < Incoming->length; i++) {
-    mailbox = (BUFFY*) Incoming->data[i];
+  for (i = 0; i < Incoming.len; i++) {
+    mailbox = Incoming.arr[i];
     if (!m_strncmp(dest, mailbox->path, matchlen)) {
       if (rc) {
         m_strcpy(dest, len, mailbox->path);
@@ -1509,7 +1499,7 @@ int imap_complete (char *dest, size_t dlen, char *path) {
 
   /* fire off command */
   snprintf (buf, sizeof (buf), "%s \"\" \"%s%%\"",
-            option (OPTIMAPLSUB) ? "LSUB" : "string_list_t", list);
+            option (OPTIMAPLSUB) ? "LSUB" : "LIST", list);
 
   imap_cmd_start (idata, buf);
 
@@ -1580,3 +1570,63 @@ int imap_reconnect (CONTEXT * ctx)
   mx_open_mailbox (ctx->path, 0, ctx);
   return 0;
 }
+
+int imap_is_magic (const char* path, struct stat* st __attribute__ ((unused))) {
+  url_scheme_t s;
+  if (!path || !*path)
+    return (-1);
+  s = url_check_scheme (NONULL (path));
+  return ((s == U_IMAP || s == U_IMAPS) ? M_IMAP : -1);
+}
+
+static int acl_check_imap (CONTEXT* ctx, int bit) {
+  return (!mutt_bit_isset (((IMAP_DATA*) ctx->data)->capabilities, ACL) ||
+          mutt_bit_isset (((IMAP_DATA*) ctx->data)->rights, bit));
+}
+
+static int imap_open_new_message (MESSAGE * msg,
+                                  CONTEXT * dest __attribute__ ((unused)),
+                                  HEADER * hdr __attribute__ ((unused)))
+{
+    char tmp[_POSIX_PATH_MAX];
+
+    msg->fp = m_tempfile(tmp, sizeof(tmp), NONULL(MCore.tmpdir), NULL);
+    if (!msg->fp) {
+        mutt_perror(tmp);
+        return -1;
+    }
+
+    msg->path = m_strdup(tmp);
+    return 0;
+}
+
+/* this ugly kludge is required since the last int to
+ * imap_check_mailbox() doesn't mean 'lock' but 'force'... */
+static int _imap_check_mailbox (CONTEXT* ctx,
+                                int* index_hint,
+                                int lock __attribute__ ((unused))) {
+  return (imap_check_mailbox (ctx, index_hint, 0));
+}
+
+static int imap_commit_message (MESSAGE* msg, CONTEXT* ctx) {
+  int r = 0;
+
+  if ((r = m_fclose(&msg->fp)) == 0)
+    r = imap_append_message (ctx, msg);
+  return (r);
+}
+
+mx_t const imap_mx = {
+    M_IMAP,
+    0,
+    imap_is_magic,
+    NULL,
+    imap_access,
+    imap_open_mailbox,
+    imap_open_new_message,
+    acl_check_imap,
+    _imap_check_mailbox,
+    imap_close_mailbox,
+    imap_sync_mailbox,
+    imap_commit_message,
+};