X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mx%2Fmx.c;h=bebaa34522898c94b218b8faf299eaecaddce194;hp=05c9e8a3d9af3ccdb51bf86889350ecf8f2b5a94;hb=4b2f5f58e6b8e65e8524596d16752f7f1e5d58ca;hpb=0ab517261694b001d2eb17f06f167a4cdd2c7c07 diff --git a/lib-mx/mx.c b/lib-mx/mx.c index 05c9e8a..bebaa34 100644 --- a/lib-mx/mx.c +++ b/lib-mx/mx.c @@ -10,7 +10,7 @@ #include -#include +#include #include #include @@ -20,7 +20,6 @@ #include "mutt.h" #include "crypt.h" #include "pattern.h" -#include "buffy.h" #include "mx.h" #include "mbox.h" #include "mh.h" @@ -29,13 +28,12 @@ #include "copy.h" #include "keymap.h" #include "compress.h" -#include "dotlock.h" +#include "score.h" #include -#include - +#include "pop.h" #ifdef USE_NNTP -#include +#include "nntp.h" #endif static mx_t const *mxfmts[] = { @@ -53,66 +51,23 @@ static mx_t const *mxfmts[] = { #define MX_IDX(idx) (idx >= 0 && idx < countof(mxfmts)) #define mutt_is_spool(s) (m_strcmp(Spoolfile, s) == 0) -/* parameters: - * path - file to lock - * retry - should retry if unable to lock? - */ -static int invoke_dotlock (const char *path, int flags, int retry) +static int dotlock_file(const char *path, int retry) { - char cmd[LONG_STRING + _POSIX_PATH_MAX]; - char f[STRING + _POSIX_PATH_MAX]; - char r[STRING]; - - if (flags & DL_FL_RETRY) - snprintf (r, sizeof (r), "-r %d ", retry ? MAXLOCKATTEMPT : 0); - - mutt_quote_filename (f, sizeof (f), path); + char lockfile[_POSIX_PATH_MAX]; + snprintf(lockfile, sizeof(lockfile), "%s.lock", path); - snprintf(cmd, sizeof(cmd), "%s %s%s%s%s%s%s%s", - MCore.dotlock, - flags & DL_FL_TRY ? "-t " : "", - flags & DL_FL_UNLOCK ? "-u " : "", - flags & DL_FL_USEPRIV ? "-p " : "", - flags & DL_FL_FORCE ? "-f " : "", - flags & DL_FL_UNLINK ? "-d " : "", - flags & DL_FL_RETRY ? r : "", f); - - return mutt_system (cmd); -} - -static int dotlock_file (const char *path, int retry) -{ - int r; - int flags = DL_FL_USEPRIV | DL_FL_RETRY; - - if (retry) - retry = 1; - -retry_lock: - if ((r = invoke_dotlock (path, flags, retry)) == DL_EX_EXIST) { - if (!option (OPTNOCURSES)) { - char msg[LONG_STRING]; - - snprintf (msg, sizeof (msg), - _("Lock count exceeded, remove lock for %s?"), path); - if (retry && mutt_yesorno (msg, M_YES) == M_YES) { - flags |= DL_FL_FORCE; - retry--; - mutt_clear_error (); - goto retry_lock; - } - } - else { - mutt_error (_("Can't dotlock %s.\n"), path); + if (lockfile_create(lockfile, retry ? 1 : 0, 0)) { + if (retry) + mutt_error (_("Can't dotlock %s.\n"), lockfile); } - } - return (r == DL_EX_OK ? 0 : -1); + return 0; } static int undotlock_file (const char *path) { - return (invoke_dotlock (path, DL_FL_USEPRIV | DL_FL_UNLOCK, 0) == - DL_EX_OK ? 0 : -1); + char lockfile[_POSIX_PATH_MAX]; + snprintf(lockfile, sizeof(lockfile), "%s.lock", path); + return lockfile_remove(lockfile); } /* looks up index of type for path in mxfmts */ @@ -157,7 +112,6 @@ int mx_lock_file (const char *path, int fd, int excl, int dot, int time_out) #ifdef USE_FCNTL struct flock lck; - p_clear(&lck, 1); lck.l_type = excl ? F_WRLCK : F_RDLCK; lck.l_whence = SEEK_SET; @@ -231,7 +185,7 @@ int mx_lock_file (const char *path, int fd, int excl, int dot, int time_out) #endif /* USE_FLOCK */ if (r == 0 && dot) - r = dotlock_file (path, time_out); + r = dotlock_file(path, time_out); if (r == -1) { /* release any other locks obtained in this routine */ @@ -272,24 +226,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 +752,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 +925,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. @@ -1074,7 +995,7 @@ MESSAGE *mx_open_new_message (CONTEXT * dest, HEADER * hdr, int flags) 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)); } } @@ -1198,7 +1119,7 @@ int mx_close_message (MESSAGE ** msg) void mx_alloc_memory (CONTEXT * ctx) { - ctx->hdrmax += 25; + ctx->hdrmax += 32; p_realloc(&ctx->hdrs, ctx->hdrmax); p_realloc(&ctx->v2r, ctx->hdrmax); @@ -1239,7 +1160,7 @@ void mx_update_context (CONTEXT * ctx, int new_messages) /* 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); } } @@ -1251,7 +1172,7 @@ void mx_update_context (CONTEXT * ctx, int new_messages) 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); }