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

diff --git a/misc.c b/misc.c
index 0a58cb9..4bf1f60 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
  */
@@ -122,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
@@ -228,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);