X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mx%2Fmx.c;h=6a6411521955528f5385a35a0967b94976027c21;hp=05c9e8a3d9af3ccdb51bf86889350ecf8f2b5a94;hb=2ac2bb6e436cef59dcbb88031b276aa81a109785;hpb=0ab517261694b001d2eb17f06f167a4cdd2c7c07 diff --git a/lib-mx/mx.c b/lib-mx/mx.c index 05c9e8a..6a64115 100644 --- a/lib-mx/mx.c +++ b/lib-mx/mx.c @@ -272,24 +272,6 @@ int mx_unlock_file (const char *path, int fd, int dot) 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; @@ -816,12 +798,6 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint) 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); @@ -995,20 +971,11 @@ static int _mx_sync_mailbox (CONTEXT * ctx, int *index_hint) 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); - 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.