X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=misc.c;h=29ba73985ff4711753948c2965133aea6ffbe2c0;hb=4e82af5614805d49188448e66b9e0c37a47edebd;hp=4bf1f60e6635638fb3474e57c65e2c5a5ed02cb2;hpb=4f7637954591ecfb575642709bd12a069ee90aab;p=pkg%2Fabook.git

diff --git a/misc.c b/misc.c
index 4bf1f60..29ba739 100644
--- a/misc.c
+++ b/misc.c
@@ -16,6 +16,9 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <errno.h>
+#ifdef HAVE_CONFIG_H
+#	include "config.h"
+#endif
 #include "misc.h"
 #ifdef ABOOK_SRC
 #	include "abook.h"
@@ -181,7 +184,7 @@ strconcat (const char *str, ...)
 
 
 int
-safe_strcmp(const char *s1, const char * s2)
+safe_strcmp(const char *s1, const char *s2)
 {
 	if (s1 == NULL && s2 == NULL) return 0;
 	if (s1 == NULL) return -1;
@@ -190,6 +193,20 @@ safe_strcmp(const char *s1, const char * s2)
 	return strcmp(s1, s2);
 }
 
+int
+safe_strcoll(const char *s1, const char *s2)
+{
+#ifdef HAVE_STRCOLL
+	if (s1 == NULL && s2 == NULL) return 0;
+	if (s1 == NULL) return -1;
+	if (s2 == NULL) return 1;
+
+	return strcoll(s1, s2);
+#else /* fall back to strcmp */
+	return safe_strcmp(s1, s2);
+#endif
+}
+
 char *
 my_getcwd()
 {