X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=f01fb9de4d073cf93c0c4900a4b1383549a58c3a;hp=e8c3b0a7f95750e2d1075378996245e7faf9d67f;hb=d4483b5add8d25008c305b51729f4a53bccfaab8;hpb=5e53f9e5f65aa5b3af6f5af9d868403536534afb

diff --git a/init.c b/init.c
index e8c3b0a..f01fb9d 100644
--- a/init.c
+++ b/init.c
@@ -14,9 +14,13 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "buffer.h"
-#include "ascii.h"
 #include "mapping.h"
 #include "mutt_curses.h"
 #include "history.h"
@@ -38,9 +42,6 @@
 #include "mx.h"
 #include "init.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/rx.h"
 #include "lib/list.h"
 #include "lib/debug.h"
@@ -61,7 +62,7 @@ static int parse_sort (struct option_t* dst, const char *s,
                        const struct mapping_t *map,
                        char* errbuf, size_t errlen);
 
-static HASH* ConfigOptions = NULL;
+static HASH *ConfigOptions = NULL;
 
 /* for synonym warning reports: synonym found during parsing */
 typedef struct {
@@ -206,7 +207,7 @@ static int bool_from_string (struct option_t* dst, const char* val,
 static void num_to_string (char* dst, size_t dstlen,
                            struct option_t* option) {
   /* XXX puke */
-  const char* fmt = (str_cmp (option->option, "umask") == 0) ? 
+  const char* fmt = (str_cmp (option->option, "umask") == 0) ?
                     "%s=%04o" : "%s=%d";
   snprintf (dst, dstlen, fmt, option->option,
             *((short*) option->data));
@@ -262,7 +263,7 @@ static void sys_to_string (char* dst, size_t dstlen,
 
   /* get some $muttng_ values dynamically */
   if (ascii_strcmp ("muttng_pwd", option->option) == 0) {
-    val = mem_malloc (_POSIX_PATH_MAX);
+    val = p_new(char, _POSIX_PATH_MAX);
     val = getcwd (val, _POSIX_PATH_MAX-1);
     clean = 1;
   } else if (ascii_strcmp ("muttng_folder_path", option->option) == 0 &&
@@ -271,15 +272,15 @@ static void sys_to_string (char* dst, size_t dstlen,
   } else if (ascii_strcmp ("muttng_folder_name", option->option) == 0 &&
              CurrentFolder && *CurrentFolder) {
 
-    size_t Maildirlength = str_len (Maildir);
+    size_t Maildirlength = m_strlen(Maildir);
 
     /*
      * if name starts with $folder, just strip it to keep hierarchy
      * $folder=imap://host, path=imap://host/inbox/b -> inbox/b
      */
-    if (Maildirlength > 0 && str_ncmp (CurrentFolder, Maildir, 
-                                      Maildirlength) == 0 && 
-       str_len (CurrentFolder) > Maildirlength) {
+    if (Maildirlength > 0 && str_ncmp (CurrentFolder, Maildir,
+                                      Maildirlength) == 0 &&
+       m_strlen(CurrentFolder) > Maildirlength) {
      val = CurrentFolder + Maildirlength;
      if (Maildir[strlen(Maildir)-1]!='/')
        val += 1;
@@ -295,7 +296,7 @@ static void sys_to_string (char* dst, size_t dstlen,
 
   snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (val));
   if (clean)
-    mem_free (&val);
+    p_delete(&val);
 }
 
 static int path_from_string (struct option_t* dst, const char* val,
@@ -306,13 +307,13 @@ static int path_from_string (struct option_t* dst, const char* val,
     return (0);
 
   if (!val || !*val) {
-    mem_free ((char**) dst->data);
+    p_delete((char**) dst->data);
     return (1);
   }
 
   path[0] = '\0';
-  strfcpy (path, val, sizeof (path));
-  mutt_expand_path (path, sizeof (path));
+  strfcpy (path, val, sizeof(path));
+  mutt_expand_path (path, sizeof(path));
   str_replace ((char **) dst->data, path);
   return (1);
 }
@@ -336,14 +337,14 @@ static int user_from_string (struct option_t* dst, const char* val,
    * just silently ignore it */
   if (!dst)
     return (1);
-  if (str_len ((char*) dst->data) == 0)
-    dst->data = (unsigned long) str_dup (val);
+  if (m_strlen((char*) dst->data) == 0)
+    dst->data = (unsigned long) m_strdup(val);
   else {
     char* s = (char*) dst->data;
     str_replace (&s, val);
   }
-  if (str_len (dst->init) == 0)
-    dst->init = str_dup ((char*) dst->data);
+  if (m_strlen(dst->init) == 0)
+    dst->init = m_strdup((char*) dst->data);
   return (1);
 }
 
@@ -379,15 +380,14 @@ static int quad_from_string (struct option_t* dst, const char* val,
 static void sort_to_string (char* dst, size_t dstlen,
                             struct option_t* option) {
   const struct mapping_t *map = get_sortmap (option);
-  char* p = NULL;
+  const char *p = NULL;
 
   if (!map) {
-    snprintf (dst, sizeof (dst), "%s=unknown", option->option);
+    snprintf (dst, sizeof(dst), "%s=unknown", option->option);
     return;
   }
 
-  p = mutt_getnamebyvalue (*((short *) option->data) & SORT_MASK,
-                           map);
+  p = mutt_getnamebyvalue(*((short *)option->data) & SORT_MASK, map);
 
   snprintf (dst, dstlen, "%s=%s%s%s", option->option,
             (*((short *) option->data) & SORT_REVERSE) ?
@@ -435,7 +435,7 @@ static int rx_from_string (struct option_t* dst, const char* val,
   }
 
   if (!((rx_t*) dst->data))
-    *((rx_t**) dst->data) = mem_calloc (1, sizeof (rx_t));
+    *((rx_t**) dst->data) = p_new(rx_t, 1);
 
   p = (rx_t*) dst->data;
 
@@ -452,18 +452,18 @@ static int rx_from_string (struct option_t* dst, const char* val,
     s++;
   }
 
-  rx = mem_malloc (sizeof (regex_t));
+  rx = p_new(regex_t, 1);
 
   if ((e = REGCOMP (rx, s, flags)) != 0) {
     regerror (e, rx, errbuf, errlen);
     regfree (rx);
-    mem_free (&rx);
+    p_delete(&rx);
     return (0);
   }
 
   if (p->rx) {
     regfree (p->rx);
-    mem_free (&p->rx);
+    p_delete(&p->rx);
   }
 
   str_replace (&p->pattern, val);
@@ -516,7 +516,7 @@ static void addr_to_string (char* dst, size_t dstlen,
                             struct option_t* option) {
   char s[HUGE_STRING];
   s[0] = '\0';
-  rfc822_write_address (s, sizeof (s), *((ADDRESS**) option->data), 0);
+  rfc822_write_address (s, sizeof(s), *((ADDRESS**) option->data), 0);
   snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (s));
 }
 
@@ -540,7 +540,7 @@ int mutt_option_value (const char* val, char* dst, size_t dstlen) {
     *dst = '\0';
     return (0);
   }
-  tmp = mem_malloc (dstlen+1);
+  tmp = p_new(char, dstlen+1);
   FuncTable[DTYPE (option->type)].opt_to_string (tmp, dstlen, option);
 
   /* as we get things of type $var=value and don't want to bloat the
@@ -548,7 +548,7 @@ int mutt_option_value (const char* val, char* dst, size_t dstlen) {
   debug_print (1, ("orig == '%s'\n", tmp));
   t = strchr (tmp, '=');
   t++;
-  l = str_len (t);
+  l = m_strlen(t);
   if (l >= 2) {
     if (t[l-1] == '"' && *t == '"') {
       t[l-1] = '\0';
@@ -556,7 +556,7 @@ int mutt_option_value (const char* val, char* dst, size_t dstlen) {
     }
   }
   memcpy (dst, t, l+1);
-  mem_free (&tmp);
+  p_delete(&tmp);
   debug_print (1, ("stripped == '%s'\n", dst));
 
   return (1);
@@ -564,8 +564,8 @@ int mutt_option_value (const char* val, char* dst, size_t dstlen) {
 
 /* for synonym warning reports: adds synonym to end of list */
 static void syn_add (struct option_t* n, struct option_t* o) {
-  syn_t* tmp = mem_malloc (sizeof (syn_t));
-  tmp->f = str_dup (CurRCFile);
+  syn_t* tmp = p_new(syn_t, 1);
+  tmp->f = m_strdup(CurRCFile);
   tmp->l = CurRCLine;
   tmp->n = n;
   tmp->o = o;
@@ -574,8 +574,8 @@ static void syn_add (struct option_t* n, struct option_t* o) {
 
 /* for synonym warning reports: free single item (for list_del()) */
 static void syn_del (void** p) {
-  mem_free(&(*(syn_t**) p)->f);
-  mem_free(p);
+  p_delete(&(*(syn_t**) p)->f);
+  p_delete(p);
 }
 
 void toggle_quadoption (int opt)
@@ -641,8 +641,8 @@ static void add_to_list (LIST ** list, const char *str)
   }
 
   if (!*list || last) {
-    t = (LIST *) mem_calloc (1, sizeof (LIST));
-    t->data = str_dup (str);
+    t = p_new(LIST, 1);
+    t->data = m_strdup(str);
     if (last) {
       last->next = t;
       last = last->next;
@@ -700,7 +700,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;
-      mem_free(t->template);
+      p_delete(&t->template);
       break;
     }
     if (!last->next)
@@ -720,7 +720,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 = str_dup (templ);
+  t->template = m_strdup(templ);
 
   /* Find highest match number in template string */
   t->nmatch = 0;
@@ -752,8 +752,8 @@ static int remove_from_spam_list (SPAM_LIST ** list, const char *pat)
   if (spam->rx && !str_cmp (spam->rx->pattern, pat)) {
     *list = spam->next;
     rx_free (&spam->rx);
-    mem_free(&spam->template);
-    mem_free(&spam);
+    p_delete(&spam->template);
+    p_delete(&spam);
     return 1;
   }
 
@@ -762,8 +762,8 @@ static int remove_from_spam_list (SPAM_LIST ** list, const char *pat)
     if (!str_cmp (spam->rx->pattern, pat)) {
       prev->next = spam->next;
       rx_free (&spam->rx);
-      mem_free(spam->template);
-      mem_free(spam);
+      p_delete(&spam->template);
+      p_delete(&spam);
       spam = prev->next;
       ++nremoved;
     }
@@ -786,12 +786,12 @@ static void remove_from_list (LIST ** l, const char *str)
     last = NULL;
     while (p) {
       if (ascii_strcasecmp (str, p->data) == 0) {
-        mem_free (&p->data);
+        p_delete(&p->data);
         if (last)
           last->next = p->next;
         else
           (*l) = p->next;
-        mem_free (&p);
+        p_delete(&p);
       }
       else {
         last = p;
@@ -827,7 +827,7 @@ static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
   BUFFER token;
   struct option_t* option = NULL;
 
-  memset (&token, 0, sizeof (token));
+  memset (&token, 0, sizeof(token));
   mutt_extract_token (tmp, s, 0);
 
   /* is the item defined as a variable or a function? */
@@ -841,8 +841,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, str_len (tmp->data))
-            && (str_len (b[j].name) == str_len (tmp->data))) {
+        if (!ascii_strncasecmp (tmp->data, b[j].name, m_strlen(tmp->data))
+            && (m_strlen(b[j].name) == m_strlen(tmp->data))) {
           res = 1;
           break;
         }
@@ -850,10 +850,10 @@ static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
   }
   /* check for feature_* */
   if (!res && ascii_strncasecmp (tmp->data, "feature_", 8) == 0 &&
-      (j = str_len (tmp->data)) > 8) {
+      (j = m_strlen(tmp->data)) > 8) {
     i = 0;
     while (Features[i]) {
-      if (str_len (Features[i]) == j-8 &&
+      if (m_strlen(Features[i]) == j-8 &&
           ascii_strncasecmp (Features[i], tmp->data+8, j-8) == 0) {
         res = 1;
         break;
@@ -875,10 +875,10 @@ static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
   if (data == res) {
     if (mutt_parse_rc_line (tmp->data, &token, err) == -1) {
       mutt_error ("Error: %s", err->data);
-      mem_free (&token.data);
+      p_delete(&token.data);
       return (-1);
     }
-    mem_free (&token.data);
+    p_delete(&token.data);
   }
   return 0;
 }
@@ -974,7 +974,7 @@ static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data,
 {
   BUFFER templ;
 
-  memset (&templ, 0, sizeof (templ));
+  memset (&templ, 0, sizeof(templ));
 
   /* Insist on at least one parameter */
   if (!MoreArgs (s)) {
@@ -996,10 +996,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) {
-        mem_free (&templ.data);
+        p_delete(&templ.data);
         return -1;
       }
-      mem_free (&templ.data);
+      p_delete(&templ.data);
     }
 
     /* If not, try to remove from the nospam list. */
@@ -1090,8 +1090,8 @@ static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
 
   /* Find the last item in the list that data points to. */
   lastp = NULL;
-  debug_print (5, ("parse_attach_list: ldata = %08x, *ldata = %08x\n",
-                   (unsigned int)ldata, (unsigned int)*ldata));
+  debug_print (5, ("parse_attach_list: ldata = %p, *ldata = %p\n",
+                   ldata, *ldata));
   for (listp = *ldata; listp; listp = listp->next) {
     a = (ATTACH_MATCH *)listp->data;
     debug_print (5, ("parse_attach_list: skipping %s/%s\n", a->major, a->minor));
@@ -1103,17 +1103,17 @@ static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
 
     if (!buf->data || *buf->data == '\0')
       continue;
-    
-    a = mem_malloc(sizeof(ATTACH_MATCH));
-    
+
+    a = p_new(ATTACH_MATCH, 1);
+
     /* some cheap hacks that I expect to remove */
     if (!str_casecmp(buf->data, "any"))
-      a->major = str_dup("*/.*");
+      a->major = m_strdup("*/.*");
     else if (!str_casecmp(buf->data, "none"))
-      a->major = str_dup("cheap_hack/this_should_never_match");
+      a->major = m_strdup("cheap_hack/this_should_never_match");
     else
-      a->major = str_dup(buf->data);
-    
+      a->major = m_strdup(buf->data);
+
     if ((p = strchr(a->major, '/'))) {
       *p = '\0';
       ++p;
@@ -1122,22 +1122,22 @@ static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
       a->minor = "unknown";
     }
 
-    len = str_len (a->minor);
-    tmpminor = mem_malloc(len+3);
+    len = m_strlen(a->minor);
+    tmpminor = p_new(char, len + 3);
     strcpy(&tmpminor[1], a->minor); /* __STRCPY_CHECKED__ */
     tmpminor[0] = '^';
     tmpminor[len+1] = '$';
     tmpminor[len+2] = '\0';
-    
+
     a->major_int = mutt_check_mime_type(a->major);
     regcomp(&a->minor_rx, tmpminor, REG_ICASE|REG_EXTENDED);
-    
-    mem_free (&tmpminor);
+
+    p_delete(&tmpminor);
 
     debug_print (5, ("parse_attach_list: added %s/%s [%d]\n",
                      a->major, a->minor, a->major_int));
 
-    listp = mem_malloc(sizeof(LIST));
+    listp = p_new(LIST, 1);
     listp->data = (char *)a;
     listp->next = NULL;
     if (lastp) {
@@ -1162,14 +1162,14 @@ static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *er
 
   do {
     mutt_extract_token (buf, s, 0);
-    
+
     if (!str_casecmp(buf->data, "any"))
-      tmp = str_dup("*/.*");
+      tmp = m_strdup("*/.*");
     else if (!str_casecmp(buf->data, "none"))
-      tmp = str_dup("cheap_hack/this_should_never_match");
+      tmp = m_strdup("cheap_hack/this_should_never_match");
     else
-      tmp = str_dup(buf->data);
-    
+      tmp = m_strdup(buf->data);
+
     if ((minor = strchr(tmp, '/'))) {
       *minor = '\0';
       ++minor;
@@ -1177,7 +1177,7 @@ static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *er
       minor = "unknown";
     }
     major = mutt_check_mime_type(tmp);
-    
+
     /* We must do our own walk here because remove_from_list() will only
      * remove the LIST->data, not anything pointed to by the LIST->data. */
     lastp = NULL;
@@ -1189,28 +1189,28 @@ static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *er
         debug_print(5, ("parse_unattach_list: removed %s/%s [%d]\n",
                         a->major, a->minor, a->major_int));
         regfree(&a->minor_rx);
-        mem_free(&a->major);
-        
+        p_delete(&a->major);
+
         /* Relink backward */
         if (lastp)
           lastp->next = lp->next;
         else
           *ldata = lp->next;
-        
+
         newlp = lp->next;
-        mem_free(&lp->data); /* same as a */
-        mem_free(&lp);
+        p_delete(&lp->data); /* same as a */
+        p_delete(&lp);
         lp = newlp;
         continue;
       }
-        
+
       lastp = lp;
       lp = lp->next;
     }
   }
   while (MoreArgs (s));
-  
-  mem_free (&tmp);
+
+  p_delete(&tmp);
   _attachments_clean();
   return 0;
 }
@@ -1222,23 +1222,23 @@ static int print_attach_list (LIST *lp, char op, const char *name) {
            ((ATTACH_MATCH *)lp->data)->minor);
     lp = lp->next;
   }
-  
+
   return 0;
 }
 
 static int parse_attachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) {
   char op, *category;
   LIST **listp;
-  
+
   mutt_extract_token(buf, s, 0);
   if (!buf->data || *buf->data == '\0') {
     strfcpy(err->data, _("attachments: no disposition"), err->dsize);
     return -1;
   }
- 
+
   category = buf->data;
   op = *category++;
-  
+
   if (op == '?') {
     mutt_endwin (NULL);
     fflush (stdout);
@@ -1272,20 +1272,20 @@ static int parse_attachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER
     strfcpy(err->data, _("attachments: invalid disposition"), err->dsize);
     return -1;
   }
-  
+
   return parse_attach_list(buf, s, listp, err);
 }
 
 static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) {
   char op, *p;
   LIST **listp;
-  
+
   mutt_extract_token(buf, s, 0);
   if (!buf->data || *buf->data == '\0') {
     strfcpy(err->data, _("unattachments: no disposition"), err->dsize);
     return -1;
   }
-  
+
   p = buf->data;
   op = *p++;
   if (op != '+' && op != '-') {
@@ -1308,7 +1308,7 @@ static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFF
     strfcpy(err->data, _("unattachments: invalid disposition"), err->dsize);
     return -1;
   }
-  
+
   return parse_unattach_list(buf, s, listp, err);
 }
 
@@ -1430,9 +1430,9 @@ static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data,
 
   if (!tmp) {
     /* create a new alias */
-    tmp = (ALIAS *) mem_calloc (1, sizeof (ALIAS));
+    tmp = p_new(ALIAS, 1);
     tmp->self = tmp;
-    tmp->name = str_dup (buf->data);
+    tmp->name = m_strdup(buf->data);
     /* give the main addressbook code a chance */
     if (CurrentMenu == MENU_ALIAS)
       set_option (OPTMENUCALLER);
@@ -1489,7 +1489,7 @@ parse_unmy_hdr (BUFFER * buf, BUFFER * s, unsigned long data, BUFFER * err)
       tmp = UserHeader;
       last = NULL;
 
-      l = str_len (buf->data);
+      l = m_strlen(buf->data);
       if (buf->data[l - 1] == ':')
         l--;
 
@@ -1535,9 +1535,9 @@ 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 */
-        mem_free (&tmp->data);
+        p_delete(&tmp->data);
         tmp->data = buf->data;
-        memset (buf, 0, sizeof (BUFFER));
+        memset (buf, 0, sizeof(BUFFER));
         return 0;
       }
       if (!tmp->next)
@@ -1551,7 +1551,7 @@ static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data,
     UserHeader = tmp;
   }
   tmp->data = buf->data;
-  memset (buf, 0, sizeof (BUFFER));
+  memset (buf, 0, sizeof(BUFFER));
   return 0;
 }
 
@@ -1581,32 +1581,34 @@ parse_sort (struct option_t* dst, const char *s, const struct mapping_t *map,
 }
 
 /* if additional data more == 1, we want to resolve synonyms */
-static void mutt_set_default (const char* name, void* p, unsigned long more) {
-  char buf[LONG_STRING];
-  struct option_t* ptr = (struct option_t*) p;
+static void mutt_set_default(const char *name, void* p, unsigned long more)
+{
+    char buf[LONG_STRING];
+    struct option_t *ptr = p;
 
-  if (DTYPE (ptr->type) == DT_SYN) {
-    if (!more)
-      return;
-    ptr = hash_find (ConfigOptions, (char*) ptr->data);
-  }
-  if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_from_string)
-    return;
-  mutt_option_value (ptr->option, buf, sizeof (buf));
-  if (str_len (ptr->init) == 0 && buf && *buf)
-    ptr->init = str_dup (buf);
+    if (DTYPE(ptr->type) == DT_SYN) {
+        if (!more)
+            return;
+        ptr = hash_find(ConfigOptions, (const char *)ptr->data);
+    }
+    if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_from_string)
+        return;
+
+    mutt_option_value(ptr->option, buf, sizeof(buf));
+    if (m_strlen(ptr->init) == 0 && buf && *buf)
+        ptr->init = m_strdup(buf);
 }
 
 static struct option_t* add_option (const char* name, const char* init,
                                     short type, short dodup) {
-  struct option_t* option = mem_calloc (1, sizeof (struct option_t));
+  struct option_t* option = p_new(struct option_t, 1);
 
   debug_print (1, ("adding $%s\n", name));
 
-  option->option = str_dup (name);
+  option->option = m_strdup(name);
   option->type = type;
   if (init)
-    option->init = dodup ? str_dup (init) : (char*) init;
+    option->init = dodup ? m_strdup(init) : (char*) init;
   return (option);
 }
 
@@ -1620,42 +1622,42 @@ static void del_option (void* p) {
   struct option_t* ptr = (struct option_t*) p;
   char* s = (char*) ptr->data;
   debug_print (1, ("removing option '%s' from table\n", NONULL (ptr->option)));
-  mem_free (&ptr->option);
-  mem_free (&s);
-  mem_free (&ptr->init);
-  mem_free (&ptr);
+  p_delete(&ptr->option);
+  p_delete(&s);
+  p_delete(&ptr->init);
+  p_delete(&ptr);
 }
 
 static int init_expand (char** dst, struct option_t* src) {
   BUFFER token, in;
   size_t len = 0;
 
-  mem_free (dst);
+  p_delete(dst);
 
   if (DTYPE(src->type) == DT_STR ||
       DTYPE(src->type) == DT_PATH) {
     /* only expand for string as it's the only place where
      * we want to expand vars right now */
     if (src->init && *src->init) {
-      memset (&token, 0, sizeof (BUFFER));
-      memset (&in, 0, sizeof (BUFFER));
-      len = str_len (src->init) + 2;
-      in.data = mem_malloc (len+1);
+      memset (&token, 0, sizeof(BUFFER));
+      memset (&in, 0, sizeof(BUFFER));
+      len = m_strlen(src->init) + 2;
+      in.data = p_new(char, len + 1);
       snprintf (in.data, len, "\"%s\"", src->init);
       in.dptr = in.data;
       in.dsize = len;
       mutt_extract_token (&token, &in, 0);
       if (token.data && *token.data)
-        *dst = str_dup (token.data);
+        *dst = m_strdup(token.data);
       else
-        *dst = str_dup ("");
-      mem_free (&in.data);
-      mem_free (&token.data);
+        *dst = m_strdup("");
+      p_delete(&in.data);
+      p_delete(&token.data);
     } else
-      *dst = str_dup ("");
+      *dst = m_strdup("");
   } else
     /* for non-string: take value as is */
-    *dst = str_dup (src->init);
+    *dst = m_strdup(src->init);
   return (1);
 }
 
@@ -1676,7 +1678,7 @@ static void mutt_restore_default (const char* name, void* p,
   if (FuncTable[DTYPE (ptr->type)].opt_from_string) {
     init_expand (&init, ptr);
     if (!FuncTable[DTYPE (ptr->type)].opt_from_string (ptr, init, errbuf,
-                                                       sizeof (errbuf))) {
+                                                       sizeof(errbuf))) {
       if (!option (OPTNOCURSES))
         mutt_endwin (NULL);
       fprintf (stderr, _("Invalid default setting for $%s found: \"%s\".\n"
@@ -1684,7 +1686,7 @@ static void mutt_restore_default (const char* name, void* p,
                ptr->option, NONULL (init), errbuf);
       exit (1);
     }
-    mem_free (&init);
+    p_delete(&init);
   }
 
   if (ptr->flags & R_INDEX)
@@ -1738,7 +1740,7 @@ static int check_dsn_notify (const char* option, unsigned long p,
       rc = 0;
       break;
     }
-  list_del (&list, (list_del_t*) _mem_free);
+  list_del (&list, (list_del_t*)xmemfree);
   return (rc);
 }
 
@@ -1853,7 +1855,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
     mutt_extract_token (tmp, s, M_TOKEN_EQUAL);
 
     /* resolve synonyms */
-    if ((option = hash_find (ConfigOptions, tmp->data)) != NULL && 
+    if ((option = hash_find (ConfigOptions, tmp->data)) != NULL &&
         DTYPE (option->type == DT_SYN)) {
       struct option_t* newopt = hash_find (ConfigOptions, (char*) option->data);
       syn_add (newopt, option);
@@ -1975,7 +1977,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
             hash_delete (ConfigOptions, option->option,
                          option, del_option);
           else
-            mem_free ((void *) option->data);
+            p_delete((void **)&option->data);
           break;
         }
       }
@@ -2080,11 +2082,11 @@ static int source_rc (const char *rcfile, BUFFER * err)
     return (-1);
   }
 
-  memset (&token, 0, sizeof (token));
+  memset (&token, 0, sizeof(token));
   while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line)) != NULL) {
     conv = ConfigCharset && (*ConfigCharset) && Charset;
     if (conv) {
-      currentline = str_dup (linebuf);
+      currentline = m_strdup(linebuf);
       if (!currentline)
         continue;
       mutt_convert_string (&currentline, ConfigCharset, Charset, 0);
@@ -2099,7 +2101,7 @@ static int source_rc (const char *rcfile, BUFFER * err)
       mutt_error (_("Error in %s, line %d: %s"), rcfile, line, err->data);
       if (--rc < -MAXERRS) {
         if (conv)
-          mem_free (&currentline);
+          p_delete(&currentline);
         break;
       }
     }
@@ -2108,10 +2110,10 @@ static int source_rc (const char *rcfile, BUFFER * err)
         rc = -1;
     }
     if (conv)
-      mem_free (&currentline);
+      p_delete(&currentline);
   }
-  mem_free (&token.data);
-  mem_free (&linebuf);
+  p_delete(&token.data);
+  p_delete(&linebuf);
   fclose (f);
   if (pid != -1)
     mutt_wait_filter (pid);
@@ -2140,8 +2142,8 @@ static int parse_source (BUFFER * tmp, BUFFER * s, unsigned long data,
       return (-1);
     }
 
-    strfcpy (path, tmp->data, sizeof (path));
-    mutt_expand_path (path, sizeof (path));
+    strfcpy (path, tmp->data, sizeof(path));
+    mutt_expand_path (path, sizeof(path));
 
     rc += source_rc (path, err);
   }
@@ -2165,9 +2167,9 @@ int mutt_parse_rc_line ( /* const */ char *line, BUFFER * token, BUFFER * err)
   int i, r = -1;
   BUFFER expn;
 
-  memset (&expn, 0, sizeof (expn));
+  memset (&expn, 0, sizeof(expn));
   expn.data = expn.dptr = line;
-  expn.dsize = str_len (line);
+  expn.dsize = m_strlen(line);
 
   *err->data = 0;
 
@@ -2198,20 +2200,20 @@ int mutt_parse_rc_line ( /* const */ char *line, BUFFER * token, BUFFER * err)
   r = 0;
 finish:
   if (expn.destroy)
-    mem_free (&expn.data);
+    p_delete(&expn.data);
   return (r);
 }
 
 
-#define NUMVARS (sizeof (MuttVars)/sizeof (MuttVars[0]))
-#define NUMCOMMANDS (sizeof (Commands)/sizeof (Commands[0]))
-/* initial string that starts completion. No telling how much crap 
+#define NUMVARS (sizeof(MuttVars)/sizeof(MuttVars[0]))
+#define NUMCOMMANDS (sizeof(Commands)/sizeof(Commands[0]))
+/* initial string that starts completion. No telling how much crap
  * the user has typed so far. Allocate LONG_STRING just to be sure! */
 char User_typed[LONG_STRING] = { 0 };
 
 int Num_matched = 0;            /* Number of matches for completion */
 char Completed[STRING] = { 0 }; /* completed string (command or variable) */
-char *Matches[MAX (NUMVARS, NUMCOMMANDS) + 1];  /* all the matches + User_typed */
+const char *Matches[MAX (NUMVARS, NUMCOMMANDS) + 1];  /* all the matches + User_typed */
 
 /* helper function for completion.  Changes the dest buffer if
    necessary/possible to aid completion.
@@ -2252,12 +2254,12 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
     /* first TAB. Collect all the matches */
     if (numtabs == 1) {
       Num_matched = 0;
-      strfcpy (User_typed, pt, sizeof (User_typed));
-      memset (Matches, 0, sizeof (Matches));
-      memset (Completed, 0, sizeof (Completed));
+      strfcpy (User_typed, pt, sizeof(User_typed));
+      memset (Matches, 0, sizeof(Matches));
+      memset (Completed, 0, sizeof(Completed));
       for (num = 0; Commands[num].name; num++)
         candidate (Completed, User_typed, Commands[num].name,
-                   sizeof (Completed));
+                   sizeof(Completed));
       Matches[Num_matched++] = User_typed;
 
       /* All matches are stored. Longest non-ambiguous string is ""
@@ -2272,10 +2274,10 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
     /* Num_matched will _always_ be atleast 1 since the initial
      * user-typed string is always stored */
     if (numtabs == 1 && Num_matched == 2)
-      snprintf (Completed, sizeof (Completed), "%s", Matches[0]);
+      snprintf (Completed, sizeof(Completed), "%s", Matches[0]);
     else if (numtabs > 1 && Num_matched > 2)
       /* cycle thru all the matches */
-      snprintf (Completed, sizeof (Completed), "%s",
+      snprintf (Completed, sizeof(Completed), "%s",
                 Matches[(numtabs - 2) % Num_matched]);
 
     /* return the completed command */
@@ -2291,8 +2293,8 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
     /* loop through all the possible prefixes (no, inv, ...) */
     if (!str_ncmp (buffer, "set", 3)) {
       for (num = 0; prefixes[num]; num++) {
-        if (!str_ncmp (pt, prefixes[num], str_len (prefixes[num]))) {
-          pt += str_len (prefixes[num]);
+        if (!str_ncmp (pt, prefixes[num], m_strlen(prefixes[num]))) {
+          pt += m_strlen(prefixes[num]);
           break;
         }
       }
@@ -2301,12 +2303,12 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
     /* first TAB. Collect all the matches */
     if (numtabs == 1) {
       Num_matched = 0;
-      strfcpy (User_typed, pt, sizeof (User_typed));
-      memset (Matches, 0, sizeof (Matches));
-      memset (Completed, 0, sizeof (Completed));
+      strfcpy (User_typed, pt, sizeof(User_typed));
+      memset (Matches, 0, sizeof(Matches));
+      memset (Completed, 0, sizeof(Completed));
       for (num = 0; MuttVars[num].option; num++)
         candidate (Completed, User_typed, MuttVars[num].option,
-                   sizeof (Completed));
+                   sizeof(Completed));
       Matches[Num_matched++] = User_typed;
 
       /* All matches are stored. Longest non-ambiguous string is ""
@@ -2321,10 +2323,10 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
     /* Num_matched will _always_ be atleast 1 since the initial
      * user-typed string is always stored */
     if (numtabs == 1 && Num_matched == 2)
-      snprintf (Completed, sizeof (Completed), "%s", Matches[0]);
+      snprintf (Completed, sizeof(Completed), "%s", Matches[0]);
     else if (numtabs > 1 && Num_matched > 2)
       /* cycle thru all the matches */
-      snprintf (Completed, sizeof (Completed), "%s",
+      snprintf (Completed, sizeof(Completed), "%s",
                 Matches[(numtabs - 2) % Num_matched]);
 
     strncpy (pt, Completed, buffer + len - pt - spaces);
@@ -2339,17 +2341,17 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
     /* first TAB. Collect all the matches */
     if (numtabs == 1) {
       Num_matched = 0;
-      strfcpy (User_typed, pt, sizeof (User_typed));
-      memset (Matches, 0, sizeof (Matches));
-      memset (Completed, 0, sizeof (Completed));
+      strfcpy (User_typed, pt, sizeof(User_typed));
+      memset (Matches, 0, sizeof(Matches));
+      memset (Completed, 0, sizeof(Completed));
       for (num = 0; menu[num].name; num++)
-        candidate (Completed, User_typed, menu[num].name, sizeof (Completed));
+        candidate (Completed, User_typed, menu[num].name, sizeof(Completed));
       /* try the generic menu */
       if (Completed[0] == 0 && CurrentMenu != MENU_PAGER) {
         menu = OpGeneric;
         for (num = 0; menu[num].name; num++)
           candidate (Completed, User_typed, menu[num].name,
-                     sizeof (Completed));
+                     sizeof(Completed));
       }
       Matches[Num_matched++] = User_typed;
 
@@ -2365,10 +2367,10 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
     /* Num_matched will _always_ be atleast 1 since the initial
      * user-typed string is always stored */
     if (numtabs == 1 && Num_matched == 2)
-      snprintf (Completed, sizeof (Completed), "%s", Matches[0]);
+      snprintf (Completed, sizeof(Completed), "%s", Matches[0]);
     else if (numtabs > 1 && Num_matched > 2)
       /* cycle thru all the matches */
-      snprintf (Completed, sizeof (Completed), "%s",
+      snprintf (Completed, sizeof(Completed), "%s",
                 Matches[(numtabs - 2) % Num_matched]);
 
     strncpy (pt, Completed, buffer + len - pt - spaces);
@@ -2399,9 +2401,9 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
     return 0;
 
   if (str_ncmp (buffer, "set", 3) == 0) {
-    strfcpy (var, pt, sizeof (var));
+    strfcpy (var, pt, sizeof(var));
     /* ignore the trailing '=' when comparing */
-    var[str_len (var) - 1] = 0;
+    var[m_strlen(var) - 1] = 0;
     if (!(option = hash_find (ConfigOptions, var)))
       return 0;                 /* no such variable. */
     else {
@@ -2415,21 +2417,21 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
       if ((DTYPE (option->type) == DT_STR) ||
           (DTYPE (option->type) == DT_PATH) ||
           (DTYPE (option->type) == DT_RX)) {
-        strfcpy (tmp, NONULL (*((char **) option->data)), sizeof (tmp));
+        strfcpy (tmp, NONULL (*((char **) option->data)), sizeof(tmp));
         if (DTYPE (option->type) == DT_PATH)
           mutt_pretty_mailbox (tmp);
       }
       else if (DTYPE (option->type) == DT_ADDR) {
-        rfc822_write_address (tmp, sizeof (tmp),
+        rfc822_write_address (tmp, sizeof(tmp),
                               *((ADDRESS **) option->data), 0);
       }
       else if (DTYPE (option->type) == DT_QUAD)
-        strfcpy (tmp, vals[quadoption (option->data)], sizeof (tmp));
+        strfcpy (tmp, vals[quadoption (option->data)], sizeof(tmp));
       else if (DTYPE (option->type) == DT_NUM)
-        snprintf (tmp, sizeof (tmp), "%d", (*((short *) option->data)));
+        snprintf (tmp, sizeof(tmp), "%d", (*((short *) option->data)));
       else if (DTYPE (option->type) == DT_SORT) {
         const struct mapping_t *map;
-        char *p;
+        const char *p;
 
         switch (option->type & DT_SUBTYPE_MASK) {
         case DT_SORT_ALIAS:
@@ -2448,15 +2450,11 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
           map = SortMethods;
           break;
         }
-        p =
-          mutt_getnamebyvalue (*((short *) option->data) & SORT_MASK,
-                               map);
-        snprintf (tmp, sizeof (tmp), "%s%s%s",
-                  (*((short *) option->data) & SORT_REVERSE) ?
-                  "reverse-" : "",
-                  (*((short *) option->data) & SORT_LAST) ? "last-" :
-                  "", p);
-      } 
+        p = mutt_getnamebyvalue(*((short *) option->data) & SORT_MASK, map);
+        snprintf(tmp, sizeof(tmp), "%s%s%s",
+                 (*((short *)option->data) & SORT_REVERSE) ? "reverse-" : "",
+                 (*((short *)option->data) & SORT_LAST) ? "last-" : "", p);
+      }
       else if (DTYPE (option->type) == DT_MAGIC) {
         const char *p;
         switch (DefaultMagic) {
@@ -2475,22 +2473,22 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
           default:
             p = "unknown";
         }
-        strfcpy (tmp, p, sizeof (tmp));
+        strfcpy (tmp, p, sizeof(tmp));
       }
       else if (DTYPE (option->type) == DT_BOOL)
         strfcpy (tmp, option (option->data) ? "yes" : "no",
-                 sizeof (tmp));
+                 sizeof(tmp));
       else
         return 0;
 
-      for (s = tmp, d = tmp2; *s && (d - tmp2) < sizeof (tmp2) - 2;) {
+      for (s = tmp, d = tmp2; *s && (d - tmp2) < sizeof(tmp2) - 2;) {
         if (*s == '\\' || *s == '"')
           *d++ = '\\';
         *d++ = *s++;
       }
       *d = '\0';
 
-      strfcpy (tmp, pt, sizeof (tmp));
+      strfcpy (tmp, pt, sizeof(tmp));
       snprintf (pt, dlen, "%s\"%s\"", tmp, tmp2);
 
       return 1;
@@ -2509,23 +2507,23 @@ int mutt_query_variables (LIST * queries)
 
   BUFFER err, token;
 
-  memset (&err, 0, sizeof (err));
-  memset (&token, 0, sizeof (token));
+  memset (&err, 0, sizeof(err));
+  memset (&token, 0, sizeof(token));
 
   err.data = errbuff;
-  err.dsize = sizeof (errbuff);
+  err.dsize = sizeof(errbuff);
 
   for (p = queries; p; p = p->next) {
-    snprintf (command, sizeof (command), "set ?%s\n", p->data);
+    snprintf (command, sizeof(command), "set ?%s\n", p->data);
     if (mutt_parse_rc_line (command, &token, &err) == -1) {
       fprintf (stderr, "%s\n", err.data);
-      mem_free (&token.data);
+      p_delete(&token.data);
       return 1;
     }
     printf ("%s\n", err.data);
   }
 
-  mem_free (&token.data);
+  p_delete(&token.data);
   return 0;
 }
 
@@ -2554,18 +2552,18 @@ static int mutt_execute_commands (LIST * p)
   BUFFER err, token;
   char errstr[SHORT_STRING];
 
-  memset (&err, 0, sizeof (err));
+  memset (&err, 0, sizeof(err));
   err.data = errstr;
-  err.dsize = sizeof (errstr);
-  memset (&token, 0, sizeof (token));
+  err.dsize = sizeof(errstr);
+  memset (&token, 0, sizeof(token));
   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);
-      mem_free (&token.data);
+      p_delete(&token.data);
       return (-1);
     }
   }
-  mem_free (&token.data);
+  p_delete(&token.data);
   return 0;
 }
 
@@ -2578,13 +2576,13 @@ void mutt_init (int skip_sys_rc, LIST * commands)
   int i, default_rc = 0, need_pause = 0;
   BUFFER err;
 
-  memset (&err, 0, sizeof (err));
+  memset (&err, 0, sizeof(err));
   err.data = error;
-  err.dsize = sizeof (error);
+  err.dsize = sizeof(error);
 
-  /* use 3*sizeof(muttvars) instead of 2*sizeof() 
+  /* use 3*sizeof(muttvars) instead of 2*sizeof()
    * to have some room for $user_ vars */
-  ConfigOptions = hash_create (sizeof (MuttVars) * 3);
+  ConfigOptions = hash_create (sizeof(MuttVars) * 3);
   for (i = 0; MuttVars[i].option; i++) {
     if (DTYPE (MuttVars[i].type) != DT_SYS)
       hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i], 0);
@@ -2594,27 +2592,27 @@ void mutt_init (int skip_sys_rc, LIST * commands)
                                DT_SYS, 0), 0);
   }
 
-  /* 
+  /*
    * XXX - use something even more difficult to predict?
    */
-  snprintf (AttachmentMarker, sizeof (AttachmentMarker),
+  snprintf (AttachmentMarker, sizeof(AttachmentMarker),
             "\033]9;%ld\a", (long) time (NULL));
 
   /* 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 = str_dup (p);
+    Homedir = m_strdup(p);
 
   /* Get some information about the user */
   if ((pw = getpwuid (getuid ()))) {
     char rnbuf[STRING];
 
-    Username = str_dup (pw->pw_name);
+    Username = m_strdup(pw->pw_name);
     if (!Homedir)
-      Homedir = str_dup (pw->pw_dir);
+      Homedir = m_strdup(pw->pw_dir);
 
-    Realname = str_dup (mutt_gecos_name (rnbuf, sizeof (rnbuf), pw));
-    Shell = str_dup (pw->pw_shell);
+    Realname = m_strdup(mutt_gecos_name (rnbuf, sizeof(rnbuf), pw));
+    Shell = m_strdup(pw->pw_shell);
     endpwent ();
   }
   else {
@@ -2624,13 +2622,13 @@ void mutt_init (int skip_sys_rc, LIST * commands)
       exit (1);
     }
     if ((p = getenv ("USER")))
-      Username = str_dup (p);
+      Username = m_strdup(p);
     else {
       mutt_endwin (NULL);
       fputs (_("unable to determine username"), stderr);
       exit (1);
     }
-    Shell = str_dup ((p = getenv ("SHELL")) ? p : "/bin/sh");
+    Shell = m_strdup((p = getenv ("SHELL")) ? p : "/bin/sh");
   }
 
   debug_start(Homedir);
@@ -2641,23 +2639,23 @@ void mutt_init (int skip_sys_rc, LIST * commands)
   if ((p = strchr (utsname.nodename, '.'))) {
     Hostname = str_substrdup (utsname.nodename, p);
     p++;
-    strfcpy (buffer, p, sizeof (buffer));       /* save the domain for below */
+    strfcpy (buffer, p, sizeof(buffer));       /* save the domain for below */
   }
   else
-    Hostname = str_dup (utsname.nodename);
+    Hostname = m_strdup(utsname.nodename);
 
 #ifndef DOMAIN
 #define DOMAIN buffer
-  if (!p && getdnsdomainname (buffer, sizeof (buffer)) == -1)
-    Fqdn = str_dup ("@");
+  if (!p && getdnsdomainname (buffer, sizeof(buffer)) == -1)
+    Fqdn = m_strdup("@");
   else
 #endif /* DOMAIN */
   if (*DOMAIN != '@') {
-    Fqdn = mem_malloc (str_len (DOMAIN) + str_len (Hostname) + 2);
+    Fqdn = p_new(char, m_strlen(DOMAIN) + m_strlen(Hostname) + 2);
     sprintf (Fqdn, "%s.%s", NONULL (Hostname), DOMAIN); /* __SPRINTF_CHECKED__ */
   }
   else
-    Fqdn = str_dup (NONULL (Hostname));
+    Fqdn = m_strdup(NONULL (Hostname));
 
 #ifdef USE_NNTP
   {
@@ -2666,44 +2664,44 @@ void mutt_init (int skip_sys_rc, LIST * commands)
 
     if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r"))) {
       buffer[0] = '\0';
-      fgets (buffer, sizeof (buffer), f);
-      p = (char*)&buffer;
+      fgets (buffer, sizeof(buffer), f);
+      p = buffer;
       SKIPWS (p);
-      q = p;
+      q = (char*)p;
       while (*q && !isspace(*q))
         q++;
       *q = '\0';
-      NewsServer = str_dup (p);
+      NewsServer = m_strdup(p);
       fclose (f);
     }
   }
   if ((p = getenv ("NNTPSERVER")))
-    NewsServer = str_dup (p);
+    NewsServer = m_strdup(p);
 #endif
 
   if ((p = getenv ("MAIL")))
-    Spoolfile = str_dup (p);
+    Spoolfile = m_strdup(p);
   else if ((p = getenv ("MAILDIR")))
-    Spoolfile = str_dup (p);
+    Spoolfile = m_strdup(p);
   else {
 #ifdef HOMESPOOL
-    mutt_concat_path (buffer, NONULL (Homedir), MAILPATH, sizeof (buffer));
+    mutt_concat_path (buffer, NONULL (Homedir), MAILPATH, sizeof(buffer));
 #else
-    mutt_concat_path (buffer, MAILPATH, NONULL (Username), sizeof (buffer));
+    mutt_concat_path (buffer, MAILPATH, NONULL (Username), sizeof(buffer));
 #endif
-    Spoolfile = str_dup (buffer);
+    Spoolfile = m_strdup(buffer);
   }
 
   if ((p = getenv ("MAILCAPS")))
-    MailcapPath = str_dup (p);
+    MailcapPath = m_strdup(p);
   else {
     /* Default search path from RFC1524 */
     MailcapPath =
-      str_dup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR
+      m_strdup("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR
                    "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap");
   }
 
-  Tempdir = str_dup ((p = getenv ("TMPDIR")) ? p : "/tmp");
+  Tempdir = m_strdup((p = getenv ("TMPDIR")) ? p : "/tmp");
 
   p = getenv ("VISUAL");
   if (!p) {
@@ -2711,21 +2709,21 @@ void mutt_init (int skip_sys_rc, LIST * commands)
     if (!p)
       p = "vi";
   }
-  Editor = str_dup (p);
-  Visual = str_dup (p);
+  Editor = m_strdup(p);
+  Visual = m_strdup(p);
 
   if ((p = getenv ("REPLYTO")) != NULL) {
     BUFFER buf, token;
 
-    snprintf (buffer, sizeof (buffer), "Reply-To: %s", p);
+    snprintf (buffer, sizeof(buffer), "Reply-To: %s", p);
 
-    memset (&buf, 0, sizeof (buf));
+    memset (&buf, 0, sizeof(buf));
     buf.data = buf.dptr = buffer;
-    buf.dsize = str_len (buffer);
+    buf.dsize = m_strlen(buffer);
 
-    memset (&token, 0, sizeof (token));
+    memset (&token, 0, sizeof(token));
     parse_my_hdr (&token, &buf, 0, &err);
-    mem_free (&token.data);
+    p_delete(&token.data);
   }
 
   if ((p = getenv ("EMAIL")) != NULL)
@@ -2762,13 +2760,13 @@ void mutt_init (int skip_sys_rc, LIST * commands)
 
 
   /*
-   * 
+   *
    *                       BIG FAT WARNING
-   * 
+   *
    * When changing the code which looks for a configuration file,
    * please also change the corresponding code in muttbug.sh.in.
-   * 
-   * 
+   *
+   *
    */
 
 
@@ -2776,44 +2774,44 @@ void mutt_init (int skip_sys_rc, LIST * commands)
 
   if (!Muttrc) {
 #if 0
-    snprintf (buffer, sizeof (buffer), "%s/.muttngrc-%s", NONULL (Homedir),
+    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));
+      snprintf (buffer, sizeof(buffer), "%s/.muttngrc", NONULL (Homedir));
     if (access (buffer, F_OK) == -1)
 #if 0
-      snprintf (buffer, sizeof (buffer), "%s/.muttng/muttngrc-%s",
+      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",
+      snprintf (buffer, sizeof(buffer), "%s/.muttng/muttngrc",
                 NONULL (Homedir));
 
     default_rc = 1;
-    Muttrc = str_dup (buffer);
+    Muttrc = m_strdup(buffer);
   }
   else {
-    strfcpy (buffer, Muttrc, sizeof (buffer));
-    mem_free (&Muttrc);
-    mutt_expand_path (buffer, sizeof (buffer));
-    Muttrc = str_dup (buffer);
+    strfcpy (buffer, Muttrc, sizeof(buffer));
+    p_delete(&Muttrc);
+    mutt_expand_path (buffer, sizeof(buffer));
+    Muttrc = m_strdup(buffer);
   }
-  mem_free (&AliasFile);
-  AliasFile = str_dup (NONULL (Muttrc));
+  p_delete(&AliasFile);
+  AliasFile = m_strdup(NONULL (Muttrc));
 
   /* Process the global rc file if it exists and the user hasn't explicity
      requested not to via "-n".  */
   if (!skip_sys_rc) {
-    snprintf (buffer, sizeof (buffer), "%s/Muttngrc-%s", SYSCONFDIR,
+    snprintf (buffer, sizeof(buffer), "%s/Muttngrc-%s", SYSCONFDIR,
               MUTT_VERSION);
     if (access (buffer, F_OK) == -1)
-      snprintf (buffer, sizeof (buffer), "%s/Muttngrc", SYSCONFDIR);
+      snprintf (buffer, sizeof(buffer), "%s/Muttngrc", SYSCONFDIR);
     if (access (buffer, F_OK) == -1)
-      snprintf (buffer, sizeof (buffer), "%s/Muttngrc-%s", PKGDATADIR,
+      snprintf (buffer, sizeof(buffer), "%s/Muttngrc-%s", PKGDATADIR,
                 MUTT_VERSION);
     if (access (buffer, F_OK) == -1)
-      snprintf (buffer, sizeof (buffer), "%s/Muttngrc", PKGDATADIR);
+      snprintf (buffer, sizeof(buffer), "%s/Muttngrc", PKGDATADIR);
     if (access (buffer, F_OK) != -1) {
       if (source_rc (buffer, &err) != 0) {
         fputs (err.data, stderr);
@@ -2835,7 +2833,7 @@ void mutt_init (int skip_sys_rc, LIST * commands)
   }
   else if (!default_rc) {
     /* file specified by -F does not exist */
-    snprintf (buffer, sizeof (buffer), "%s: %s", Muttrc, strerror (errno));
+    snprintf (buffer, sizeof(buffer), "%s: %s", Muttrc, strerror (errno));
     mutt_endwin (buffer);
     exit (1);
   }
@@ -2910,7 +2908,7 @@ static void opt_sel_diff (const char* key, void* data,
   if (DTYPE (option->type) == DT_SYN)
     return;
 
-  mutt_option_value (option->option, buf, sizeof (buf));
+  mutt_option_value (option->option, buf, sizeof(buf));
   if (str_cmp (buf, option->init) != 0)
     list_push_back (l, option);
 }
@@ -2928,11 +2926,11 @@ int mutt_dump_variables (int full) {
 
   if (!list_empty(tmp)) {
     /* ...and dump list sorted */
-    qsort (tmp->data, tmp->length, sizeof (void*), opt_cmp);
+    qsort (tmp->data, tmp->length, sizeof(void*), opt_cmp);
     for (i = 0; i < tmp->length; i++) {
       option = (struct option_t*) tmp->data[i];
       FuncTable[DTYPE (option->type)].opt_to_string
-        (outbuf, sizeof (outbuf), option);
+        (outbuf, sizeof(outbuf), option);
       printf ("%s\n", outbuf);
     }
   }