Changeset 3447:e0073fa9c57c

Timestamp:

2003-08-05 06:55:47 (5 years ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

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

Files:

• attach.c (modified) (1 diff)
• buffy.c (modified) (2 diffs)
• commands.c (modified) (1 diff)
• copy.c (modified) (1 diff)
• editmsg.c (modified) (1 diff)
• init.c (modified) (1 diff)
• mbox.c (modified) (12 diffs)
• mx.c (modified) (4 diffs)
• mx.h (modified) (2 diffs)
• sendlib.c (modified) (1 diff)

attach.c

@@ -766 +766 @@
         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);

buffy.c

@@ -121 +121 @@
   typ = mx_get_magic (path);
 
-  if (typ != M_MBOX && typ != M_MMDF && typ != M_KENDRA)
+  if (typ != M_MBOX && typ != M_MMDF)
     return 0;
 
@@ -349 +349 @@
       case M_MBOX:
       case M_MMDF:
-      case M_KENDRA:
 
         if (STAT_CHECK)

commands.c

@@ -804 +804 @@
     }
 
-    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);

copy.c

@@ -699 +699 @@
   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);

editmsg.c

@@ -144 +144 @@
   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;
   }

init.c

@@ -1065 +1065 @@
             p = "MMDF";
             break;
-          case M_KENDRA:
-            p = "KENDRA";
-            break;
           case M_MH:
             p = "MH";

mbox.c

@@ -19 +19 @@
 /* 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"
@@ -121 +117 @@
       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);
@@ -170 +166 @@
           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)
@@ -191 +187 @@
             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;
@@ -204 +200 @@
 
       ctx->msgcount++;
-      if(ctx->magic == M_KENDRA && feof(ctx->fp))
-        break;
     }
     else
@@ -425 +419 @@
   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
@@ -609 +603 @@
       {
         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)
@@ -772 +765 @@
   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 */
@@ -810 +801 @@
           
       }
-      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
@@ -853 +834 @@
             unlink (tempfile);
             goto bail; 
-          }
-          break;
-        case M_KENDRA:
-          if(fputs(KENDRA_SEP, fp) == EOF)
-          {
-            mutt_perror (tempfile);
-            mutt_sleep (5);
-            unlink (tempfile);
-            goto bail;
           }
           break;
@@ -910 +882 @@
       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."));
@@ -1117 +1088 @@
     case M_MBOX:
     case M_MMDF:
-    case M_KENDRA:
       if (fseek (ctx->fp, 0, SEEK_SET) != 0)
       {

mx.c

@@ -467 +467 @@
   else if (ascii_strcasecmp (s, "maildir") == 0)
     DefaultMagic = M_MAILDIR;
-  else if (ascii_strcasecmp (s, "kendra") == 0)
-    DefaultMagic = M_KENDRA;
   else
     return (-1);
@@ -1465 +1463 @@
     }
 
-    case M_KENDRA:
-    {
-      if (fputs (KENDRA_SEP, msg->fp) == EOF)
-        r = -1;
-      break;
-    }
-
 #ifdef USE_IMAP
     case M_IMAP:
@@ -1494 +1485 @@
   }
   
-  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))
   {
@@ -1645 +1636 @@
     case M_MBOX:
     case M_MMDF:
-    case M_KENDRA:
       return mbox_check_empty (path);
     case M_MH:

mx.h

@@ -33 +33 @@
   M_MBOX = 1,
   M_MMDF,
-  M_KENDRA,
   M_MH,
   M_MAILDIR
@@ -47 +46 @@
 
 #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
 

sendlib.c

@@ -2353 +2353 @@
    * 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);