move hash.[hc] into lib-lib/

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index fd1cea5..2e15ea0 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -13,10 +13,12 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/buffer.h>
 
 #include "mutt.h"
-#include "ascii.h"
-#include "buffer.h"
 #include "enter.h"
 #include "mutt_curses.h"
 #include "mime.h"
@@ -34,9 +36,6 @@
 
 #include "mutt_crypt.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <string.h>
@@ -55,7 +54,7 @@
 
 BODY *mutt_new_body (void)
 {
-  BODY *p = (BODY *) mem_calloc (1, sizeof (BODY));
+  BODY *p = p_new(BODY, 1);
 
   p->disposition = DISPATTACH;
   p->use_disp = 1;
@@ -95,7 +94,7 @@ void mutt_adv_mktemp (const char* dir, char *s, size_t l)
     mktemp (s);
     if (period != NULL) {
       *period = '.';
-      sl = str_len (s);
+      sl = m_strlen(s);
       strfcpy (s + sl, period, l - sl);
     }
   }
@@ -132,19 +131,19 @@ int mutt_copy_body (FILE * fp, BODY ** tgt, BODY * src)
   b->parts = NULL;
   b->next = NULL;
 
-  b->filename = str_dup (tmp);
+  b->filename = m_strdup(tmp);
   b->use_disp = use_disp;
   b->unlink = 1;
 
   if (mutt_is_text_part (b))
     b->noconv = 1;
 
-  b->xtype = str_dup (b->xtype);
-  b->subtype = str_dup (b->subtype);
-  b->form_name = str_dup (b->form_name);
-  b->filename = str_dup (b->filename);
-  b->d_filename = str_dup (b->d_filename);
-  b->description = str_dup (b->description);
+  b->xtype = m_strdup(b->xtype);
+  b->subtype = m_strdup(b->subtype);
+  b->form_name = m_strdup(b->form_name);
+  b->filename = m_strdup(b->filename);
+  b->d_filename = m_strdup(b->d_filename);
+  b->description = m_strdup(b->description);
 
   /* 
    * we don't seem to need the HEADER structure currently.
@@ -158,8 +157,8 @@ int mutt_copy_body (FILE * fp, BODY ** tgt, BODY * src)
   for (par = b->parameter, ppar = &b->parameter; par;
        ppar = &(*ppar)->next, par = par->next) {
     *ppar = mutt_new_parameter ();
-    (*ppar)->attribute = str_dup (par->attribute);
-    (*ppar)->value = str_dup (par->value);
+    (*ppar)->attribute = m_strdup(par->attribute);
+    (*ppar)->value = m_strdup(par->value);
   }
 
   mutt_stamp_attachment (b);
@@ -254,7 +253,7 @@ void mutt_free_header (HEADER ** h)
 int mutt_matches_ignore (const char *s, LIST * t)
 {
   for (; t; t = t->next) {
-    if (!ascii_strncasecmp (s, t->data, str_len (t->data))
+    if (!ascii_strncasecmp (s, t->data, m_strlen(t->data))
         || *t->data == '*')
       return 1;
   }
@@ -342,7 +341,7 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
 #ifdef USE_IMAP
         /* if folder = imap[s]://host/: don't append slash */
         if (imap_is_magic (NONULL (Maildir), NULL) == M_IMAP && 
-            Maildir[str_len (Maildir) - 1] == '/')
+            Maildir[m_strlen(Maildir) - 1] == '/')
           strfcpy (p, NONULL (Maildir), sizeof (p));
         else
 #endif
@@ -455,7 +454,7 @@ char *mutt_gecos_name (char *dest, size_t destlen, struct passwd *pw)
   if (!pw || !pw->pw_gecos)
     return NULL;
 
-  memset (dest, 0, destlen);
+  p_clear(dest, destlen);
 
   if (GecosMask.rx) {
     if (regexec (GecosMask.rx, pw->pw_gecos, 1, pat_match, 0) == 0)
@@ -467,7 +466,7 @@ char *mutt_gecos_name (char *dest, size_t destlen, struct passwd *pw)
   else
     strfcpy (dest, pw->pw_gecos, destlen);
 
-  pwnl = str_len (pw->pw_name);
+  pwnl = m_strlen(pw->pw_name);
 
   for (idx = 0; dest[idx]; idx++) {
     if (dest[idx] == '&') {
@@ -509,8 +508,8 @@ void mutt_set_parameter (const char *attribute, const char *value,
   }
 
   q = mutt_new_parameter ();
-  q->attribute = str_dup (attribute);
-  q->value = str_dup (value);
+  q->attribute = m_strdup(attribute);
+  q->value = m_strdup(value);
   q->next = *p;
   *p = q;
 }
@@ -723,15 +722,15 @@ void mutt_pretty_mailbox (char *s)
   }
   *q = 0;
 
-  if (str_ncmp (s, Maildir, (len = str_len (Maildir))) == 0 &&
+  if (str_ncmp (s, Maildir, (len = m_strlen(Maildir))) == 0 &&
       s[len] == '/') {
     *s++ = '=';
-    memmove (s, s + len, str_len (s + len) + 1);
+    memmove (s, s + len, m_strlen(s + len) + 1);
   }
-  else if (str_ncmp (s, Homedir, (len = str_len (Homedir))) == 0 &&
+  else if (str_ncmp (s, Homedir, (len = m_strlen(Homedir))) == 0 &&
            s[len] == '/') {
     *s++ = '~';
-    memmove (s, s + len - 1, str_len (s + len - 1) + 1);
+    memmove (s, s + len - 1, m_strlen(s + len - 1) + 1);
   }
 }
 
@@ -771,7 +770,7 @@ void mutt_expand_fmt (char *dest, size_t destlen, const char *fmt,
   size_t slen;
   int found = 0;
 
-  slen = str_len (src);
+  slen = m_strlen(src);
   destlen--;
 
   for (p = fmt, d = dest; destlen && *p; p++) {
@@ -923,7 +922,7 @@ int mutt_skipchars (const char *s, const char *c)
     ret++;
     s++;
   }
-  return (str_len (p));
+  return (m_strlen(p));
 }
 
 void mutt_FormatString (char *dest,     /* output buffer */
@@ -1021,7 +1020,7 @@ void mutt_FormatString (char *dest,     /* output buffer */
         if (count > col) {
           count -= col;         /* how many columns left on this line */
           mutt_FormatString (buf, sizeof (buf), src, callback, data, flags);
-          wid = str_len (buf);
+          wid = m_strlen(buf);
           if (count > wid) {
             count -= wid;       /* how many chars to pad */
             memset (wptr, ch, count);
@@ -1079,7 +1078,7 @@ void mutt_FormatString (char *dest,     /* output buffer */
               *p = '_';
         }
 
-        if ((len = str_len (buf)) + wlen > destlen)
+        if ((len = m_strlen(buf)) + wlen > destlen)
           len = (destlen - wlen > 0) ? (destlen - wlen) : 0;
 
         memcpy (wptr, buf, len);
@@ -1146,11 +1145,11 @@ void mutt_FormatString (char *dest,     /* output buffer */
    then we assume it is a commmand to run instead of a normal file. */
 FILE *mutt_open_read (const char *path, pid_t * thepid)
 {
-    int len = str_len (path);
+    int len = m_strlen(path);
     FILE *f;
 
     if (path[len - 1] == '|') {
-        char *s = str_dup (path);
+        char *s = m_strdup(path);
 
         /* read from a pipe */
 
@@ -1335,7 +1334,7 @@ int mutt_match_spam_list (const char *s, SPAM_LIST * l, char *text, int x)
   for (; l; l = l->next) {
     /* If this pattern needs more matches, expand pmatch. */
     if (l->nmatch > nmatch) {
-      mem_realloc (&pmatch, l->nmatch * sizeof (regmatch_t));
+      p_realloc(&pmatch, l->nmatch);
       nmatch = l->nmatch;
     }