MH dirs are now correctly parsed (Closes: 538128)

[software/mutt-debian.git] / imap / message.c

diff --git a/imap/message.c b/imap/message.c
index 5bcd6fb7d7cc6ee603fcd3d615ab282cbf35d901..3d64c0d5f62cc1dfd19a3b392b96192dfe81d9c4 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -1,22 +1,22 @@
 /*
  * Copyright (C) 1996-9 Brandon Long <blong@fiction.net>
  * Copyright (C) 1999-2009 Brendan Cully <brendan@kublai.com>
 /*
  * Copyright (C) 1996-9 Brandon Long <blong@fiction.net>
  * Copyright (C) 1999-2009 Brendan Cully <brendan@kublai.com>

- * 
+ *

  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *     the Free Software Foundation; either version 2 of the License, or
  *     (at your option) any later version.
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *     the Free Software Foundation; either version 2 of the License, or
  *     (at your option) any later version.

- * 
+ *

  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.

- * 
+ *

  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *

- */ 
+ */

 
 /* message parsing/updating functions */
 
 
 /* message parsing/updating functions */
 


@@ -85,12 +85,12 @@ int imap_read_headers (IMAP_DATA* idata, int msgbegin, int msgend)
 
   if (mutt_bit_isset (idata->capabilities,IMAP4REV1))
   {
 
   if (mutt_bit_isset (idata->capabilities,IMAP4REV1))
   {

-    snprintf (hdrreq, sizeof (hdrreq), "BODY.PEEK[HEADER.FIELDS (%s%s%s)]", 
-             want_headers, ImapHeaders ? " " : "", ImapHeaders ? ImapHeaders : ""); 
-  } 
+    snprintf (hdrreq, sizeof (hdrreq), "BODY.PEEK[HEADER.FIELDS (%s%s%s)]",
+             want_headers, ImapHeaders ? " " : "", ImapHeaders ? ImapHeaders : "");
+  }

   else if (mutt_bit_isset (idata->capabilities,IMAP4))
   {
   else if (mutt_bit_isset (idata->capabilities,IMAP4))
   {

-    snprintf (hdrreq, sizeof (hdrreq), "RFC822.HEADER.LINES (%s%s%s)", 
+    snprintf (hdrreq, sizeof (hdrreq), "RFC822.HEADER.LINES (%s%s%s)",

              want_headers, ImapHeaders ? " " : "", ImapHeaders ? ImapHeaders : "");
   }
   else
              want_headers, ImapHeaders ? " " : "", ImapHeaders ? ImapHeaders : "");
   }
   else


@@ -142,14 +142,14 @@ int imap_read_headers (IMAP_DATA* idata, int msgbegin, int msgend)
 
     snprintf (buf, sizeof (buf),
       "UID FETCH 1:%u (UID FLAGS)", uidnext - 1);
 
     snprintf (buf, sizeof (buf),
       "UID FETCH 1:%u (UID FLAGS)", uidnext - 1);

-  
+

     imap_cmd_start (idata, buf);
     imap_cmd_start (idata, buf);

-  
+

     rc = IMAP_CMD_CONTINUE;
     for (msgno = msgbegin; rc == IMAP_CMD_CONTINUE; msgno++)
     {
       mutt_progress_update (&progress, msgno + 1, -1);
     rc = IMAP_CMD_CONTINUE;
     for (msgno = msgbegin; rc == IMAP_CMD_CONTINUE; msgno++)
     {
       mutt_progress_update (&progress, msgno + 1, -1);

-  
+

       memset (&h, 0, sizeof (h));
       h.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA));
       do
       memset (&h, 0, sizeof (h));
       h.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA));
       do


@@ -183,13 +183,13 @@ int imap_read_headers (IMAP_DATA* idata, int msgbegin, int msgend)
           mfhrc = -1;
           continue;
         }
           mfhrc = -1;
           continue;
         }

-        
+

         idx = h.sid - 1;
         ctx->hdrs[idx] = imap_hcache_get (idata, h.data->uid);
         if (ctx->hdrs[idx])
         {
          ctx->hdrs[idx]->index = idx;
         idx = h.sid - 1;
         ctx->hdrs[idx] = imap_hcache_get (idata, h.data->uid);
         if (ctx->hdrs[idx])
         {
          ctx->hdrs[idx]->index = idx;

-         /* messages which have not been expunged are ACTIVE (borrowed from mh 
+         /* messages which have not been expunged are ACTIVE (borrowed from mh

           * folders) */
          ctx->hdrs[idx]->active = 1;
           ctx->hdrs[idx]->read = h.data->read;
           * folders) */
          ctx->hdrs[idx]->active = 1;
           ctx->hdrs[idx]->read = h.data->read;


@@ -220,7 +220,7 @@ int imap_read_headers (IMAP_DATA* idata, int msgbegin, int msgend)
         if (h.data)
           imap_free_header_data ((void**) (void*) &h.data);
         imap_hcache_close (idata);
         if (h.data)
           imap_free_header_data ((void**) (void*) &h.data);
         imap_hcache_close (idata);

-        fclose (fp);
+        safe_fclose (&fp);

         return -1;
       }
     }
         return -1;
       }
     }


@@ -287,11 +287,18 @@ int imap_read_headers (IMAP_DATA* idata, int msgbegin, int msgend)
         mfhrc = -1;
         continue;
       }
         mfhrc = -1;
         continue;
       }

+      /* May receive FLAGS updates in a separate untagged response (#2935) */
+      if (idx < ctx->msgcount)
+      {
+       dprint (2, (debugfile, "imap_read_headers: message %d is not new\n",
+                   h.sid));
+       continue;
+      }

 
       ctx->hdrs[idx] = mutt_new_header ();
 
       ctx->hdrs[idx]->index = h.sid - 1;
 
       ctx->hdrs[idx] = mutt_new_header ();
 
       ctx->hdrs[idx]->index = h.sid - 1;

-      /* messages which have not been expunged are ACTIVE (borrowed from mh 
+      /* messages which have not been expunged are ACTIVE (borrowed from mh

        * folders) */
       ctx->hdrs[idx]->active = 1;
       ctx->hdrs[idx]->read = h.data->read;
        * folders) */
       ctx->hdrs[idx]->active = 1;
       ctx->hdrs[idx]->read = h.data->read;


@@ -331,7 +338,7 @@ int imap_read_headers (IMAP_DATA* idata, int msgbegin, int msgend)
 #if USE_HCACHE
       imap_hcache_close (idata);
 #endif
 #if USE_HCACHE
       imap_hcache_close (idata);
 #endif

-      fclose (fp);
+      safe_fclose (&fp);

       return -1;
     }
 
       return -1;
     }
 


@@ -364,7 +371,7 @@ int imap_read_headers (IMAP_DATA* idata, int msgbegin, int msgend)
   imap_hcache_close (idata);
 #endif /* USE_HCACHE */
 
   imap_hcache_close (idata);
 #endif /* USE_HCACHE */
 

-  fclose(fp);
+  safe_fclose (&fp);

 
   if (ctx->msgcount > oldmsgcount)
   {
 
   if (ctx->msgcount > oldmsgcount)
   {


@@ -443,7 +450,7 @@ int imap_fetch_message (MESSAGE *msg, CONTEXT *ctx, int msgno)
    * also try to update it. HACK until all this code can be moved into the
    * command handler */
   h->active = 0;
    * also try to update it. HACK until all this code can be moved into the
    * command handler */
   h->active = 0;

-  
+

   snprintf (buf, sizeof (buf), "UID FETCH %u %s", HEADER_DATA(h)->uid,
            (mutt_bit_isset (idata->capabilities, IMAP4REV1) ?
             (option (OPTIMAPPEEK) ? "BODY.PEEK[]" : "BODY[]") :
   snprintf (buf, sizeof (buf), "UID FETCH %u %s", HEADER_DATA(h)->uid,
            (mutt_bit_isset (idata->capabilities, IMAP4REV1) ?
             (option (OPTIMAPPEEK) ? "BODY.PEEK[]" : "BODY[]") :


@@ -516,7 +523,7 @@ int imap_fetch_message (MESSAGE *msg, CONTEXT *ctx, int msgno)
     mutt_perror (cache->path);
     goto bail;
   }
     mutt_perror (cache->path);
     goto bail;
   }

-  
+

   if (rc != IMAP_CMD_OK)
     goto bail;
 
   if (rc != IMAP_CMD_OK)
     goto bail;
 


@@ -586,7 +593,7 @@ int imap_append_message (CONTEXT *ctx, MESSAGE *msg)
   FILE *fp;
   char buf[LONG_STRING];
   char mbox[LONG_STRING];
   FILE *fp;
   char buf[LONG_STRING];
   char mbox[LONG_STRING];

-  char mailbox[LONG_STRING]; 
+  char mailbox[LONG_STRING];

   size_t len;
   progress_t progressbar;
   size_t sent;
   size_t len;
   progress_t progressbar;
   size_t sent;


@@ -602,7 +609,7 @@ int imap_append_message (CONTEXT *ctx, MESSAGE *msg)
   imap_fix_path (idata, mx.mbox, mailbox, sizeof (mailbox));
   if (!*mailbox)
     strfcpy (mailbox, "INBOX", sizeof (mailbox));
   imap_fix_path (idata, mx.mbox, mailbox, sizeof (mailbox));
   if (!*mailbox)
     strfcpy (mailbox, "INBOX", sizeof (mailbox));

-  
+

   if ((fp = fopen (msg->path, "r")) == NULL)
   {
     mutt_perror (msg->path);
   if ((fp = fopen (msg->path, "r")) == NULL)
   {
     mutt_perror (msg->path);


@@ -654,7 +661,7 @@ int imap_append_message (CONTEXT *ctx, MESSAGE *msg)
     pc = imap_next_word (pc);
     mutt_error ("%s", pc);
     mutt_sleep (1);
     pc = imap_next_word (pc);
     mutt_error ("%s", pc);
     mutt_sleep (1);

-    fclose (fp);
+    safe_fclose (&fp);

     goto fail;
   }
 
     goto fail;
   }
 


@@ -672,12 +679,12 @@ int imap_append_message (CONTEXT *ctx, MESSAGE *msg)
       mutt_progress_update (&progressbar, sent, -1);
     }
   }
       mutt_progress_update (&progressbar, sent, -1);
     }
   }

-  
+

   if (len)
     flush_buffer(buf, &len, idata->conn);
 
   mutt_socket_write (idata->conn, "\r\n");
   if (len)
     flush_buffer(buf, &len, idata->conn);
 
   mutt_socket_write (idata->conn, "\r\n");

-  fclose (fp);
+  safe_fclose (&fp);

 
   do
     rc = imap_cmd_step (idata);
 
   do
     rc = imap_cmd_step (idata);


@@ -745,7 +752,7 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete)
     dprint (3, (debugfile, "imap_copy_messages: Message contains attachments to be deleted\n"));
     return 1;
   }
     dprint (3, (debugfile, "imap_copy_messages: Message contains attachments to be deleted\n"));
     return 1;
   }

-  
+

   imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox));
   if (!*mbox)
     strfcpy (mbox, "INBOX", sizeof (mbox));
   imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox));
   if (!*mbox)
     strfcpy (mbox, "INBOX", sizeof (mbox));


@@ -778,7 +785,7 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete)
           if (rc < 0)
           {
             dprint (1, (debugfile, "imap_copy_messages: could not sync\n"));
           if (rc < 0)
           {
             dprint (1, (debugfile, "imap_copy_messages: could not sync\n"));

-            goto fail;
+            goto out;

           }
         }
       }
           }
         }
       }


@@ -787,12 +794,13 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete)
       if (!rc)
       {
         dprint (1, (debugfile, "imap_copy_messages: No messages tagged\n"));
       if (!rc)
       {
         dprint (1, (debugfile, "imap_copy_messages: No messages tagged\n"));

-        goto fail;
+        rc = -1;
+        goto out;

       }
       else if (rc < 0)
       {
         dprint (1, (debugfile, "could not queue copy\n"));
       }
       else if (rc < 0)
       {
         dprint (1, (debugfile, "could not queue copy\n"));

-        goto fail;
+        goto out;

       }
       else
         mutt_message (_("Copying %d messages to %s..."), rc, mbox);
       }
       else
         mutt_message (_("Copying %d messages to %s..."), rc, mbox);


@@ -808,13 +816,13 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete)
         if (rc < 0)
         {
           dprint (1, (debugfile, "imap_copy_messages: could not sync\n"));
         if (rc < 0)
         {
           dprint (1, (debugfile, "imap_copy_messages: could not sync\n"));

-          goto fail;
+          goto out;

         }
         }

-      }    
+      }

       if ((rc = imap_exec (idata, cmd.data, IMAP_CMD_QUEUE)) < 0)
       {
         dprint (1, (debugfile, "could not queue copy\n"));
       if ((rc = imap_exec (idata, cmd.data, IMAP_CMD_QUEUE)) < 0)
       {
         dprint (1, (debugfile, "could not queue copy\n"));

-        goto fail;
+        goto out;

       }
     }
 
       }
     }
 


@@ -835,7 +843,7 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete)
       if (option (OPTCONFIRMCREATE) && mutt_yesorno (prompt, 1) < 1)
       {
         mutt_clear_error ();
       if (option (OPTCONFIRMCREATE) && mutt_yesorno (prompt, 1) < 1)
       {
         mutt_clear_error ();

-        break;
+        goto out;

       }
       if (imap_create_mailbox (idata, mbox) < 0)
         break;
       }
       if (imap_create_mailbox (idata, mbox) < 0)
         break;


@@ -847,7 +855,7 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete)
   if (rc != 0)
   {
     imap_error ("imap_copy_messages", idata->buf);
   if (rc != 0)
   {
     imap_error ("imap_copy_messages", idata->buf);

-    goto fail;
+    goto out;

   }
 
   /* cleanup */
   }
 
   /* cleanup */


@@ -871,20 +879,16 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete)
     }
   }
 
     }
   }
 

-  if (cmd.data)
-    FREE (&cmd.data);
-  if (sync_cmd.data)
-    FREE (&sync_cmd.data);
-  FREE (&mx.mbox);
-  return 0;
+  rc = 0;

 
 

- fail:
+ out:

   if (cmd.data)
     FREE (&cmd.data);
   if (sync_cmd.data)
     FREE (&sync_cmd.data);
   FREE (&mx.mbox);
   if (cmd.data)
     FREE (&cmd.data);
   if (sync_cmd.data)
     FREE (&sync_cmd.data);
   FREE (&mx.mbox);

-  return -1;
+
+  return rc < 0 ? -1 : rc;

 }
 
 static body_cache_t *msg_cache_open (IMAP_DATA *idata)
 }
 
 static body_cache_t *msg_cache_open (IMAP_DATA *idata)


@@ -1026,14 +1030,14 @@ char* imap_set_flags (IMAP_DATA* idata, HEADER* h, char* s)
   dprint (2, (debugfile, "imap_fetch_message: parsing FLAGS\n"));
   if ((s = msg_parse_flags (&newh, s)) == NULL)
     return NULL;
   dprint (2, (debugfile, "imap_fetch_message: parsing FLAGS\n"));
   if ((s = msg_parse_flags (&newh, s)) == NULL)
     return NULL;

-  
+

   /* YAUH (yet another ugly hack): temporarily set context to
    * read-write even if it's read-only, so *server* updates of
    * flags can be processed by mutt_set_flag. ctx->changed must
    * be restored afterwards */
   readonly = ctx->readonly;
   ctx->readonly = 0;
   /* YAUH (yet another ugly hack): temporarily set context to
    * read-write even if it's read-only, so *server* updates of
    * flags can be processed by mutt_set_flag. ctx->changed must
    * be restored afterwards */
   readonly = ctx->readonly;
   ctx->readonly = 0;

-           
+

   mutt_set_flag (ctx, h, M_NEW, !(hd->read || hd->old));
   mutt_set_flag (ctx, h, M_OLD, hd->old);
   mutt_set_flag (ctx, h, M_READ, hd->read);
   mutt_set_flag (ctx, h, M_NEW, !(hd->read || hd->old));
   mutt_set_flag (ctx, h, M_OLD, hd->old);
   mutt_set_flag (ctx, h, M_READ, hd->read);


@@ -1067,7 +1071,7 @@ static int msg_fetch_header (CONTEXT* ctx, IMAP_HEADER* h, char* buf, FILE* fp)
 
   if (buf[0] != '*')
     return rc;
 
   if (buf[0] != '*')
     return rc;

-  
+

   /* skip to message number */
   buf = imap_next_word (buf);
   h->sid = atoi (buf);
   /* skip to message number */
   buf = imap_next_word (buf);
   h->sid = atoi (buf);


@@ -1086,7 +1090,7 @@ static int msg_fetch_header (CONTEXT* ctx, IMAP_HEADER* h, char* buf, FILE* fp)
    *   read header lines and call it again. Silly. */
   if ((rc = msg_parse_fetch (h, buf)) != -2 || !fp)
     return rc;
    *   read header lines and call it again. Silly. */
   if ((rc = msg_parse_fetch (h, buf)) != -2 || !fp)
     return rc;

-  
+

   if (imap_get_literal_count (buf, &bytes) == 0)
   {
     imap_read_literal (fp, idata, bytes, NULL);
   if (imap_get_literal_count (buf, &bytes) == 0)
   {
     imap_read_literal (fp, idata, bytes, NULL);


@@ -1097,13 +1101,13 @@ static int msg_fetch_header (CONTEXT* ctx, IMAP_HEADER* h, char* buf, FILE* fp)
      * interchangeably at any time. */
     if (imap_cmd_step (idata) != IMAP_CMD_CONTINUE)
       return rc;
      * interchangeably at any time. */
     if (imap_cmd_step (idata) != IMAP_CMD_CONTINUE)
       return rc;

-  
+

     if (msg_parse_fetch (h, idata->buf) == -1)
       return rc;
   }
 
   rc = 0; /* success */
     if (msg_parse_fetch (h, idata->buf) == -1)
       return rc;
   }
 
   rc = 0; /* success */

-  
+

   /* subtract headers from message size - unfortunately only the subset of
    * headers we've requested. */
   h->content_length -= bytes;
   /* subtract headers from message size - unfortunately only the subset of
    * headers we've requested. */
   h->content_length -= bytes;