X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=63de716009020fe50db190b0f027c91ab97ff5b6;hp=2a39ff7e0aef506f855d245210beda9353a40975;hb=b777618bc61046875b5c79c7126f64496c6e5a93;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/copy.c b/copy.c
index 2a39ff7..63de716 100644
--- a/copy.c
+++ b/copy.c
@@ -12,7 +12,6 @@
 #endif
 
 #include "mutt.h"
-#include "mailbox.h"
 #include "mx.h"
 #include "copy.h"
 #include "rfc2047.h"
@@ -20,6 +19,9 @@
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
+#include "lib/mem.h"
+#include "lib/str.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -69,7 +71,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
       /* Is it the begining of a header? */
       if (nl && buf[0] != ' ' && buf[0] != '\t') {
         ignore = 1;
-        if (!from && mutt_strncmp ("From ", buf, 5) == 0) {
+        if (!from && safe_strncmp ("From ", buf, 5) == 0) {
           if ((flags & CH_FROM) == 0)
             continue;
           from = 1;
@@ -143,8 +145,8 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
         if (!headers[x])
           headers[x] = this_one;
         else {
-          safe_realloc (&headers[x], mutt_strlen (headers[x]) +
-                        mutt_strlen (this_one) + sizeof (char));
+          safe_realloc (&headers[x], safe_strlen (headers[x]) +
+                        safe_strlen (this_one) + sizeof (char));
           strcat (headers[x], this_one);        /* __STRCAT_CHECKED__ */
           FREE (&this_one);
         }
@@ -154,7 +156,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
 
       ignore = 1;
       this_is_from = 0;
-      if (!from && mutt_strncmp ("From ", buf, 5) == 0) {
+      if (!from && safe_strncmp ("From ", buf, 5) == 0) {
         if ((flags & CH_FROM) == 0)
           continue;
         this_is_from = from = 1;
@@ -195,7 +197,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
       /* Find x -- the array entry where this header is to be saved */
       if (flags & CH_REORDER) {
         for (t = HeaderOrderList, x = 0; (t); t = t->next, x++) {
-          if (!ascii_strncasecmp (buf, t->data, mutt_strlen (t->data))) {
+          if (!ascii_strncasecmp (buf, t->data, safe_strlen (t->data))) {
             dprint (2, (debugfile, "Reorder: %s matches %s\n", t->data, buf));
             break;
           }
@@ -212,7 +214,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
         this_one = safe_strdup (buf);
       else {
         safe_realloc (&this_one,
-                      mutt_strlen (this_one) + mutt_strlen (buf) +
+                      safe_strlen (this_one) + safe_strlen (buf) +
                       sizeof (char));
         strcat (this_one, buf); /* __STRCAT_CHECKED__ */
       }
@@ -229,8 +231,8 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
     if (!headers[x])
       headers[x] = this_one;
     else {
-      safe_realloc (&headers[x], mutt_strlen (headers[x]) +
-                    mutt_strlen (this_one) + sizeof (char));
+      safe_realloc (&headers[x], safe_strlen (headers[x]) +
+                    safe_strlen (this_one) + sizeof (char));
       strcat (headers[x], this_one);    /* __STRCAT_CHECKED__ */
       FREE (&this_one);
     }
@@ -518,12 +520,12 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
       char date[SHORT_STRING];
 
       mutt_make_date (date, sizeof (date));
-      date[5] = date[mutt_strlen (date) - 1] = '\"';
+      date[5] = date[safe_strlen (date) - 1] = '\"';
 
       /* Count the number of lines and bytes to be deleted */
       fseek (fpin, body->offset, SEEK_SET);
       new_lines = hdr->lines -
-        count_delete_lines (fpin, body, &new_length, mutt_strlen (date));
+        count_delete_lines (fpin, body, &new_length, safe_strlen (date));
 
       /* Copy the headers */
       if (mutt_copy_header (fpin, hdr, fpout,
@@ -802,7 +804,7 @@ static void format_address_header (char **h, ADDRESS * a)
 
   int l, linelen, buflen, count;
 
-  linelen = mutt_strlen (*h);
+  linelen = safe_strlen (*h);
   buflen = linelen + 3;
 
 
@@ -815,7 +817,7 @@ static void format_address_header (char **h, ADDRESS * a)
     rfc822_write_address (buf, sizeof (buf), a, 0);
     a->next = tmp;
 
-    l = mutt_strlen (buf);
+    l = safe_strlen (buf);
     if (count && linelen + l > 74) {
       strcpy (cbuf, "\n\t");    /* __STRCPY_CHECKED__ */
       linelen = l + 8;
@@ -833,7 +835,7 @@ static void format_address_header (char **h, ADDRESS * a)
       strcpy (c2buf, ",");      /* __STRCPY_CHECKED__ */
     }
 
-    buflen += l + mutt_strlen (cbuf) + mutt_strlen (c2buf);
+    buflen += l + safe_strlen (cbuf) + safe_strlen (c2buf);
     safe_realloc (h, buflen);
     strcat (*h, cbuf);          /* __STRCAT_CHECKED__ */
     strcat (*h, buf);           /* __STRCAT_CHECKED__ */