--- ray/src/cal/rcalc.c	2003/07/27 22:12:01	1.7
+++ 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.7 2003/07/27 22:12:01 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.
@@ -17,10 +17,6 @@ static const char RCSid[] = "$Id: rcalc.c,v 1.7 2003/0
 #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')
 
@@ -151,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;
@@ -650,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) ?