X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rfc3676.c;h=c194540ef12c1848c6191c287cac3f10c91ad523;hp=d359f250dc2ba56d649b3745b82f4708ea22fa4f;hb=dded59764065d6d5051f3188cd691cd1a00c185e;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/rfc3676.c b/rfc3676.c
index d359f25..c194540 100644
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -21,17 +21,17 @@
 #include <sys/stat.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
 #include "mutt_curses.h"
-#include "ascii.h"
 #include "handler.h"
 #include "state.h"
 #include "lib.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #define FLOWED_MAX 77
@@ -47,7 +47,7 @@ static int get_quote_level (char *line)
 static void print_flowed_line (char *line, STATE * s, int ql) {
   int width;
   char *pos, *oldpos;
-  int len = str_len (line);
+  int len = m_strlen(line);
   int i;
 
   if (MaxLineLength > 0) {
@@ -69,7 +69,7 @@ static void print_flowed_line (char *line, STATE * s, int ql) {
       width = COLS;
   }
 
-  if (str_len (line) == 0) {
+  if (m_strlen(line) == 0) {
     if (!(s->flags & M_REPLYING) || option (OPTQUOTEEMPTY)) {
       if (s->prefix)
         state_puts(s->prefix,s);
@@ -149,7 +149,7 @@ int rfc3676_handler (BODY * a, STATE * s) {
 
   /* respect DelSP of RfC3676 only with f=f parts */
   if ((t = (char*) mutt_get_parameter ("delsp", a->parameter))) {
-    delsp = str_len (t) == 3 && ascii_strncasecmp (t, "yes", 3) == 0;
+    delsp = m_strlen(t) == 3 && ascii_strncasecmp (t, "yes", 3) == 0;
     t = NULL;
   }
 
@@ -157,7 +157,7 @@ int rfc3676_handler (BODY * a, STATE * s) {
 
   while (bytes > 0 && fgets (buf, sizeof (buf), s->fpin)) {
 
-    buf_len = str_len (buf);
+    buf_len = m_strlen(buf);
     bytes -= buf_len;
 
     newql = get_quote_level (buf);
@@ -212,7 +212,7 @@ int rfc3676_handler (BODY * a, STATE * s) {
       curline_len = 1;
     }
 
-    mem_realloc (&curline, curline_len + buf_len - buf_off);
+    p_realloc(&curline, curline_len + buf_len - buf_off);
     strcpy (curline + curline_len - 1, buf + buf_off);
     curline_len += buf_len - buf_off;
 
@@ -255,7 +255,7 @@ void rfc3676_space_stuff (HEADER* hdr) {
       fputc (' ', out);
 #if DEBUG
       lc++;
-      len = str_len (buf);
+      len = m_strlen(buf);
       if (len > 0) {
         c = buf[len-1];
         buf[len-1] = '\0';
@@ -272,5 +272,5 @@ void rfc3676_space_stuff (HEADER* hdr) {
   fclose (out);
   mutt_set_mtime (hdr->content->filename, tmpfile);
   unlink (hdr->content->filename);
-  str_replace (&hdr->content->filename, tmpfile);
+  m_strreplace(&hdr->content->filename, tmpfile);
 }