From 417ffb6ab572389e13b31d01d2eee4ad8482c78a Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Sat, 18 Dec 1999 19:34:05 -0800 Subject: [PATCH] Release calc version 2.11.1t2.1 --- CHANGES | 14 +++----------- Makefile | 5 ++--- cal/regress.cal | 13 ++++++++----- func.c | 9 ++------- version.c | 6 +++--- 5 files changed, 18 insertions(+), 29 deletions(-) diff --git a/CHANGES b/CHANGES index 7d42ca9..ea7bfb3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,12 +1,4 @@ -The following are the changes from calc version 2.11.1t3 to date: - - Removed non-portable strerror() tests (3715, 3724 and 3728) from - calc/regress.cal. - - Fixed missing strdup() from func.c problem. - - -The following are the changes from calc version 2.11.1 to 2.11.1t2.2: +The following are the changes from calc version 2.11.1 to date: Placed calc under version 2.1 of the GNU Lesser General Public License. @@ -4726,8 +4718,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1: ## received a copy with calc; if not, write to Free Software Foundation, Inc. ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ## -## @(#) $Revision: 29.6 $ -## @(#) $Id: CHANGES,v 29.6 1999/12/19 03:26:47 chongo Exp $ +## @(#) $Revision: 29.5 $ +## @(#) $Id: CHANGES,v 29.5 1999/12/17 10:36:02 chongo Exp $ ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $ ## ## Under source code control: 1993/06/02 18:12:57 diff --git a/Makefile b/Makefile index 896ab36..b3e5c31 100644 --- a/Makefile +++ b/Makefile @@ -20,8 +20,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # -# @(#) $Revision: 29.6 $ -# @(#) $Id: Makefile.ship,v 29.6 1999/12/19 03:19:58 chongo Exp $ +# @(#) $Revision: 29.5 $ +# @(#) $Id: Makefile.ship,v 29.5 1999/12/17 09:07:35 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -3316,7 +3316,6 @@ func.o: have_malloc.h func.o: have_memmv.h func.o: have_newstr.h func.o: have_stdlib.h -func.o: have_strdup.h func.o: have_string.h func.o: have_times.h func.o: have_unistd.h diff --git a/cal/regress.cal b/cal/regress.cal index 33112ba..4cdbfa0 100644 --- a/cal/regress.cal +++ b/cal/regress.cal @@ -17,8 +17,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * - * @(#) $Revision: 29.2 $ - * @(#) $Id: regress.cal,v 29.2 1999/12/19 03:16:54 chongo Exp $ + * @(#) $Revision: 29.1 $ + * @(#) $Id: regress.cal,v 29.1 1999/12/14 09:15:32 chongo Exp $ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/regress.cal,v $ * * Under source code control: 1990/02/15 01:50:36 @@ -3085,7 +3085,8 @@ define test_error() print '3712: e9999 = error(9999)'; vrfy(errno() == 9999, '3713: errno() == 9999'); vrfy(error() == e9999, '3714: error() == e9999'); - /* test 3715 removed due to non-portable strerror() output */ + 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); @@ -3096,14 +3097,16 @@ define test_error() vrfy(errno(9999) == n, '3721: errno() == n'); vrfy(errno() == 9999, '3722: errno() == 9999'); vrfy(error() == e9999, '3723: error() == e9999'); - /* test 3724 removed due to non-portable strerror() output */ + 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"'); n = 8191; print '3727: n = 8191'; - /* test 3728 removed due to non-portable strerror() output */ + 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, '3729: errcount() == ecnt'); diff --git a/func.c b/func.c index 7ca85cd..59f7400 100644 --- a/func.c +++ b/func.c @@ -19,8 +19,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * - * @(#) $Revision: 29.2 $ - * @(#) $Id: func.c,v 29.2 1999/12/19 03:20:26 chongo Exp $ + * @(#) $Revision: 29.1 $ + * @(#) $Id: func.c,v 29.1 1999/12/14 09:15:38 chongo Exp $ * @(#) $Source: /usr/local/src/cmd/calc/RCS/func.c,v $ * * Under source code control: 1990/02/15 01:48:15 @@ -73,11 +73,6 @@ #include #endif -#include "have_strdup.h" -#if !defined(HAVE_STRDUP) -# define strdup(x) calc_strdup((CONST char *)(x)) -#endif - #include "have_const.h" #include "calc.h" #include "calcerr.h" diff --git a/version.c b/version.c index 904f4e7..d3e35c4 100644 --- a/version.c +++ b/version.c @@ -19,8 +19,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * - * @(#) $Revision: 29.8 $ - * @(#) $Id: version.c,v 29.8 1999/12/19 03:32:56 chongo Exp $ + * @(#) $Revision: 29.5 $ + * @(#) $Id: version.c,v 29.5 1999/12/17 10:36:02 chongo Exp $ * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $ * * Under source code control: 1990/05/22 11:00:58 @@ -43,7 +43,7 @@ static char *program; #define MAJOR_VER 2 /* major version */ #define MINOR_VER 11 /* minor version */ #define MAJOR_PATCH 1 /* patch level or 0 if no patch */ -#define MINOR_PATCH "3.0" /* test number or empty string if no patch */ +#define MINOR_PATCH "2.1" /* test number or empty string if no patch */ /* * calc version constants