X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mx%2Fmx.c;h=bebaa34522898c94b218b8faf299eaecaddce194;hp=aa7e3e372f52a807301f9be1e4375da32d608ed9;hb=4b2f5f58e6b8e65e8524596d16752f7f1e5d58ca;hpb=55de28a5bb96c3edfbb2a3b080356acbb44a3cc4

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index aa7e3e3..bebaa34 100644
--- a/lib-mx/mx.c
+++ b/lib-mx/mx.c
@@ -10,6 +10,8 @@
 
 #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>
@@ -26,12 +28,12 @@
 #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"
 #ifdef USE_NNTP
-#include <nntp/nntp.h>
+#include "nntp.h"
 #endif
 
 static mx_t const *mxfmts[] = {
@@ -49,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);
-
-  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);
-}
+    char lockfile[_POSIX_PATH_MAX];
+    snprintf(lockfile, sizeof(lockfile), "%s.lock", path);
 
-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 */
@@ -153,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;
@@ -227,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 */
@@ -1037,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));
     }
   }
@@ -1202,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);
       }
     }
@@ -1214,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);
     }