X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sort.c;h=b6aad7198c1f587ba15d998831d66f3dce8287a3;hp=0bf16e80e41b4156b98df3bdf20ed7029453db97;hb=53186676acf2c3b5509a614433eb00a2087cd4ec;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/sort.c b/sort.c
index 0bf16e8..b6aad71 100644
--- a/sort.c
+++ b/sort.c
@@ -11,10 +11,15 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+#include <lib-lib/str.h>
+
 #include "mutt.h"
 #include "sort.h"
+#include "thread.h"
 #include "mutt_idna.h"
 
+
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
@@ -78,7 +83,7 @@ int compare_subject (const void *a, const void *b)
   else if (!(*pb)->env->real_subj)
     rc = 1;
   else
-    rc = mutt_strcasecmp ((*pa)->env->real_subj, (*pb)->env->real_subj);
+    rc = m_strcasecmp((*pa)->env->real_subj, (*pb)->env->real_subj);
   AUXSORT (rc, a, b);
   return (SORTCODE (rc));
 }
@@ -113,13 +118,10 @@ int compare_to (const void *a, const void *b)
    * On the next call that pointer may get smashed so we copy the return value
    * to our own memory space. */
 
-  strncpy (fa, mutt_get_name ((*ppa)->env->to), sizeof (fa));
-  fa[sizeof (fa) - 1] = '\0';
+  m_strcpy(fa, sizeof(fa), mutt_get_name((*ppa)->env->to));
+  m_strcpy(fb, sizeof(fb), mutt_get_name((*ppb)->env->to));
 
-  strncpy (fb, mutt_get_name ((*ppb)->env->to), sizeof (fb));
-  fb[sizeof (fb) - 1] = '\0';
-
-  result = mutt_strcasecmp (fa, fb);
+  result = m_strcasecmp(fa, fb);
   AUXSORT (result, a, b);
   return (SORTCODE (result));
 }
@@ -136,13 +138,10 @@ int compare_from (const void *a, const void *b)
    * On the next call that pointer may get smashed so we copy the return value
    * to our own memory space. */
 
-  strncpy (fa, mutt_get_name ((*ppa)->env->from), sizeof (fa));
-  fa[sizeof (fa) - 1] = '\0';
-
-  strncpy (fb, mutt_get_name ((*ppb)->env->from), sizeof (fb));
-  fb[sizeof (fb) - 1] = '\0';
+  m_strcpy(fa, sizeof(fa), mutt_get_name((*ppa)->env->from));
+  m_strcpy(fb, sizeof(fb), mutt_get_name((*ppb)->env->from));
 
-  result = mutt_strcasecmp (fa, fb);
+  result = m_strcasecmp(fa, fb);
   AUXSORT (result, a, b);
   return (SORTCODE (result));
 }
@@ -210,13 +209,13 @@ int compare_spam (const void *a, const void *b)
   /* If either aptr or bptr is equal to data, there is no numeric    */
   /* value for that spam attribute. In this case, compare lexically. */
   if ((aptr == (*ppa)->env->spam->data) || (bptr == (*ppb)->env->spam->data))
-    return (SORTCODE (strcmp (aptr, bptr)));
+    return (SORTCODE (m_strcmp(aptr, bptr)));
 
   /* Otherwise, we have numeric value for both attrs. If these values */
   /* are equal, then we first fall back upon string comparison, then  */
   /* upon auxiliary sort.                                             */
   if (result == 0) {
-    result = strcmp (aptr, bptr);
+    result = m_strcmp(aptr, bptr);
     if (result == 0)
       AUXSORT (result, a, b);
   }