X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=misc.c;h=4bf1f60e6635638fb3474e57c65e2c5a5ed02cb2;hb=8ef046bcef972932a5fcb11cf8d066c2f7942bfe;hp=eae1e90178b37ee344fa4f16766936118b6a4137;hpb=12a57d9405d7910566d5ff888d743d29b0716554;p=pkg%2Fabook.git

diff --git a/misc.c b/misc.c
index eae1e90..4bf1f60 100644
--- a/misc.c
+++ b/misc.c
@@ -2,7 +2,7 @@
 /*
  * $Id$
  *
- * by JH <jheinonen@bigfoot.com>
+ * by JH <jheinonen@users.sourceforge.net>
  *
  * Copyright (C) Jaakko Heinonen
  */
@@ -123,10 +123,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
@@ -229,7 +232,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);