commit 8a3cbc157981485adc947c0477dc3e4907acc9a3
author wkj <devnull@localhost> Mon May 17 02:23:43 2004 +0000
committer wkj <devnull@localhost> Mon May 17 02:23:43 2004 +0000
tree 349384ec94a177152ef945dcf41b9d368de5bf18
parent 1f72bc47fe416f8fa00d8cea27ee1482fba28c20

Make tbl compile silently.

src/cmd/tbl/t1.c

diff --git a/src/cmd/tbl/t1.c b/src/cmd/tbl/t1.c
index aff5f3d..1e6cbf1 100644
--- a/src/cmd/tbl/t1.c
+++ b/src/cmd/tbl/t1.c
@@ -8,17 +8,10 @@
 
 # define ever (;;)
 
-int
+void
 main(int argc, char *argv[])
 {
-	tabin = stdin;
-	tabout = stdout;
-
-	if(tbl(argc, argv)){
-		fprintf(stderr, "error");
-		return 1;
-	}
-	return 0;
+	exits(tbl(argc, argv)? "error" : 0);
 }
 
 
@@ -28,14 +21,14 @@
 	char	line[5120];
 	/*int x;*/
 	/*x=malloc((char *)0);	uncomment when allocation breaks*/
-	/*Binit(&tabout, 1, OWRITE); /* tabout=stdout */
+	Binit(&tabout, 1, OWRITE);
 	setinp(argc, argv);
 	while (gets1(line, sizeof(line))) {
-		fprintf(tabout, "%s\n", line);
+		Bprint(&tabout, "%s\n", line);
 		if (prefix(".TS", line))
 			tableput();
 	}
-	fclose(tabin);
+	Bterm(tabin);
 	return(0);
 }
 
@@ -52,8 +45,10 @@
 	sargv++;
 	if (sargc > 0)
 		swapin();
-	else
-		tabin = stdin;
+	else {
+		tabin = (Biobuf*)getcore(sizeof(Biobuf), 1);
+		Binit(tabin, 0, OREAD);
+	}
 }
 
 
@@ -81,16 +76,17 @@
 		return(0);
 	/* file closing is done by GCOS troff preprocessor */
 	if(tabin)
-		fclose(tabin);
+		Bterm(tabin);
 	ifile = *sargv;
 	name = ifile;
 	if (match(ifile, "-")) {
-		tabin = stdin;
+		tabin = (Biobuf*)getcore(sizeof(Biobuf), 1);
+		Binit(tabin, 0, OREAD);
 	} else
-		tabin = fopen(ifile, "r");
+		tabin = Bopen(ifile, OREAD);
 	iline = 1;
-	fprintf(tabout, ".ds f. %s\n", ifile);
-	fprintf(tabout, ".lf %d %s\n", iline, name);
+	Bprint(&tabout, ".ds f. %s\n", ifile);
+	Bprint(&tabout, ".lf %d %s\n", iline, name);
 	if (tabin == 0)
 		error("Can't open file");
 	sargc--;