X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=523a10dae647df2bb30732d96fe2c1ecb5f3aa10;hp=7ffb37cb98abce7da0bcacba489ce8a022e4d31c;hb=50cf2c861c766ecec67a3a3d1925c3d74d7f618c;hpb=98ccd0a3050f3dda6c8995e1894b46b8cb7f6ba5

diff --git a/init.c b/init.c
index 7ffb37c..523a10d 100644
--- a/init.c
+++ b/init.c
@@ -12,6 +12,8 @@
 #endif
 
 #include "mutt.h"
+#include "buffer.h"
+#include "ascii.h"
 #include "mapping.h"
 #include "mutt_curses.h"
 #include "history.h"
@@ -21,10 +23,14 @@
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
-#if defined(USE_SSL) || defined(USE_NSS) || defined(USE_GNUTLS)
+#if defined(USE_SSL) || defined(USE_GNUTLS)
 #include "mutt_ssl.h"
 #endif
 
+#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
+#include "mutt_libesmtp.h"
+#endif
+
 #include "mx.h"
 #include "init.h"
 
@@ -32,6 +38,7 @@
 #include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/rx.h"
+#include "lib/list.h"
 #include "lib/debug.h"
 
 #include <ctype.h>
@@ -42,6 +49,12 @@
 #include <errno.h>
 #include <sys/wait.h>
 
+/*
+ * prototypes
+ */
+static int mutt_option_index (char*);
+static const struct mapping_t* get_sortmap (int idx);
+
 /* for synonym warning reports: synonym found during parsing */
 typedef struct {
   char* f;      /* file */
@@ -51,16 +64,166 @@ typedef struct {
 } syn_t;
 
 /* for synonym warning reports: list of synonyms found */
-list2_t* Synonyms;
+static list2_t* Synonyms;
 /* for synonym warning reports: current rc file */
-char* CurRCFile = NULL;
+static const char* CurRCFile = NULL;
 /* for synonym warning reports: current rc line */
-int CurRCLine = 0;
+static int CurRCLine = 0;
+
+/* prototypes for checking for special vars */
+static int check_dsn_return (const char*);
+static int check_dsn_notify (const char*);
+
+/* variable <-> sanity check function mappings */
+static struct {
+  const char* name;
+  int (*check) (const char*);
+} SpecialVars[] = {
+  { "dsn_notify", check_dsn_notify },
+  { "dsn_return", check_dsn_return },
+#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
+  { "smtp_use_tls", mutt_libesmtp_check_usetls },
+#endif
+  /* last */
+  { NULL,         NULL }
+};
+
+/* protos for config type handles */
+static void bool_to_string  (char* dst, size_t dstlen, int idx);
+static void num_to_string   (char* dst, size_t dstlen, int idx);
+static void str_to_string   (char* dst, size_t dstlen, int idx);
+static void quad_to_string  (char* dst, size_t dstlen, int idx);
+static void sort_to_string  (char* dst, size_t dstlen, int idx);
+static void rx_to_string    (char* dst, size_t dstlen, int idx);
+static void magic_to_string (char* dst, size_t dstlen, int idx);
+static void syn_to_string   (char* dst, size_t dstlen, int idx);
+static void addr_to_string  (char* dst, size_t dstlen, int idx);
+
+static struct {
+  unsigned short type;
+  void (*opt_to_string) (char* dst, size_t dstlen, int idx);
+} FuncTable[] = {
+  { 0,          NULL            }, /* there's no DT_ type with 0 */
+  { DT_BOOL,    bool_to_string  },
+  { DT_NUM,     num_to_string   },
+  { DT_STR,     str_to_string   },
+  { DT_PATH,    str_to_string   },
+  { DT_QUAD,    quad_to_string  },
+  { DT_SORT,    sort_to_string  },
+  { DT_RX,      rx_to_string    },
+  { DT_MAGIC,   magic_to_string },
+  { DT_SYN,     syn_to_string   },
+  { DT_ADDR,    addr_to_string  }
+};
+
+static void bool_to_string (char* dst, size_t dstlen, int idx) {
+  snprintf (dst, dstlen, "%s=%s", MuttVars[idx].option,
+            MuttVars[idx].data ? "yes" : "no");
+}
+
+static void num_to_string (char* dst, size_t dstlen, int idx) {
+  /* XXX puke */
+  const char* fmt = (idx == mutt_option_index ("umask")) ? "%s=%04o" : "%s=%d";
+  snprintf (dst, dstlen, fmt, MuttVars[idx].option,
+            *((short*) MuttVars[idx].data));
+}
+
+static void str_to_string (char* dst, size_t dstlen, int idx) {
+  snprintf (dst, dstlen, "%s=\"%s\"", MuttVars[idx].option,
+            NONULL (*((char**) MuttVars[idx].data)));
+}
+
+static void quad_to_string (char* dst, size_t dstlen, int idx) {
+  char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
+  snprintf (dst, dstlen, "%s=%s", MuttVars[idx].option,
+            vals[quadoption (MuttVars[idx].data)]);
+}
+
+static void sort_to_string (char* dst, size_t dstlen, int idx) {
+  const struct mapping_t *map = get_sortmap (idx);
+  char* p = NULL;
+
+  if (!map) {
+    snprintf (dst, sizeof (dst), "%s=unknown", MuttVars[idx].option);
+    return;
+  }
+
+  p = mutt_getnamebyvalue (*((short *) MuttVars[idx].data) & SORT_MASK,
+                           map);
+
+  snprintf (dst, dstlen, "%s=%s%s%s", MuttVars[idx].option,
+            (*((short *) MuttVars[idx].data) & SORT_REVERSE) ?
+            "reverse-" : "",
+            (*((short *) MuttVars[idx].data) & SORT_LAST) ? "last-" :
+            "", NONULL (p));
+}
+
+static void rx_to_string (char* dst, size_t dstlen, int idx) {
+  rx_t* p = (rx_t*) MuttVars[idx].data;
+  snprintf (dst, dstlen, "%s=\"%s\"", MuttVars[idx].option,
+            NONULL (p->pattern));
+}
+
+static void magic_to_string (char* dst, size_t dstlen, int idx) {
+  const char* s = NULL;
+  switch (MuttVars[idx].data) {
+    case M_MBOX:    s = "mbox"; break;
+    case M_MMDF:    s = "MMDF"; break;
+    case M_MH:      s = "MH"; break;
+    case M_MAILDIR: s = "Maildir"; break;
+    default:        s = "unknown"; break;
+  }
+  snprintf (dst, dstlen, "%s=%s", MuttVars[idx].option, s);
+}
+
+static void syn_to_string (char* dst, size_t dstlen, int idx) {
+  int i = mutt_option_index ((char*) MuttVars[idx].data);
+  FuncTable[MuttVars[i].type].opt_to_string (dst, dstlen, i);
+}
+
+static void addr_to_string (char* dst, size_t dstlen, int idx) {
+  char s[STRING];
+  s[0] = '\0';
+  rfc822_write_address (s, sizeof (s), *((ADDRESS**) MuttVars[idx].data), 0);
+  snprintf (dst, dstlen, "%s=\"%s\"", MuttVars[idx].option, NONULL (s));
+}
+
+int mutt_option_value (const char* val, char* dst, size_t dstlen) {
+  int i = mutt_option_index ((char*) val);
+  char* tmp = NULL, *t = NULL;
+  size_t l = 0;
+
+  if (i < 0) {
+    debug_print (1, ("var '%s' not found, i = %d\n", val, i));
+    *dst = '\0';
+    return (0);
+  }
+  tmp = mem_malloc (dstlen+1);
+  FuncTable[DTYPE (MuttVars[i].type)].opt_to_string (tmp, dstlen, i);
+
+  /* as we get things of type $var=value and don't want to bloat the
+   * above "just" for expansion, we do the stripping here */
+  debug_print (1, ("orig == '%s'\n", tmp));
+  t = strchr (tmp, '=');
+  t++;
+  l = str_len (t);
+  if (l >= 2) {
+    if (t[l-1] == '"' && *t == '"') {
+      t[l-1] = '\0';
+      t++;
+    }
+  }
+  memcpy (dst, t, l+1);
+  mem_free (&tmp);
+  debug_print (1, ("stripped == '%s'\n", dst));
+
+  return (1);
+}
 
 /* for synonym warning reports: adds synonym to end of list */
 static void syn_add (int n, int o) {
-  syn_t* tmp = safe_malloc (sizeof (syn_t));
-  tmp->f = safe_strdup (CurRCFile);
+  syn_t* tmp = mem_malloc (sizeof (syn_t));
+  tmp->f = str_dup (CurRCFile);
   tmp->l = CurRCLine;
   tmp->n = n;
   tmp->o = o;
@@ -69,8 +232,8 @@ static void syn_add (int n, int o) {
 
 /* for synonym warning reports: free single item (for list_del()) */
 static void syn_del (void** p) {
-  FREE(&(*(syn_t**) p)->f);
-  FREE(p);
+  mem_free(&(*(syn_t**) p)->f);
+  mem_free(p);
 }
 
 void toggle_quadoption (int opt)
@@ -118,12 +281,12 @@ int query_quadoption (int opt, const char *prompt)
 
 /* given the variable ``s'', return the index into the rc_vars array which
    matches, or -1 if the variable is not found.  */
-int mutt_option_index (char *s)
+static int mutt_option_index (char *s)
 {
   int i;
 
   for (i = 0; MuttVars[i].option; i++)
-    if (mutt_strcmp (s, MuttVars[i].option) == 0) {
+    if (str_cmp (s, MuttVars[i].option) == 0) {
       if (MuttVars[i].type == DT_SYN)
         syn_add (mutt_option_index ((char *) MuttVars[i].data), i);
       return (MuttVars[i].type ==
@@ -132,176 +295,6 @@ int mutt_option_index (char *s)
   return (-1);
 }
 
-int mutt_extract_token (BUFFER * dest, BUFFER * tok, int flags)
-{
-  char ch;
-  char qc = 0;                  /* quote char */
-  char *pc;
-
-  /* reset the destination pointer to the beginning of the buffer */
-  dest->dptr = dest->data;
-
-  SKIPWS (tok->dptr);
-  while ((ch = *tok->dptr)) {
-    if (!qc) {
-      if ((ISSPACE (ch) && !(flags & M_TOKEN_SPACE)) ||
-          (ch == '#' && !(flags & M_TOKEN_COMMENT)) ||
-          (ch == '=' && (flags & M_TOKEN_EQUAL)) ||
-          (ch == ';' && !(flags & M_TOKEN_SEMICOLON)) ||
-          ((flags & M_TOKEN_PATTERN) && strchr ("~!|", ch)))
-        break;
-    }
-
-    tok->dptr++;
-
-    if (ch == qc)
-      qc = 0;                   /* end of quote */
-    else if (!qc && (ch == '\'' || ch == '"') && !(flags & M_TOKEN_QUOTE))
-      qc = ch;
-    else if (ch == '\\' && qc != '\'') {
-      if (!*tok->dptr)
-        return -1;              /* premature end of token */
-      switch (ch = *tok->dptr++) {
-      case 'c':
-      case 'C':
-        if (!*tok->dptr)
-          return -1;            /* premature end of token */
-        mutt_buffer_addch (dest, (toupper ((unsigned char) *tok->dptr)
-                                  - '@') & 0x7f);
-        tok->dptr++;
-        break;
-      case 'r':
-        mutt_buffer_addch (dest, '\r');
-        break;
-      case 'n':
-        mutt_buffer_addch (dest, '\n');
-        break;
-      case 't':
-        mutt_buffer_addch (dest, '\t');
-        break;
-      case 'f':
-        mutt_buffer_addch (dest, '\f');
-        break;
-      case 'e':
-        mutt_buffer_addch (dest, '\033');
-        break;
-      default:
-        if (isdigit ((unsigned char) ch) &&
-            isdigit ((unsigned char) *tok->dptr) &&
-            isdigit ((unsigned char) *(tok->dptr + 1))) {
-
-          mutt_buffer_addch (dest,
-                             (ch << 6) + (*tok->dptr << 3) + *(tok->dptr +
-                                                               1) - 3504);
-          tok->dptr += 2;
-        }
-        else
-          mutt_buffer_addch (dest, ch);
-      }
-    }
-    else if (ch == '^' && (flags & M_TOKEN_CONDENSE)) {
-      if (!*tok->dptr)
-        return -1;              /* premature end of token */
-      ch = *tok->dptr++;
-      if (ch == '^')
-        mutt_buffer_addch (dest, ch);
-      else if (ch == '[')
-        mutt_buffer_addch (dest, '\033');
-      else if (isalpha ((unsigned char) ch))
-        mutt_buffer_addch (dest, toupper ((unsigned char) ch) - '@');
-      else {
-        mutt_buffer_addch (dest, '^');
-        mutt_buffer_addch (dest, ch);
-      }
-    }
-    else if (ch == '`' && (!qc || qc == '"')) {
-      FILE *fp;
-      pid_t pid;
-      char *cmd, *ptr;
-      size_t expnlen;
-      BUFFER expn;
-      int line = 0;
-
-      pc = tok->dptr;
-      do {
-        if ((pc = strpbrk (pc, "\\`"))) {
-          /* skip any quoted chars */
-          if (*pc == '\\')
-            pc += 2;
-        }
-      } while (pc && *pc != '`');
-      if (!pc) {
-        debug_print (1, ("mismatched backtics\n"));
-        return (-1);
-      }
-      cmd = str_substrdup (tok->dptr, pc);
-      if ((pid = mutt_create_filter (cmd, NULL, &fp, NULL)) < 0) {
-        debug_print (1, ("unable to fork command: %s\n", cmd));
-        FREE (&cmd);
-        return (-1);
-      }
-      FREE (&cmd);
-
-      tok->dptr = pc + 1;
-
-      /* read line */
-      memset (&expn, 0, sizeof (expn));
-      expn.data = mutt_read_line (NULL, &expn.dsize, fp, &line);
-      fclose (fp);
-      mutt_wait_filter (pid);
-
-      /* if we got output, make a new string consiting of the shell ouptput
-         plus whatever else was left on the original line */
-      /* BUT: If this is inside a quoted string, directly add output to 
-       * the token */
-      if (expn.data && qc) {
-        mutt_buffer_addstr (dest, expn.data);
-        FREE (&expn.data);
-      }
-      else if (expn.data) {
-        expnlen = mutt_strlen (expn.data);
-        tok->dsize = expnlen + mutt_strlen (tok->dptr) + 1;
-        ptr = safe_malloc (tok->dsize);
-        memcpy (ptr, expn.data, expnlen);
-        strcpy (ptr + expnlen, tok->dptr);      /* __STRCPY_CHECKED__ */
-        if (tok->destroy)
-          FREE (&tok->data);
-        tok->data = ptr;
-        tok->dptr = ptr;
-        tok->destroy = 1;       /* mark that the caller should destroy this data */
-        ptr = NULL;
-        FREE (&expn.data);
-      }
-    }
-    else if (ch == '$' && (!qc || qc == '"')
-             && (*tok->dptr == '{' || isalpha ((unsigned char) *tok->dptr))) {
-      char *env = NULL, *var = NULL;
-
-      if (*tok->dptr == '{') {
-        tok->dptr++;
-        if ((pc = strchr (tok->dptr, '}'))) {
-          var = str_substrdup (tok->dptr, pc);
-          tok->dptr = pc + 1;
-        }
-      }
-      else {
-        for (pc = tok->dptr; isalpha ((unsigned char) *pc) || *pc == '_';
-             pc++);
-        var = str_substrdup (tok->dptr, pc);
-        tok->dptr = pc;
-      }
-      if (var && (env = getenv (var)))
-        mutt_buffer_addstr (dest, env);
-      FREE (&var);
-    }
-    else
-      mutt_buffer_addch (dest, ch);
-  }
-  mutt_buffer_addch (dest, 0);  /* terminate the string */
-  SKIPWS (tok->dptr);
-  return 0;
-}
-
 static void add_to_list (LIST ** list, const char *str)
 {
   LIST *t, *last = NULL;
@@ -322,8 +315,8 @@ static void add_to_list (LIST ** list, const char *str)
   }
 
   if (!*list || last) {
-    t = (LIST *) safe_calloc (1, sizeof (LIST));
-    t->data = safe_strdup (str);
+    t = (LIST *) mem_calloc (1, sizeof (LIST));
+    t->data = str_dup (str);
     if (last) {
       last->next = t;
       last = last->next;
@@ -381,7 +374,7 @@ static int add_to_spam_list (SPAM_LIST ** list, const char *pat,
        * the template, and leaving t pointed at the current item.
        */
       t = last;
-      FREE(t->template);
+      mem_free(t->template);
       break;
     }
     if (!last->next)
@@ -401,7 +394,7 @@ static int add_to_spam_list (SPAM_LIST ** list, const char *pat,
   }
 
   /* Now t is the SPAM_LIST* that we want to modify. It is prepared. */
-  t->template = safe_strdup (templ);
+  t->template = str_dup (templ);
 
   /* Find highest match number in template string */
   t->nmatch = 0;
@@ -428,21 +421,23 @@ static int remove_from_spam_list (SPAM_LIST ** list, const char *pat)
 
   /* Being first is a special case. */
   spam = *list;
-  if (spam->rx && !mutt_strcmp (spam->rx->pattern, pat)) {
+  if (!spam)
+    return 0;
+  if (spam->rx && !str_cmp (spam->rx->pattern, pat)) {
     *list = spam->next;
     rx_free (&spam->rx);
-    FREE(&spam->template);
-    FREE(&spam);
+    mem_free(&spam->template);
+    mem_free(&spam);
     return 1;
   }
 
   prev = spam;
   for (spam = prev->next; spam;) {
-    if (!mutt_strcmp (spam->rx->pattern, pat)) {
+    if (!str_cmp (spam->rx->pattern, pat)) {
       prev->next = spam->next;
       rx_free (&spam->rx);
-      FREE(spam->template);
-      FREE(spam);
+      mem_free(spam->template);
+      mem_free(spam);
       spam = prev->next;
       ++nremoved;
     }
@@ -458,19 +453,19 @@ static void remove_from_list (LIST ** l, const char *str)
 {
   LIST *p, *last = NULL;
 
-  if (mutt_strcmp ("*", str) == 0)
+  if (str_cmp ("*", str) == 0)
     mutt_free_list (l);         /* ``unCMD *'' means delete all current entries */
   else {
     p = *l;
     last = NULL;
     while (p) {
       if (ascii_strcasecmp (str, p->data) == 0) {
-        FREE (&p->data);
+        mem_free (&p->data);
         if (last)
           last->next = p->next;
         else
           (*l) = p->next;
-        FREE (&p);
+        mem_free (&p);
       }
       else {
         last = p;
@@ -484,7 +479,7 @@ static int remove_from_rx_list (list2_t** l, const char *str)
 {
   int i = 0;
 
-  if (mutt_strcmp ("*", str) == 0) {
+  if (str_cmp ("*", str) == 0) {
     list_del (l, (list_del_t*) rx_free);
     return (0);
   }
@@ -517,8 +512,8 @@ static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
         continue;
 
       for (j = 0; b[j].name; j++)
-        if (!ascii_strncasecmp (tmp->data, b[j].name, mutt_strlen (tmp->data))
-            && (mutt_strlen (b[j].name) == mutt_strlen (tmp->data))) {
+        if (!ascii_strncasecmp (tmp->data, b[j].name, str_len (tmp->data))
+            && (str_len (b[j].name) == str_len (tmp->data))) {
           res = 1;
           break;
         }
@@ -528,13 +523,13 @@ static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
     char *p = NULL;
 
     i = 0;
-    j = mutt_strlen (tmp->data);
+    j = str_len (tmp->data);
     /* need at least input of 'feature_X' */
     if (j >= 7) {
       p = tmp->data + 7;
       j -= 7;
       while (Features[i].name) {
-        if (mutt_strlen (Features[i].name) == j &&
+        if (str_len (Features[i].name) == j &&
             ascii_strncasecmp (Features[i].name, p, j)) {
           res = 1;
           break;
@@ -556,10 +551,10 @@ static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
   if ((data && res) || (!data && !res)) {
     if (mutt_parse_rc_line (tmp->data, &token, err) == -1) {
       mutt_error ("Error: %s", err->data);
-      FREE (&token.data);
+      mem_free (&token.data);
       return (-1);
     }
-    FREE (&token.data);
+    mem_free (&token.data);
   }
   return 0;
 }
@@ -640,7 +635,7 @@ static int parse_unalternates (BUFFER * buf, BUFFER * s, unsigned long data,
     mutt_extract_token (buf, s, 0);
     remove_from_rx_list (&Alternates, buf->data);
 
-    if (mutt_strcmp (buf->data, "*") &&
+    if (str_cmp (buf->data, "*") &&
         add_to_rx_list (&UnAlternates, buf->data, REG_ICASE, err) != 0)
       return -1;
 
@@ -677,10 +672,10 @@ static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data,
 
       /* Add to the spam list. */
       if (add_to_spam_list (&SpamList, buf->data, templ.data, err) != 0) {
-        FREE (&templ.data);
+        mem_free (&templ.data);
         return -1;
       }
-      FREE (&templ.data);
+      mem_free (&templ.data);
     }
 
     /* If not, try to remove from the nospam list. */
@@ -696,7 +691,7 @@ static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data,
     /* nospam only ever has one parameter. */
 
     /* "*" is a special case. */
-    if (!mutt_strcmp (buf->data, "*")) {
+    if (!str_cmp (buf->data, "*")) {
       mutt_free_spam_list (&SpamList);
       list_del (&NoSpamList, (list_del_t*) rx_free);
       return 0;
@@ -726,7 +721,7 @@ static int parse_unlist (BUFFER * buf, BUFFER * s, unsigned long data,
     /*
      * Check for deletion of entire list
      */
-    if (mutt_strcmp (buf->data, "*") == 0) {
+    if (str_cmp (buf->data, "*") == 0) {
       mutt_free_list ((LIST **) data);
       break;
     }
@@ -760,7 +755,7 @@ static int parse_unlists (BUFFER * buf, BUFFER * s, unsigned long data,
     remove_from_rx_list (&SubscribedLists, buf->data);
     remove_from_rx_list (&MailLists, buf->data);
 
-    if (mutt_strcmp (buf->data, "*") &&
+    if (str_cmp (buf->data, "*") &&
         add_to_rx_list (&UnMailLists, buf->data, REG_ICASE, err) != 0)
       return -1;
   }
@@ -794,7 +789,7 @@ static int parse_unsubscribe (BUFFER * buf, BUFFER * s, unsigned long data,
     mutt_extract_token (buf, s, 0);
     remove_from_rx_list (&SubscribedLists, buf->data);
 
-    if (mutt_strcmp (buf->data, "*") &&
+    if (str_cmp (buf->data, "*") &&
         add_to_rx_list (&UnSubscribedLists, buf->data, REG_ICASE, err) != 0)
       return -1;
   }
@@ -811,7 +806,7 @@ static int parse_unalias (BUFFER * buf, BUFFER * s, unsigned long data,
   do {
     mutt_extract_token (buf, s, 0);
 
-    if (mutt_strcmp ("*", buf->data) == 0) {
+    if (str_cmp ("*", buf->data) == 0) {
       if (CurrentMenu == MENU_ALIAS) {
         for (tmp = Aliases; tmp; tmp = tmp->next)
           tmp->del = 1;
@@ -823,7 +818,7 @@ static int parse_unalias (BUFFER * buf, BUFFER * s, unsigned long data,
     }
     else
       for (tmp = Aliases; tmp; tmp = tmp->next) {
-        if (safe_strcasecmp (buf->data, tmp->name) == 0) {
+        if (str_casecmp (buf->data, tmp->name) == 0) {
           if (CurrentMenu == MENU_ALIAS) {
             tmp->del = 1;
             set_option (OPTFORCEREDRAWINDEX);
@@ -863,16 +858,16 @@ static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data,
 
   /* check to see if an alias with this name already exists */
   for (; tmp; tmp = tmp->next) {
-    if (!safe_strcasecmp (tmp->name, buf->data))
+    if (!str_casecmp (tmp->name, buf->data))
       break;
     last = tmp;
   }
 
   if (!tmp) {
     /* create a new alias */
-    tmp = (ALIAS *) safe_calloc (1, sizeof (ALIAS));
+    tmp = (ALIAS *) mem_calloc (1, sizeof (ALIAS));
     tmp->self = tmp;
-    tmp->name = safe_strdup (buf->data);
+    tmp->name = str_dup (buf->data);
     /* give the main addressbook code a chance */
     if (CurrentMenu == MENU_ALIAS)
       set_option (OPTMENUCALLER);
@@ -922,13 +917,13 @@ parse_unmy_hdr (BUFFER * buf, BUFFER * s, unsigned long data, BUFFER * err)
 
   do {
     mutt_extract_token (buf, s, 0);
-    if (mutt_strcmp ("*", buf->data) == 0)
+    if (str_cmp ("*", buf->data) == 0)
       mutt_free_list (&UserHeader);
     else {
       tmp = UserHeader;
       last = NULL;
 
-      l = mutt_strlen (buf->data);
+      l = str_len (buf->data);
       if (buf->data[l - 1] == ':')
         l--;
 
@@ -974,7 +969,7 @@ static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data,
       /* see if there is already a field by this name */
       if (ascii_strncasecmp (buf->data, tmp->data, keylen) == 0) {
         /* replace the old value */
-        FREE (&tmp->data);
+        mem_free (&tmp->data);
         tmp->data = buf->data;
         memset (buf, 0, sizeof (BUFFER));
         return 0;
@@ -1000,12 +995,12 @@ parse_sort (short *val, const char *s, const struct mapping_t *map,
 {
   int i, flags = 0;
 
-  if (safe_strncmp ("reverse-", s, 8) == 0) {
+  if (str_ncmp ("reverse-", s, 8) == 0) {
     s += 8;
     flags = SORT_REVERSE;
   }
 
-  if (safe_strncmp ("last-", s, 5) == 0) {
+  if (str_ncmp ("last-", s, 5) == 0) {
     s += 5;
     flags |= SORT_LAST;
   }
@@ -1025,11 +1020,11 @@ static void mutt_set_default (struct option_t *p)
   switch (p->type & DT_MASK) {
   case DT_STR:
     if (!p->init && *((char **) p->data))
-      p->init = (unsigned long) safe_strdup (*((char **) p->data));
+      p->init = (unsigned long) str_dup (*((char **) p->data));
     break;
   case DT_PATH:
     if (!p->init && *((char **) p->data)) {
-      char *cp = safe_strdup (*((char **) p->data));
+      char *cp = str_dup (*((char **) p->data));
 
       /* mutt_pretty_mailbox (cp); */
       p->init = (unsigned long) cp;
@@ -1041,7 +1036,7 @@ static void mutt_set_default (struct option_t *p)
 
       *tmp = '\0';
       rfc822_write_address (tmp, sizeof (tmp), *((ADDRESS **) p->data), 0);
-      p->init = (unsigned long) safe_strdup (tmp);
+      p->init = (unsigned long) str_dup (tmp);
     }
     break;
   case DT_RX:
@@ -1049,7 +1044,7 @@ static void mutt_set_default (struct option_t *p)
       rx_t* pp = (rx_t*) p->data;
 
       if (!p->init && pp->pattern)
-        p->init = (unsigned long) safe_strdup (pp->pattern);
+        p->init = (unsigned long) str_dup (pp->pattern);
       break;
     }
   }
@@ -1096,19 +1091,19 @@ static void mutt_restore_default (struct option_t *p)
       rx_t *pp = (rx_t *) p->data;
       int flags = 0;
 
-      FREE (&pp->pattern);
+      mem_free (&pp->pattern);
       if (pp->rx) {
         regfree (pp->rx);
-        FREE (&pp->rx);
+        mem_free (&pp->rx);
       }
 
       if (p->init) {
         char *s = (char *) p->init;
 
-        pp->rx = safe_calloc (1, sizeof (regex_t));
-        if (mutt_strcmp (p->option, "mask") != 0)
+        pp->rx = mem_calloc (1, sizeof (regex_t));
+        if (str_cmp (p->option, "mask") != 0)
           flags |= mutt_which_case ((const char *) p->init);
-        if (mutt_strcmp (p->option, "mask") == 0 && *s == '!') {
+        if (str_cmp (p->option, "mask") == 0 && *s == '!') {
           s++;
           pp->not = 1;
         }
@@ -1116,9 +1111,9 @@ static void mutt_restore_default (struct option_t *p)
           fprintf (stderr,
                    _("mutt_restore_default(%s): error in regexp: %s\n"),
                    p->option, pp->pattern);
-          FREE (&pp->pattern);
+          mem_free (&pp->pattern);
           regfree (pp->rx);
-          FREE (&pp->rx);
+          mem_free (&pp->rx);
         }
         else
           str_replace (&pp->pattern, (char *) p->init);
@@ -1141,6 +1136,71 @@ static void mutt_restore_default (struct option_t *p)
     set_option (OPTREDRAWTREE);
 }
 
+/* check whether value for $dsn_return would be valid */
+static int check_dsn_return (const char* val) {
+  if (val && *val && str_ncmp (val, "hdrs", 4) != 0 &&
+      str_ncmp (val, "full", 4) != 0)
+    return (0);
+  return (1);
+}
+
+/* check whether value for $dsn_notify would be valid */
+static int check_dsn_notify (const char* val) {
+  list2_t* list = NULL;
+  int i = 0, rc = 1;
+
+  if (!val || !*val)
+    return (1);
+  list = list_from_str (val, ",");
+  if (list_empty (list))
+    return (1);
+
+  for (i = 0; i < list->length; i++)
+    if (str_ncmp (list->data[i], "never", 5) != 0 &&
+        str_ncmp (list->data[i], "failure", 7) != 0 &&
+        str_ncmp (list->data[i], "delay", 5) != 0 &&
+        str_ncmp (list->data[i], "success", 7) != 0) {
+      rc = 0;
+      break;
+    }
+  list_del (&list, (list_del_t*) _mem_free);
+  return (rc);
+}
+
+static int check_special (const char* name, const char* val) {
+  int i = 0;
+
+  for (i = 0; SpecialVars[i].name; i++) {
+    if (str_cmp (SpecialVars[i].name, name) == 0)
+      return (SpecialVars[i].check (val));
+  }
+  return (1);
+}
+
+static const struct mapping_t* get_sortmap (int idx) {
+  const struct mapping_t* map = NULL;
+
+  switch (MuttVars[idx].type & DT_SUBTYPE_MASK) {
+  case DT_SORT_ALIAS:
+    map = SortAliasMethods;
+    break;
+  case DT_SORT_BROWSER:
+    map = SortBrowserMethods;
+    break;
+  case DT_SORT_KEYS:
+    if ((WithCrypto & APPLICATION_PGP))
+      map = SortKeyMethods;
+    break;
+  case DT_SORT_AUX:
+    map = SortAuxMethods;
+    break;
+  default:
+    map = SortMethods;
+    break;
+  }
+  return (map);
+}
+
 static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
                       BUFFER * err)
 {
@@ -1158,11 +1218,11 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       query = 1;
       s->dptr++;
     }
-    else if (safe_strncmp ("no", s->dptr, 2) == 0) {
+    else if (str_ncmp ("no", s->dptr, 2) == 0) {
       s->dptr += 2;
       unset = !unset;
     }
-    else if (safe_strncmp ("inv", s->dptr, 3) == 0) {
+    else if (str_ncmp ("inv", s->dptr, 3) == 0) {
       s->dptr += 3;
       inv = !inv;
     }
@@ -1175,7 +1235,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
     mutt_extract_token (tmp, s, M_TOKEN_EQUAL);
 
     if ((idx = mutt_option_index (tmp->data)) == -1 &&
-        !(reset && !mutt_strcmp ("all", tmp->data))) {
+        !(reset && !str_cmp ("all", tmp->data))) {
       snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data);
       return (-1);
     }
@@ -1192,7 +1252,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         return (-1);
       }
 
-      if (!mutt_strcmp ("all", tmp->data)) {
+      if (!str_cmp ("all", tmp->data)) {
         for (idx = 0; MuttVars[idx].option; idx++)
           mutt_restore_default (&MuttVars[idx]);
         return 0;
@@ -1220,8 +1280,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       }
 
       if (query) {
-        snprintf (err->data, err->dsize, option (MuttVars[idx].data)
-                  ? _("%s is set") : _("%s is unset"), tmp->data);
+        bool_to_string (err->data, err->dsize, idx);
         return 0;
       }
 
@@ -1239,24 +1298,10 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         if (DTYPE (MuttVars[idx].type) == DT_ADDR)
           rfc822_free_address ((ADDRESS **) MuttVars[idx].data);
         else
-          FREE ((void *) MuttVars[idx].data);
+          mem_free ((void *) MuttVars[idx].data);
       }
       else if (query || *s->dptr != '=') {
-        char _tmp[STRING];
-        char *val = NULL;
-
-        if (DTYPE (MuttVars[idx].type) == DT_ADDR) {
-          _tmp[0] = '\0';
-          rfc822_write_address (_tmp, sizeof (_tmp),
-                                *((ADDRESS **) MuttVars[idx].data), 0);
-          val = _tmp;
-        }
-        else
-          val = *((char **) MuttVars[idx].data);
-
-        /* user requested the value of this variable */
-        snprintf (err->data, err->dsize, "%s=\"%s\"", MuttVars[idx].option,
-                  NONULL (val));
+        FuncTable[DTYPE (MuttVars[idx].type)].opt_to_string (err->data, err->dsize, idx);
         break;
       }
       else {
@@ -1266,18 +1311,26 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         if (DTYPE (MuttVars[idx].type) == DT_ADDR)
           rfc822_free_address ((ADDRESS **) MuttVars[idx].data);
         else
-          FREE ((void *) MuttVars[idx].data);
+          mem_free ((void *) MuttVars[idx].data);
 
         mutt_extract_token (tmp, s, 0);
         if (DTYPE (MuttVars[idx].type) == DT_PATH) {
           strfcpy (scratch, tmp->data, sizeof (scratch));
           mutt_expand_path (scratch, sizeof (scratch));
-          *((char **) MuttVars[idx].data) = safe_strdup (scratch);
+          *((char **) MuttVars[idx].data) = str_dup (scratch);
         }
         else if (DTYPE (MuttVars[idx].type) == DT_STR) {
-          *((char **) MuttVars[idx].data) = safe_strdup (tmp->data);
-          if (mutt_strcmp (MuttVars[idx].option, "charset") == 0)
-            mutt_set_charset (Charset);
+          /* see if the value may only be a certain value... */
+          if (check_special (MuttVars[idx].option, tmp->data)) {
+            *((char **) MuttVars[idx].data) = str_dup (tmp->data);
+            if (str_cmp (MuttVars[idx].option, "charset") == 0)
+              mutt_set_charset (Charset);
+          } else {
+            /* ... and abort if it fails */
+            snprintf (err->data, err->dsize, "'%s' is invalid for $%s",
+                      tmp->data, MuttVars[idx].option);
+            return (-1);
+          }
         }
         else {
           *((ADDRESS **) MuttVars[idx].data) =
@@ -1291,14 +1344,12 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       int e, flags = 0;
 
       if (query || *s->dptr != '=') {
-        /* user requested the value of this variable */
-        snprintf (err->data, err->dsize, "%s=\"%s\"", MuttVars[idx].option,
-                  NONULL (ptr->pattern));
+        rx_to_string (err->data, err->dsize, idx);
         break;
       }
 
       if (option (OPTATTACHMSG)
-          && !mutt_strcmp (MuttVars[idx].option, "reply_regexp")) {
+          && !str_cmp (MuttVars[idx].option, "reply_regexp")) {
         snprintf (err->data, err->dsize,
                   "Operation not permitted when in attach-message mode.");
         r = -1;
@@ -1310,44 +1361,44 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       /* copy the value of the string */
       mutt_extract_token (tmp, s, 0);
 
-      if (!ptr->pattern || mutt_strcmp (ptr->pattern, tmp->data) != 0) {
+      if (!ptr->pattern || str_cmp (ptr->pattern, tmp->data) != 0) {
         int not = 0;
 
         /* $mask is case-sensitive */
-        if (mutt_strcmp (MuttVars[idx].option, "mask") != 0)
+        if (str_cmp (MuttVars[idx].option, "mask") != 0)
           flags |= mutt_which_case (tmp->data);
 
         p = tmp->data;
-        if (mutt_strcmp (MuttVars[idx].option, "mask") == 0) {
+        if (str_cmp (MuttVars[idx].option, "mask") == 0) {
           if (*p == '!') {
             not = 1;
             p++;
           }
         }
 
-        rx = (regex_t *) safe_malloc (sizeof (regex_t));
+        rx = (regex_t *) mem_malloc (sizeof (regex_t));
         if ((e = REGCOMP (rx, p, flags)) != 0) {
           regerror (e, rx, err->data, err->dsize);
           regfree (rx);
-          FREE (&rx);
+          mem_free (&rx);
           break;
         }
 
         /* get here only if everything went smootly */
         if (ptr->pattern) {
-          FREE (&ptr->pattern);
+          mem_free (&ptr->pattern);
           regfree ((regex_t *) ptr->rx);
-          FREE (&ptr->rx);
+          mem_free (&ptr->rx);
         }
 
-        ptr->pattern = safe_strdup (tmp->data);
+        ptr->pattern = str_dup (tmp->data);
         ptr->rx = rx;
         ptr->not = not;
 
         /* $reply_regexp and $alterantes require special treatment */
 
         if (Context && Context->msgcount &&
-            mutt_strcmp (MuttVars[idx].option, "reply_regexp") == 0) {
+            str_cmp (MuttVars[idx].option, "reply_regexp") == 0) {
           regmatch_t pmatch[1];
           int i;
 
@@ -1365,25 +1416,9 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       }
     }
     else if (DTYPE (MuttVars[idx].type) == DT_MAGIC) {
+
       if (query || *s->dptr != '=') {
-        switch (DefaultMagic) {
-        case M_MBOX:
-          p = "mbox";
-          break;
-        case M_MMDF:
-          p = "MMDF";
-          break;
-        case M_MH:
-          p = "MH";
-          break;
-        case M_MAILDIR:
-          p = "Maildir";
-          break;
-        default:
-          p = "unknown";
-          break;
-        }
-        snprintf (err->data, err->dsize, "%s=%s", MuttVars[idx].option, p);
+        magic_to_string (err->data, err->dsize, idx);
         break;
       }
 
@@ -1404,8 +1439,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       char *t;
 
       if (query || *s->dptr != '=') {
-        /* user requested the value of this variable */
-        snprintf (err->data, err->dsize, "%s=%d", MuttVars[idx].option, *ptr);
+        num_to_string (err->data, err->dsize, idx);
         break;
       }
 
@@ -1423,22 +1457,20 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         *ptr = (short) val;
 
       /* these ones need a sanity check */
-      if (mutt_strcmp (MuttVars[idx].option, "history") == 0) {
+      if (str_cmp (MuttVars[idx].option, "history") == 0) {
         if (*ptr < 0)
           *ptr = 0;
         mutt_init_history ();
       }
-      else if (mutt_strcmp (MuttVars[idx].option, "pager_index_lines") == 0) {
+      else if (str_cmp (MuttVars[idx].option, "pager_index_lines") == 0) {
         if (*ptr < 0)
           *ptr = 0;
       }
     }
     else if (DTYPE (MuttVars[idx].type) == DT_QUAD) {
-      if (query) {
-        char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
 
-        snprintf (err->data, err->dsize, "%s=%s", MuttVars[idx].option,
-                  vals[quadoption (MuttVars[idx].data)]);
+      if (query) {
+        quad_to_string (err->data, err->dsize, idx);
         break;
       }
 
@@ -1471,44 +1503,19 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
     else if (DTYPE (MuttVars[idx].type) == DT_SORT) {
       const struct mapping_t *map = NULL;
 
-      switch (MuttVars[idx].type & DT_SUBTYPE_MASK) {
-      case DT_SORT_ALIAS:
-        map = SortAliasMethods;
-        break;
-      case DT_SORT_BROWSER:
-        map = SortBrowserMethods;
-        break;
-      case DT_SORT_KEYS:
-        if ((WithCrypto & APPLICATION_PGP))
-          map = SortKeyMethods;
-        break;
-      case DT_SORT_AUX:
-        map = SortAuxMethods;
-        break;
-      default:
-        map = SortMethods;
-        break;
+      if (query || *s->dptr != '=') {
+        sort_to_string (err->data, err->dsize, idx);
+        return 0;
       }
 
-      if (!map) {
+      /* do this here so we don't ordinarily do it twice for queries */
+      if (!(map = get_sortmap (idx))) {
         snprintf (err->data, err->dsize, _("%s: Unknown type."),
                   MuttVars[idx].option);
         r = -1;
         break;
       }
 
-      if (query || *s->dptr != '=') {
-        p =
-          mutt_getnamebyvalue (*((short *) MuttVars[idx].data) & SORT_MASK,
-                               map);
-
-        snprintf (err->data, err->dsize, "%s=%s%s%s", MuttVars[idx].option,
-                  (*((short *) MuttVars[idx].data) & SORT_REVERSE) ?
-                  "reverse-" : "",
-                  (*((short *) MuttVars[idx].data) & SORT_LAST) ? "last-" :
-                  "", p);
-        return 0;
-      }
       s->dptr++;
       mutt_extract_token (tmp, s, 0);
 
@@ -1556,8 +1563,6 @@ static int source_rc (const char *rcfile, BUFFER * err)
   pid_t pid;
 
   debug_print (2, ("reading configuration file '%s'.\n", rcfile));
-  str_replace (&CurRCFile, rcfile);
-  CurRCLine = 0;
 
   if ((f = mutt_open_read (rcfile, &pid)) == NULL) {
     snprintf (err->data, err->dsize, "%s: %s", rcfile, strerror (errno));
@@ -1566,10 +1571,9 @@ static int source_rc (const char *rcfile, BUFFER * err)
 
   memset (&token, 0, sizeof (token));
   while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line)) != NULL) {
-    CurRCLine++;
     conv = ConfigCharset && (*ConfigCharset) && Charset;
     if (conv) {
-      currentline = safe_strdup (linebuf);
+      currentline = str_dup (linebuf);
       if (!currentline)
         continue;
       mutt_convert_string (&currentline, ConfigCharset, Charset, 0);
@@ -1577,11 +1581,14 @@ static int source_rc (const char *rcfile, BUFFER * err)
     else
       currentline = linebuf;
 
+    CurRCLine = line;
+    CurRCFile = rcfile;
+
     if (mutt_parse_rc_line (currentline, &token, err) == -1) {
       mutt_error (_("Error in %s, line %d: %s"), rcfile, line, err->data);
       if (--rc < -MAXERRS) {
         if (conv)
-          FREE (&currentline);
+          mem_free (&currentline);
         break;
       }
     }
@@ -1590,10 +1597,10 @@ static int source_rc (const char *rcfile, BUFFER * err)
         rc = -1;
     }
     if (conv)
-      FREE (&currentline);
+      mem_free (&currentline);
   }
-  FREE (&token.data);
-  FREE (&linebuf);
+  mem_free (&token.data);
+  mem_free (&linebuf);
   fclose (f);
   if (pid != -1)
     mutt_wait_filter (pid);
@@ -1649,7 +1656,7 @@ int mutt_parse_rc_line ( /* const */ char *line, BUFFER * token, BUFFER * err)
 
   memset (&expn, 0, sizeof (expn));
   expn.data = expn.dptr = line;
-  expn.dsize = mutt_strlen (line);
+  expn.dsize = str_len (line);
 
   *err->data = 0;
 
@@ -1663,7 +1670,7 @@ int mutt_parse_rc_line ( /* const */ char *line, BUFFER * token, BUFFER * err)
     }
     mutt_extract_token (token, &expn, 0);
     for (i = 0; Commands[i].name; i++) {
-      if (!mutt_strcmp (token->data, Commands[i].name)) {
+      if (!str_cmp (token->data, Commands[i].name)) {
         if (Commands[i].func (token, &expn, Commands[i].data, err) != 0)
           goto finish;
         break;
@@ -1678,7 +1685,7 @@ int mutt_parse_rc_line ( /* const */ char *line, BUFFER * token, BUFFER * err)
   r = 0;
 finish:
   if (expn.destroy)
-    FREE (&expn.data);
+    mem_free (&expn.data);
   return (r);
 }
 
@@ -1761,18 +1768,18 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
     /* return the completed command */
     strncpy (buffer, Completed, len - spaces);
   }
-  else if (!safe_strncmp (buffer, "set", 3)
-           || !safe_strncmp (buffer, "unset", 5)
-           || !safe_strncmp (buffer, "reset", 5)
-           || !safe_strncmp (buffer, "toggle", 6)) {    /* complete variables */
+  else if (!str_ncmp (buffer, "set", 3)
+           || !str_ncmp (buffer, "unset", 5)
+           || !str_ncmp (buffer, "reset", 5)
+           || !str_ncmp (buffer, "toggle", 6)) {    /* complete variables */
     char *prefixes[] = { "no", "inv", "?", "&", 0 };
 
     pt++;
     /* loop through all the possible prefixes (no, inv, ...) */
-    if (!safe_strncmp (buffer, "set", 3)) {
+    if (!str_ncmp (buffer, "set", 3)) {
       for (num = 0; prefixes[num]; num++) {
-        if (!safe_strncmp (pt, prefixes[num], mutt_strlen (prefixes[num]))) {
-          pt += mutt_strlen (prefixes[num]);
+        if (!str_ncmp (pt, prefixes[num], str_len (prefixes[num]))) {
+          pt += str_len (prefixes[num]);
           break;
         }
       }
@@ -1809,7 +1816,7 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
 
     strncpy (pt, Completed, buffer + len - pt - spaces);
   }
-  else if (!safe_strncmp (buffer, "exec", 4)) {
+  else if (!str_ncmp (buffer, "exec", 4)) {
     struct binding_t *menu = km_get_table (CurrentMenu);
 
     if (!menu && CurrentMenu != MENU_PAGER)
@@ -1877,12 +1884,12 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
   if (*pt == '=')               /* abort if no var before the '=' */
     return 0;
 
-  if (safe_strncmp (buffer, "set", 3) == 0) {
+  if (str_ncmp (buffer, "set", 3) == 0) {
     int idx;
 
     strfcpy (var, pt, sizeof (var));
     /* ignore the trailing '=' when comparing */
-    var[mutt_strlen (var) - 1] = 0;
+    var[str_len (var) - 1] = 0;
     if ((idx = mutt_option_index (var)) == -1)
       return 0;                 /* no such variable. */
     else {
@@ -1937,6 +1944,26 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
                   "reverse-" : "",
                   (*((short *) MuttVars[idx].data) & SORT_LAST) ? "last-" :
                   "", p);
+      } 
+      else if (DTYPE (MuttVars[idx].type) == DT_MAGIC) {
+        char *p;
+        switch (DefaultMagic) {
+          case M_MBOX:
+            p = "mbox";
+            break;
+          case M_MMDF:
+            p = "MMDF";
+            break;
+          case M_MH:
+            p = "MH";
+          break;
+          case M_MAILDIR:
+            p = "Maildir";
+            break;
+          default:
+            p = "unknown";
+        }
+        strfcpy (tmp, p, sizeof (tmp));
       }
       else if (DTYPE (MuttVars[idx].type) == DT_BOOL)
         strfcpy (tmp, option (MuttVars[idx].data) ? "yes" : "no",
@@ -1980,13 +2007,13 @@ int mutt_query_variables (LIST * queries)
     snprintf (command, sizeof (command), "set ?%s\n", p->data);
     if (mutt_parse_rc_line (command, &token, &err) == -1) {
       fprintf (stderr, "%s\n", err.data);
-      FREE (&token.data);
+      mem_free (&token.data);
       return 1;
     }
     printf ("%s\n", err.data);
   }
 
-  FREE (&token.data);
+  mem_free (&token.data);
   return 0;
 }
 
@@ -2022,11 +2049,11 @@ static int mutt_execute_commands (LIST * p)
   for (; p; p = p->next) {
     if (mutt_parse_rc_line (p->data, &token, &err) != 0) {
       fprintf (stderr, _("Error in command line: %s\n"), err.data);
-      FREE (&token.data);
+      mem_free (&token.data);
       return (-1);
     }
   }
-  FREE (&token.data);
+  mem_free (&token.data);
   return 0;
 }
 
@@ -2051,18 +2078,18 @@ void mutt_init (int skip_sys_rc, LIST * commands)
   /* on one of the systems I use, getcwd() does not return the same prefix
      as is listed in the passwd file */
   if ((p = getenv ("HOME")))
-    Homedir = safe_strdup (p);
+    Homedir = str_dup (p);
 
   /* Get some information about the user */
   if ((pw = getpwuid (getuid ()))) {
     char rnbuf[STRING];
 
-    Username = safe_strdup (pw->pw_name);
+    Username = str_dup (pw->pw_name);
     if (!Homedir)
-      Homedir = safe_strdup (pw->pw_dir);
+      Homedir = str_dup (pw->pw_dir);
 
-    Realname = safe_strdup (mutt_gecos_name (rnbuf, sizeof (rnbuf), pw));
-    Shell = safe_strdup (pw->pw_shell);
+    Realname = str_dup (mutt_gecos_name (rnbuf, sizeof (rnbuf), pw));
+    Shell = str_dup (pw->pw_shell);
   }
   else {
     if (!Homedir) {
@@ -2071,13 +2098,13 @@ void mutt_init (int skip_sys_rc, LIST * commands)
       exit (1);
     }
     if ((p = getenv ("USER")))
-      Username = safe_strdup (p);
+      Username = str_dup (p);
     else {
       mutt_endwin (NULL);
       fputs (_("unable to determine username"), stderr);
       exit (1);
     }
-    Shell = safe_strdup ((p = getenv ("SHELL")) ? p : "/bin/sh");
+    Shell = str_dup ((p = getenv ("SHELL")) ? p : "/bin/sh");
   }
 
   debug_start(Homedir);
@@ -2091,20 +2118,20 @@ void mutt_init (int skip_sys_rc, LIST * commands)
     strfcpy (buffer, p, sizeof (buffer));       /* save the domain for below */
   }
   else
-    Hostname = safe_strdup (utsname.nodename);
+    Hostname = str_dup (utsname.nodename);
 
 #ifndef DOMAIN
 #define DOMAIN buffer
   if (!p && getdnsdomainname (buffer, sizeof (buffer)) == -1)
-    Fqdn = safe_strdup ("@");
+    Fqdn = str_dup ("@");
   else
 #endif /* DOMAIN */
   if (*DOMAIN != '@') {
-    Fqdn = safe_malloc (mutt_strlen (DOMAIN) + mutt_strlen (Hostname) + 2);
+    Fqdn = mem_malloc (str_len (DOMAIN) + str_len (Hostname) + 2);
     sprintf (Fqdn, "%s.%s", NONULL (Hostname), DOMAIN); /* __SPRINTF_CHECKED__ */
   }
   else
-    Fqdn = safe_strdup (NONULL (Hostname));
+    Fqdn = str_dup (NONULL (Hostname));
 
 #ifdef USE_NNTP
   {
@@ -2121,37 +2148,37 @@ void mutt_init (int skip_sys_rc, LIST * commands)
              && (*i != '\n'))
         i++;
       *i = '\0';
-      NewsServer = safe_strdup (p);
+      NewsServer = str_dup (p);
       fclose (f);
     }
   }
   if ((p = getenv ("NNTPSERVER")))
-    NewsServer = safe_strdup (p);
+    NewsServer = str_dup (p);
 #endif
 
   if ((p = getenv ("MAIL")))
-    Spoolfile = safe_strdup (p);
+    Spoolfile = str_dup (p);
   else if ((p = getenv ("MAILDIR")))
-    Spoolfile = safe_strdup (p);
+    Spoolfile = str_dup (p);
   else {
 #ifdef HOMESPOOL
     mutt_concat_path (buffer, NONULL (Homedir), MAILPATH, sizeof (buffer));
 #else
     mutt_concat_path (buffer, MAILPATH, NONULL (Username), sizeof (buffer));
 #endif
-    Spoolfile = safe_strdup (buffer);
+    Spoolfile = str_dup (buffer);
   }
 
   if ((p = getenv ("MAILCAPS")))
-    MailcapPath = safe_strdup (p);
+    MailcapPath = str_dup (p);
   else {
     /* Default search path from RFC1524 */
     MailcapPath =
-      safe_strdup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR
+      str_dup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR
                    "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap");
   }
 
-  Tempdir = safe_strdup ((p = getenv ("TMPDIR")) ? p : "/tmp");
+  Tempdir = str_dup ((p = getenv ("TMPDIR")) ? p : "/tmp");
 
   p = getenv ("VISUAL");
   if (!p) {
@@ -2159,8 +2186,8 @@ void mutt_init (int skip_sys_rc, LIST * commands)
     if (!p)
       p = "vi";
   }
-  Editor = safe_strdup (p);
-  Visual = safe_strdup (p);
+  Editor = str_dup (p);
+  Visual = str_dup (p);
 
   if ((p = getenv ("REPLYTO")) != NULL) {
     BUFFER buf, token;
@@ -2169,11 +2196,11 @@ void mutt_init (int skip_sys_rc, LIST * commands)
 
     memset (&buf, 0, sizeof (buf));
     buf.data = buf.dptr = buffer;
-    buf.dsize = mutt_strlen (buffer);
+    buf.dsize = str_len (buffer);
 
     memset (&token, 0, sizeof (token));
     parse_my_hdr (&token, &buf, 0, &err);
-    FREE (&token.data);
+    mem_free (&token.data);
   }
 
   if ((p = getenv ("EMAIL")) != NULL)
@@ -2225,28 +2252,32 @@ void mutt_init (int skip_sys_rc, LIST * commands)
 
 
   if (!Muttrc) {
+#if 0
     snprintf (buffer, sizeof (buffer), "%s/.muttngrc-%s", NONULL (Homedir),
               MUTT_VERSION);
     if (access (buffer, F_OK) == -1)
+#endif
       snprintf (buffer, sizeof (buffer), "%s/.muttngrc", NONULL (Homedir));
     if (access (buffer, F_OK) == -1)
+#if 0
       snprintf (buffer, sizeof (buffer), "%s/.muttng/muttngrc-%s",
                 NONULL (Homedir), MUTT_VERSION);
     if (access (buffer, F_OK) == -1)
+#endif
       snprintf (buffer, sizeof (buffer), "%s/.muttng/muttngrc",
                 NONULL (Homedir));
 
     default_rc = 1;
-    Muttrc = safe_strdup (buffer);
+    Muttrc = str_dup (buffer);
   }
   else {
     strfcpy (buffer, Muttrc, sizeof (buffer));
-    FREE (&Muttrc);
+    mem_free (&Muttrc);
     mutt_expand_path (buffer, sizeof (buffer));
-    Muttrc = safe_strdup (buffer);
+    Muttrc = str_dup (buffer);
   }
-  FREE (&AliasFile);
-  AliasFile = safe_strdup (NONULL (Muttrc));
+  mem_free (&AliasFile);
+  AliasFile = str_dup (NONULL (Muttrc));
 
   /* Process the global rc file if it exists and the user hasn't explicity
      requested not to via "-n".  */
@@ -2299,12 +2330,10 @@ void mutt_init (int skip_sys_rc, LIST * commands)
                MuttVars[((syn_t*) Synonyms->data[i])->n].option,
                NONULL(((syn_t*) Synonyms->data[i])->f),
                ((syn_t*) Synonyms->data[i])->l);
-    fprintf (stderr, _("Warning: Synonym variables are scheduled for removal.\n"));
+    fprintf (stderr, _("Warning: synonym variables are scheduled for removal.\n"));
     list_del (&Synonyms, syn_del);
     need_pause = 1;
   }
-  /* this is not needed during runtime */
-  FREE(&CurRCFile);
 
   if (need_pause && !option (OPTNOCURSES)) {
     if (mutt_any_key_to_continue (NULL) == -1)
@@ -2325,3 +2354,33 @@ int mutt_get_hook_type (const char *name)
       return c->data;
   return 0;
 }
+
+static int opt_cmp (const void* a, const void* b) {
+  return (str_cmp ((*(struct option_t**) a)->option,
+                       (*(struct option_t**) b)->option));
+}
+
+/* dump out the value of all the variables we have */
+int mutt_dump_variables (void) {
+  int i = 0, idx = 0;
+  char outbuf[STRING];
+  list2_t* tmp = NULL;
+
+  /* get all non-synonyms into list... */
+  for (i = 0; MuttVars[i].option; i++) {
+    if (MuttVars[i].type == DT_SYN)
+      continue;
+    list_push_back (&tmp, &MuttVars[i]);
+  }
+  if (!list_empty(tmp)) {
+    /* ...and dump list sorted */
+    qsort (tmp->data, tmp->length, sizeof (void*), opt_cmp);
+    for (i = 0; i < tmp->length; i++) {
+      idx = mutt_option_index (((struct option_t*) tmp->data[i])->option);
+      FuncTable[DTYPE (MuttVars[idx].type)].opt_to_string (outbuf, sizeof (outbuf), idx);
+      printf ("%s\n", outbuf);
+    }
+  }
+  list_del (&tmp, NULL);
+  return 0;
+}