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

add Bfdopen.
---
 src/libbio/Makefile | 31 -------------------------------
 src/libbio/binit.c  | 19 +++++++++++++++----
 src/libbio/mkfile   | 31 +++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 35 deletions(-)
 delete mode 100644 src/libbio/Makefile
 create mode 100644 src/libbio/mkfile

(limited to 'src')

diff --git a/src/libbio/Makefile b/src/libbio/Makefile
deleted file mode 100644
index f404f256..00000000
--- a/src/libbio/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-PLAN9=../..
-include $(PLAN9)/src/Makehdr
-
-LIB=libbio.a
-
-OFILES=\
-	bbuffered.$O\
-	bfildes.$O\
-	bflush.$O\
-	bgetc.$O\
-	bgetd.$O\
-	binit.$O\
-	boffset.$O\
-	bprint.$O\
-	bputc.$O\
-	brdline.$O\
-	brdstr.$O\
-	bread.$O\
-	bseek.$O\
-	bwrite.$O\
-	bgetrune.$O\
-	bputrune.$O\
-
-HFILES=\
-	$(PLAN9)/include/bio.h\
-
-include $(PLAN9)/src/Makesyslib
-
-bcat: bcat.$O $(LIB)
-	$(CC) -o bcat bcat.$O -L$(PLAN9)/lib -lbio -lfmt -lutf
-
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/mkfile b/src/libbio/mkfile
new file mode 100644
index 00000000..2c64b257
--- /dev/null
+++ b/src/libbio/mkfile
@@ -0,0 +1,31 @@
+PLAN9=../..
+<$PLAN9/src/mkhdr
+
+LIB=libbio.a
+
+OFILES=\
+	bbuffered.$O\
+	bfildes.$O\
+	bflush.$O\
+	bgetc.$O\
+	bgetd.$O\
+	binit.$O\
+	boffset.$O\
+	bprint.$O\
+	bputc.$O\
+	brdline.$O\
+	brdstr.$O\
+	bread.$O\
+	bseek.$O\
+	bwrite.$O\
+	bgetrune.$O\
+	bputrune.$O\
+
+HFILES=\
+	$PLAN9/include/bio.h\
+
+<$PLAN9/src/mksyslib
+
+bcat: bcat.$O $LIB
+	$CC -o bcat bcat.$O -L$PLAN9/lib -lbio -lfmt -lutf
+
-- 
cgit v1.2.3