#include <lib-lib/lib-lib.h>
-#include <utime.h>
+#include <lockfile.h>
#include <lib-lua/lib-lua.h>
#include <lib-sys/unix.h>
#include <lib-mime/mime.h>
-#include <lib-ui/sidebar.h>
+#include <lib-ui/lib-ui.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 "dotlock.h"
+#include "score.h"
#include <imap/imap.h>
-#include <pop/pop.h>
+#include "pop.h"
+
+#define MAXLOCKATTEMPT 5
-#ifdef USE_NNTP
-#include <nntp/nntp.h>
-#endif
static mx_t const *mxfmts[] = {
&mbox_mx,
&maildir_mx,
&imap_mx,
&pop_mx,
-#ifdef USE_NNTP
- &nntp_mx,
-#endif
&compress_mx,
};
#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 */
/* Args:
* excl if excl != 0, request an exclusive lock
- * dot if dot != 0, try to dotlock the file
* time_out should retry locking?
*/
-int mx_lock_file (const char *path, int fd, int excl, int dot, int time_out)
+int mx_lock_file(const char *path, int fd, int excl, int time_out)
{
-#if defined (USE_FCNTL) || defined (USE_FLOCK)
- int count;
- int attempt;
- struct stat prev_sb;
-#endif
- int r = 0;
-
-#ifdef USE_FCNTL
- struct flock lck;
-
+ int count = 0, attempt = 0;
+ struct flock lck = {
+ .l_type = excl ? F_WRLCK : F_RDLCK,
+ .l_whence = SEEK_SET,
+ };
- p_clear(&lck, 1);
- lck.l_type = excl ? F_WRLCK : F_RDLCK;
- lck.l_whence = SEEK_SET;
-
- count = 0;
- attempt = 0;
- prev_sb.st_size = 0;
- while (fcntl (fd, F_SETLK, &lck) == -1) {
- struct stat sb;
+ if (dotlock_file(path, time_out) < 0)
+ return -1;
+ while (fcntl(fd, F_SETLK, &lck) == -1) {
if (errno != EAGAIN && errno != EACCES) {
- mutt_perror ("fcntl");
- return (-1);
+ mutt_perror("fcntl");
+ goto error;
}
- if (fstat (fd, &sb) != 0)
- sb.st_size = 0;
-
- if (count == 0)
- prev_sb = sb;
-
- /* only unlock file if it is unchanged */
- if (prev_sb.st_size == sb.st_size
- && ++count >= (time_out ? MAXLOCKATTEMPT : 0)) {
+ if (++count >= (time_out ? MAXLOCKATTEMPT : 0)) {
if (time_out)
mutt_error _("Timeout exceeded while attempting fcntl lock!");
-
- return (-1);
- }
-
- prev_sb = sb;
-
- mutt_message (_("Waiting for fcntl lock... %d"), ++attempt);
- sleep (1);
- }
-#endif /* USE_FCNTL */
-
-#ifdef USE_FLOCK
- count = 0;
- attempt = 0;
- while (flock (fd, (excl ? LOCK_EX : LOCK_SH) | LOCK_NB) == -1) {
- struct stat sb;
-
- if (errno != EWOULDBLOCK) {
- mutt_perror ("flock");
- r = -1;
- break;
- }
-
- if (fstat (fd, &sb) != 0)
- sb.st_size = 0;
-
- if (count == 0)
- prev_sb = sb;
-
- /* only unlock file if it is unchanged */
- if (prev_sb.st_size == sb.st_size
- && ++count >= (time_out ? MAXLOCKATTEMPT : 0)) {
- if (time_out)
- mutt_error _("Timeout exceeded while attempting flock lock!");
-
- r = -1;
- break;
+ goto error;
}
-
- prev_sb = sb;
-
- mutt_message (_("Waiting for flock attempt... %d"), ++attempt);
- sleep (1);
+ mutt_message(_("Waiting for fcntl lock... %d"), ++attempt);
+ mutt_sleep(1);
}
-#endif /* USE_FLOCK */
-
- if (r == 0 && dot)
- r = dotlock_file (path, time_out);
-
- if (r == -1) {
- /* release any other locks obtained in this routine */
-
-#ifdef USE_FCNTL
- lck.l_type = F_UNLCK;
- fcntl (fd, F_SETLK, &lck);
-#endif /* USE_FCNTL */
-
-#ifdef USE_FLOCK
- flock (fd, LOCK_UN);
-#endif /* USE_FLOCK */
-
- return (-1);
- }
-
return 0;
+
+ error:
+ undotlock_file(path);
+ return -1;
}
-int mx_unlock_file (const char *path, int fd, int dot)
+int mx_unlock_file(const char *path, int fd)
{
-#ifdef USE_FCNTL
struct flock unlockit;
p_clear(&unlockit, 1);
unlockit.l_type = F_UNLCK;
unlockit.l_whence = SEEK_SET;
- fcntl (fd, F_SETLK, &unlockit);
-#endif
-
-#ifdef USE_FLOCK
- flock (fd, LOCK_UN);
-#endif
-
- if (dot)
- undotlock_file (path);
-
+ fcntl(fd, F_SETLK, &unlockit);
+ undotlock_file(path);
return 0;
}
case M_MBOX:
if ((ctx->fp =
safe_fopen (ctx->path, flags & M_NEWFOLDER ? "w" : "a")) == NULL
- || mbox_lock_mailbox (ctx, 1, 1) != 0) {
+ || mbox_lock_mailbox(ctx, 1, 1) != 0) {
if (!ctx->fp)
mutt_perror (ctx->path);
else {
ctx->closing = 1;
-#ifdef USE_NNTP
- if (ctx->magic == M_NNTP) {
- int ret;
-
- ret = nntp_close_mailbox (ctx);
- mx_fastclose_mailbox (ctx);
- return ret;
- }
-#endif
if (ctx->readonly || ctx->dontwrite) {
/* mailbox is readonly or we don't want to write */
mx_fastclose_mailbox (ctx);
}
if (read_msgs && quadoption (OPT_MOVE) != M_NO) {
- char *p;
-
- if ((p = mutt_find_hook (M_MBOXHOOK, ctx->path))) {
- isSpool = 1;
- m_strcpy(mbox, sizeof(mbox), p);
- }
- else {
- m_strcpy(mbox, sizeof(mbox), NONULL(Inbox));
- isSpool = mutt_is_spool (ctx->path) && !mutt_is_spool (mbox);
- }
+ m_strcpy(mbox, sizeof(mbox), NONULL(Inbox));
+ isSpool = mutt_is_spool (ctx->path) && !mutt_is_spool (mbox);
mutt_expand_path (mbox, sizeof (mbox));
if (isSpool) {
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));
}
}
break;
}
-#ifdef USE_NNTP
- case M_NNTP:
- {
- if (nntp_fetch_message (msg, ctx, msgno) != 0)
- p_delete(&msg);
- break;
- }
-#endif /* USE_NNTP */
-
default:
p_delete(&msg);
break;
int r = 0;
if ((*msg)->magic == M_MH || (*msg)->magic == M_MAILDIR
- || (*msg)->magic == M_IMAP
- || (*msg)->magic == M_POP
-#ifdef USE_NNTP
- || (*msg)->magic == M_NNTP
-#endif
- ) {
+ || (*msg)->magic == M_IMAP || (*msg)->magic == M_POP)
+ {
r = m_fclose(&(*msg)->fp);
}
else
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);
}
projects / apps / madmutt.git / blobdiff