From 986b36bccd134726eea42f2cfabff2943d729ac4 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Sun, 23 Nov 2003 18:14:35 +0000
Subject: [PATCH] make -> mk.

add Bfdopen.
---
 include/bio.h                   |  1 +
 src/libbio/binit.c              | 19 +++++++++++++++----
 src/libbio/{Makefile => mkfile} | 10 +++++-----
 3 files changed, 21 insertions(+), 9 deletions(-)
 rename src/libbio/{Makefile => mkfile} (60%)

diff --git a/include/bio.h b/include/bio.h
index fda598ac..600f0948 100644
--- a/include/bio.h
+++ b/include/bio.h
@@ -55,6 +55,7 @@ struct	Biobuf
 	(bp)->fid
 
 int	Bbuffered(Biobuf*);
+Biobuf*	Bfdopen(int, int);
 int	Bfildes(Biobuf*);
 int	Bflush(Biobuf*);
 int	Bgetc(Biobuf*);
diff --git a/src/libbio/binit.c b/src/libbio/binit.c
index d76168b7..33bf5812 100644
--- a/src/libbio/binit.c
+++ b/src/libbio/binit.c
@@ -97,6 +97,19 @@ Binit(Biobuf *bp, int f, int mode)
 	return Binits(bp, f, mode, bp->b, sizeof(bp->b));
 }
 
+Biobuf*
+Bfdopen(int f, int mode)
+{
+	Biobuf *bp;
+
+	bp = malloc(sizeof(Biobuf));
+	if(bp == 0)
+		return 0;
+	Binits(bp, f, mode, bp->b, sizeof(bp->b));
+	bp->flag = Bmagic;
+	return bp;
+}
+
 Biobuf*
 Bopen(char *name, int mode)
 {
@@ -119,11 +132,9 @@ Bopen(char *name, int mode)
 		if(f < 0)
 			return 0;
 	}
-	bp = malloc(sizeof(Biobuf));
+	bp = Bfdopen(f, mode);
 	if(bp == 0)
-		return 0;
-	Binits(bp, f, mode, bp->b, sizeof(bp->b));
-	bp->flag = Bmagic;
+		close(f);
 	return bp;
 }
 
diff --git a/src/libbio/Makefile b/src/libbio/mkfile
similarity index 60%
rename from src/libbio/Makefile
rename to src/libbio/mkfile
index f404f256..2c64b257 100644
--- a/src/libbio/Makefile
+++ b/src/libbio/mkfile
@@ -1,5 +1,5 @@
 PLAN9=../..
-include $(PLAN9)/src/Makehdr
+<$PLAN9/src/mkhdr
 
 LIB=libbio.a
 
@@ -22,10 +22,10 @@ OFILES=\
 	bputrune.$O\
 
 HFILES=\
-	$(PLAN9)/include/bio.h\
+	$PLAN9/include/bio.h\
 
-include $(PLAN9)/src/Makesyslib
+<$PLAN9/src/mksyslib
 
-bcat: bcat.$O $(LIB)
-	$(CC) -o bcat bcat.$O -L$(PLAN9)/lib -lbio -lfmt -lutf
+bcat: bcat.$O $LIB
+	$CC -o bcat bcat.$O -L$PLAN9/lib -lbio -lfmt -lutf