X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sort.c;h=6235cc6741cdc70bc5a6439b2ddb014ff92b4e44;hp=79fac85e740f97c528368dcb08f56f784981e724;hb=18ea5e8b861632627335b8d94787c742dbf5f567;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/sort.c b/sort.c
index 79fac85..6235cc6 100644
--- a/sort.c
+++ b/sort.c
@@ -1,19 +1,10 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 #if HAVE_CONFIG_H
@@ -21,9 +12,12 @@
 #endif
 
 #include "mutt.h"
+#include "lib/str.h"
 #include "sort.h"
 #include "mutt_idna.h"
 
+#include "lib/intl.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
@@ -87,7 +81,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 = safe_strcasecmp ((*pa)->env->real_subj, (*pb)->env->real_subj);
   AUXSORT (rc, a, b);
   return (SORTCODE (rc));
 }
@@ -128,7 +122,7 @@ int compare_to (const void *a, const void *b)
   strncpy (fb, mutt_get_name ((*ppb)->env->to), sizeof (fb));
   fb[sizeof (fb) - 1] = '\0';
 
-  result = mutt_strcasecmp (fa, fb);
+  result = safe_strcasecmp (fa, fb);
   AUXSORT (result, a, b);
   return (SORTCODE (result));
 }
@@ -151,7 +145,7 @@ int compare_from (const void *a, const void *b)
   strncpy (fb, mutt_get_name ((*ppb)->env->from), sizeof (fb));
   fb[sizeof (fb) - 1] = '\0';
 
-  result = mutt_strcasecmp (fa, fb);
+  result = safe_strcasecmp (fa, fb);
   AUXSORT (result, a, b);
   return (SORTCODE (result));
 }
@@ -219,13 +213,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 (mutt_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 = mutt_strcmp (aptr, bptr);
     if (result == 0)
       AUXSORT (result, a, b);
   }