Hack around INBOX.INBOX breakage from [5d1cc2f0c1c4]

diff --git a/ChangeLog b/ChangeLog
index 0061de0bf0634f6c21a13d86a605b8514c3b4449..836bbb26616bbc2f671d9fb10bc61c0d7cc633d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-20 18:00 +0100  Vincent Lefevre  <vincent@vinc17.org>  (11d2c6712c88)
+
+       * pattern.c: Make eat_regexp static.
+
+2008-10-20 09:55 -0700  Kyle Wheeler  <kyle@memoryhole.net>  (361b298c9fe2)
+
+       * imap/util.c: Fix #3129
+
 2008-10-20 09:48 -0700  Brendan Cully  <brendan@kublai.com>  (f119005f8169)
 
        * imap/imap.c, imap/imap_private.h: Call imap_free_idata instead of

diff --git a/imap/imap.c b/imap/imap.c
index 53c20cd852dba5e6902ac3019c255af9537528fb..cb7034118e27987b9c3466e6458c95777f2f5b44 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -76,6 +76,8 @@ int imap_access (const char* path, int flags)
   }
 
   imap_fix_path (idata, mx.mbox, mailbox, sizeof (mailbox));
+  if (!*mailbox)
+    strfcpy (mailbox, "INBOX", sizeof (mailbox));
 
   /* we may already be in the folder we're checking */
   if (!ascii_strcmp(idata->mailbox, mx.mbox))
@@ -577,6 +579,8 @@ int imap_open_mailbox (CONTEXT* ctx)
 
   /* Clean up path and replace the one in the ctx */
   imap_fix_path (idata, mx.mbox, buf, sizeof (buf));
+  if (!*buf)
+    strfcpy (buf, "INBOX", sizeof (buf));
   FREE(&(idata->mailbox));
   idata->mailbox = safe_strdup (buf);
   imap_qualify_path (buf, sizeof (buf), &mx, idata->mailbox);
@@ -790,6 +794,8 @@ int imap_open_mailbox_append (CONTEXT *ctx)
   ctx->data = idata;
 
   imap_fix_path (idata, mx.mbox, mailbox, sizeof (mailbox));
+  if (!*mailbox)
+    strfcpy (mailbox, "INBOX", sizeof (mailbox));
   FREE (&mx.mbox);
 
   /* really we should also check for W_OK */
@@ -1440,6 +1446,8 @@ static int imap_get_mailbox (const char* path, IMAP_DATA** hidata, char* buf, si
   }
   
   imap_fix_path (*hidata, mx.mbox, buf, blen);
+  if (!*buf)
+    strfcpy (buf, "INBOX", blen);
   FREE (&mx.mbox);
 
   return 0;
@@ -1813,6 +1821,8 @@ int imap_subscribe (char *path, int subscribe)
   conn = idata->conn;
 
   imap_fix_path (idata, mx.mbox, buf, sizeof (buf));
+  if (!*buf)
+    strfcpy (buf, "INBOX", sizeof (buf));
 
   if (option (OPTIMAPCHECKSUBSCRIBED))
   {

diff --git a/imap/message.c b/imap/message.c
index e4536ae0e03df1f622abb900dcd05bd8b342981a..10221f3fba13276af163a70122904dbcbdc30367 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -575,6 +575,8 @@ int imap_append_message (CONTEXT *ctx, MESSAGE *msg)
     return -1;
 
   imap_fix_path (idata, mx.mbox, mailbox, sizeof (mailbox));
+  if (!*mailbox)
+    strfcpy (mailbox, "INBOX", sizeof (mailbox));
   
   if ((fp = fopen (msg->path, "r")) == NULL)
   {
@@ -720,6 +722,8 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete)
   }
   
   imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox));
+  if (!*mbox)
+    strfcpy (mbox, "INBOX", sizeof (mbox));
   imap_munge_mbox_name (mmbox, sizeof (mmbox), mbox);
 
   /* loop in case of TRYCREATE */