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

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index b41a079..79eaad0 100644
--- a/lib-mx/mx.c
+++ b/lib-mx/mx.c
@@ -35,7 +35,6 @@
 
 #define MAXLOCKATTEMPT 5
 
-
 static mx_t const *mxfmts[] = {
     &mbox_mx,
     &mh_mx,
@@ -43,6 +42,9 @@ static mx_t const *mxfmts[] = {
     &imap_mx,
     &pop_mx,
     &compress_mx,
+
+    /* hack so that it's linked together */
+    &pop_mx_ng,
 };
 
 #define MX_IDX(idx)          (idx >= 0 && idx < countof(mxfmts))
@@ -77,7 +79,7 @@ static int mx_get_idx (const char* path) {
         if (!mxfmts[i]->local)
             t = mxfmts[i]->mx_is_magic(path, NULL);
         if (t >= 1)
-            return (t-1);
+            return t-1;
     }
     if (stat (path, &st) == 0) {
         /* if stat() succeeded, keep testing until success and
@@ -86,10 +88,10 @@ static int mx_get_idx (const char* path) {
             if (mxfmts[i]->local)
                 t = mxfmts[i]->mx_is_magic(path, &st);
             if (t >= 1)
-                return (t-1);
+                return t-1;
         }
     }
-    return (-1);
+    return -1;
 }
 
 /* Args:
@@ -145,33 +147,16 @@ int mx_get_magic (const char *path) {
   int i = 0;
 
   if (m_strlen(path) == 0)
-    return (-1);
+    return -1;
   if ((i = mx_get_idx (path)) >= 0)
-    return (mxfmts[i]->type);
-  return (-1);
+    return mxfmts[i]->type;
+  return -1;
 }
 
 int mx_is_local (int m) {
   if (!MX_IDX(m))
-    return (0);
-  return (mxfmts[m]->local);
-}
-
-/*
- * set DefaultMagic to the given value
- */
-int mx_set_magic (const char *s)
-{
-  if (ascii_strcasecmp (s, "mbox") == 0)
-    DefaultMagic = M_MBOX;
-  else if (ascii_strcasecmp (s, "mh") == 0)
-    DefaultMagic = M_MH;
-  else if (ascii_strcasecmp (s, "maildir") == 0)
-    DefaultMagic = M_MAILDIR;
-  else
-    return (-1);
-
-  return 0;
+    return 0;
+  return mxfmts[m]->local;
 }
 
 /* mx_access: Wrapper for access, checks permissions on a given mailbox.
@@ -182,8 +167,8 @@ int mx_access (const char *path, int flags)
   int i = 0;
 
   if ((i = mx_get_idx (path)) >= 0 && mxfmts[i]->mx_access)
-    return (mxfmts[i]->mx_access(path,flags));
-  return (0);
+    return mxfmts[i]->mx_access(path,flags);
+  return 0;
 }
 
 static int mx_open_mailbox_append (CONTEXT * ctx, int flags)
@@ -208,90 +193,64 @@ static int mx_open_mailbox_append (CONTEXT * ctx, int flags)
       mutt_error (_("%s is not a mailbox."), ctx->path);
       /* fall through */
     case -1:
-      return (-1);
+      return -1;
     }
-  }
-  else if (errno == ENOENT) {
-    ctx->magic = DefaultMagic;
-
-    if (ctx->magic == M_MH || ctx->magic == M_MAILDIR) {
+  } else if (errno == ENOENT) {
+    int len = m_strlen(ctx->path);
+    if (len > 0 && ctx->path[len - 1] == '/') {
       char tmp[_POSIX_PATH_MAX];
 
       if (mkdir (ctx->path, S_IRWXU)) {
         mutt_perror (ctx->path);
-        return (-1);
+        return -1;
       }
 
-      if (ctx->magic == M_MAILDIR) {
-        snprintf (tmp, sizeof (tmp), "%s/cur", ctx->path);
-        if (mkdir (tmp, S_IRWXU)) {
-          mutt_perror (tmp);
-          rmdir (ctx->path);
-          return (-1);
-        }
+      snprintf (tmp, sizeof (tmp), "%s/cur", ctx->path);
+      if (mkdir (tmp, S_IRWXU)) {
+        mutt_perror (tmp);
+        rmdir (ctx->path);
+        return -1;
+      }
 
-        snprintf (tmp, sizeof (tmp), "%s/new", ctx->path);
-        if (mkdir (tmp, S_IRWXU)) {
-          mutt_perror (tmp);
-          snprintf (tmp, sizeof (tmp), "%s/cur", ctx->path);
-          rmdir (tmp);
-          rmdir (ctx->path);
-          return (-1);
-        }
-        snprintf (tmp, sizeof (tmp), "%s/tmp", ctx->path);
-        if (mkdir (tmp, S_IRWXU)) {
-          mutt_perror (tmp);
-          snprintf (tmp, sizeof (tmp), "%s/cur", ctx->path);
-          rmdir (tmp);
-          snprintf (tmp, sizeof (tmp), "%s/new", ctx->path);
-          rmdir (tmp);
-          rmdir (ctx->path);
-          return (-1);
-        }
+      snprintf (tmp, sizeof (tmp), "%s/new", ctx->path);
+      if (mkdir (tmp, S_IRWXU)) {
+        mutt_perror (tmp);
+        snprintf (tmp, sizeof (tmp), "%s/cur", ctx->path);
+        rmdir (tmp);
+        rmdir (ctx->path);
+        return -1;
       }
-      else {
-        int i;
-
-        snprintf (tmp, sizeof (tmp), "%s/.mh_sequences", ctx->path);
-        if ((i = creat (tmp, S_IRWXU)) == -1) {
-          mutt_perror (tmp);
-          rmdir (ctx->path);
-          return (-1);
-        }
-        close (i);
+      snprintf (tmp, sizeof (tmp), "%s/tmp", ctx->path);
+      if (mkdir (tmp, S_IRWXU)) {
+        mutt_perror (tmp);
+        snprintf (tmp, sizeof (tmp), "%s/cur", ctx->path);
+        rmdir (tmp);
+        snprintf (tmp, sizeof (tmp), "%s/new", ctx->path);
+        rmdir (tmp);
+        rmdir (ctx->path);
+        return -1;
       }
+      ctx->magic = M_MAILDIR;
+    } else {
+      ctx->magic = M_MBOX;
     }
-  }
-  else {
+  } else {
     mutt_perror (ctx->path);
-    return (-1);
+    return -1;
   }
 
-  switch (ctx->magic) {
-  case M_MBOX:
-    if ((ctx->fp =
-         safe_fopen (ctx->path, flags & M_NEWFOLDER ? "w" : "a")) == NULL
-        || mbox_lock_mailbox(ctx, 1, 1) != 0) {
-      if (!ctx->fp)
-        mutt_perror (ctx->path);
-      else {
-        mutt_error (_("Couldn't lock %s\n"), ctx->path);
-        m_fclose(&ctx->fp);
-      }
-      return (-1);
+  if (ctx->magic == M_MBOX) {
+    if (!(ctx->fp = safe_fopen(ctx->path, flags & M_NEWFOLDER ? "w" : "a"))) {
+      mutt_perror(ctx->path);
+      return -1;
     }
-    fseeko (ctx->fp, 0, 2);
-    break;
-
-  case M_MH:
-  case M_MAILDIR:
-    /* nothing to do */
-    break;
-
-  default:
-    return (-1);
+    if (mbox_lock_mailbox(ctx, 1, 1) != 0) {
+      mutt_error(_("Couldn't lock %s\n"), ctx->path);
+      m_fclose(&ctx->fp);
+      return -1;
+    }
+    fseeko(ctx->fp, 0, 2);
   }
-
   return 0;
 }
 
@@ -351,7 +310,7 @@ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT * pctx)
     mx_fastclose_mailbox (ctx);
     if (!pctx)
       p_delete(&ctx);
-    return (NULL);
+    return NULL;
   }
 
   /* if the user has a `push' command in their .muttrc, or in a folder-hook,
@@ -384,7 +343,7 @@ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT * pctx)
   }
 
   unset_option (OPTFORCEREFRESH);
-  return (ctx);
+  return ctx;
 }
 
 /* free up memory associated with the mailbox context */
@@ -526,7 +485,7 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint)
       snprintf (buf, sizeof (buf), _("Move read messages to %s?"), mbox);
       if ((move_messages = query_quadoption (OPT_MOVE, buf)) == -1) {
         ctx->closing = 0;
-        return (-1);
+        return -1;
       }
     }
   }
@@ -541,7 +500,7 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint)
               _("Purge %d deleted messages?"), ctx->deleted);
     if ((purge = query_quadoption (OPT_DELETE, buf)) < 0) {
       ctx->closing = 0;
-      return (-1);
+      return -1;
     }
   }
 
@@ -560,7 +519,7 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint)
     /* try to use server-side copy first */
     i = 1;
 
-    if (ctx->magic == M_IMAP && imap_is_magic (mbox, NULL) == M_IMAP) {
+    if (ctx->magic == M_IMAP && imap_mx.mx_is_magic (mbox, NULL) == M_IMAP) {
       /* tag messages for moving, and clear old tags, if any */
       for (i = 0; i < ctx->msgcount; i++)
         if (ctx->hdrs[i]->read && !ctx->hdrs[i]->deleted
@@ -650,7 +609,7 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint)
                   ctx->msgcount - ctx->deleted, ctx->deleted);
 
   if (ctx->cinfo && mutt_slow_close_compressed (ctx))
-    return (-1);
+    return -1;
 
   mx_fastclose_mailbox (ctx);
 
@@ -660,10 +619,10 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint)
 int mx_close_mailbox (CONTEXT * ctx, int *index_hint) {
   int ret = 0;
   if (!ctx)
-    return (0);
+    return 0;
   ret = _mx_close_mailbox (ctx, index_hint);
   sidebar_set_buffystats (ctx);
-  return (ret);
+  return ret;
 }
 
 /* update a Context structure's internal tables. */
@@ -779,7 +738,7 @@ static int _mx_sync_mailbox (CONTEXT * ctx, int *index_hint)
   if (!ctx->changed && !ctx->deleted) {
     mutt_message _("Mailbox is unchanged.");
 
-    return (0);
+    return 0;
   }
 
   if (ctx->deleted) {
@@ -789,7 +748,7 @@ static int _mx_sync_mailbox (CONTEXT * ctx, int *index_hint)
               ? _("Purge %d deleted message?") :
               _("Purge %d deleted messages?"), ctx->deleted);
     if ((purge = query_quadoption (OPT_DELETE, buf)) < 0)
-      return (-1);
+      return -1;
     else if (purge == M_NO) {
       if (!ctx->changed)
         return 0;               /* nothing to do! */
@@ -844,13 +803,13 @@ static int _mx_sync_mailbox (CONTEXT * ctx, int *index_hint)
     }
   }
 
-  return (rc);
+  return rc;
 }
 
 int mx_sync_mailbox (CONTEXT* ctx, int* index_hint) {
   int ret = _mx_sync_mailbox (ctx, index_hint);
   sidebar_set_buffystats (ctx);
-  return (ret);
+  return ret;
 }
 
 /* args:
@@ -860,11 +819,12 @@ int mx_sync_mailbox (CONTEXT* ctx, int* index_hint) {
  */
 MESSAGE *mx_open_new_message (CONTEXT * dest, HEADER * hdr, int flags)
 {
+
   MESSAGE *msg;
   address_t *p = NULL;
 
   if (!MX_IDX(dest->magic-1)) {
-    return (NULL);
+    return NULL;
   }
 
   msg = p_new(MESSAGE, 1);
@@ -911,61 +871,25 @@ int mx_check_mailbox (CONTEXT * ctx, int *index_hint, int lock) {
     if (ctx->locked)
       lock = 0;
     if (MX_IDX(ctx->magic-1) && mxfmts[ctx->magic-1]->mx_check_mailbox)
-      return (mxfmts[ctx->magic-1]->mx_check_mailbox(ctx, index_hint, lock));
+      return mxfmts[ctx->magic-1]->mx_check_mailbox(ctx, index_hint, lock);
   }
 
-  return (-1);
+  return -1;
 }
 
 /* return a stream pointer for a message */
 MESSAGE *mx_open_message (CONTEXT * ctx, int msgno)
 {
-  MESSAGE *msg;
+    MESSAGE *msg;
 
-  msg = p_new(MESSAGE, 1);
-  switch (msg->magic = ctx->magic) {
-  case M_MBOX:
-    msg->fp = ctx->fp;
-    break;
+    if (!MX_IDX(ctx->magic) || !mxfmts[ctx->magic - 1]->mx_open_message)
+        return NULL;
 
-  case M_MH:
-  case M_MAILDIR:
-    {
-      HEADER *cur = ctx->hdrs[msgno];
-      char path[_POSIX_PATH_MAX];
-
-      snprintf (path, sizeof (path), "%s/%s", ctx->path, cur->path);
-
-      if ((msg->fp = fopen (path, "r")) == NULL && errno == ENOENT &&
-          ctx->magic == M_MAILDIR)
-        msg->fp = maildir_open_find_message (ctx->path, cur->path);
-
-      if (msg->fp == NULL) {
-        mutt_perror (path);
+    msg = p_new(MESSAGE, 1);
+    msg->magic = ctx->magic;
+    if (mxfmts[ctx->magic - 1]->mx_open_message(msg, ctx, msgno))
         p_delete(&msg);
-      }
-    }
-    break;
-
-  case M_IMAP:
-    {
-      if (imap_fetch_message (msg, ctx, msgno) != 0)
-        p_delete(&msg);
-      break;
-    }
-
-  case M_POP:
-    {
-      if (pop_fetch_message (msg, ctx, msgno) != 0)
-        p_delete(&msg);
-      break;
-    }
-
-  default:
-    p_delete(&msg);
-    break;
-  }
-  return (msg);
+    return msg;
 }
 
 /* commit a message to a folder */
@@ -975,8 +899,8 @@ int mx_commit_message (MESSAGE * msg, CONTEXT * ctx) {
     return -1;
   }
   if (!ctx || !MX_IDX(ctx->magic-1) || !mxfmts[ctx->magic-1]->mx_commit_message)
-    return (-1);
-  return (mxfmts[ctx->magic-1]->mx_commit_message (msg, ctx));
+    return -1;
+  return mxfmts[ctx->magic-1]->mx_commit_message (msg, ctx);
 }
 
 /* close a pointer to a message */
@@ -998,7 +922,7 @@ int mx_close_message (MESSAGE ** msg)
   }
 
   p_delete(msg);
-  return (r);
+  return r;
 }
 
 void mx_alloc_memory (CONTEXT * ctx)
@@ -1086,9 +1010,9 @@ int mx_check_empty (const char *path)
 {
   int i = 0;
   if ((i = mx_get_idx (path)) >= 0 && mxfmts[i]->mx_check_empty)
-    return (mxfmts[i]->mx_check_empty(path));
+    return mxfmts[i]->mx_check_empty(path);
   errno = EINVAL;
-  return (-1);
+  return -1;
 }
 
 int mx_acl_check(CONTEXT *ctx, int flag)