X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mx%2Fmx.c;h=b41a079cc802acbcec484a2971401240d9d9b0be;hp=6693d27d83c97b8f45cc2e7e08e6d6a7f8b9b0b9;hb=b94ae1245c98907bffbbbefaf6feb53f1ac80234;hpb=cfd5f411041c7ef44087b032751792fadc74586d

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index 6693d27..b41a079 100644
--- a/lib-mx/mx.c
+++ b/lib-mx/mx.c
@@ -15,7 +15,7 @@
 #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"
@@ -33,6 +33,9 @@
 #include <imap/imap.h>
 #include "pop.h"
 
+#define MAXLOCKATTEMPT 5
+
+
 static mx_t const *mxfmts[] = {
     &mbox_mx,
     &mh_mx,
@@ -91,132 +94,49 @@ static int mx_get_idx (const char* path) {
 
 /* 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;
-
-    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;
+    int count = 0, attempt = 0;
+    struct flock lck = {
+        .l_type   = excl ? F_WRLCK : F_RDLCK,
+        .l_whence = SEEK_SET,
+    };
 
+    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;
+            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 (time_out)
-                mutt_error _("Timeout exceeded while attempting flock lock!");
-
-            r = -1;
-            break;
-        }
-
-        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;
 }
 
@@ -351,7 +271,7 @@ static int mx_open_mailbox_append (CONTEXT * ctx, int flags)
   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 {
@@ -598,16 +518,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) {