X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=c96e35095b7b9971aee7202e21d69e60051099f8;hp=169b8b6555d20520329a85a87c96fbe50fd7cc03;hb=91d0c04349c9345f0ee29a61cc18dfc144b60edc;hpb=df9a60705a8b714c1929339fe9173cf0a06ab3ba

diff --git a/init.c b/init.c
index 169b8b6..c96e350 100644
--- a/init.c
+++ b/init.c
@@ -14,10 +14,15 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/file.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/buffer.h>
+#include <lib-lib/mapping.h>
+
 #include "mutt.h"
-#include "buffer.h"
-#include "ascii.h"
-#include "mapping.h"
 #include "mutt_curses.h"
 #include "history.h"
 #include "keymap.h"
@@ -38,9 +43,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"
@@ -206,7 +208,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 = (m_strcmp(option->option, "umask") == 0) ?
                     "%s=%04o" : "%s=%d";
   snprintf (dst, dstlen, fmt, option->option,
             *((short*) option->data));
@@ -262,7 +264,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 +273,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,
+    if (Maildirlength > 0 && m_strncmp(CurrentFolder, Maildir,
                                       Maildirlength) == 0 &&
-       str_len (CurrentFolder) > Maildirlength) {
+       m_strlen(CurrentFolder) > Maildirlength) {
      val = CurrentFolder + Maildirlength;
      if (Maildir[strlen(Maildir)-1]!='/')
        val += 1;
@@ -295,7 +297,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,12 +308,12 @@ 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));
+  m_strcpy(path, sizeof(path), val);
   mutt_expand_path (path, sizeof(path));
   str_replace ((char **) dst->data, path);
   return (1);
@@ -336,14 +338,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);
 }
 
@@ -426,7 +428,7 @@ static int rx_from_string (struct option_t* dst, const char* val,
   if (!dst)
     return (0);
 
-  if (option (OPTATTACHMSG) && !str_cmp (dst->option, "reply_regexp")) {
+  if (option (OPTATTACHMSG) && !m_strcmp(dst->option, "reply_regexp")) {
     if (errbuf)
       snprintf (errbuf, errlen,
                 "Operation not permitted when in attach-message mode.");
@@ -434,42 +436,42 @@ 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;
 
   /* something to do? */
-  if (!val || !*val || (p->pattern && str_cmp (p->pattern, val) == 0))
+  if (!val || !*val || (p->pattern && m_strcmp(p->pattern, val) == 0))
     return (1);
 
-  if (str_cmp (dst->option, "mask") != 0)
+  if (m_strcmp(dst->option, "mask") != 0)
     flags |= mutt_which_case (val);
 
   s = (char*) val;
-  if (str_cmp (dst->option, "mask") == 0 && *s == '!') {
+  if (m_strcmp(dst->option, "mask") == 0 && *s == '!') {
     not = 1;
     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);
   p->rx = rx;
   p->not = not;
 
-  if (str_cmp (dst->option, "reply_regexp") == 0)
+  if (m_strcmp(dst->option, "reply_regexp") == 0)
     mutt_adjust_all_subjects ();
 
   return (1);
@@ -539,7 +541,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
@@ -547,7 +549,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';
@@ -555,7 +557,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);
@@ -563,8 +565,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;
@@ -573,8 +575,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)
@@ -640,8 +642,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;
@@ -699,7 +701,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)
@@ -719,7 +721,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;
@@ -748,21 +750,21 @@ static int remove_from_spam_list (SPAM_LIST ** list, const char *pat)
   spam = *list;
   if (!spam)
     return 0;
-  if (spam->rx && !str_cmp (spam->rx->pattern, pat)) {
+  if (spam->rx && !m_strcmp(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;
   }
 
   prev = spam;
   for (spam = prev->next; spam;) {
-    if (!str_cmp (spam->rx->pattern, pat)) {
+    if (!m_strcmp(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;
     }
@@ -778,19 +780,19 @@ static void remove_from_list (LIST ** l, const char *str)
 {
   LIST *p, *last = NULL;
 
-  if (str_cmp ("*", str) == 0)
+  if (m_strcmp("*", 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) {
-        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;
@@ -804,7 +806,7 @@ static int remove_from_rx_list (list2_t** l, const char *str)
 {
   int i = 0;
 
-  if (str_cmp ("*", str) == 0) {
+  if (m_strcmp("*", str) == 0) {
     list_del (l, (list_del_t*) rx_free);
     return (0);
   }
@@ -826,7 +828,7 @@ static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
   BUFFER token;
   struct option_t* option = NULL;
 
-  memset (&token, 0, sizeof(token));
+  p_clear(&token, 1);
   mutt_extract_token (tmp, s, 0);
 
   /* is the item defined as a variable or a function? */
@@ -840,8 +842,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;
         }
@@ -849,10 +851,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;
@@ -874,10 +876,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;
 }
@@ -958,7 +960,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 (str_cmp (buf->data, "*") &&
+    if (m_strcmp(buf->data, "*") &&
         add_to_rx_list (&UnAlternates, buf->data, REG_ICASE, err) != 0)
       return -1;
 
@@ -973,14 +975,14 @@ static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data,
 {
   BUFFER templ;
 
-  memset (&templ, 0, sizeof(templ));
+  p_clear(&templ, 1);
 
   /* Insist on at least one parameter */
   if (!MoreArgs (s)) {
     if (data == M_SPAM)
-      strfcpy (err->data, _("spam: no matching pattern"), err->dsize);
+      m_strcpy(err->data, err->dsize, _("spam: no matching pattern"));
     else
-      strfcpy (err->data, _("nospam: no matching pattern"), err->dsize);
+      m_strcpy(err->data, err->dsize, _("nospam: no matching pattern"));
     return -1;
   }
 
@@ -995,10 +997,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. */
@@ -1014,7 +1016,7 @@ static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data,
     /* nospam only ever has one parameter. */
 
     /* "*" is a special case. */
-    if (!str_cmp (buf->data, "*")) {
+    if (!m_strcmp(buf->data, "*")) {
       mutt_free_spam_list (&SpamList);
       list_del (&NoSpamList, (list_del_t*) rx_free);
       return 0;
@@ -1032,7 +1034,7 @@ static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data,
   }
 
   /* This should not happen. */
-  strfcpy (err->data, "This is no good at all.", err->dsize);
+  m_strcpy(err->data, err->dsize, "This is no good at all.");
   return -1;
 }
 
@@ -1044,7 +1046,7 @@ static int parse_unlist (BUFFER * buf, BUFFER * s, unsigned long data,
     /*
      * Check for deletion of entire list
      */
-    if (str_cmp (buf->data, "*") == 0) {
+    if (m_strcmp(buf->data, "*") == 0) {
       mutt_free_list ((LIST **) data);
       break;
     }
@@ -1089,8 +1091,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,15 +1105,15 @@ 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("*/.*");
-    else if (!str_casecmp(buf->data, "none"))
-      a->major = str_dup("cheap_hack/this_should_never_match");
+    if (!m_strcasecmp(buf->data, "any"))
+      a->major = m_strdup("*/.*");
+    else if (!m_strcasecmp(buf->data, "none"))
+      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';
@@ -1121,8 +1123,8 @@ 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] = '$';
@@ -1131,12 +1133,12 @@ static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
     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,12 +1164,12 @@ 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("*/.*");
-    else if (!str_casecmp(buf->data, "none"))
-      tmp = str_dup("cheap_hack/this_should_never_match");
+    if (!m_strcasecmp(buf->data, "any"))
+      tmp = m_strdup("*/.*");
+    else if (!m_strcasecmp(buf->data, "none"))
+      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';
@@ -1184,11 +1186,11 @@ static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *er
       a = (ATTACH_MATCH *)lp->data;
       debug_print(5, ("parse_unattach_list: check %s/%s [%d] : %s/%s [%d]\n",
                       a->major, a->minor, a->major_int, tmp, minor, major));
-      if (a->major_int == major && !str_casecmp(minor, a->minor)) {
+      if (a->major_int == major && !m_strcasecmp(minor, a->minor)) {
         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)
@@ -1197,8 +1199,8 @@ static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *er
           *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;
       }
@@ -1209,7 +1211,7 @@ static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *er
   }
   while (MoreArgs (s));
 
-  mem_free (&tmp);
+  p_delete(&tmp);
   _attachments_clean();
   return 0;
 }
@@ -1231,7 +1233,7 @@ static int parse_attachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER
 
   mutt_extract_token(buf, s, 0);
   if (!buf->data || *buf->data == '\0') {
-    strfcpy(err->data, _("attachments: no disposition"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("attachments: no disposition"));
     return -1;
   }
 
@@ -1256,19 +1258,19 @@ static int parse_attachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER
     op = '+';
     category--;
   }
-  if (!str_ncasecmp(category, "attachment", strlen(category))) {
+  if (!m_strncasecmp(category, "attachment", strlen(category))) {
     if (op == '+')
       listp = &AttachAllow;
     else
       listp = &AttachExclude;
   }
-  else if (!str_ncasecmp(category, "inline", strlen(category))) {
+  else if (!m_strncasecmp(category, "inline", strlen(category))) {
     if (op == '+')
       listp = &InlineAllow;
     else
       listp = &InlineExclude;
   } else {
-    strfcpy(err->data, _("attachments: invalid disposition"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("attachments: invalid disposition"));
     return -1;
   }
 
@@ -1281,7 +1283,7 @@ static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFF
 
   mutt_extract_token(buf, s, 0);
   if (!buf->data || *buf->data == '\0') {
-    strfcpy(err->data, _("unattachments: no disposition"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("unattachments: no disposition"));
     return -1;
   }
 
@@ -1291,20 +1293,20 @@ static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFF
     op = '+';
     p--;
   }
-  if (!str_ncasecmp(p, "attachment", strlen(p))) {
+  if (!m_strncasecmp(p, "attachment", strlen(p))) {
     if (op == '+')
       listp = &AttachAllow;
     else
       listp = &AttachExclude;
   }
-  else if (!str_ncasecmp(p, "inline", strlen(p))) {
+  else if (!m_strncasecmp(p, "inline", strlen(p))) {
     if (op == '+')
       listp = &InlineAllow;
     else
       listp = &InlineExclude;
   }
   else {
-    strfcpy(err->data, _("unattachments: invalid disposition"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("unattachments: invalid disposition"));
     return -1;
   }
 
@@ -1319,7 +1321,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 (str_cmp (buf->data, "*") &&
+    if (m_strcmp(buf->data, "*") &&
         add_to_rx_list (&UnMailLists, buf->data, REG_ICASE, err) != 0)
       return -1;
   }
@@ -1353,7 +1355,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 (str_cmp (buf->data, "*") &&
+    if (m_strcmp(buf->data, "*") &&
         add_to_rx_list (&UnSubscribedLists, buf->data, REG_ICASE, err) != 0)
       return -1;
   }
@@ -1370,7 +1372,7 @@ static int parse_unalias (BUFFER * buf, BUFFER * s, unsigned long data,
   do {
     mutt_extract_token (buf, s, 0);
 
-    if (str_cmp ("*", buf->data) == 0) {
+    if (m_strcmp("*", buf->data) == 0) {
       if (CurrentMenu == MENU_ALIAS) {
         for (tmp = Aliases; tmp; tmp = tmp->next)
           tmp->del = 1;
@@ -1382,7 +1384,7 @@ static int parse_unalias (BUFFER * buf, BUFFER * s, unsigned long data,
     }
     else
       for (tmp = Aliases; tmp; tmp = tmp->next) {
-        if (str_casecmp (buf->data, tmp->name) == 0) {
+        if (m_strcasecmp(buf->data, tmp->name) == 0) {
           if (CurrentMenu == MENU_ALIAS) {
             tmp->del = 1;
             set_option (OPTFORCEREDRAWINDEX);
@@ -1412,7 +1414,7 @@ static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data,
   char *estr = NULL;
 
   if (!MoreArgs (s)) {
-    strfcpy (err->data, _("alias: no address"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("alias: no address"));
     return (-1);
   }
 
@@ -1422,16 +1424,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 (!str_casecmp (tmp->name, buf->data))
+    if (!m_strcasecmp(tmp->name, buf->data))
       break;
     last = tmp;
   }
 
   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);
@@ -1482,13 +1484,13 @@ parse_unmy_hdr (BUFFER * buf, BUFFER * s, unsigned long data, BUFFER * err)
 
   do {
     mutt_extract_token (buf, s, 0);
-    if (str_cmp ("*", buf->data) == 0)
+    if (m_strcmp("*", buf->data) == 0)
       mutt_free_list (&UserHeader);
     else {
       tmp = UserHeader;
       last = NULL;
 
-      l = str_len (buf->data);
+      l = m_strlen(buf->data);
       if (buf->data[l - 1] == ':')
         l--;
 
@@ -1524,7 +1526,7 @@ static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data,
 
   mutt_extract_token (buf, s, M_TOKEN_SPACE | M_TOKEN_QUOTE);
   if ((p = strpbrk (buf->data, ": \t")) == NULL || *p != ':') {
-    strfcpy (err->data, _("invalid header field"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("invalid header field"));
     return (-1);
   }
   keylen = p - buf->data + 1;
@@ -1534,9 +1536,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));
+        p_clear(buf, 1);
         return 0;
       }
       if (!tmp->next)
@@ -1550,7 +1552,7 @@ static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data,
     UserHeader = tmp;
   }
   tmp->data = buf->data;
-  memset (buf, 0, sizeof(BUFFER));
+  p_clear(buf, 1);
   return 0;
 }
 
@@ -1559,12 +1561,12 @@ parse_sort (struct option_t* dst, const char *s, const struct mapping_t *map,
             char* errbuf, size_t errlen) {
   int i, flags = 0;
 
-  if (str_ncmp ("reverse-", s, 8) == 0) {
+  if (m_strncmp("reverse-", s, 8) == 0) {
     s += 8;
     flags = SORT_REVERSE;
   }
 
-  if (str_ncmp ("last-", s, 5) == 0) {
+  if (m_strncmp("last-", s, 5) == 0) {
     s += 5;
     flags |= SORT_LAST;
   }
@@ -1594,20 +1596,20 @@ static void mutt_set_default(const char *name, void* p, unsigned long more)
         return;
 
     mutt_option_value(ptr->option, buf, sizeof(buf));
-    if (str_len(ptr->init) == 0 && buf && *buf)
-        ptr->init = str_dup(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);
 }
 
@@ -1618,45 +1620,45 @@ static struct option_t* add_user_option (const char* name) {
 
 /* free()'s option_t* */
 static void del_option (void* p) {
-  struct option_t* ptr = (struct option_t*) 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);
+      p_clear(&token, 1);
+      p_clear(&in, 1);
+      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);
 }
 
@@ -1685,7 +1687,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)
@@ -1706,8 +1708,8 @@ static void mutt_restore_default (const char* name, void* p,
 static int check_dsn_return (const char* option, unsigned long p,
                              char* errbuf, size_t errlen) {
   char* val = (char*) p;
-  if (val && *val && str_ncmp (val, "hdrs", 4) != 0 &&
-      str_ncmp (val, "full", 4) != 0) {
+  if (val && *val && m_strncmp(val, "hdrs", 4) != 0 &&
+      m_strncmp(val, "full", 4) != 0) {
     if (errbuf)
       snprintf (errbuf, errlen, _("'%s' is invalid for $%s"), val, "dsn_return");
     return (0);
@@ -1729,17 +1731,17 @@ static int check_dsn_notify (const char* option, unsigned long p,
     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) {
+    if (m_strncmp(list->data[i], "never", 5) != 0 &&
+        m_strncmp(list->data[i], "failure", 7) != 0 &&
+        m_strncmp(list->data[i], "delay", 5) != 0 &&
+        m_strncmp(list->data[i], "success", 7) != 0) {
       if (errbuf)
         snprintf (errbuf, errlen, _("'%s' is invalid for $%s"),
                   (char*) list->data[i], "dsn_notify");
       rc = 0;
       break;
     }
-  list_del (&list, (list_del_t*) _mem_free);
+  list_del (&list, (list_del_t*)xmemfree);
   return (rc);
 }
 
@@ -1779,7 +1781,7 @@ static int check_special (const char* name, unsigned long val,
   int i = 0;
 
   for (i = 0; SpecialVars[i].name; i++) {
-    if (str_cmp (SpecialVars[i].name, name) == 0) {
+    if (m_strcmp(SpecialVars[i].name, name) == 0) {
       return (SpecialVars[i].check (SpecialVars[i].name,
                                     val, errbuf, errlen));
     }
@@ -1837,11 +1839,11 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       query = 1;
       s->dptr++;
     }
-    else if (str_ncmp ("no", s->dptr, 2) == 0) {
+    else if (m_strncmp("no", s->dptr, 2) == 0) {
       s->dptr += 2;
       unset = !unset;
     }
-    else if (str_ncmp ("inv", s->dptr, 3) == 0) {
+    else if (m_strncmp("inv", s->dptr, 3) == 0) {
       s->dptr += 3;
       inv = !inv;
     }
@@ -1872,11 +1874,11 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       }
     }
 
-    if (!option && !(reset && str_cmp ("all", tmp->data) == 0)) {
+    if (!option && !(reset && m_strcmp("all", tmp->data) == 0)) {
       snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data);
       return (-1);
     }
-    SKIPWS (s->dptr);
+    s->dptr = vskipspaces(s->dptr);
 
     if (reset) {
       if (query || unset || inv) {
@@ -1889,7 +1891,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         return (-1);
       }
 
-      if (!str_cmp ("all", tmp->data)) {
+      if (!m_strcmp("all", tmp->data)) {
         if (CurrentMenu == MENU_PAGER) {
           snprintf (err->data, err->dsize, _("Not available in this menu."));
           return (-1);
@@ -1976,7 +1978,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;
         }
       }
@@ -2081,11 +2083,11 @@ static int source_rc (const char *rcfile, BUFFER * err)
     return (-1);
   }
 
-  memset (&token, 0, sizeof(token));
+  p_clear(&token, 1);
   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);
@@ -2100,7 +2102,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;
       }
     }
@@ -2109,10 +2111,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);
@@ -2141,7 +2143,7 @@ static int parse_source (BUFFER * tmp, BUFFER * s, unsigned long data,
       return (-1);
     }
 
-    strfcpy (path, tmp->data, sizeof(path));
+    m_strcpy(path, sizeof(path), tmp->data);
     mutt_expand_path (path, sizeof(path));
 
     rc += source_rc (path, err);
@@ -2166,15 +2168,15 @@ int mutt_parse_rc_line ( /* const */ char *line, BUFFER * token, BUFFER * err)
   int i, r = -1;
   BUFFER expn;
 
-  memset (&expn, 0, sizeof(expn));
+  p_clear(&expn, 1);
   expn.data = expn.dptr = line;
-  expn.dsize = str_len (line);
+  expn.dsize = m_strlen(line);
 
   *err->data = 0;
 
   debug_print (1, ("expand '%s'\n", line));
 
-  SKIPWS (expn.dptr);
+  expn.dptr = vskipspaces(expn.dptr);
   while (*expn.dptr) {
     if (*expn.dptr == '#')
       break;                    /* rest of line is a comment */
@@ -2184,7 +2186,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 (!str_cmp (token->data, Commands[i].name)) {
+      if (!m_strcmp(token->data, Commands[i].name)) {
         if (Commands[i].func (token, &expn, Commands[i].data, err) != 0)
           goto finish;
         break;
@@ -2199,7 +2201,7 @@ 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);
 }
 
@@ -2228,7 +2230,7 @@ static void candidate (char *dest, char *try, const char *src, int len)
   if (strstr (src, try) == src) {
     Matches[Num_matched++] = src;
     if (dest[0] == 0)
-      strfcpy (dest, src, len);
+      m_strcpy(dest, len, src);
     else {
       for (l = 0; src[l] && src[l] == dest[l]; l++);
       dest[l] = 0;
@@ -2242,7 +2244,7 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
   int num;
   int spaces;                   /* keep track of the number of leading spaces on the line */
 
-  SKIPWS (buffer);
+  buffer = vskipspaces(buffer);
   spaces = buffer - pt;
 
   pt = buffer + pos - spaces;
@@ -2253,9 +2255,9 @@ 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));
+      m_strcpy(User_typed, sizeof(User_typed), pt);
+      p_clear(Matches, sizeof(Matches));
+      p_clear(Completed, sizeof(Completed));
       for (num = 0; Commands[num].name; num++)
         candidate (Completed, User_typed, Commands[num].name,
                    sizeof(Completed));
@@ -2280,20 +2282,20 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
                 Matches[(numtabs - 2) % Num_matched]);
 
     /* return the completed command */
-    strncpy (buffer, Completed, len - spaces);
+    m_strcpy(buffer, len - spaces, Completed);
   }
-  else if (!str_ncmp (buffer, "set", 3)
-           || !str_ncmp (buffer, "unset", 5)
-           || !str_ncmp (buffer, "reset", 5)
-           || !str_ncmp (buffer, "toggle", 6)) {    /* complete variables */
+  else if (!m_strncmp(buffer, "set", 3)
+           || !m_strncmp(buffer, "unset", 5)
+           || !m_strncmp(buffer, "reset", 5)
+           || !m_strncmp(buffer, "toggle", 6)) {    /* complete variables */
     const char *prefixes[] = { "no", "inv", "?", "&", NULL };
 
     pt++;
     /* loop through all the possible prefixes (no, inv, ...) */
-    if (!str_ncmp (buffer, "set", 3)) {
+    if (!m_strncmp(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 (!m_strncmp(pt, prefixes[num], m_strlen(prefixes[num]))) {
+          pt += m_strlen(prefixes[num]);
           break;
         }
       }
@@ -2302,12 +2304,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));
+      m_strcpy(User_typed, sizeof(User_typed), pt);
+      p_clear(Matches, sizeof(Matches));
+      p_clear(Completed, sizeof(Completed));
       for (num = 0; MuttVars[num].option; num++)
-        candidate (Completed, User_typed, MuttVars[num].option,
-                   sizeof(Completed));
+        candidate(Completed, User_typed, MuttVars[num].option,
+                  sizeof(Completed));
       Matches[Num_matched++] = User_typed;
 
       /* All matches are stored. Longest non-ambiguous string is ""
@@ -2328,9 +2330,9 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
       snprintf (Completed, sizeof(Completed), "%s",
                 Matches[(numtabs - 2) % Num_matched]);
 
-    strncpy (pt, Completed, buffer + len - pt - spaces);
+    m_strcpy(pt, buffer + len - pt - spaces, Completed);
   }
-  else if (!str_ncmp (buffer, "exec", 4)) {
+  else if (!m_strncmp(buffer, "exec", 4)) {
     struct binding_t *menu = km_get_table (CurrentMenu);
 
     if (!menu && CurrentMenu != MENU_PAGER)
@@ -2340,9 +2342,9 @@ 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));
+      m_strcpy(User_typed, sizeof(User_typed), pt);
+      p_clear(Matches, sizeof(Matches));
+      p_clear(Completed, sizeof(Completed));
       for (num = 0; menu[num].name; num++)
         candidate (Completed, User_typed, menu[num].name, sizeof(Completed));
       /* try the generic menu */
@@ -2372,7 +2374,7 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
       snprintf (Completed, sizeof(Completed), "%s",
                 Matches[(numtabs - 2) % Num_matched]);
 
-    strncpy (pt, Completed, buffer + len - pt - spaces);
+    m_strcpy(pt, buffer + len - pt - spaces, Completed);
   }
   else
     return 0;
@@ -2389,7 +2391,7 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
   if (buffer[0] == 0)
     return 0;
 
-  SKIPWS (buffer);
+  buffer = vskipspaces(buffer);
   spaces = buffer - pt;
 
   pt = buffer + pos - spaces;
@@ -2399,10 +2401,10 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
   if (*pt == '=')               /* abort if no var before the '=' */
     return 0;
 
-  if (str_ncmp (buffer, "set", 3) == 0) {
-    strfcpy (var, pt, sizeof(var));
+  if (m_strncmp(buffer, "set", 3) == 0) {
+    m_strcpy(var, sizeof(var), pt);
     /* 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 {
@@ -2416,7 +2418,7 @@ 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));
+        m_strcpy(tmp, sizeof(tmp), NONULL(*((char **)option->data)));
         if (DTYPE (option->type) == DT_PATH)
           mutt_pretty_mailbox (tmp);
       }
@@ -2425,7 +2427,7 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
                               *((ADDRESS **) option->data), 0);
       }
       else if (DTYPE (option->type) == DT_QUAD)
-        strfcpy (tmp, vals[quadoption (option->data)], sizeof(tmp));
+        m_strcpy(tmp, sizeof(tmp), vals[quadoption(option->data)]);
       else if (DTYPE (option->type) == DT_NUM)
         snprintf (tmp, sizeof(tmp), "%d", (*((short *) option->data)));
       else if (DTYPE (option->type) == DT_SORT) {
@@ -2472,11 +2474,10 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
           default:
             p = "unknown";
         }
-        strfcpy (tmp, p, sizeof(tmp));
+        m_strcpy(tmp, sizeof(tmp), p);
       }
       else if (DTYPE (option->type) == DT_BOOL)
-        strfcpy (tmp, option (option->data) ? "yes" : "no",
-                 sizeof(tmp));
+        m_strcpy(tmp, sizeof(tmp), option(option->data) ? "yes" : "no");
       else
         return 0;
 
@@ -2487,7 +2488,7 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
       }
       *d = '\0';
 
-      strfcpy (tmp, pt, sizeof(tmp));
+      m_strcpy(tmp, sizeof(tmp), pt);
       snprintf (pt, dlen, "%s\"%s\"", tmp, tmp2);
 
       return 1;
@@ -2506,8 +2507,8 @@ int mutt_query_variables (LIST * queries)
 
   BUFFER err, token;
 
-  memset (&err, 0, sizeof(err));
-  memset (&token, 0, sizeof(token));
+  p_clear(&err, 1);
+  p_clear(&token, 1);
 
   err.data = errbuff;
   err.dsize = sizeof(errbuff);
@@ -2516,53 +2517,33 @@ 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);
-      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;
 }
 
-const char *mutt_getnamebyvalue (int val, const struct mapping_t *map)
-{
-  int i;
-
-  for (i = 0; map[i].name; i++)
-    if (map[i].value == val)
-      return (map[i].name);
-  return NULL;
-}
-
-int mutt_getvaluebyname (const char *name, const struct mapping_t *map)
-{
-  int i;
-
-  for (i = 0; map[i].name; i++)
-    if (ascii_strcasecmp (map[i].name, name) == 0)
-      return (map[i].value);
-  return (-1);
-}
-
 static int mutt_execute_commands (LIST * p)
 {
   BUFFER err, token;
   char errstr[SHORT_STRING];
 
-  memset (&err, 0, sizeof(err));
+  p_clear(&err, 1);
   err.data = errstr;
   err.dsize = sizeof(errstr);
-  memset (&token, 0, sizeof(token));
+  p_clear(&token, 1);
   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;
 }
 
@@ -2575,7 +2556,7 @@ void mutt_init (int skip_sys_rc, LIST * commands)
   int i, default_rc = 0, need_pause = 0;
   BUFFER err;
 
-  memset (&err, 0, sizeof(err));
+  p_clear(&err, 1);
   err.data = error;
   err.dsize = sizeof(error);
 
@@ -2600,18 +2581,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 = 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 {
@@ -2621,13 +2602,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);
@@ -2638,23 +2619,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 */
+    m_strcpy(buffer, sizeof(buffer), p);       /* 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 ("@");
+    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
   {
@@ -2664,43 +2645,42 @@ 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 = buffer;
-      SKIPWS (p);
+      p = vskipspaces(buffer);
       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, sizeof(buffer), NONULL(Homedir), MAILPATH);
 #else
-    mutt_concat_path (buffer, MAILPATH, NONULL (Username), sizeof(buffer));
+    mutt_concat_path(buffer, sizeof(buffer), MAILPATH, NONULL(Username));
 #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) {
@@ -2708,21 +2688,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);
 
-    memset (&buf, 0, sizeof(buf));
+    p_clear(&buf, 1);
     buf.data = buf.dptr = buffer;
-    buf.dsize = str_len (buffer);
+    buf.dsize = m_strlen(buffer);
 
-    memset (&token, 0, sizeof(token));
+    p_clear(&token, 1);
     parse_my_hdr (&token, &buf, 0, &err);
-    mem_free (&token.data);
+    p_delete(&token.data);
   }
 
   if ((p = getenv ("EMAIL")) != NULL)
@@ -2788,16 +2768,16 @@ void mutt_init (int skip_sys_rc, LIST * commands)
                 NONULL (Homedir));
 
     default_rc = 1;
-    Muttrc = str_dup (buffer);
+    Muttrc = m_strdup(buffer);
   }
   else {
-    strfcpy (buffer, Muttrc, sizeof(buffer));
-    mem_free (&Muttrc);
+    m_strcpy(buffer, sizeof(buffer), Muttrc);
+    p_delete(&Muttrc);
     mutt_expand_path (buffer, sizeof(buffer));
-    Muttrc = str_dup (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".  */
@@ -2882,7 +2862,7 @@ int mutt_get_hook_type (const char *name)
 
 /* compare two option_t*'s for sorting -t/-T output */
 static int opt_cmp (const void* a, const void* b) {
-  return (str_cmp ((*(struct option_t**) a)->option,
+  return (m_strcmp((*(struct option_t**) a)->option,
                        (*(struct option_t**) b)->option));
 }
 
@@ -2908,7 +2888,7 @@ static void opt_sel_diff (const char* key, void* data,
     return;
 
   mutt_option_value (option->option, buf, sizeof(buf));
-  if (str_cmp (buf, option->init) != 0)
+  if (m_strcmp(buf, option->init) != 0)
     list_push_back (l, option);
 }