X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fimap.c;h=2a4dff55d4762adc180ca4c748136ae11ab1d01e;hp=a8e9c9a70bc45cd9d711ea0e98c9f189ff2b1e7e;hb=cee79e37906a9ce36e9f92905da773841ec7c194;hpb=8e6b42b9b28f646a6764936d80bda04647d5b45f

diff --git a/imap/imap.c b/imap/imap.c
index a8e9c9a..2a4dff5 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -30,6 +30,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <unistd.h>
 #include <ctype.h>
@@ -46,7 +47,9 @@ static int imap_check_capabilities (IMAP_DATA * idata);
 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;
@@ -66,21 +69,27 @@ int imap_access (const char *path, int flags)
   }
 
   imap_fix_path (idata, mx.mbox, mailbox, sizeof (mailbox));
+
+  /* we may already be in the folder we're checking */
+  if (!ascii_strcmp(idata->mailbox, mx.mbox)) {
+    FREE (&mx.mbox);
+    return 0;
+  }
+
   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))
     snprintf (buf, sizeof (buf), "STATUS %s (UID-VALIDITY)", mbox);
   else {
-    dprint (2, (debugfile, "imap_access: STATUS not supported?\n"));
+    debug_print (2, ("STATUS not supported?\n"));
     return -1;
   }
 
   if (imap_exec (idata, buf, IMAP_CMD_FAIL_OK) < 0) {
-    dprint (1, (debugfile, "imap_access: Can't check STATUS of %s\n", mbox));
+    debug_print (1, ("Can't check STATUS of %s\n", mbox));
     return -1;
   }
 
@@ -178,14 +187,11 @@ int imap_read_literal (FILE * fp, IMAP_DATA * idata, long bytes)
 
   int r = 0;
 
-  dprint (2, (debugfile, "imap_read_literal: reading %ld bytes\n", bytes));
+  debug_print (2, ("reading %ld bytes\n", bytes));
 
   for (pos = 0; pos < bytes; pos++) {
     if (mutt_socket_readchar (idata->conn, &c) != 1) {
-      dprint (1,
-              (debugfile,
-               "imap_read_literal: error during read, %ld bytes read\n",
-               pos));
+      debug_print (1, ("error during read, %ld bytes read\n", pos));
       idata->status = IMAP_FATAL;
 
       return -1;
@@ -204,8 +210,8 @@ int imap_read_literal (FILE * fp, IMAP_DATA * idata, long bytes)
 #endif
     fputc (c, fp);
 #ifdef DEBUG
-    if (debuglevel >= IMAP_LOG_LTRL)
-      fputc (c, debugfile);
+    if (DebugLevel >= IMAP_LOG_LTRL)
+      fputc (c, DebugFile);
 #endif
   }
 
@@ -224,9 +230,7 @@ void imap_expunge_mailbox (IMAP_DATA * idata)
     h = idata->ctx->hdrs[i];
 
     if (h->index == -1) {
-      dprint (2,
-              (debugfile, "Expunging message UID %d.\n",
-               HEADER_DATA (h)->uid));
+      debug_print (2, ("Expunging message UID %d.\n", HEADER_DATA (h)->uid));
 
       h->active = 0;
 
@@ -277,11 +281,11 @@ static int imap_get_delim (IMAP_DATA * idata)
   while (rc == IMAP_CMD_CONTINUE);
 
   if (rc != IMAP_CMD_OK) {
-    dprint (1, (debugfile, "imap_get_delim: failed.\n"));
+    debug_print (1, ("failed.\n"));
     return -1;
   }
 
-  dprint (2, (debugfile, "Delimiter: %c\n", idata->delim));
+  debug_print (2, ("Delimiter: %c\n", idata->delim));
 
   return -1;
 }
@@ -372,8 +376,7 @@ IMAP_DATA *imap_conn_find (const ACCOUNT * account, int flags)
     if (!imap_authenticate (idata)) {
       idata->state = IMAP_AUTHENTICATED;
       if (idata->conn->ssf)
-        dprint (2, (debugfile, "Communication encrypted at %d bits\n",
-                    idata->conn->ssf));
+        debug_print (2, ("Communication encrypted at %d bits\n", idata->conn->ssf));
     }
     else
       mutt_account_unsetpass (&idata->conn->account);
@@ -472,13 +475,13 @@ static char *imap_get_flags (LIST ** hflags, char *s)
 
   /* sanity-check string */
   if (ascii_strncasecmp ("FLAGS", s, 5) != 0) {
-    dprint (1, (debugfile, "imap_get_flags: not a FLAGS response: %s\n", s));
+    debug_print (1, ("not a FLAGS response: %s\n", s));
     return NULL;
   }
   s += 5;
   SKIPWS (s);
   if (*s != '(') {
-    dprint (1, (debugfile, "imap_get_flags: bogus FLAGS response: %s\n", s));
+    debug_print (1, ("bogus FLAGS response: %s\n", s));
     return NULL;
   }
 
@@ -501,8 +504,7 @@ static char *imap_get_flags (LIST ** hflags, char *s)
 
   /* note bad flags response */
   if (*s != ')') {
-    dprint (1, (debugfile,
-                "imap_get_flags: Unterminated FLAGS response: %s\n", s));
+    debug_print (1, ("Unterminated FLAGS response: %s\n", s));
     mutt_free_list (hflags);
 
     return NULL;
@@ -577,14 +579,14 @@ int imap_open_mailbox (CONTEXT * ctx)
     if (ascii_strncasecmp ("FLAGS", pc, 5) == 0) {
       /* don't override PERMANENTFLAGS */
       if (!idata->flags) {
-        dprint (2, (debugfile, "Getting mailbox FLAGS\n"));
+        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) {
-      dprint (2, (debugfile, "Getting mailbox PERMANENTFLAGS\n"));
+      debug_print (2, ("Getting mailbox PERMANENTFLAGS\n"));
       /* safe to call on NULL */
       mutt_free_list (&(idata->flags));
       /* skip "OK [PERMANENT" so syntax is the same as FLAGS */
@@ -595,7 +597,7 @@ int imap_open_mailbox (CONTEXT * ctx)
 #ifdef USE_HCACHE
     /* save UIDVALIDITY for the header cache */
     else if (ascii_strncasecmp ("OK [UIDVALIDITY", pc, 14) == 0) {
-      dprint (2, (debugfile, "Getting mailbox UIDVALIDITY\n"));
+      debug_print (2, ("Getting mailbox UIDVALIDITY\n"));
       pc += 3;
       pc = imap_next_word (pc);
 
@@ -629,26 +631,25 @@ int imap_open_mailbox (CONTEXT * ctx)
   if (!ascii_strncasecmp
       (imap_get_qualifier (idata->cmd.buf), "[READ-ONLY]", 11)
       && !mutt_bit_isset (idata->capabilities, ACL)) {
-    dprint (2, (debugfile, "Mailbox is read-only.\n"));
+    debug_print (2, ("Mailbox is read-only.\n"));
     ctx->readonly = 1;
   }
 
 #ifdef DEBUG
   /* dump the mailbox flags we've found */
-  if (debuglevel > 2) {
+  if (DebugLevel > 2) {
     if (!idata->flags)
-      dprint (3, (debugfile, "No folder flags found\n"));
+      debug_print (3, ("No folder flags found\n"));
     else {
       LIST *t = idata->flags;
 
-      dprint (3, (debugfile, "Mailbox flags: "));
+      debug_print (3, ("Mailbox flags:\n"));
 
       t = t->next;
       while (t) {
-        dprint (3, (debugfile, "[%s] ", t->data));
+        debug_print (3, ("[%s]\n", t->data));
         t = t->next;
       }
-      dprint (3, (debugfile, "\n"));
     }
   }
 #endif
@@ -685,8 +686,7 @@ int imap_open_mailbox (CONTEXT * ctx)
     goto fail;
   }
 
-  dprint (2,
-          (debugfile, "imap_open_mailbox: msgcount is %d\n", ctx->msgcount));
+  debug_print (2, ("msgcount is %d\n", ctx->msgcount));
   FREE (&mx.mbox);
   return 0;
 
@@ -702,9 +702,8 @@ int imap_open_mailbox_append (CONTEXT * ctx)
 {
   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))
@@ -713,52 +712,31 @@ int imap_open_mailbox_append (CONTEXT * ctx)
   /* 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))) {
+    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);
+  FREE(&mx.mbox);
 
-  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");
-
-    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. */
@@ -776,7 +754,7 @@ void imap_logout (IMAP_DATA * idata)
 /*
 int imap_close_connection (CONTEXT *ctx)
 {
-  dprint (1, (debugfile, "imap_close_connection(): closing connection\n"));
+  debug_print (1, (debugfile, "imap_close_connection(): closing connection\n"));
   if (CTX_DATA->status != IMAP_BYE)
   {
     mutt_message _("Closing connection to IMAP server...");
@@ -913,7 +891,7 @@ int imap_sync_message (IMAP_DATA *idata, HEADER *hdr, BUFFER *cmd,
   if (mutt_bit_isset (idata->rights, ACL_WRITE))
     imap_add_keywords (flags, hdr, idata->flags, sizeof (flags));
 
-  mutt_remove_trailing_ws (flags);
+  str_skip_trailws (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) */
@@ -924,7 +902,7 @@ int imap_sync_message (IMAP_DATA *idata, HEADER *hdr, BUFFER *cmd,
     imap_set_flag (idata, ACL_WRITE, 1, "\\Answered ", flags, sizeof (flags));
     imap_set_flag (idata, ACL_DELETE, 1, "\\Deleted ", flags, sizeof (flags));
 
-    mutt_remove_trailing_ws (flags);
+    str_skip_trailws (flags);
 
     mutt_buffer_addstr (cmd, " -FLAGS.SILENT (");
   } else
@@ -972,17 +950,10 @@ int imap_sync_mailbox (CONTEXT * ctx, int expunge, int *index_hint)
   idata = (IMAP_DATA *) ctx->data;
 
   if (idata->state != IMAP_SELECTED) {
-    dprint (2, (debugfile, "imap_sync_mailbox: no mailbox selected\n"));
+    debug_print (2, ("no mailbox selected\n"));
     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);
@@ -1025,17 +996,13 @@ int imap_sync_mailbox (CONTEXT * ctx, int expunge, int *index_hint)
       /* 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) {
-        dprint (3,
-                (debugfile,
-                 "imap_sync_mailbox: Attachments to be deleted, falling back to _mutt_save_message\n"));
+        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) {
-          dprint (1,
-                  (debugfile,
-                   "imap_sync_mailbox: Error opening mailbox in append mode\n"));
+          debug_print (1, ("Error opening mailbox in append mode\n"));
         }
         else
           _mutt_save_message (ctx->hdrs[n], appendctx, 1, 0, 0);
@@ -1058,11 +1025,17 @@ int imap_sync_mailbox (CONTEXT * ctx, int expunge, int *index_hint)
     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 (ctx->closing) {
+    if (imap_exec (idata, "CLOSE", 0))
+      mutt_error (_("CLOSE failed"));
+    idata->state = IMAP_AUTHENTICATED;
+  }
+
   rc = 0;
 out:
   if (cmd.data)
@@ -1074,7 +1047,7 @@ out:
   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;
@@ -1085,13 +1058,16 @@ void imap_close_mailbox (CONTEXT * ctx)
   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));
     mutt_free_list (&idata->flags);
     idata->ctx = NULL;
@@ -1188,7 +1164,7 @@ int imap_mailbox_check (char *path, int new)
    * command on a mailbox that you have selected 
    */
 
-  if (safe_strcmp (mbox_unquoted, idata->mailbox) == 0
+  if (mutt_strcmp (mbox_unquoted, idata->mailbox) == 0
       || (ascii_strcasecmp (mbox_unquoted, "INBOX") == 0
           && safe_strcasecmp (mbox_unquoted, idata->mailbox) == 0)) {
     strfcpy (buf, "NOOP", sizeof (buf));
@@ -1215,22 +1191,19 @@ int imap_mailbox_check (char *path, int new)
       /* 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 (safe_strncmp (mbox_unquoted, s, mutt_strlen (mbox_unquoted)) == 0
+          || safe_strncmp (mbox, s, mutt_strlen (mbox)) == 0) {
         s = imap_next_word (s);
         s = imap_next_word (s);
         if (isdigit ((unsigned char) *s)) {
           if (*s != '0') {
             msgcount = atoi (s);
-            dprint (2,
-                    (debugfile, "%d new messages in %s\n", msgcount, path));
+            debug_print (2, ("%d new messages in %s\n", msgcount, path));
           }
         }
       }
       else
-        dprint (1,
-                (debugfile,
-                 "imap_mailbox_check: STATUS response doesn't match requested mailbox.\n"));
+        debug_print (1, ("STATUS response doesn't match requested mailbox.\n"));
     }
   }
   while (rc == IMAP_CMD_CONTINUE);
@@ -1371,7 +1344,7 @@ int imap_complete (char *dest, size_t dlen, char *path)
 
   /* verify passed in path is an IMAP path */
   if (imap_parse_path (path, &mx)) {
-    dprint (2, (debugfile, "imap_complete: bad path %s\n", path));
+    debug_print (2, ("bad path %s\n", path));
     return -1;
   }
 
@@ -1407,14 +1380,14 @@ int imap_complete (char *dest, size_t dlen, char *path)
       /* 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 = mutt_strlen (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 = mutt_strlen (completion);
         completions++;
         continue;
       }
@@ -1448,7 +1421,12 @@ fail:
 /* reconnect if connection was lost */
 int imap_reconnect (CONTEXT * ctx)
 {
-  IMAP_DATA *imap_data = (IMAP_DATA *) ctx->data;
+  IMAP_DATA *imap_data;
+
+  if (!ctx)
+    return (-1);
+
+  imap_data = (IMAP_DATA *) ctx->data;
 
   if (imap_data) {
     if (imap_data->status == IMAP_CONNECTED)