Release calc version 2.11.0t10.1.4

Makefile

@@ -1114,8 +1114,7 @@ custom.o: custom.c ${MAKE_FILE}
 	${CC} ${CFLAGS} ${ALLOW_CUSTOM} -c custom.c
 
 hist.o: hist.c ${MAKE_FILE}
-	${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} \
+	${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} -c hist.c
-	    -c hist.c
 
 func.o: func.c ${MAKE_FILE}
 	${CC} ${CFLAGS} ${ALLOW_CUSTOM} -c func.c

help/fputs

@@ -22,7 +22,7 @@ EXAMPLE
 	    "chongo was here"
 
 LIMITS
-    fd must be associaed with an open file
+    fd must be associated with an open file
 
 LIBRARY
     none

lib/mod.cal

@@ -159,9 +159,9 @@ define mod_inv(a)
 
 define mod_div(a, b)
 {
-	local c, x, y;
+	local c;
-
+	local obj mod x;
-	obj mod x, y;
+	local obj mod y;
 	if (isnum(a))
 		a = lmod(a);
 	if (isnum(b))

lib/poly.cal

@@ -471,8 +471,9 @@ define plist(s) {
 define deg(a) = size(a.p) - 1;
 
 define polydiv(a,b) {
-	local q, r, d, u, i, m, n, sa, sb, sq;
+	local d, u, i, m, n, sa, sb, sq;
-	obj poly q, r;
+	local obj poly q;
+	local obj poly r;
 	sa=findlist(a); sb = findlist(b); sq = list();
 	m=size(sa)-1; n=size(sb)-1;
 	if (n<0) quit "Zero divisor";

lib/regress.cal

@@ -3048,8 +3048,8 @@ define test_error()
 	print				'3712: e9999 = error(9999)';
 	vrfy(errno() == 9999,		'3713: errno() == 9999');
 	vrfy(error() == e9999,		'3714: error() == e9999');
-	vrfy(substr(strerror(), strlen(strerror())-3, 4) == "9999",
+	vrfy(substr(strerror(), strpos(strerror(),"9999"), 4) == "9999",
-		'3715: substr(strerror(), strlen(strerror())-3, 4) == "9999"');
+	    '3715: substr(strerror(), strpos(strerror(),"9999"), 4) == "9999"');
 	x = newerror("Alpha");
 	print				'3716: x = newerror("Alpha")';
 	n = iserror(x);
@@ -3060,19 +3060,21 @@ define test_error()
 	vrfy(errno(9999) == n,		'3721: errno() == n');
 	vrfy(errno() == 9999,		'3722: errno() == 9999');
 	vrfy(error() == e9999,		'3723: error() == e9999');
-	vrfy(substr(strerror(), strlen(strerror())-3, 4) == "9999",
+	vrfy(substr(strerror(), strpos(strerror(),"9999"), 4) == "9999",
-		'3724: substr(strerror(), strlen(strerror())-3, 4) == "9999"');
+	    '3724: substr(strerror(), strpos(strerror(),"9999"), 4) == "9999"');
 	a = 1/0;
 	print				'3725: a = 1/0';
 	vrfy(strerror() == "Division by zero",
 				'3726: strerror() == "Division by zero"');
-	vrfy(substr(strerror(9941), strlen(strerror(9941))-3, 4) == "9941",
+	n = 8191;
-	 '3728: substr(strerror(9941), strlen(strerror(9941))-3, 4) == "9941"');
+	print				'3727: n = 8191';
+	vrfy(substr(strerror(8191),strpos(strerror(n),"8191"), 4) == "8191",
+	    '3728: substr(strerror(n),strpos(strerror(n),"8191"),4) == "8191"');
 
 	/* errmax and errcount should be bumped up the 148 errors above */
-	vrfy(errcount() == ecnt,	'3728: errcount() == ecnt');
+	vrfy(errcount() == ecnt,	'3729: errcount() == ecnt');
 
-	print '3729: Ending test_error';
+	print '3730: Ending test_error';
 }
 print '054: parsed test_error()';
 

version.c

@@ -18,7 +18,7 @@ static char *program;
 #define MAJOR_VER	2	/* major version */
 #define MINOR_VER	11	/* minor version */
 #define MAJOR_PATCH	0	/* patch level or 0 if no patch */
-#define MINOR_PATCH  "10.1.2"	/* test number or empty string if no patch */
+#define MINOR_PATCH  "10.1.4"	/* test number or empty string if no patch */
 
 /*
  * calc version constants