X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=handler.c;h=4abb3015822c4dd2cdfde2146644356f1056d852;hb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c;hp=a2481ace792a89c39ea88c8141930986b2001760;hpb=617e7d83d14e14e6a520a48e75437211b16c8834;p=apps%2Fmadmutt.git

diff --git a/handler.c b/handler.c
index a2481ac..4abb301 100644
--- a/handler.c
+++ b/handler.c
@@ -19,9 +19,12 @@
 #include <sys/stat.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
-#include "ascii.h"
 #include "recvattach.h"
 #include "handler.h"
 #include "mutt_curses.h"
@@ -36,8 +39,6 @@
 #include "attach.h"
 #include "lib.h"
 
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 typedef int handler_f (BODY *, STATE *);
@@ -199,7 +200,7 @@ void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
     if (fgets (line, MIN ((ssize_t) sizeof (line), len + 1), s->fpin) == NULL)
       break;
 
-    linelen = str_len (line);
+    linelen = m_strlen(line);
     len -= linelen;
 
     /*
@@ -326,15 +327,15 @@ void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd)
   while (len > 0) {
     if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
       return;
-    len -= str_len (tmps);
-    if ((!str_ncmp (tmps, "begin", 5)) && ISSPACE (tmps[5]))
+    len -= m_strlen(tmps);
+    if ((!m_strncmp(tmps, "begin", 5)) && ISSPACE (tmps[5]))
       break;
   }
   while (len > 0) {
     if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
       return;
-    len -= str_len (tmps);
-    if (!str_ncmp (tmps, "end", 3))
+    len -= m_strlen(tmps);
+    if (!m_strncmp(tmps, "end", 3))
       break;
     pt = tmps;
     linelen = decode_byte (*pt);
@@ -474,7 +475,7 @@ static void enriched_wrap (struct enriched_state *stte)
   stte->indent_len = 0;
   if (stte->s->prefix) {
     state_puts (stte->s->prefix, stte->s);
-    stte->indent_len += str_len (stte->s->prefix);
+    stte->indent_len += m_strlen(stte->s->prefix);
   }
 
   if (stte->tag_level[RICH_EXCERPT]) {
@@ -482,11 +483,11 @@ static void enriched_wrap (struct enriched_state *stte)
     while (x) {
       if (stte->s->prefix) {
         state_puts (stte->s->prefix, stte->s);
-        stte->indent_len += str_len (stte->s->prefix);
+        stte->indent_len += m_strlen(stte->s->prefix);
       }
       else {
         state_puts ("> ", stte->s);
-        stte->indent_len += str_len ("> ");
+        stte->indent_len += m_strlen("> ");
       }
       x--;
     }
@@ -588,7 +589,7 @@ static void enriched_puts (const char *s, struct enriched_state *stte)
 {
   const char *p;
 
-  if (stte->buff_len < stte->buff_used + str_len (s)) {
+  if (stte->buff_len < stte->buff_used + m_strlen(s)) {
     stte->buff_len += LONG_STRING;
     p_realloc(&stte->buffer, stte->buff_len + 1);
   }
@@ -678,7 +679,7 @@ int text_enriched_handler (BODY * a, STATE * s)
   int tag_len = 0;
   char tag[LONG_STRING + 1];
 
-  memset (&stte, 0, sizeof (stte));
+  p_clear(&stte, 1);
   stte.s = s;
   stte.WrapMargin =
     ((s->flags & M_DISPLAY) ? (COLS - 4) : ((COLS - 4) <
@@ -692,7 +693,7 @@ int text_enriched_handler (BODY * a, STATE * s)
 
   if (s->prefix) {
     state_puts (s->prefix, s);
-    stte.indent_len += str_len (s->prefix);
+    stte.indent_len += m_strlen(s->prefix);
   }
 
   while (state != DONE) {
@@ -831,7 +832,7 @@ static int alternative_handler (BODY * a, STATE * s)
     }
     else {
       wild = 1;
-      btlen = str_len (t->data);
+      btlen = m_strlen(t->data);
     }
 
     if (a && a->parts)
@@ -1096,7 +1097,7 @@ static int autoview_handler (BODY * a, STATE * s)
   snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
   rfc1524_mailcap_lookup (a, type, entry, M_AUTOVIEW);
 
-  fname = str_dup (a->filename);
+  fname = m_strdup(a->filename);
   mutt_sanitize_filename (fname, 1);
   rfc1524_expand_filename (entry->nametemplate, fname, tempfile,
                            sizeof (tempfile));
@@ -1398,7 +1399,7 @@ int mutt_body_handler (BODY * b, STATE * s)
         handler = mutt_signed_handler;
     }
     else if ((WithCrypto & APPLICATION_PGP)
-             && str_casecmp ("encrypted", b->subtype) == 0) {
+             && m_strcasecmp("encrypted", b->subtype) == 0) {
       p = mutt_get_parameter ("protocol", b->parameter);
 
       if (!p)