From 18e480ceb298bcc00703931e1e3413e3f1580e35 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@gmx.de>
Date: Sat, 4 May 2013 18:30:49 +0200
Subject: [PATCH] bio: use UTFmax for Bungetsize and fix libmach to include
 <libc.h> before <bio.h> (from sources)

---
 sys/include/bio.h   | 2 +-
 sys/src/libmach/0.c | 1 +
 sys/src/libmach/2.c | 1 +
 sys/src/libmach/5.c | 1 +
 sys/src/libmach/7.c | 1 +
 sys/src/libmach/8.c | 1 +
 sys/src/libmach/k.c | 1 +
 sys/src/libmach/q.c | 1 +
 sys/src/libmach/u.c | 1 +
 sys/src/libmach/v.c | 1 +
 10 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/sys/include/bio.h b/sys/include/bio.h
index f358c962c..a1e259449 100644
--- a/sys/include/bio.h
+++ b/sys/include/bio.h
@@ -7,7 +7,7 @@ typedef	struct	Biobufhdr	Biobufhdr;
 enum
 {
 	Bsize		= 8*1024,
-	Bungetsize	= 4,		/* space for ungetc */
+	Bungetsize	= UTFmax+1,	/* space for ungetc */
 	Bmagic		= 0x314159,
 	Beof		= -1,
 	Bbad		= -2,
diff --git a/sys/src/libmach/0.c b/sys/src/libmach/0.c
index e30329396..b2140b241 100644
--- a/sys/src/libmach/0.c
+++ b/sys/src/libmach/0.c
@@ -4,6 +4,7 @@
  * currently no compiler - not related to 0c
  */
 #include <u.h>
+#include <libc.h>
 #include <bio.h>
 #include "mips2ureg.h"
 #include <mach.h>
diff --git a/sys/src/libmach/2.c b/sys/src/libmach/2.c
index 792a47825..816d96ea8 100644
--- a/sys/src/libmach/2.c
+++ b/sys/src/libmach/2.c
@@ -3,6 +3,7 @@
  */
 #include <u.h>
 #include "/68020/include/ureg.h"
+#include <libc.h>
 #include <bio.h>
 #include <mach.h>
 
diff --git a/sys/src/libmach/5.c b/sys/src/libmach/5.c
index 3f5afdaa5..6e8490ccd 100644
--- a/sys/src/libmach/5.c
+++ b/sys/src/libmach/5.c
@@ -2,6 +2,7 @@
  * arm definition
  */
 #include <u.h>
+#include <libc.h>
 #include <bio.h>
 #include "/arm/include/ureg.h"
 #include <mach.h>
diff --git a/sys/src/libmach/7.c b/sys/src/libmach/7.c
index ec3996793..47c72b736 100644
--- a/sys/src/libmach/7.c
+++ b/sys/src/libmach/7.c
@@ -2,6 +2,7 @@
  * alpha definition
  */
 #include <u.h>
+#include <libc.h>
 #include <bio.h>
 #include "/alpha/include/ureg.h"
 #include <mach.h>
diff --git a/sys/src/libmach/8.c b/sys/src/libmach/8.c
index 112e1977c..5ec20a581 100644
--- a/sys/src/libmach/8.c
+++ b/sys/src/libmach/8.c
@@ -2,6 +2,7 @@
  * 386 definition
  */
 #include <u.h>
+#include <libc.h>
 #include <bio.h>
 #include "/386/include/ureg.h"
 #include <mach.h>
diff --git a/sys/src/libmach/k.c b/sys/src/libmach/k.c
index f81dc8e17..9993e8046 100644
--- a/sys/src/libmach/k.c
+++ b/sys/src/libmach/k.c
@@ -2,6 +2,7 @@
  * sparc definition
  */
 #include <u.h>
+#include <libc.h>
 #include <bio.h>
 #include "/sparc/include/ureg.h"
 #include <mach.h>
diff --git a/sys/src/libmach/q.c b/sys/src/libmach/q.c
index 77e197b8a..db828ecda 100644
--- a/sys/src/libmach/q.c
+++ b/sys/src/libmach/q.c
@@ -3,6 +3,7 @@
  *	forsyth@terzarima.net
  */
 #include <u.h>
+#include <libc.h>
 #include <bio.h>
 #include "/power/include/ureg.h"
 #include <mach.h>
diff --git a/sys/src/libmach/u.c b/sys/src/libmach/u.c
index b96c7c08d..3d5afaeba 100644
--- a/sys/src/libmach/u.c
+++ b/sys/src/libmach/u.c
@@ -2,6 +2,7 @@
  * sparc64 definition
  */
 #include <u.h>
+#include <libc.h>
 #include <bio.h>
 #include "/sparc64/include/ureg.h"
 #include <mach.h>
diff --git a/sys/src/libmach/v.c b/sys/src/libmach/v.c
index 97cd33d85..f059c2598 100644
--- a/sys/src/libmach/v.c
+++ b/sys/src/libmach/v.c
@@ -2,6 +2,7 @@
  * mips definition
  */
 #include <u.h>
+#include <libc.h>
 #include <bio.h>
 #include "/mips/include/ureg.h"
 #include <mach.h>