Changeset 5033:bf208df92829

Timestamp:

2007-03-31 16:07:36 (22 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

default

Message:

Allow IMAP FCC to reconnect if append fails (closes: #890)

Location:

imap

Files:

• command.c (modified) (1 diff)
• imap.c (modified) (5 diffs)

imap/command.c

@@ -271 +271 @@
   if (rc != IMAP_CMD_OK)
   {
-    if (flags & IMAP_CMD_FAIL_OK)
+    if (flags & IMAP_CMD_FAIL_OK && idata->status != IMAP_FATAL)
       return -2;
 

imap/imap.c

@@ -64 +64 @@
   char mailbox[LONG_STRING];
   char mbox[LONG_STRING];
+  int rc;
 
   if (imap_parse_path (path, &mx))
@@ -97 +98 @@
   }
 
-  if (imap_exec (idata, buf, IMAP_CMD_FAIL_OK) < 0)
+  if ((rc = imap_exec (idata, buf, IMAP_CMD_FAIL_OK)) < 0)
   {
     dprint (1, (debugfile, "imap_access: Can't check STATUS of %s\n", mbox));
-    return -1;
+    return rc;
   }
 
@@ -341 +342 @@
     }
     if (flags & M_IMAP_CONN_NOSELECT && idata && idata->state >= IMAP_SELECTED)
+      continue;
+    if (idata && idata->status == IMAP_FATAL)
       continue;
     break;
@@ -772 +775 @@
   char mailbox[LONG_STRING];
   IMAP_MBOX mx;
+  int rc;
 
   if (imap_parse_path (ctx->path, &mx))
@@ -794 +798 @@
 
   /* really we should also check for W_OK */
-  if (!imap_access (ctx->path, F_OK))
+  if ((rc = imap_access (ctx->path, F_OK)) == 0)
     return 0;
+
+  if (rc == -1)
+    return -1;
 
   snprintf (buf, sizeof (buf), _("Create %s?"), mailbox);