--- ray/src/cal/rcalc.c	2003/06/08 12:03:09	1.5
+++ ray/src/cal/rcalc.c	2003/11/05 19:03:03	1.9
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rcalc.c,v 1.5 2003/06/08 12:03:09 schorsch Exp $";
+static const char RCSid[] = "$Id: rcalc.c,v 1.9 2003/11/05 19:03:03 greg Exp $";
 #endif
 /*
  *  rcalc.c - record calculator program.
@@ -15,11 +15,8 @@ static const char RCSid[] = "$Id: rcalc.c,v 1.5 2003/0
 
 #include  "platform.h"
 #include  "calcomp.h"
+#include  "rterror.h"
 
-#ifdef  CPM
-#define  getc           agetc   /* text files only, right? */
-#endif
-
 #define  isnum(c)       (isdigit(c) || (c)=='-' || (c)=='.' \
 				|| (c)=='+' || (c)=='e' || (c)=='E')
 
@@ -150,12 +147,22 @@ char  *argv[]
 					nbicols = atoi(argv[i]+3);
 				else
 					nbicols = 1;
+				if (nbicols*sizeof(double) > INBSIZ) {
+					eputs(argv[0]);
+					eputs(": too many input columns\n");
+					quit(1);
+				}
 				break;
 			case 'f':
 				if (isdigit(argv[i][3]))
 					nbicols = -atoi(argv[i]+3);
 				else
 					nbicols = -1;
+				if (-nbicols*sizeof(float) > INBSIZ) {
+					eputs(argv[0]);
+					eputs(": too many input columns\n");
+					quit(1);
+				}
 				break;
 			default:
 				goto userr;
@@ -616,7 +623,7 @@ getfield(                             /* get next fiel
 register struct field  *f
 )
 {
-	static char  buf[MAXWORD+1];            /* no recursion! */
+	static char  buf[RMAXWORD+1];            /* no recursion! */
 	int  delim, inword;
 	double  d;
 	char  *np;
@@ -649,7 +656,7 @@ register struct field  *f
 			delim = f->next->f.sl[0];
 		cp = buf;
 		do {
-			if (ipb.chr == EOF)
+			if (ipb.chr == EOF || ipb.chr == '\n')
 				inword = 0;
 			else if (blnkeq && delim != EOF)
 				inword = isblnk(delim) ?
@@ -661,7 +668,7 @@ register struct field  *f
 				*cp++ = ipb.chr;
 				scaninp();
 			}
-		} while (inword && cp < &buf[MAXWORD]);
+		} while (inword && cp < &buf[RMAXWORD]);
 		*cp = '\0';
 		if (f->f.sv->val == NULL)
 			f->f.sv->val = savqstr(buf);	/* first setting */
@@ -690,7 +697,7 @@ register struct field  *f
 				*cp++ = ipb.chr;
 				scaninp();
 			}
-		} while (inword && cp < &buf[MAXWORD]);
+		} while (inword && cp < &buf[RMAXWORD]);
 		*cp = '\0';
 		d = np==NULL ? 0. : atof(np);
 		if (!vardefined(f->f.nv))