#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 "mutt.h"
#include "crypt.h"
#include "pattern.h"
-#include "buffy.h"
#include "mx.h"
#include "mbox.h"
#include "mh.h"
#include "copy.h"
#include "keymap.h"
#include "compress.h"
+#include "score.h"
#include "dotlock.h"
#include <imap/imap.h>
-#include <pop/pop.h>
-
+#include "pop.h"
#ifdef USE_NNTP
-#include <nntp/nntp.h>
+#include "nntp.h"
#endif
static mx_t const *mxfmts[] = {
mutt_quote_filename (f, sizeof (f), path);
snprintf(cmd, sizeof(cmd), "%s %s%s%s%s%s%s%s",
- MCore.dotlock,
+ mod_core.dotlock,
flags & DL_FL_TRY ? "-t " : "",
flags & DL_FL_UNLOCK ? "-u " : "",
flags & DL_FL_USEPRIV ? "-p " : "",
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;
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 (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.
p = hdr->env->from;
}
- fprintf (msg->fp, "From %s %s", p ? p->mailbox : NONULL(MCore.username),
+ fprintf (msg->fp, "From %s %s", p ? p->mailbox : NONULL(mod_core.username),
ctime (&msg->received));
}
}
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_delete(&h->env->supersedes); should I ? */
if (h2) {
h2->superseded = 1;
- if (!ctx->counting && option (OPTSCORE))
+ if (!ctx->counting && mod_score.enable)
mutt_score_message (ctx, h2, 1);
}
}
if (ctx->subj_hash && h->env->real_subj)
hash_insert (ctx->subj_hash, h->env->real_subj, h);
- if (option (OPTSCORE))
+ if (mod_score.enable)
mutt_score_message (ctx, h, 0);
}