--- ray/src/cal/lam.c	2003/02/22 02:07:20	1.1
+++ ray/src/cal/lam.c	2019/07/05 00:46:23	1.21
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: lam.c,v 1.1 2003/02/22 02:07:20 greg Exp $";
+static const char	RCSid[] = "$Id: lam.c,v 1.21 2019/07/05 00:46:23 greg Exp $";
 #endif
 /*
  *  lam.c - simple program to laminate files.
@@ -7,79 +7,177 @@ static const char	RCSid[] = "$Id: lam.c,v 1.1 2003/02/
  *	7/14/88		Greg Ward
  */
 
+#include <stdlib.h>
+#include <string.h>
 #include <stdio.h>
+#include <ctype.h>
 
-#define MAXFILE		16		/* maximum number of files */
+#include "platform.h"
+#include "rtio.h"
 
-#define MAXLINE		512		/* maximum input line */
+#define MAXFILE		512		/* maximum number of files */
 
+#define MAXLINE		65536		/* maximum input line */
+
 FILE	*input[MAXFILE];
-int	tabc[MAXFILE];
-int	nfiles;
+int	bytsiz[MAXFILE];
+char	*tabc[MAXFILE];
+int	nfiles = 0;
 
 char	buf[MAXLINE];
 
-main(argc, argv)
-int	argc;
-char	*argv[];
+int
+main(int argc, char *argv[])
 {
-	register int	i;
-	int	curtab;
-	int	running;
+	long	incnt = 0;
+	int	unbuff = 0;
+	int	binout = 0;
+	char	*curtab = "\t";
+	int	curbytes = 0;
+	int	puteol;
+	int	i;
 
-	curtab = '\t';
-	nfiles = 0;
 	for (i = 1; i < argc; i++) {
 		if (argv[i][0] == '-') {
 			switch (argv[i][1]) {
 			case 't':
-				curtab = argv[i][2];
+				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;
+				case 'd':
+					curbytes = sizeof(double);
+					break;
+				case 'i':
+					curbytes = sizeof(int);
+					break;
+				case 'w':
+					curbytes = 2;
+					break;
+				case 'b':
+					curbytes = 1;
+					break;
+				case 'a':
+					curbytes = argv[i][3] ? -1 : 0;
+					break;
+				default:
+					goto badopt;
+				}
+				if (isdigit(argv[i][3]))
+					curbytes *= atoi(argv[i]+3);
+				curbytes += (curbytes == -1);
+				if (curbytes > MAXLINE) {
+					fputs(argv[0], stderr);
+					fputs(": input size too big\n", stderr);
+					return(1);
+				}
+				if (curbytes > 0) {
+					curtab = "";
+					++binout;
+				}
+				break;
 			case '\0':
 				tabc[nfiles] = curtab;
-				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;
-			if ((input[nfiles++] = popen(argv[i]+1, "r")) == NULL) {
+			if ((input[nfiles] = popen(argv[i]+1, "r")) == NULL) {
 				fputs(argv[i], stderr);
 				fputs(": cannot start command\n", stderr);
-				exit(1);
+				return(1);
 			}
+			if (curbytes > 0)
+				SET_FILE_BINARY(input[nfiles]);
+			bytsiz[nfiles++] = curbytes;
 		} else {
 			tabc[nfiles] = curtab;
-			if ((input[nfiles++] = fopen(argv[i], "r")) == NULL) {
+			if ((input[nfiles] = fopen(argv[i], "r")) == NULL) {
 				fputs(argv[i], stderr);
 				fputs(": cannot open file\n", stderr);
-				exit(1);
+				return(1);
 			}
+			if (curbytes > 0)
+				SET_FILE_BINARY(input[nfiles]);
+			bytsiz[nfiles++] = curbytes;
 		}
 		if (nfiles >= MAXFILE) {
 			fputs(argv[0], stderr);
 			fputs(": too many input streams\n", stderr);
-			exit(1);
+			return(1);
 		}
 	}
-
-	do {
-		running = 0;
+	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--; )
+		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 (fgets(buf, MAXLINE, input[i]) != NULL) {
+			if (bytsiz[i] > 0) {		/* binary input */
+				if (getbinary(buf, bytsiz[i], 1, input[i]) < 1)
+					break;
+				putbinary(buf, bytsiz[i], 1, stdout);
+			} 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);
+					buf[strlen(buf)-1] = '\0';
+					fputs(buf, stdout);
+				}
+				if (n >= 0)		/* fell short? */
+					break;
+			} else {			/* single-line input */
+				if (fgets(buf, MAXLINE, input[i]) == NULL)
+					break;
 				if (i)
-					putchar(tabc[i]);
+					fputs(tabc[i], stdout);
 				buf[strlen(buf)-1] = '\0';
 				fputs(buf, stdout);
-				running++;
 			}
 		}
-		if (running)
+		if (i < nfiles)
+			break;
+		if (puteol)
 			putchar('\n');
-	} while (running);
-
-	exit(0);
+		if (unbuff)
+			fflush(stdout);
+	} while (--incnt);
+							/* check ending */
+	if (incnt > 0) {
+		fputs(argv[0], stderr);
+		fputs(": warning: premature EOD\n", stderr);
+	}
+	return(0);
 }