--- ray/src/cal/lam.c 2016/08/18 00:52:47 1.17 +++ ray/src/cal/lam.c 2025/03/06 20:19:03 1.28 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: lam.c,v 1.17 2016/08/18 00:52:47 greg Exp $"; +static const char RCSid[] = "$Id: lam.c,v 1.28 2025/03/06 20:19:03 greg Exp $"; #endif /* * lam.c - simple program to laminate files. @@ -7,67 +7,72 @@ static const char RCSid[] = "$Id: lam.c,v 1.17 2016/08 * 7/14/88 Greg Ward */ -#include -#include -#include #include -#include "platform.h" -#include "rtprocess.h" #include "rtio.h" +#include "platform.h" +#include "paths.h" -#define MAXFILE 512 /* maximum number of files */ +#ifndef MAXLINE +#define MAXLINE (1L<<20) /* maximum input line per stream */ +#endif -#define MAXLINE 65536 /* maximum input line */ +struct instream { /* structure to hold input stream info */ + FILE *input; /* input stream */ + int bytsiz; /* bytes/component if binary */ + char *tabc; /* data separation string */ +} *rifile = NULL; -long incnt = 0; /* limit number of records? */ +int nfiles = 0; -FILE *input[MAXFILE]; -int bytsiz[MAXFILE]; -char *tabc[MAXFILE]; -int nfiles; - char buf[MAXLINE]; int -main(argc, argv) -int argc; -char *argv[]; +main(int argc, char *argv[]) { + long incnt = 0; int unbuff = 0; int binout = 0; - int i; - char *curtab; - int curbytes; + char *curtab = "\t"; + int curbytes = 0; int puteol; + int i; - curtab = "\t"; - curbytes = 0; - nfiles = 0; + rifile = (struct instream *)calloc(argc-1, sizeof(struct instream)); + if (!rifile) { + fputs(argv[0], stderr); + fputs(": not enough memory\n", stderr); + return(1); + } for (i = 1; i < argc; i++) { if (argv[i][0] == '-') { switch (argv[i][1]) { case 't': curtab = argv[i]+2; - break; + if (!*curtab) curtab = "\n"; + continue; case 'u': unbuff = !unbuff; - break; + continue; case 'i': switch (argv[i][2]) { case 'n': incnt = atol(argv[++i]); - break; + continue; case 'f': + case 'F': curbytes = sizeof(float); break; case 'd': + case 'D': curbytes = sizeof(double); break; case 'i': + case 'I': curbytes = sizeof(int); break; case 'w': + case 'W': curbytes = 2; break; case 'b': @@ -81,90 +86,104 @@ char *argv[]; } if (isdigit(argv[i][3])) curbytes *= atoi(argv[i]+3); - if (abs(curbytes) > MAXLINE) { + curbytes += (curbytes == -1); + if (curbytes > MAXLINE) { fputs(argv[0], stderr); fputs(": input size too big\n", stderr); - exit(1); + return(1); } - if (curbytes) { + if (curbytes > 0) { curtab = ""; ++binout; } - break; + continue; case '\0': - tabc[nfiles] = curtab; - input[nfiles] = stdin; + rifile[nfiles].tabc = curtab; + rifile[nfiles].input = stdin; if (curbytes > 0) - SET_FILE_BINARY(input[nfiles]); - else - curbytes = -curbytes; - bytsiz[nfiles++] = curbytes; - break; + SET_FILE_BINARY(rifile[nfiles].input); + rifile[nfiles++].bytsiz = curbytes; + continue; badopt:; default: fputs(argv[0], stderr); - fputs(": bad option\n", stderr); - exit(1); + fputs(": unknown option '", stderr); + fputs(argv[i], stderr); + fputs("'\n", stderr); + return(1); } - } else if (argv[i][0] == '!') { - tabc[nfiles] = curtab; - if ((input[nfiles] = popen(argv[i]+1, "r")) == NULL) { + } + if (argv[i][0] == '!') { + rifile[nfiles].tabc = curtab; + if ((rifile[nfiles].input = 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]); - else - curbytes = -curbytes; - bytsiz[nfiles++] = curbytes; + SET_FILE_BINARY(rifile[nfiles].input); + rifile[nfiles++].bytsiz = curbytes; } else { - tabc[nfiles] = curtab; - if ((input[nfiles] = fopen(argv[i], "r")) == NULL) { + rifile[nfiles].tabc = curtab; + if ((rifile[nfiles].input = 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]); - else - curbytes = -curbytes; - bytsiz[nfiles++] = curbytes; + SET_FILE_BINARY(rifile[nfiles].input); + rifile[nfiles++].bytsiz = curbytes; } - if (nfiles >= MAXFILE) { - fputs(argv[0], stderr); - fputs(": too many input streams\n", stderr); - exit(1); - } } + if (!nfiles) { + fputs(argv[0], stderr); + fputs(": no input streams\n", stderr); + return(1); + } /* reduce array to size we need */ + rifile = (struct instream *)realloc(rifile, nfiles*sizeof(struct instream)); + if (!rifile) { + fputs(argv[0], stderr); + fputs(": realloc() failed!\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(rifile[i].input); flockfile(stdout); #endif puteol = 0; /* any ASCII output at all? */ for (i = nfiles; i--; ) - if (!bytsiz[i] || isprint(tabc[i][0]) || tabc[i][0] == '\t') { - puteol++; - break; - } + puteol += (rifile[i].bytsiz <= 0); do { /* main loop */ for (i = 0; i < nfiles; i++) { - if (bytsiz[i]) { /* binary file */ - if (getbinary(buf, bytsiz[i], 1, input[i]) < 1) + if (rifile[i].bytsiz > 0) { /* binary input */ + if (getbinary(buf, rifile[i].bytsiz, 1, rifile[i].input) < 1) break; - if (i) - fputs(tabc[i], stdout); - putbinary(buf, bytsiz[i], 1, stdout); - } else { - if (fgets(buf, MAXLINE, input[i]) == NULL) + if (putbinary(buf, rifile[i].bytsiz, 1, stdout) != 1) break; + } else if (rifile[i].bytsiz < 0) { /* multi-line input */ + int n = -rifile[i].bytsiz; + while (n--) { + if (fgets(buf, MAXLINE, rifile[i].input) == NULL) + break; + if ((i > 0) | (n < -rifile[i].bytsiz-1)) + fputs(rifile[i].tabc, stdout); + buf[strlen(buf)-1] = '\0'; + if (fputs(buf, stdout) == EOF) + break; + } + if (n >= 0) /* fell short? */ + break; + } else { /* single-line input */ + if (fgets(buf, MAXLINE, rifile[i].input) == NULL) + break; if (i) - fputs(tabc[i], stdout); + fputs(rifile[i].tabc, stdout); buf[strlen(buf)-1] = '\0'; - fputs(buf, stdout); + if (fputs(buf, stdout) == EOF) + break; } } if (i < nfiles) @@ -174,5 +193,15 @@ char *argv[]; 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); }