X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mx%2Fmx.c;h=493b42165b531b9dce745c7715fd586ae8b10f68;hp=baae76ffb572aaa9fdc6c0b220fd4bc919627128;hb=981e10e224fde4de5d40adcee1deda89df2715ca;hpb=68fabfdd78a08d3896ef25fe99e76c32beb56761

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index baae76f..493b421 100644
--- a/lib-mx/mx.c
+++ b/lib-mx/mx.c
@@ -89,7 +89,7 @@ static int mx_get_idx (const char* path) {
                 return (t-1);
         }
     }
-    return (-1);
+    return -1;
 }
 
 /* Args:
@@ -145,10 +145,10 @@ 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 -1;
 }
 
 int mx_is_local (int m) {
@@ -157,23 +157,6 @@ int mx_is_local (int m) {
   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;
-}
-
 /* mx_access: Wrapper for access, checks permissions on a given mailbox.
  *   We may be interested in using ACL-style flags at some point, currently
  *   we use the normal access() flags. */
@@ -208,90 +191,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;
 }
 
@@ -518,23 +475,15 @@ 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) {
       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;
       }
     }
   }
@@ -549,7 +498,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;
     }
   }
 
@@ -658,7 +607,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);
 
@@ -797,7 +746,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! */
@@ -922,7 +871,7 @@ int mx_check_mailbox (CONTEXT * ctx, int *index_hint, int lock) {
       return (mxfmts[ctx->magic-1]->mx_check_mailbox(ctx, index_hint, lock));
   }
 
-  return (-1);
+  return -1;
 }
 
 /* return a stream pointer for a message */
@@ -983,7 +932,7 @@ 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 -1;
   return (mxfmts[ctx->magic-1]->mx_commit_message (msg, ctx));
 }
 
@@ -1096,7 +1045,7 @@ int mx_check_empty (const char *path)
   if ((i = mx_get_idx (path)) >= 0 && mxfmts[i]->mx_check_empty)
     return (mxfmts[i]->mx_check_empty(path));
   errno = EINVAL;
-  return (-1);
+  return -1;
 }
 
 int mx_acl_check(CONTEXT *ctx, int flag)