indent is a fool

[apps/madmutt.git] / copy.c

diff --git a/copy.c b/copy.c
index 05768a3..27cf073 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -11,10 +11,13 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/file.h>
+#include <lib-lib/ascii.h>
 
 #include "mutt.h"
-#include "ascii.h"
 #include "handler.h"
 #include "mx.h"
 #include "copy.h"
@@ -23,7 +26,6 @@
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <string.h>
@@ -75,7 +77,7 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
       /* Is it the begining of a header? */
       if (nl && buf[0] != ' ' && buf[0] != '\t') {
         ignore = 1;
-        if (!from && str_ncmp ("From ", buf, 5) == 0) {
+        if (!from && m_strncmp("From ", buf, 5) == 0) {
           if ((flags & CH_FROM) == 0)
             continue;
           from = 1;
@@ -155,7 +157,7 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
         if (!headers[x])
           headers[x] = this_one;
         else {
-          p_realloc(&headers[x], str_len(headers[x]) + str_len(this_one) + 1);
+          p_realloc(&headers[x], m_strlen(headers[x]) + m_strlen(this_one) + 1);
           strcat(headers[x], this_one);        /* __STRCAT_CHECKED__ */
           p_delete(&this_one);
         }
@@ -165,7 +167,7 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
 
       ignore = 1;
       this_is_from = 0;
-      if (!from && str_ncmp ("From ", buf, 5) == 0) {
+      if (!from && m_strncmp("From ", buf, 5) == 0) {
         if ((flags & CH_FROM) == 0)
           continue;
         this_is_from = from = 1;
@@ -206,7 +208,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;
           }
@@ -219,17 +221,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) {
-        p_realloc(&this_one, str_len(this_one) + str_len(buf) + 1);
+        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) {
-        p_realloc(&this_one, str_len(this_one) + 5);
+        p_realloc(&this_one, m_strlen(this_one) + 5);
         strcat (this_one, " ...");
       }
     }
@@ -245,7 +247,7 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
     if (!headers[x])
       headers[x] = this_one;
     else {
-      p_realloc(&headers[x], str_len(headers[x]) + str_len(this_one) + 1);
+      p_realloc(&headers[x], m_strlen(headers[x]) + m_strlen(this_one) + 1);
       strcat (headers[x], this_one);    /* __STRCAT_CHECKED__ */
       p_delete(&this_one);
     }
@@ -519,7 +521,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
 
   if (flags & M_CM_PREFIX) {
     if (option (OPTTEXTFLOWED))
-      strfcpy (prefix, ">", sizeof (prefix));
+      m_strcpy(prefix, sizeof(prefix), ">");
     else
       _mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix), Context,
                          hdr, 0);
@@ -535,12 +537,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,
@@ -603,7 +605,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)
@@ -818,7 +820,7 @@ 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;
 
 
@@ -831,7 +833,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;
@@ -849,7 +851,7 @@ static void format_address_header (char **h, ADDRESS * a)
       strcpy (c2buf, ",");      /* __STRCPY_CHECKED__ */
     }
 
-    buflen += l + str_len (cbuf) + str_len (c2buf);
+    buflen += l + m_strlen(cbuf) + m_strlen(c2buf);
     p_realloc(h, buflen);
     strcat (*h, cbuf);          /* __STRCAT_CHECKED__ */
     strcat (*h, buf);           /* __STRCAT_CHECKED__ */