fixes, simplifictions

[apps/madmutt.git] / lib-mx / mx.c

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index 05c9e8a..aa7e3e3 100644 (file)
--- a/lib-mx/mx.c
+++ b/lib-mx/mx.c
@@ -10,8 +10,6 @@
 
 #include <lib-lib/lib-lib.h>
 
 
 #include <lib-lib/lib-lib.h>
 

-#include <utime.h>
-

 #include <lib-lua/lib-lua.h>
 #include <lib-sys/unix.h>
 #include <lib-mime/mime.h>
 #include <lib-lua/lib-lua.h>
 #include <lib-sys/unix.h>
 #include <lib-mime/mime.h>


@@ -20,7 +18,6 @@
 #include "mutt.h"
 #include "crypt.h"
 #include "pattern.h"
 #include "mutt.h"
 #include "crypt.h"
 #include "pattern.h"

-#include "buffy.h"

 #include "mx.h"
 #include "mbox.h"
 #include "mh.h"
 #include "mx.h"
 #include "mbox.h"
 #include "mh.h"


@@ -33,7 +30,6 @@
 
 #include <imap/imap.h>
 #include <pop/pop.h>
 
 #include <imap/imap.h>
 #include <pop/pop.h>

-

 #ifdef USE_NNTP
 #include <nntp/nntp.h>
 #endif
 #ifdef USE_NNTP
 #include <nntp/nntp.h>
 #endif


@@ -272,24 +268,6 @@ int mx_unlock_file (const char *path, int fd, int dot)
     return 0;
 }
 
     return 0;
 }
 

-static void mx_unlink_empty (const char *path)
-{
-    int fd;
-
-    if ((fd = open (path, O_RDWR)) == -1)
-        return;
-
-    if (mx_lock_file (path, fd, 1, 0, 1) == -1) {
-    close (fd);
-    return;
-  }
-
-  invoke_dotlock(path, DL_FL_UNLINK, 1);
-
-  mx_unlock_file (path, fd, 0);
-  close (fd);
-}
-

 /* try to figure out what type of mailbox ``path'' is */
 int mx_get_magic (const char *path) {
   int i = 0;
 /* try to figure out what type of mailbox ``path'' is */
 int mx_get_magic (const char *path) {
   int i = 0;


@@ -816,12 +794,6 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint)
     mutt_message (_("%d kept, %d deleted."),
                   ctx->msgcount - ctx->deleted, ctx->deleted);
 
     mutt_message (_("%d kept, %d deleted."),
                   ctx->msgcount - ctx->deleted, ctx->deleted);
 

-  if (ctx->msgcount == ctx->deleted && ctx->magic == M_MBOX
-  &&  !mutt_is_spool (ctx->path) && !option (OPTSAVEEMPTY))
-  {
-    mx_unlink_empty (ctx->path);
-  }
-

   if (ctx->cinfo && mutt_slow_close_compressed (ctx))
     return (-1);
 
   if (ctx->cinfo && mutt_slow_close_compressed (ctx))
     return (-1);
 


@@ -995,20 +967,11 @@ static int _mx_sync_mailbox (CONTEXT * ctx, int *index_hint)
   if (rc == 0) {
     if (ctx->magic == M_IMAP && !purge)
       mutt_message (_("Mailbox checkpointed."));
   if (rc == 0) {
     if (ctx->magic == M_IMAP && !purge)
       mutt_message (_("Mailbox checkpointed."));

-

     else
       mutt_message (_("%d kept, %d deleted."), msgcount - deleted, deleted);
 
     mutt_sleep (0);
 
     else
       mutt_message (_("%d kept, %d deleted."), msgcount - deleted, deleted);
 
     mutt_sleep (0);
 

-    if (ctx->msgcount == ctx->deleted && ctx->magic == M_MBOX
-    &&  !mutt_is_spool (ctx->path) && !option (OPTSAVEEMPTY))
-    {
-      unlink (ctx->path);
-      mx_fastclose_mailbox (ctx);
-      return 0;
-    }
-

     /* if we haven't deleted any messages, we don't need to resort */
     /* ... except for certain folder formats which need "unsorted" 
      * sort order in order to synchronize folders.
     /* if we haven't deleted any messages, we don't need to resort */
     /* ... except for certain folder formats which need "unsorted" 
      * sort order in order to synchronize folders.


@@ -1198,7 +1161,7 @@ int mx_close_message (MESSAGE ** msg)
 
 void mx_alloc_memory (CONTEXT * ctx)
 {
 
 void mx_alloc_memory (CONTEXT * ctx)
 {

-    ctx->hdrmax += 25;
+    ctx->hdrmax += 32;

 
     p_realloc(&ctx->hdrs, ctx->hdrmax);
     p_realloc(&ctx->v2r, ctx->hdrmax);
 
     p_realloc(&ctx->hdrs, ctx->hdrmax);
     p_realloc(&ctx->v2r, ctx->hdrmax);