use plan9 malloc

src/lib9/fmt/fmtdef.h

@@ -25,7 +25,9 @@
 #define vlong _fmtvlong
 #define uvlong _fmtuvlong
 
+#ifndef USED
 #define USED(x) if(x);else
+#endif
 
 typedef unsigned char		uchar;
 typedef unsigned short		ushort;
@@ -37,6 +39,7 @@ typedef unsigned long long	uvlong;
 typedef long long		vlong;
 #endif
 
+#undef nil
 #define nil		0	/* cannot be ((void*)0) because used for function pointers */
 
 typedef int (*Fmts)(Fmt*);

src/lib9/fmt/fmtstr.c

@@ -11,11 +11,8 @@
  * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
+#include <u.h>
-#include <string.h>
+#include <libc.h>
-#include <stdlib.h>
-#include "utf.h"
-#include "fmt.h"
 #include "fmtdef.h"
 
 static int

src/lib9/fmt/runefmtstr.c

@@ -11,11 +11,8 @@
  * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
+#include <u.h>
-#include <string.h>
+#include <libc.h>
-#include <stdlib.h>
-#include "utf.h"
-#include "fmt.h"
 #include "fmtdef.h"
 
 static int

src/lib9/fmt/vsmprint.c

@@ -31,6 +31,5 @@ vsmprint(char *fmt, va_list args)
 	n = dofmt(&f, fmt);
 	if(n < 0)
 		return nil;
-	*(char*)f.to = '\0';
+	return fmtstrflush(&f);
-	return (char*)f.start;
 }