X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sort.c;h=e7581748359a20a9275fcfdd4c059338f3c53c23;hp=60296c3feefa97f95ebc328a87ce1eb1b99d085a;hb=d776c6c67b63e05bd052fcedf77e9147560e83af;hpb=74a2265af51ce89bca845adc1d68f273c9933c13

diff --git a/sort.c b/sort.c
index 60296c3..e758174 100644
--- a/sort.c
+++ b/sort.c
@@ -7,21 +7,14 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
+#include "alias.h"
 #include "sort.h"
+#include "thread.h"
 #include "mutt_idna.h"
 
-#include "lib/intl.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-
 #define SORTCODE(x) (Sort & SORT_REVERSE) ? -(x) : x
 
 /* function to use as discriminator when normal sort method is equal */
@@ -80,18 +73,18 @@ 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));
 }
 
-const char *mutt_get_name (ADDRESS * a)
+const char *mutt_get_name (address_t * a)
 {
-  ADDRESS *ali;
+  const address_t *ali;
   const char *name = "";
 
   if (a) {
-    if (option (OPTREVALIAS) && (ali = alias_reverse_lookup (a))
+    if (option (OPTREVALIAS) && (ali = alias_reverse_lookup(a))
         && ali->personal)
       name = ali->personal;
     else if (a->personal)
@@ -115,13 +108,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));
 }
@@ -138,13 +128,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));
 }
@@ -212,13 +199,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);
   }