Move mprintf to libaux

ce/ce.c

@@ -2,13 +2,13 @@
 #include "context.h"
 #include "gapbuffer.h"
 #include "interp.h"
-#include "mprintf.h"
 #include "strbuf.h"
 #include <arena.h>
 #include <debugconsole.h>
 #include <kb.h>
 #include <list.h>
 #include <malloc.h>
+#include <mprintf.h>
 #include <printf.h>
 #include <process_self.h>
 #include <stdbool.h>

ce/edit.c

@@ -1,13 +1,13 @@
 #include "edit.h"
 #include "arena_alloc.h"
 #include "gapbuffer.h"
-#include "mprintf.h"
 #include "walloc.h"
 #include <arena.h>
 #include <filewriter.h>
 #include <kb.h>
 #include <list.h>
 #include <malloc.h>
+#include <mprintf.h>
 #include <path.h>
 #include <printf.h>
 #include <process_self.h>

ce/interp.c

@@ -2,7 +2,6 @@
 #include "arena_alloc.h"
 #include "context.h"
 #include "edit.h"
-#include "mprintf.h"
 #include "parser.h"
 #include <debugconsole.h>
 #include <desc.h>
@@ -12,6 +11,7 @@
 #include <kb.h>
 #include <libfat.h>
 #include <malloc.h>
+#include <mprintf.h>
 #include <path.h>
 #include <printf.h>
 #include <process.h>

ce/mprintf.h

@@ -1,10 +0,0 @@
-#ifndef _MPRINTF_H
-#define _MPRINTF_H
-
-#include "context.h"
-
-#define MPRINTF_BUF_MAX CPRINTF_BUF_MAX
-
-void mprintf (const char* fmt, ...);
-
-#endif // _MPRINTF_H

ce/parser.c

@@ -2,9 +2,9 @@
 #include "arena_alloc.h"
 #include "context.h"
 #include "interp.h"
-#include "mprintf.h"
 #include <arena.h>
 #include <list.h>
+#include <mprintf.h>
 #include <string.h>
 
 static struct parse_rule parse_rules[] = {

ce/src.mk

@@ -4,7 +4,6 @@ c += ce.c \
 		 context.c \
 		 parser.c \
 		 interp.c \
-		 mprintf.c \
 		 gapbuffer.c \
 		 edit.c
 
@@ -14,6 +13,5 @@ o += ce.o \
 		 context.o \
 		 parser.o \
 		 interp.o \
-		 mprintf.o \
 		 gapbuffer.o \
 		 edit.o

libaux/Makefile

@@ -1,6 +1,9 @@
 include ../make/ufuncs.mk
 
 $(eval $(call add_include,libsystem))
+$(eval $(call add_include,libmalloc))
+$(eval $(call add_include,libprocess))
+$(eval $(call add_include,libstring))
 
 libname := libaux
 

libaux/mprintf.c

@@ -1,5 +1,5 @@
-#include "mprintf.h"
 #include <malloc.h>
+#include <mprintf.h>
 #include <printf.h>
 #include <process_self.h>
 #include <stdarg.h>

libaux/mprintf.h

@@ -0,0 +1,8 @@
+#ifndef _LIBAUX_MPRINTF_H
+#define _LIBAUX_MPRINTF_H
+
+#define MPRINTF_BUF_MAX (1024 * 16)
+
+void mprintf (const char* fmt, ...);
+
+#endif // _LIBAUX_MPRINTF_H

libaux/src.mk

@@ -1,7 +1,9 @@
 include $(platform)/src.mk
 
 c += printf.c \
-		 path.c
+		 path.c \
+		 mprintf.c
 
 o += printf.o \
-		 path.o
+		 path.o \
+		 mprintf.o