X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hdrline.c;h=a568c9a90be57dbe0d04df74e1fac833379bd419;hp=716a5dfb86212ba943fae0f40d174300c3ebdf44;hb=b36dc16c428cc2b1371bb99c0581aa014f302791;hpb=4eaac5c4a87b84ea9ec0668b4e088ac27e2d1106

diff --git a/hdrline.c b/hdrline.c
index 716a5df..a568c9a 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -18,9 +18,11 @@
 #include "charset.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
-#include "mime.h"
 
-#include "lib/str.h"
+#include <lib-lib/str.h>
+
+#include <lib-mime/mime.h>
+
 #include "lib/rx.h"
 
 #include <ctype.h>
@@ -106,7 +108,7 @@ static void make_from (ENVELOPE * hdr, char *buf, size_t len, int do_lists)
   else if (me && hdr->cc)
     snprintf (buf, len, "Cc %s", mutt_get_name (hdr->cc));
   else if (hdr->from)
-    strfcpy (buf, mutt_get_name (hdr->from), len);
+    m_strcpy(buf, len, mutt_get_name(hdr->from));
   else
     *buf = 0;
 }
@@ -130,7 +132,7 @@ static void make_from_addr (ENVELOPE * hdr, char *buf, size_t len,
   else if (me && hdr->cc)
     snprintf (buf, len, "%s", hdr->cc->mailbox);
   else if (hdr->from)
-    strfcpy (buf, hdr->from->mailbox, len);
+    m_strcpy(buf, len, hdr->from->mailbox);
   else
     *buf = 0;
 }
@@ -266,7 +268,7 @@ static const char *hdr_format_str (char *dest,
         !first_mailing_list (dest, destlen, hdr->env->cc))
       dest[0] = 0;
     if (dest[0]) {
-      strfcpy (buf2, dest, sizeof (buf2));
+      m_strcpy(buf2, sizeof(buf2), dest);
       mutt_format_s (dest, destlen, prefix, buf2);
       break;
     }
@@ -275,13 +277,13 @@ static const char *hdr_format_str (char *dest,
   case 'b':
     if (ctx) {
       if ((p = strrchr (ctx->path, '/')))
-        strfcpy (dest, p + 1, destlen);
+        m_strcpy(dest, destlen, p + 1);
       else
-        strfcpy (dest, ctx->path, destlen);
+        m_strcpy(dest, destlen, ctx->path);
     }
     else
-      strfcpy (dest, "(null)", destlen);
-    strfcpy (buf2, dest, sizeof (buf2));
+      m_strcpy(dest, destlen, "(null)");
+    m_strcpy(buf2, sizeof(buf2), dest);
     mutt_format_s (dest, destlen, prefix, buf2);
     break;
 
@@ -487,7 +489,7 @@ static const char *hdr_format_str (char *dest,
       snprintf (dest, destlen, fmt, ctx->msgcount);
     }
     else
-      strfcpy (dest, "(null)", destlen);
+      m_strcpy(dest, destlen, "(null)");
     break;
 
   case 'n':
@@ -590,12 +592,12 @@ static const char *hdr_format_str (char *dest,
     snprintf (dest, destlen, fmt,
               (Tochars
                && ((i = mutt_user_is_recipient (hdr))) <
-               str_len (Tochars)) ? Tochars[i] : ' ');
+               m_strlen(Tochars)) ? Tochars[i] : ' ');
     break;
 
   case 'u':
     if (hdr->env->from && hdr->env->from->mailbox) {
-      strfcpy (buf2, mutt_addr_for_display (hdr->env->from), sizeof (buf2));
+      m_strcpy(buf2, sizeof(buf2), mutt_addr_for_display(hdr->env->from));
       if ((p = strpbrk (buf2, "%@")))
         *p = 0;
     }
@@ -681,7 +683,7 @@ static const char *hdr_format_str (char *dest,
                                                     ((i =
                                                       mutt_user_is_recipient
                                                       (hdr)) <
-                                                     str_len (Tochars)) ?
+                                                     m_strlen(Tochars)) ?
                                                     Tochars[i] : ' ')));
     mutt_format_s (dest, destlen, prefix, buf2);
     break;
@@ -705,7 +707,7 @@ static const char *hdr_format_str (char *dest,
                && (hdr->thread->parent && hdr->thread->parent->message
                    && hdr->thread->parent->message->env->x_label))
         htmp = hdr->thread->parent->message;
-      if (htmp && str_casecmp (hdr->env->x_label,
+      if (htmp && m_strcasecmp(hdr->env->x_label,
                                    htmp->env->x_label) == 0)
         i = 0;
     }