X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mx%2Fmx.c;h=23997aa284f61f7a83bfc9a3751ce8e95e3f305d;hp=96dab2cf16dc07a1e85252e49ea9bf948edb8d4c;hb=ec42b5f9dbca7a552524c138f6764671612fe385;hpb=688ac22f746f785c27ac99ac86aa85a3035a3638

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index 96dab2c..23997aa 100644
--- a/lib-mx/mx.c
+++ b/lib-mx/mx.c
@@ -10,15 +10,16 @@
 
 #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"
@@ -27,94 +28,40 @@
 #include "copy.h"
 #include "keymap.h"
 #include "compress.h"
-#include "dotlock.h"
+#include "score.h"
 
 #include <imap/imap.h>
-#include <pop/pop.h>
-
-#ifdef USE_NNTP
-#include <nntp/nntp.h>
-#endif
-
-#include <lib-crypt/crypt.h>
+#include "pop.h"
 
 static mx_t const *mxfmts[] = {
     &mbox_mx,
-    &mmdf_mx,
     &mh_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);
-
-  snprintf (cmd, sizeof (cmd),
-            "%s %s%s%s%s%s%s%s",
-            NONULL (MuttDotlock),
-            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;
-      }
+    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 */
@@ -150,146 +97,127 @@ static int mx_get_idx (const char* path) {
 int mx_lock_file (const char *path, int fd, int excl, int dot, int time_out)
 {
 #if defined (USE_FCNTL) || defined (USE_FLOCK)
-  int count;
-  int attempt;
-  struct stat prev_sb;
+    int count;
+    int attempt;
+    struct stat prev_sb;
 #endif
-  int r = 0;
+    int r = 0;
 
 #ifdef USE_FCNTL
-  struct flock lck;
-
+    struct flock lck;
 
-  p_clear(&lck, 1);
-  lck.l_type = excl ? F_WRLCK : F_RDLCK;
-  lck.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;
+    count = 0;
+    attempt = 0;
+    prev_sb.st_size = 0;
+    while (fcntl (fd, F_SETLK, &lck) == -1) {
+        struct stat sb;
 
-    if (errno != EAGAIN && errno != EACCES) {
-      mutt_perror ("fcntl");
-      return (-1);
-    }
+        if (errno != EAGAIN && errno != EACCES) {
+            mutt_perror ("fcntl");
+            return (-1);
+        }
 
-    if (fstat (fd, &sb) != 0)
-      sb.st_size = 0;
+        if (fstat (fd, &sb) != 0)
+            sb.st_size = 0;
 
-    if (count == 0)
-      prev_sb = sb;
+        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 fcntl lock!");
+        /* 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 fcntl lock!");
 
-      return (-1);
-    }
+            return (-1);
+        }
 
-    prev_sb = sb;
+        prev_sb = sb;
 
-    mutt_message (_("Waiting for fcntl lock... %d"), ++attempt);
-    sleep (1);
-  }
+        mutt_message (_("Waiting for fcntl lock... %d"), ++attempt);
+        mutt_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;
-    }
+    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 (fstat (fd, &sb) != 0)
+            sb.st_size = 0;
 
-    if (count == 0)
-      prev_sb = sb;
+        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!");
+        /* 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;
-    }
+            r = -1;
+            break;
+        }
 
-    prev_sb = sb;
+        prev_sb = sb;
 
-    mutt_message (_("Waiting for flock attempt... %d"), ++attempt);
-    sleep (1);
-  }
+        mutt_message (_("Waiting for flock attempt... %d"), ++attempt);
+        mutt_sleep (1);
+    }
 #endif /* USE_FLOCK */
 
-  if (r == 0 && dot)
-    r = dotlock_file (path, time_out);
+    if (r == 0 && dot)
+        r = dotlock_file(path, time_out);
 
-  if (r == -1) {
-    /* release any other locks obtained in this routine */
+    if (r == -1) {
+        /* release any other locks obtained in this routine */
 
 #ifdef USE_FCNTL
-    lck.l_type = F_UNLCK;
-    fcntl (fd, F_SETLK, &lck);
+        lck.l_type = F_UNLCK;
+        fcntl (fd, F_SETLK, &lck);
 #endif /* USE_FCNTL */
 
 #ifdef USE_FLOCK
-    flock (fd, LOCK_UN);
+        flock (fd, LOCK_UN);
 #endif /* USE_FLOCK */
 
-    return (-1);
-  }
+        return (-1);
+    }
 
-  return 0;
+    return 0;
 }
 
 int mx_unlock_file (const char *path, int fd, int dot)
 {
 #ifdef USE_FCNTL
-  struct flock unlockit;
+    struct flock unlockit;
 
-  p_clear(&unlockit, 1);
-  unlockit.l_type = F_UNLCK;
-  unlockit.l_whence = SEEK_SET;
-  fcntl (fd, F_SETLK, &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);
+    flock (fd, LOCK_UN);
 #endif
 
-  if (dot)
-    undotlock_file (path);
-
-  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);
+    if (dot)
+        undotlock_file (path);
 
-  mx_unlock_file (path, fd, 0);
-  close (fd);
+    return 0;
 }
 
 /* try to figure out what type of mailbox ``path'' is */
@@ -316,8 +244,6 @@ int mx_set_magic (const char *s)
 {
   if (ascii_strcasecmp (s, "mbox") == 0)
     DefaultMagic = M_MBOX;
-  else if (ascii_strcasecmp (s, "mmdf") == 0)
-    DefaultMagic = M_MMDF;
   else if (ascii_strcasecmp (s, "mh") == 0)
     DefaultMagic = M_MH;
   else if (ascii_strcasecmp (s, "maildir") == 0)
@@ -423,7 +349,6 @@ static int mx_open_mailbox_append (CONTEXT * ctx, int flags)
 
   switch (ctx->magic) {
   case M_MBOX:
-  case M_MMDF:
     if ((ctx->fp =
          safe_fopen (ctx->path, flags & M_NEWFOLDER ? "w" : "a")) == NULL
         || mbox_lock_mailbox (ctx, 1, 1) != 0) {
@@ -553,9 +478,9 @@ void mx_fastclose_mailbox (CONTEXT * ctx)
   if (MX_IDX(ctx->magic-1) && mxfmts[ctx->magic-1]->mx_fastclose_mailbox)
     mxfmts[ctx->magic-1]->mx_fastclose_mailbox(ctx);
   if (ctx->subj_hash)
-    hash_destroy (&ctx->subj_hash, NULL);
+    hash_delete (&ctx->subj_hash, NULL);
   if (ctx->id_hash)
-    hash_destroy (&ctx->id_hash, NULL);
+    hash_delete (&ctx->id_hash, NULL);
   mutt_clear_threads (ctx);
   for (i = 0; i < ctx->msgcount; i++)
     header_delete(&ctx->hdrs[i]);
@@ -651,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);
@@ -668,7 +584,7 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint)
 
   if (ctx->append) {
     /* mailbox was opened in write-mode */
-    if (ctx->magic == M_MBOX || ctx->magic == M_MMDF)
+    if (ctx->magic == M_MBOX)
       mbox_close_mailbox (ctx);
     else
       mx_fastclose_mailbox (ctx);
@@ -821,11 +737,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_MMDF || 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);
 
@@ -907,10 +818,10 @@ void mx_update_tables (CONTEXT * ctx, int committing)
                       ctx->hdrs[i]->content->hdr_offset);
       /* remove message from the hash tables */
       if (ctx->subj_hash && ctx->hdrs[i]->env->real_subj)
-        hash_delete (ctx->subj_hash, ctx->hdrs[i]->env->real_subj,
+        hash_remove (ctx->subj_hash, ctx->hdrs[i]->env->real_subj,
                      ctx->hdrs[i], NULL);
       if (ctx->id_hash && ctx->hdrs[i]->env->message_id)
-        hash_delete (ctx->id_hash, ctx->hdrs[i]->env->message_id,
+        hash_remove (ctx->id_hash, ctx->hdrs[i]->env->message_id,
                      ctx->hdrs[i], NULL);
       header_delete(&ctx->hdrs[i]);
     }
@@ -999,20 +910,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 || ctx->magic == M_MMDF) &&
-        !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.
@@ -1068,10 +970,7 @@ MESSAGE *mx_open_new_message (CONTEXT * dest, HEADER * hdr, int flags)
     time (&msg->received);
 
   if (mxfmts[dest->magic-1]->mx_open_new_message(msg, dest, hdr) == 0) {
-    if (dest->magic == M_MMDF)
-      fputs (MMDF_SEP, msg->fp);
-
-    if ((msg->magic == M_MBOX || msg->magic == M_MMDF) && flags & M_ADD_FROM) {
+    if (msg->magic == M_MBOX && flags & M_ADD_FROM) {
       if (hdr) {
         if (hdr->env->return_path)
           p = hdr->env->return_path;
@@ -1081,7 +980,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 (Username),
+      fprintf (msg->fp, "From %s %s", p ? p->mailbox : NONULL(mod_core.username),
                ctime (&msg->received));
     }
   }
@@ -1114,7 +1013,6 @@ MESSAGE *mx_open_message (CONTEXT * ctx, int msgno)
   msg = p_new(MESSAGE, 1);
   switch (msg->magic = ctx->magic) {
   case M_MBOX:
-  case M_MMDF:
     msg->fp = ctx->fp;
     break;
 
@@ -1151,15 +1049,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;
@@ -1184,12 +1073,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
@@ -1206,28 +1091,12 @@ int mx_close_message (MESSAGE ** msg)
 
 void mx_alloc_memory (CONTEXT * ctx)
 {
-  int i;
-  size_t s = MAX (sizeof (HEADER *), sizeof (int));
-
-  if ((ctx->hdrmax + 25) * s < ctx->hdrmax * s) {
-    mutt_error _("Integer overflow -- can't allocate memory.");
-
-    sleep (1);
-    mutt_exit (1);
-  }
+    ctx->hdrmax += 32;
 
-  if (ctx->hdrs) {
-    p_realloc(&ctx->hdrs, ctx->hdrmax += 25);
+    p_realloc(&ctx->hdrs, ctx->hdrmax);
     p_realloc(&ctx->v2r, ctx->hdrmax);
-  }
-  else {
-    ctx->hdrs = p_new(HEADER *, (ctx->hdrmax += 25));
-    ctx->v2r = p_new(int, ctx->hdrmax);
-  }
-  for (i = ctx->msgcount; i < ctx->hdrmax; i++) {
-    ctx->hdrs[i] = NULL;
-    ctx->v2r[i] = -1;
-  }
+    p_clear(ctx->hdrs + ctx->msgcount, ctx->hdrmax - ctx->msgcount);
+    p_clear(ctx->v2r + ctx->msgcount, ctx->hdrmax - ctx->msgcount);
 }
 
 /* this routine is called to update the counts in the context structure for
@@ -1263,19 +1132,19 @@ 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);
       }
     }
 
     /* add this message to the hash tables */
     if (ctx->id_hash && h->env->message_id)
-      hash_insert (ctx->id_hash, h->env->message_id, h, 0);
+      hash_insert (ctx->id_hash, h->env->message_id, h);
     if (!ctx->counting) {
       if (ctx->subj_hash && h->env->real_subj)
-        hash_insert (ctx->subj_hash, h->env->real_subj, h, 1);
+        hash_insert (ctx->subj_hash, h->env->real_subj, h);
 
-      if (option (OPTSCORE))
+      if (mod_score.enable)
         mutt_score_message (ctx, h, 0);
     }
 
@@ -1310,49 +1179,11 @@ int mx_check_empty (const char *path)
   return (-1);
 }
 
-int mx_acl_check (CONTEXT* ctx, int flag) {
-  if (!ctx || !MX_IDX(ctx->magic-1))
-    return (0);
-  /* if no acl_check defined for module, assume permission is granted */
-  if (!mxfmts[ctx->magic-1]->mx_acl_check)
-    return (1);
-  return (mxfmts[ctx->magic-1]->mx_acl_check(ctx,flag));
-}
-
-int mx_rebuild_cache (void) {
-#ifndef USE_HCACHE
-  mutt_error (_("Support for header caching was not build in."));
-  return (1);
-#else
-  int i = 0, magic = 0;
-  CONTEXT* ctx = NULL;
-  BUFFY* b = NULL;
-
-  if (!Incoming.len) {
-    mutt_error (_("No mailboxes defined."));
-    return (1);
-  }
-
-  for (i = 0; i < Incoming.len; i++) {
-    b = Incoming.arr[i];
-    magic = mx_get_magic (b->path);
-    if (magic != M_MAILDIR && magic != M_MH && magic != M_IMAP)
-      continue;
-    sidebar_set_current (b->path);
-    sidebar_draw ();
-    if ((ctx = mx_open_mailbox (b->path,
-                                M_READONLY | M_NOSORT | M_COUNT,
-                                NULL)) != NULL)
-      mx_close_mailbox (ctx, 0);
-  }
-  mutt_clear_error ();
-
-  if (Context && Context->path)
-    sidebar_set_current (Context->path);
-  sidebar_draw ();
-
-  return (0);
-#endif
+int mx_acl_check(CONTEXT *ctx, int flag)
+{
+    if (!mxfmts[ctx->magic-1]->mx_acl_check)
+        return 1;
+    return mxfmts[ctx->magic-1]->mx_acl_check(ctx,flag);
 }
 
 void mutt_parse_mime_message (CONTEXT * ctx, HEADER * cur)