X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=addrbook.c;h=6d34f74b5fd0c4021fe52c0855c0353f61e4368e;hp=8be76f646fcbf9c3fb669390723d4d4114e9d9ef;hb=ce5e12405904f419adf8b4b6d4465fb27274c08b;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/addrbook.c b/addrbook.c
index 8be76f6..6d34f74 100644
--- a/addrbook.c
+++ b/addrbook.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
@@ -27,6 +18,10 @@
 
 #include "mutt_idna.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -99,7 +94,7 @@ static int alias_SortAlias (const void *a, const void *b)
 {
   ALIAS *pa = *(ALIAS **) a;
   ALIAS *pb = *(ALIAS **) b;
-  int r = mutt_strcasecmp (pa->name, pb->name);
+  int r = safe_strcasecmp (pa->name, pb->name);
 
   return (RSORT (r));
 }
@@ -118,7 +113,7 @@ static int alias_SortAddress (const void *a, const void *b)
     r = 1;
   else if (pa->personal) {
     if (pb->personal)
-      r = mutt_strcasecmp (pa->personal, pb->personal);
+      r = safe_strcasecmp (pa->personal, pb->personal);
     else
       r = 1;
   }