FOREVER is of very bad taste, use for (;;)

[apps/madmutt.git] / copy.c

diff --git a/copy.c b/copy.c
index 19b3d8c..b265b66 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -12,9 +12,10 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
 
 #include "mutt.h"
-#include "ascii.h"
 #include "handler.h"
 #include "mx.h"
 #include "copy.h"
@@ -23,8 +24,6 @@
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
-#include "lib/mem.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <string.h>
@@ -156,9 +155,8 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
         if (!headers[x])
           headers[x] = this_one;
         else {
-          mem_realloc (&headers[x], str_len (headers[x]) +
-                        str_len (this_one) + sizeof (char));
-          strcat (headers[x], this_one);        /* __STRCAT_CHECKED__ */
+          p_realloc(&headers[x], m_strlen(headers[x]) + m_strlen(this_one) + 1);
+          strcat(headers[x], this_one);        /* __STRCAT_CHECKED__ */
           p_delete(&this_one);
         }
 
@@ -208,7 +206,7 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
       /* 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, str_len (t->data))) {
+          if (!ascii_strncasecmp (buf, t->data, m_strlen(t->data))) {
             debug_print (2, ("Reorder: %s matches %s\n", t->data, buf));
             break;
           }
@@ -221,19 +219,17 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
     if (!ignore) {
       debug_print (2, ("Reorder: x = %d; hdr_count = %d\n", x, hdr_count));
       if (!this_one)
-        this_one = str_dup (buf);
+        this_one = m_strdup(buf);
       /* we do want to see all lines if this header doesn't feature
        * abbreviations (curline is 0), $max_display_recips is 0 and
        * while the number hasn't reached $max_display_recips yet */
       else if (curline == 0 || MaxDispRecips == 0 || ++curline <= MaxDispRecips) {
-        mem_realloc (&this_one,
-                      str_len (this_one) + str_len (buf) +
-                      sizeof (char));
+        p_realloc(&this_one, m_strlen(this_one) + m_strlen(buf) + 1);
         strcat (this_one, buf); /* __STRCAT_CHECKED__ */
       /* only for the first line which doesn't exeeds
        * $max_display_recips: abbreviate it */
       } else if (curline == MaxDispRecips+1) {
-        mem_realloc (&this_one, str_len (this_one) + 5);
+        p_realloc(&this_one, m_strlen(this_one) + 5);
         strcat (this_one, " ...");
       }
     }
@@ -249,8 +245,7 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
     if (!headers[x])
       headers[x] = this_one;
     else {
-      mem_realloc (&headers[x], str_len (headers[x]) +
-                    str_len (this_one) + sizeof (char));
+      p_realloc(&headers[x], m_strlen(headers[x]) + m_strlen(this_one) + 1);
       strcat (headers[x], this_one);    /* __STRCAT_CHECKED__ */
       p_delete(&this_one);
     }
@@ -540,12 +535,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[str_len (date) - 1] = '\"';
+      date[5] = date[m_strlen(date) - 1] = '\"';
 
       /* Count the number of lines and bytes to be deleted */
       fseeko (fpin, body->offset, SEEK_SET);
       new_lines = hdr->lines -
-        count_delete_lines (fpin, body, &new_length, str_len (date));
+        count_delete_lines (fpin, body, &new_length, m_strlen(date));
 
       /* Copy the headers */
       if (mutt_copy_header (fpin, hdr, fpout,
@@ -608,7 +603,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
 
   if (flags & M_CM_DECODE) {
     /* now make a text/plain version of the message */
-    memset (&s, 0, sizeof (STATE));
+    p_clear(&s, 1);
     s.fpin = fpin;
     s.fpout = fpout;
     if (flags & M_CM_PREFIX)
@@ -823,11 +818,11 @@ static void format_address_header (char **h, ADDRESS * a)
 
   int l, linelen, buflen, count;
 
-  linelen = str_len (*h);
+  linelen = m_strlen(*h);
   buflen = linelen + 3;
 
 
-  mem_realloc (h, buflen);
+  p_realloc(h, buflen);
   for (count = 0; a; a = a->next, count++) {
     ADDRESS *tmp = a->next;
 
@@ -836,7 +831,7 @@ static void format_address_header (char **h, ADDRESS * a)
     rfc822_write_address (buf, sizeof (buf), a, 0);
     a->next = tmp;
 
-    l = str_len (buf);
+    l = m_strlen(buf);
     if (count && linelen + l > 74) {
       strcpy (cbuf, "\n\t");    /* __STRCPY_CHECKED__ */
       linelen = l + 8;
@@ -854,8 +849,8 @@ static void format_address_header (char **h, ADDRESS * a)
       strcpy (c2buf, ",");      /* __STRCPY_CHECKED__ */
     }
 
-    buflen += l + str_len (cbuf) + str_len (c2buf);
-    mem_realloc (h, buflen);
+    buflen += l + m_strlen(cbuf) + m_strlen(c2buf);
+    p_realloc(h, buflen);
     strcat (*h, cbuf);          /* __STRCAT_CHECKED__ */
     strcat (*h, buf);           /* __STRCAT_CHECKED__ */
     strcat (*h, c2buf);         /* __STRCAT_CHECKED__ */