further pop_mx_ng work

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index 1dcd5eb..dc07e8a 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -14,7 +14,6 @@
 #include <pwd.h>
 
 #include <lib-ui/lib-ui.h>
-#include <lib-ui/enter.h>
 #include <lib-sys/unix.h>
 #include <imap/imap.h>
 
@@ -22,6 +21,8 @@
 #include "mutt.h"
 #include "attach.h"
 
+const char *madmutt_version = "Madmutt/" MUTT_VERSION;
+
 /* Modified by blong to accept a "suggestion" for file name.  If
  * that file exists, then construct one with unique name but 
  * keep any extension.  This might fail, I guess.
@@ -82,7 +83,7 @@ ssize_t _mutt_expand_path(char *buf, ssize_t len, const char *s, int rx)
       case '=':
       case '+':
         /* if folder = imap[s]://host/: don't append slash */
-        if (imap_is_magic(NONULL(Maildir), NULL) == M_IMAP
+        if (imap_mx.mx_is_magic(NONULL(Maildir), NULL) == M_IMAP
         &&  Maildir[m_strlen(Maildir) - 1] == '/') {
             m_strcpy(p, sizeof(p), Maildir);
         } else {
@@ -248,7 +249,7 @@ int mutt_check_overwrite (const char *attname, const char *path,
       tmp[0] = 0;
       if (mutt_get_field (_("File under directory: "), tmp, sizeof (tmp),
                           M_FILE | M_CLEAR) != 0 || !tmp[0])
-        return (-1);
+        return -1;
       mutt_concat_path(fname, flen, path, tmp);
     }
     else
@@ -349,7 +350,7 @@ int mutt_save_confirm (const char *s, struct stat *st)
       }
     }
   }
-  return (ret);
+  return ret;
 }
 
 void mutt_sleep (short s)
@@ -357,43 +358,30 @@ void mutt_sleep (short s)
     sleep(MAX(s, SleepTime));
 }
 
-const char *mutt_make_version(void)
-{
-  static char vstring[STRING];
-  snprintf(vstring, sizeof (vstring), "Madmutt/%s", MUTT_VERSION);
-  return vstring;
-}
-
 /* return 1 if address lists are strictly identical */
 static int mutt_cmp_addr (const address_t * a, const address_t * b)
 {
   while (a && b) {
     if (m_strcmp(a->mailbox, b->mailbox) ||
         m_strcmp(a->personal, b->personal))
-      return (0);
+      return 0;
 
     a = a->next;
     b = b->next;
   }
-  if (a || b)
-    return (0);
-
-  return (1);
+  return !(a || b);
 }
 
 static int mutt_cmp_list (const string_list_t * a, const string_list_t * b)
 {
   while (a && b) {
     if (m_strcmp(a->data, b->data))
-      return (0);
+      return 0;
 
     a = a->next;
     b = b->next;
   }
-  if (a || b)
-    return (0);
-
-  return (1);
+  return !(a || b);
 }
 
 static int mutt_cmp_env (const ENVELOPE * e1, const ENVELOPE * e2)
@@ -408,16 +396,11 @@ static int mutt_cmp_env (const ENVELOPE * e1, const ENVELOPE * e2)
         !mutt_cmp_addr (e1->to, e2->to) ||
         !mutt_cmp_addr (e1->cc, e2->cc) ||
         !mutt_cmp_addr (e1->return_path, e2->return_path))
-      return (0);
+      return 0;
     else
-      return (1);
-  }
-  else {
-    if (e1 == NULL && e2 == NULL)
-      return (1);
-    else
-      return (0);
+      return 1;
   }
+  return e1 == NULL && e2 == NULL;
 }
 
 static int mutt_cmp_body (const BODY * b1, const BODY * b2)
@@ -428,8 +411,8 @@ static int mutt_cmp_body (const BODY * b1, const BODY * b2)
       m_strcmp(b1->description, b2->description) ||
       !parameter_equal(b1->parameter, b2->parameter) ||
       b1->length != b2->length)
-    return (0);
-  return (1);
+    return 0;
+  return 1;
 }
 int mutt_cmp_header (const HEADER * h1, const HEADER * h2) {
   if (h1 && h2) {
@@ -443,16 +426,11 @@ int mutt_cmp_header (const HEADER * h1, const HEADER * h2) {
         h1->mime != h2->mime ||
         !mutt_cmp_env (h1->env, h2->env) ||
         !mutt_cmp_body (h1->content, h2->content))
-      return (0);
+      return 0;
     else
-      return (1);
-  }
-  else {
-    if (h1 == NULL && h2 == NULL)
-      return (1);
-    else
-      return (0);
+      return 1;
   }
+  return h1 == NULL && h2 == NULL;
 }
 
 
@@ -560,7 +538,7 @@ int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
                 }
             } while (pc && *pc != '`');
             if (!pc) {
-                return (-1);
+                return -1;
             }
 
             cmd = p_dupstr(tok->dptr, pc - tok->dptr);