--- ray/src/cal/calc.c	2003/11/14 17:31:24	1.5
+++ ray/src/cal/calc.c	2013/12/19 16:38:12	1.7
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: calc.c,v 1.5 2003/11/14 17:31:24 schorsch Exp $";
+static const char	RCSid[] = "$Id: calc.c,v 1.7 2013/12/19 16:38:12 greg Exp $";
 #endif
 /*
  *  calc.c - simple algebraic desk calculator program.
@@ -8,11 +8,10 @@ static const char	RCSid[] = "$Id: calc.c,v 1.5 2003/11
  */
 
 #include  <stdlib.h>
-#include  <stdio.h>
-#include  <string.h>
 #include  <setjmp.h>
 #include  <ctype.h>
 
+#include  "rtio.h"
 #include  "rterror.h"
 #include  "calcomp.h"
 
@@ -30,7 +29,8 @@ main(argc, argv)
 int  argc;
 char  *argv[];
 {
-	char  expr[512];
+	char  expr[2048];
+	char  *epos;
 	FILE  *fp;
 	int  i;
 	register char  *cp;
@@ -42,17 +42,31 @@ char  *argv[];
 #endif
 	varset("PI", ':', 3.14159265358979323846);
 
-	for (i = 1; i < argc; i++)
-		fcompile(argv[i]);
-
+	for (i = 1; i < argc; i++) {
+		char	*path = getpath(argv[i], getrlibpath(), 0);
+		if (path == NULL) {
+			eputs(argv[0]);
+			eputs(": cannot find file '");
+			eputs(argv[i]);
+			eputs("'\n");
+			quit(1);
+		}
+		fcompile(path);
+	}
 	setjmp(env);
 	recover = 1;
 	eclock++;
 
-	while (fgets(expr, sizeof(expr), stdin) != NULL) {
-		for (cp = expr; *cp && *cp != '\n'; cp++)
-			;
-		*cp = '\0';
+	epos = expr;
+	while (fgets(epos, sizeof(expr)-(epos-expr), stdin) != NULL) {
+		while (*epos && *epos != '\n')
+			epos++;
+		if (*epos && epos > expr && epos[-1] == '\\') {
+			epos[-1] = ' ';
+			continue;		/* escaped newline */
+		}
+		*epos = '\0';
+		epos = expr;
 		switch (expr[0]) {
 		case '\0':
 			continue;