X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=misc.c;h=1eadf97b19e4edc9fc43ce76196475df1e3bec69;hb=2f1c42673b37d0545b37ae63506f49eade90d02e;hp=0a58cb96be67593103343ca25c032674321f3f06;hpb=0d3c17d9ab127e5596c8fb97d65122b3b90f6b11;p=pkg%2Fabook.git

diff --git a/misc.c b/misc.c
index 0a58cb9..1eadf97 100644
--- a/misc.c
+++ b/misc.c
@@ -1,7 +1,8 @@
 
 /*
- * misc.c
- * by JH <jheinonen@bigfoot.com>
+ * $Id$
+ *
+ * by JH <jheinonen@users.sourceforge.net>
  *
  * Copyright (C) Jaakko Heinonen
  */
@@ -15,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"
@@ -33,6 +37,8 @@ revstr(char *str)
 {
 	char *s, *s2;
 
+	assert(str != NULL);
+
 	s = s2 = strdup(str);
 
 	while( *str )
@@ -50,6 +56,8 @@ strupper(char *str)
 {
 	char *tmp = str;
 
+	assert(str != NULL);
+
 	while( ( *str = toupper( *str ) ) )
 		str++;
 	
@@ -61,6 +69,8 @@ strlower(char *str)
 {
 	char *tmp = str;
 
+	assert(str != NULL);
+
 	while( ( *str = tolower ( *str ) ) )
 		str++;
 
@@ -115,6 +125,8 @@ mkstr (const char *format, ... )
 		(char *) malloc (size);
 #endif
 	
+	assert(format != NULL);
+
 	for(;;) {
 		int n;
 		MY_VA_START(format);
@@ -122,10 +134,13 @@ mkstr (const char *format, ... )
 				format, ap);
 		MY_VA_END;
 
-		if (n > -1)
+		if (n > -1 && n < size)
 			return buffer;
 
-		size *= 2;
+		if (n > -1)
+			size = n + 1;
+		else
+			size *= 2;
 		
 		buffer =
 #ifdef ABOOK_SRC
@@ -144,8 +159,7 @@ strconcat (const char *str, ...)
 	MY_VA_LOCAL_DECL;
 	char *s, *concat;
 
-	if(str == NULL)
-		return NULL;
+	assert(str != NULL);
 
 	l = 1 + strlen (str);
 	MY_VA_START(str);
@@ -177,7 +191,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;
@@ -186,16 +200,32 @@ 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()
 {
 	char *dir = NULL;
 	int size = 100;
 
-	dir = malloc(size);
+	if( (dir = malloc(size)) == NULL)
+		return NULL;
 	
 	while( getcwd(dir, size) == NULL && errno == ERANGE )
-		dir = realloc(dir, size *=2);
+		if( (dir = realloc(dir, size *=2)) == NULL)
+			return NULL;
 
 	return dir;
 }
@@ -228,7 +258,7 @@ getaline(FILE *f)
 
 	len = 0;
 	size = thres;
-	buf = abook_malloc(size);
+	buf = (char *)abook_malloc(size);
 
 	while (fgets(buf+len, size-len, f) != NULL) {
 		len += strlen(buf+len);