This patch removes the Kendra format from mutt. (The support was

broken anyways.)

diff --git a/attach.c b/attach.c
index a491d186255b32c736d45dc6405761323605d17f..4cda1702c1997a6e1f61d8b4b703a980b875a69a 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -765,7 +765,7 @@ int mutt_save_attachment (FILE *fp, BODY *m, char *path, int flags, HEADER *hdr)
        mx_close_mailbox(&ctx, NULL);
        return -1;
       }
-      if (ctx.magic == M_MBOX || ctx.magic == M_MMDF || ctx.magic == M_KENDRA)
+      if (ctx.magic == M_MBOX || ctx.magic == M_MMDF)
        chflags = CH_FROM;
       chflags |= (ctx.magic == M_MAILDIR ? CH_NOSTATUS : CH_UPDATE);
       if (_mutt_copy_message (msg->fp, fp, hn, hn->content, 0, chflags) == 0 

diff --git a/buffy.c b/buffy.c
index 43ba56fad3e17e032bcc2022ba8e0592218f76f1..8830931ca8c5a489102b082b512fdfee8ecf279d 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -120,7 +120,7 @@ int test_new_folder (const char *path)
 
   typ = mx_get_magic (path);
 
-  if (typ != M_MBOX && typ != M_MMDF && typ != M_KENDRA)
+  if (typ != M_MBOX && typ != M_MMDF)
     return 0;
 
   if ((f = fopen (path, "rb")))
@@ -348,7 +348,6 @@ int mutt_buffy_check (int force)
       {
       case M_MBOX:
       case M_MMDF:
-      case M_KENDRA:
 
        if (STAT_CHECK)
        {

diff --git a/commands.c b/commands.c
index e425874026818d9032134ccedf6f7c485c49112f..fe623fd466c31ce935f3ae1013189f0b1027847d 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -803,7 +803,7 @@ int mutt_save_message (HEADER *h, int delete,
       }
     }
 
-    need_buffy_cleanup = (ctx.magic == M_MBOX || ctx.magic == M_MMDF || ctx.magic == M_KENDRA);
+    need_buffy_cleanup = (ctx.magic == M_MBOX || ctx.magic == M_MMDF);
 
     mx_close_mailbox (&ctx, NULL);
 

diff --git a/copy.c b/copy.c
index 7d4e9c73d1acf6498f22d6b19ad3ea50a2302b94..3d814febe7757e488512e6fd23619fcac5a0b618 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -698,9 +698,9 @@ _mutt_append_message (CONTEXT *dest, FILE *fpin, CONTEXT *src, HEADER *hdr,
   MESSAGE *msg;
   int r;
 
-  if ((msg = mx_open_new_message (dest, hdr, (src->magic == M_MBOX || src->magic == M_MMDF || src->magic == M_KENDRA) ? 0 : M_ADD_FROM)) == NULL)
+  if ((msg = mx_open_new_message (dest, hdr, (src->magic == M_MBOX || src->magic == M_MMDF) ? 0 : M_ADD_FROM)) == NULL)
     return -1;
-  if (dest->magic == M_MBOX || dest->magic == M_MMDF || dest->magic == M_KENDRA)
+  if (dest->magic == M_MBOX || dest->magic == M_MMDF)
     chflags |= CH_FROM | CH_FORCE_FROM;
   chflags |= (dest->magic == M_MAILDIR ? CH_NOSTATUS : CH_UPDATE);
   r = _mutt_copy_message (msg->fp, fpin, hdr, body, flags, chflags);

diff --git a/editmsg.c b/editmsg.c
index 6369f0a9b9200784f2328861b3f7ef249f93e675..c341542dfe0778c2668a0bdce429fc35afb142d0 100644 (file)
--- a/editmsg.c
+++ b/editmsg.c
@@ -143,8 +143,7 @@ static int edit_one_message (CONTEXT *ctx, HEADER *cur)
   
   if (fgets (buff, sizeof (buff), fp) && is_from (buff, NULL, 0, NULL))
   {
-    if (tmpctx.magic == M_MBOX || tmpctx.magic == M_MMDF ||
-       tmpctx.magic == M_KENDRA)
+    if (tmpctx.magic == M_MBOX || tmpctx.magic == M_MMDF)
       cf = CH_FROM | CH_FORCE_FROM;
   }
   else

diff --git a/init.c b/init.c
index 80fcc94fe835ddb43dc24fc9ffcd8480df50d23a..94ee7a47e40d6fe20606051a32203c4a2bb47f26 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1064,9 +1064,6 @@ static int parse_set (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
          case M_MMDF:
            p = "MMDF";
            break;
-         case M_KENDRA:
-           p = "KENDRA";
-           break;
          case M_MH:
            p = "MH";
            break;

diff --git a/mbox.c b/mbox.c
index c9635092523b2141bd08c6c9ba7407e085e17f53..dc900e4139b742969df91e59e8f7a5d3bc8b2469 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -18,10 +18,6 @@
 
 /* This file contains code to parse ``mbox'' and ``mmdf'' style mailboxes */
 
-/* OS/2's "kendra" mail folder format is also supported.  It's a slightly
- * modified version of MMDF.
- */
-
 #include "mutt.h"
 #include "mailbox.h"
 #include "mx.h"
@@ -120,7 +116,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx)
     if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL)
       break;
 
-    if (mutt_strcmp (buf, ctx->magic == M_MMDF ? MMDF_SEP : KENDRA_SEP) == 0)
+    if (mutt_strcmp (buf, MMDF_SEP) == 0)
     {
       loc = ftell (ctx->fp);
       
@@ -169,7 +165,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx)
        {
          if (fseek (ctx->fp, tmploc, SEEK_SET) != 0 ||
              fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL ||
-             mutt_strcmp (ctx->magic == M_MMDF ? MMDF_SEP : KENDRA_SEP, buf) != 0)
+             mutt_strcmp (MMDF_SEP, buf) != 0)
          {
            if (fseek (ctx->fp, loc, SEEK_SET) != 0)
              dprint (1, (debugfile, "mmdf_parse_mailbox: fseek() failed\n"));
@@ -190,7 +186,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx)
          if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL)
            break;
          lines++;
-       } while (mutt_strcmp (buf, ctx->magic == M_MMDF ? MMDF_SEP : KENDRA_SEP) != 0);
+       } while (mutt_strcmp (buf, MMDF_SEP) != 0);
 
        hdr->lines = lines;
        hdr->content->length = loc - hdr->content->offset;
@@ -203,8 +199,6 @@ int mmdf_parse_mailbox (CONTEXT *ctx)
        hdr->env->from = rfc822_cpy_adr (hdr->env->return_path);
 
       ctx->msgcount++;
-      if(ctx->magic == M_KENDRA && feof(ctx->fp))
-       break;
     }
     else
     {
@@ -424,7 +418,7 @@ int mbox_open_mailbox (CONTEXT *ctx)
 
   if (ctx->magic == M_MBOX)
     rc = mbox_parse_mailbox (ctx);
-  else if (ctx->magic == M_MMDF || ctx->magic == M_KENDRA)
+  else if (ctx->magic == M_MMDF)
     rc = mmdf_parse_mailbox (ctx);
   else
     rc = -1;
@@ -608,8 +602,7 @@ int mbox_check_mailbox (CONTEXT *ctx, int *index_hint)
       if (fgets (buffer, sizeof (buffer), ctx->fp) != NULL)
       {
        if ((ctx->magic == M_MBOX && mutt_strncmp ("From ", buffer, 5) == 0) ||
-           (ctx->magic == M_MMDF && mutt_strcmp (MMDF_SEP, buffer) == 0) ||
-           (ctx->magic == M_KENDRA && mutt_strcmp(KENDRA_SEP, buffer) == 0))
+           (ctx->magic == M_MMDF && mutt_strcmp (MMDF_SEP, buffer) == 0))
        {
          if (fseek (ctx->fp, ctx->size, SEEK_SET) != 0)
            dprint (1, (debugfile, "mbox_check_mailbox: fseek() failed\n"));
@@ -771,8 +764,6 @@ int mbox_sync_mailbox (CONTEXT *ctx, int *index_hint)
    */
   if (ctx->magic == M_MMDF)
     offset -= (sizeof MMDF_SEP - 1);
-  else if (ctx->magic == M_KENDRA)
-    offset -= (sizeof KENDRA_SEP - 1);
   
   /* allocate space for the new offsets */
   newOffset = safe_calloc (ctx->msgcount - first, sizeof (struct m_update_t));
@@ -809,16 +800,6 @@ int mbox_sync_mailbox (CONTEXT *ctx, int *index_hint)
        }
          
       }
-      else if (ctx->magic == M_KENDRA)
-      {
-       if (fputs (KENDRA_SEP, fp) == EOF)
-       {
-         mutt_perror (tempfile);
-         mutt_sleep (5);
-         unlink (tempfile);
-         goto bail;
-       }
-      }
 
       /* save the new offset for this message.  we add `offset' because the
        * temporary file only contains saved message which are located after
@@ -854,15 +835,6 @@ int mbox_sync_mailbox (CONTEXT *ctx, int *index_hint)
            goto bail; 
          }
          break;
-       case M_KENDRA:
-         if(fputs(KENDRA_SEP, fp) == EOF)
-         {
-           mutt_perror (tempfile);
-           mutt_sleep (5);
-           unlink (tempfile);
-           goto bail;
-         }
-         break;
        default:
          if(fputs("\n", fp) == EOF) 
          {
@@ -909,8 +881,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int *index_hint)
       /* do a sanity check to make sure the mailbox looks ok */
       fgets (buf, sizeof (buf), ctx->fp) == NULL ||
       (ctx->magic == M_MBOX && mutt_strncmp ("From ", buf, 5) != 0) ||
-      (ctx->magic == M_MMDF && mutt_strcmp (MMDF_SEP, buf) != 0) ||
-      (ctx->magic == M_KENDRA && mutt_strcmp (KENDRA_SEP, buf) != 0))
+      (ctx->magic == M_MMDF && mutt_strcmp (MMDF_SEP, buf) != 0))
   {
     dprint (1, (debugfile, "mbox_sync_mailbox: message not in expected position."));
     dprint (1, (debugfile, "\tLINE: %s\n", buf));
@@ -1116,7 +1087,6 @@ int mutt_reopen_mailbox (CONTEXT *ctx, int *index_hint)
   {
     case M_MBOX:
     case M_MMDF:
-    case M_KENDRA:
       if (fseek (ctx->fp, 0, SEEK_SET) != 0)
       {
         dprint (1, (debugfile, "mutt_reopen_mailbox: fseek() failed\n"));

diff --git a/mx.c b/mx.c
index bc7b8ffcce36d279f9835d4dd619c8a7a3f4e48e..8b8c96f2e83b5bb7142f25169fa9b59e40e44734 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -466,8 +466,6 @@ int mx_set_magic (const char *s)
     DefaultMagic = M_MH;
   else if (ascii_strcasecmp (s, "maildir") == 0)
     DefaultMagic = M_MAILDIR;
-  else if (ascii_strcasecmp (s, "kendra") == 0)
-    DefaultMagic = M_KENDRA;
   else
     return (-1);
 
@@ -1464,13 +1462,6 @@ int mx_commit_message (MESSAGE *msg, CONTEXT *ctx)
       break;
     }
 
-    case M_KENDRA:
-    {
-      if (fputs (KENDRA_SEP, msg->fp) == EOF)
-       r = -1;
-      break;
-    }
-
 #ifdef USE_IMAP
     case M_IMAP:
     {
@@ -1493,7 +1484,7 @@ int mx_commit_message (MESSAGE *msg, CONTEXT *ctx)
     }
   }
   
-  if (r == 0 && (ctx->magic == M_MBOX || ctx->magic == M_MMDF || ctx->magic == M_KENDRA)
+  if (r == 0 && (ctx->magic == M_MBOX || ctx->magic == M_MMDF)
       && (fflush (msg->fp) == EOF || fsync (fileno (msg->fp)) == -1))
   {
     mutt_perror _("Can't write message");
@@ -1644,7 +1635,6 @@ int mx_check_empty (const char *path)
   {
     case M_MBOX:
     case M_MMDF:
-    case M_KENDRA:
       return mbox_check_empty (path);
     case M_MH:
       return mh_check_empty (path);

diff --git a/mx.h b/mx.h
index 7220721851fc8932c7021da4ddaffb5d7372f1d8..62d84b4922e0615dda71d586a452266b6040e00d 100644 (file)
--- a/mx.h
+++ b/mx.h
@@ -32,7 +32,6 @@ enum
 {
   M_MBOX = 1,
   M_MMDF,
-  M_KENDRA,
   M_MH,
   M_MAILDIR
 #ifdef USE_IMAP
@@ -46,7 +45,6 @@ enum
 WHERE short DefaultMagic INITVAL (M_MBOX);
 
 #define MMDF_SEP "\001\001\001\001\n"
-#define KENDRA_SEP "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\n"
 #define MAXLOCKATTEMPT 5
 
 int mbox_sync_mailbox (CONTEXT *, int *);

diff --git a/sendlib.c b/sendlib.c
index 84ee8928f8ef7875fb9c42fe9d45bb43f689fab5..69209e281cc2ab9d96ff79aedf724ced00e0ee09 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -2352,7 +2352,7 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post,
   /* We need to add a Content-Length field to avoid problems where a line in
    * the message body begins with "From "   
    */
-  if (f.magic == M_MMDF || f.magic == M_MBOX || f.magic == M_KENDRA)
+  if (f.magic == M_MMDF || f.magic == M_MBOX)
   {
     mutt_mktemp (tempfile);
     if ((tempfp = safe_fopen (tempfile, "w+")) == NULL)