Merge branch 'master' into nohook

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

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index 10d9d12..0ed8bad 100644 (file)
--- a/lib-mx/mx.c
+++ b/lib-mx/mx.c
@@ -10,10 +10,12 @@
 
 #include <lib-lib/lib-lib.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"
@@ -26,13 +28,10 @@
 #include "copy.h"
 #include "keymap.h"
 #include "compress.h"
-#include "dotlock.h"
+#include "score.h"
 
 #include <imap/imap.h>
 #include "pop.h"
-#ifdef USE_NNTP
-#include <nntp/nntp.h>
-#endif
 
 static mx_t const *mxfmts[] = {
     &mbox_mx,
@@ -40,75 +39,29 @@ static mx_t const *mxfmts[] = {
     &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];
+    char lockfile[_POSIX_PATH_MAX];
+    snprintf(lockfile, sizeof(lockfile), "%s.lock", path);
 
-  if (flags & DL_FL_RETRY)
-    snprintf (r, sizeof (r), "-r %d ", retry ? MAXLOCKATTEMPT : 0);
-
-  mutt_quote_filename (f, sizeof (f), 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;
-      }
+    if (lockfile_create(lockfile, retry ? 1 : 0, 0)) {
+        if (retry)
+            mutt_error (_("Can't dotlock %s.\n"), lockfile);
     }
-    else {
-      mutt_error (_("Can't dotlock %s.\n"), path);
-    }
-  }
-  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 */
@@ -153,7 +106,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;
@@ -187,7 +139,7 @@ int mx_lock_file (const char *path, int fd, int excl, int dot, int time_out)
         prev_sb = sb;
 
         mutt_message (_("Waiting for fcntl lock... %d"), ++attempt);
-        sleep (1);
+        mutt_sleep (1);
     }
 #endif /* USE_FCNTL */
 
@@ -222,12 +174,12 @@ int mx_lock_file (const char *path, int fd, int excl, int dot, int time_out)
         prev_sb = sb;
 
         mutt_message (_("Waiting for flock attempt... %d"), ++attempt);
-        sleep (1);
+        mutt_sleep (1);
     }
 #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 */
@@ -624,15 +576,6 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint)
 
   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);
@@ -657,14 +600,8 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint)
   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) {
@@ -1037,7 +974,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));
     }
   }
@@ -1106,15 +1043,6 @@ MESSAGE *mx_open_message (CONTEXT * ctx, int msgno)
       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;
@@ -1139,12 +1067,8 @@ int mx_close_message (MESSAGE ** msg)
   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
@@ -1202,7 +1126,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);
       }
     }
@@ -1214,7 +1138,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);
     }