--- font.c	2002/06/24 09:53:17	1.1
+++ font.c	2003/02/15 15:22:18	1.4
@@ -36,6 +36,8 @@
   *                                                                            *
   ******************************************************************************/
 
+#include <stdio.h>
+#include <stdarg.h>
 
 #include "image.h"
 #include "font.h"
@@ -479,9 +481,9 @@
 		0,0,1,0,
 		0,0,1,0,
 		0,0,1,0,
-		0,1,1,0,
+		0,0,1,0,
+		0,1,1,0 },
 
-		0,0,1,0 },
 	{	0,1,0,1,		// ^
 		0,0,0,0,
 		0,0,0,0,
@@ -532,12 +534,12 @@
 {
 	va_list args;
 	char buf[FONT_BUF_SZ];
-	size_t i;
+	int i;
 
 	va_start(args, fmt);
 	vsprintf(buf, fmt, args);
 
-	for (i = 0; i < strlen(buf); i++) {
+	for (i = 0; i < buf[i]; i++) {
 		const char * font;
 
 		if (buf[i] >= '!' && buf[i] <= '@')