--- ray/src/cal/lam.c	2010/06/18 01:12:57	1.10
+++ ray/src/cal/lam.c	2019/07/05 15:04:20	1.22
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: lam.c,v 1.10 2010/06/18 01:12:57 greg Exp $";
+static const char	RCSid[] = "$Id: lam.c,v 1.22 2019/07/05 15:04:20 greg Exp $";
 #endif
 /*
  *  lam.c - simple program to laminate files.
@@ -13,40 +13,44 @@ static const char	RCSid[] = "$Id: lam.c,v 1.10 2010/06
 #include <ctype.h>
 
 #include "platform.h"
-#include "rtprocess.h"
+#include "rtio.h"
 
 #define MAXFILE		512		/* maximum number of files */
 
-#define MAXLINE		4096		/* maximum input line */
+#define MAXLINE		65536		/* maximum input line */
 
 FILE	*input[MAXFILE];
 int	bytsiz[MAXFILE];
 char	*tabc[MAXFILE];
-int	nfiles;
+int	nfiles = 0;
 
 char	buf[MAXLINE];
 
 int
-main(argc, argv)
-int	argc;
-char	*argv[];
+main(int argc, char *argv[])
 {
-	register int	i;
-	char	*curtab;
-	int	curbytes;
-	int	running, puteol;
+	long	incnt = 0;
+	int	unbuff = 0;
+	int	binout = 0;
+	char	*curtab = "\t";
+	int	curbytes = 0;
+	int	puteol;
+	int	i;
 
-	curtab = "\t";
-	curbytes = 0;
-	nfiles = 0;
 	for (i = 1; i < argc; i++) {
 		if (argv[i][0] == '-') {
 			switch (argv[i][1]) {
 			case 't':
 				curtab = argv[i]+2;
 				break;
+			case 'u':
+				unbuff = !unbuff;
+				break;
 			case 'i':
 				switch (argv[i][2]) {
+				case 'n':
+					incnt = atol(argv[++i]);
+					break;
 				case 'f':
 					curbytes = sizeof(float);
 					break;
@@ -63,89 +67,125 @@ char	*argv[];
 					curbytes = 1;
 					break;
 				case 'a':
-					curbytes = argv[i][3] ? 1 : 0;
+					curbytes = argv[i][3] ? -1 : 0;
 					break;
 				default:
 					goto badopt;
 				}
 				if (isdigit(argv[i][3]))
 					curbytes *= atoi(argv[i]+3);
-				if (curbytes < 0 || curbytes > MAXLINE) {
+				curbytes += (curbytes == -1);
+				if (curbytes > MAXLINE) {
 					fputs(argv[0], stderr);
-					fputs(": illegal input size\n", stderr);
-					exit(1);
+					fputs(": input size too big\n", stderr);
+					return(1);
 				}
-				if (curbytes)
+				if (curbytes > 0) {
 					curtab = "";
+					++binout;
+				}
 				break;
 			case '\0':
 				tabc[nfiles] = curtab;
-				bytsiz[nfiles] = curbytes;
-				input[nfiles++] = stdin;
+				input[nfiles] = stdin;
+				if (curbytes > 0)
+					SET_FILE_BINARY(input[nfiles]);
+				bytsiz[nfiles++] = curbytes;
 				break;
 			badopt:;
 			default:
 				fputs(argv[0], stderr);
 				fputs(": bad option\n", stderr);
-				exit(1);
+				return(1);
 			}
 		} else if (argv[i][0] == '!') {
 			tabc[nfiles] = curtab;
-			bytsiz[nfiles] = curbytes;
 			if ((input[nfiles] = popen(argv[i]+1, "r")) == NULL) {
 				fputs(argv[i], stderr);
 				fputs(": cannot start command\n", stderr);
-				exit(1);
+				return(1);
 			}
-			if (bytsiz[nfiles])
+			if (curbytes > 0)
 				SET_FILE_BINARY(input[nfiles]);
-			++nfiles;
+			bytsiz[nfiles++] = curbytes;
 		} else {
 			tabc[nfiles] = curtab;
-			bytsiz[nfiles] = curbytes;
 			if ((input[nfiles] = fopen(argv[i], "r")) == NULL) {
 				fputs(argv[i], stderr);
 				fputs(": cannot open file\n", stderr);
-				exit(1);
+				return(1);
 			}
-			if (bytsiz[nfiles])
+			if (curbytes > 0)
 				SET_FILE_BINARY(input[nfiles]);
-			++nfiles;
+			bytsiz[nfiles++] = curbytes;
 		}
 		if (nfiles >= MAXFILE) {
 			fputs(argv[0], stderr);
 			fputs(": too many input streams\n", stderr);
-			exit(1);
+			return(1);
 		}
 	}
-	puteol = 0;				/* check for tab character */
+	if (!nfiles) {
+		fputs(argv[0], stderr);
+		fputs(": no input streams\n", stderr);
+		return(1);
+	}
+	if (binout)				/* binary output? */
+		SET_FILE_BINARY(stdout);
+#ifdef getc_unlocked				/* avoid lock/unlock overhead */
 	for (i = nfiles; i--; )
-		if (isprint(tabc[i][0]) || tabc[i][0] == '\t') {
-			puteol++;
-			break;
-		}
-	do {
-		running = 0;
+		flockfile(input[i]);
+	flockfile(stdout);
+#endif
+	puteol = 0;				/* any ASCII output at all? */
+	for (i = nfiles; i--; )
+		puteol += (bytsiz[i] <= 0);
+	do {					/* main loop */
 		for (i = 0; i < nfiles; i++) {
-			if (bytsiz[i]) {		/* binary file */
-				if (fread(buf, bytsiz[i], 1, input[i]) == 1) {
-					if (i)
+			if (bytsiz[i] > 0) {		/* binary input */
+				if (getbinary(buf, bytsiz[i], 1, input[i]) < 1)
+					break;
+				if (putbinary(buf, bytsiz[i], 1, stdout) != 1)
+					break;
+			} else if (bytsiz[i] < 0) {	/* multi-line input */
+				int	n = -bytsiz[i];
+				while (n--) {
+					if (fgets(buf, MAXLINE, input[i]) == NULL)
+						break;
+					if ((i > 0) | (n < -bytsiz[i]-1))
 						fputs(tabc[i], stdout);
-					fwrite(buf, bytsiz[i], 1, stdout);
-					running++;
+					buf[strlen(buf)-1] = '\0';
+					if (fputs(buf, stdout) == EOF)
+						break;
 				}
-			} else if (fgets(buf, MAXLINE, input[i]) != NULL) {
+				if (n >= 0)		/* fell short? */
+					break;
+			} else {			/* single-line input */
+				if (fgets(buf, MAXLINE, input[i]) == NULL)
+					break;
 				if (i)
 					fputs(tabc[i], stdout);
 				buf[strlen(buf)-1] = '\0';
-				fputs(buf, stdout);
-				puteol++;
-				running++;
+				if (fputs(buf, stdout) == EOF)
+					break;
 			}
 		}
-		if (running && puteol)
+		if (i < nfiles)
+			break;
+		if (puteol)
 			putchar('\n');
-	} while (running);
-
-	exit(0);
+		if (unbuff)
+			fflush(stdout);
+	} while (--incnt);
+							/* check ending */
+	if (fflush(stdout) == EOF) {
+		fputs(argv[0], stderr);
+		fputs(": write error on standard output\n", stderr);
+		return(1);
+	}
+	if (incnt > 0) {
+		fputs(argv[0], stderr);
+		fputs(": warning: premature EOD\n", stderr);
+	}
+	return(0);
 }