diff --git a/Makefile b/Makefile index e825838..ebc65fa 100644 --- a/Makefile +++ b/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} \ - -c hist.c + ${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} -c hist.c func.o: func.c ${MAKE_FILE} ${CC} ${CFLAGS} ${ALLOW_CUSTOM} -c func.c diff --git a/lib/regress.cal b/lib/regress.cal index f5a9f1e..0cf144e 100644 --- a/lib/regress.cal +++ b/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", - '3715: substr(strerror(), strlen(strerror())-3, 4) == "9999"'); + vrfy(substr(strerror(), strpos(strerror(),"9999"), 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", - '3724: substr(strerror(), strlen(strerror())-3, 4) == "9999"'); + vrfy(substr(strerror(), strpos(strerror(),"9999"), 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", - '3728: substr(strerror(9941), strlen(strerror(9941))-3, 4) == "9941"'); + n = 8191; + 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()'; diff --git a/version.c b/version.c index 3ec933c..d0ae284 100644 --- a/version.c +++ b/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.3" /* 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