Release calc version 2.11.1t1

BUGS

@@ -177,8 +177,8 @@ Problems with known work-a-rounds:
 ## 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.1 $
+## @(#) $Revision: 29.4 $
-## @(#) $Id: BUGS,v 29.1 1999/12/14 09:15:29 chongo Exp $
+## @(#) $Id: BUGS,v 29.4 1999/12/15 09:13:29 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/BUGS,v $
 ##
 ## Under source code control:	1994/03/18 14:06:13

CHANGES

@@ -39,6 +39,13 @@ The following are the changes from calc version 2.11.1 to date:
     now uses ./cal:~/cal (instead of ./lib:~/lib).  Changed LIB_PASSDOWN
     Makefile variable to CAL_PASSDOWN.
 
+    Fixed misc compile warnings and bugs.
+
+    Fixed problem of incorrect paths in the formation of installed
+    calc shell scripts.
+
+    Changed the recommended Comqaq cc compile to be -std0 -fast -O4 -static.
+
 
 The following are the changes from calc version 2.11.0t10 to 2.11.0t11:
 
@@ -4703,8 +4710,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.1 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: CHANGES,v 29.1 1999/12/14 09:15:29 chongo Exp $
+## @(#) $Id: CHANGES,v 29.3 1999/12/15 09:13:45 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $
 ##
 ## Under source code control:	1993/06/02 18:12:57

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.1 $
+# @(#) $Revision: 29.4 $
-# @(#) $Id: Makefile.ship,v 29.1 1999/12/14 09:14:53 chongo Exp $
+# @(#) $Id: Makefile.ship,v 29.4 1999/12/15 08:54:07 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $
 #
 # Under source code control:	1990/02/15 01:48:41
@@ -415,6 +415,7 @@ NROFF_ARG= -man
 #NROFF_ARG= -mandoc
 MANMAKE= /usr/local/bin/manmake
 #MANMAKE= manmake
+MANMODE= 0444
 
 # If the $CALCPATH environment variable is not defined, then the following
 # path will be search for calc resource file routines.
@@ -487,6 +488,8 @@ DEBUG= -O2 -g3
 #DEBUG= -O3 -ipa
 #DEBUG= -O3 -g3 -ipa
 #
+#DEBUG= -std0 -fast -O4 -static
+#
 #DEBUG= -g
 #DEBUG= -g3
 #DEBUG= -gx
@@ -784,7 +787,7 @@ CC= ${PURIFY} ${LCC}
 #
 # Dec Alpha / Compaq Tru64 cc (non-gnu) compiler set
 #
-# For better performance, set the following above:	DEBUG= -O2 -g3
+# For better performance, set the following:	DEBUG= -std0 -fast -O4 -static
 #
 #CCWARN=
 #CCOPT= ${DEBUG} ${NO_SHARED}

calc.h

@@ -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.1 $
+ * @(#) $Revision: 29.2 $
- * @(#) $Id: calc.h,v 29.1 1999/12/14 09:15:34 chongo Exp $
+ * @(#) $Id: calc.h,v 29.2 1999/12/14 19:37:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.h,v $
  *
  * Under source code control:	1990/02/15 01:48:31
@@ -202,7 +202,7 @@ extern char *pager;		/* $PAGER or default */
 extern int stdin_tty;		/* TRUE if stdin is a tty */
 extern int havecommands;	/* TRUE if have cmd args) */
 extern char *program;		/* our name */
-extern char *basename;		/* basename of our name */
+extern char *base_name;		/* basename of our name */
 extern char cmdbuf[];		/* command line expression */
 
 extern int abortlevel;		/* current level of aborts */

config.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.1 $
+ * @(#) $Revision: 29.2 $
- * @(#) $Id: config.c,v 29.1 1999/12/14 09:15:35 chongo Exp $
+ * @(#) $Id: config.c,v 29.2 1999/12/14 19:37:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/config.c,v $
  *
  * Under source code control:	1991/07/20 00:21:56
@@ -960,10 +960,10 @@ config_copy(CONFIG *src)
 	} else {
 		dest->program = strdup(src->program);
 	}
-	if (src->basename == NULL) {
+	if (src->base_name == NULL) {
-		dest->basename = strdup(basename);
+		dest->base_name = strdup(base_name);
 	} else {
-		dest->basename = strdup(src->basename);
+		dest->base_name = strdup(src->base_name);
 	}
 	if (src->version == NULL) {
 		dest->version = strdup(version());
@@ -1009,8 +1009,8 @@ config_free(CONFIG *cfg)
 	if (cfg->program != NULL) {
 		free(cfg->program);
 	}
-	if (cfg->basename != NULL) {
+	if (cfg->base_name != NULL) {
-		free(cfg->basename);
+		free(cfg->base_name);
 	}
 	if (cfg->version != NULL) {
 		free(cfg->version);
@@ -1255,7 +1255,7 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 
 	case CONFIG_PROGRAM:
 		vp->v_type = V_STR;
-		if (cfg->basename == NULL) {
+		if (cfg->base_name == NULL) {
 			vp->v_str = makestring(strdup(program));
 		} else {
 			vp->v_str = makenewstring(cfg->program);
@@ -1264,10 +1264,10 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 
 	case CONFIG_BASENAME:
 		vp->v_type = V_STR;
-		if (cfg->basename == NULL) {
+		if (cfg->base_name == NULL) {
-			vp->v_str = makestring(strdup(basename));
+			vp->v_str = makestring(strdup(base_name));
 		} else {
-			vp->v_str = makenewstring(cfg->basename);
+			vp->v_str = makenewstring(cfg->base_name);
 		}
 		return;
 
@@ -1364,10 +1364,10 @@ config_cmp(CONFIG *cfg1, CONFIG *cfg2)
 	       (cfg1->program != NULL && cfg2->program != NULL &&
 		strcmp(cfg1->program, cfg2->program) != 0) ||
 
-	       (cfg1->basename == NULL && cfg2->basename != NULL) ||
+	       (cfg1->base_name == NULL && cfg2->base_name != NULL) ||
-	       (cfg1->basename != NULL && cfg2->basename == NULL) ||
+	       (cfg1->base_name != NULL && cfg2->base_name == NULL) ||
-	       (cfg1->basename != NULL && cfg2->basename != NULL &&
+	       (cfg1->base_name != NULL && cfg2->base_name != NULL &&
-		strcmp(cfg1->basename, cfg2->basename) != 0) ||
+		strcmp(cfg1->base_name, cfg2->base_name) != 0) ||
 
 	       (cfg1->version == NULL && cfg2->version != NULL) ||
 	       (cfg1->version != NULL && cfg2->version == NULL) ||

config.h

@@ -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.1 $
+ * @(#) $Revision: 29.2 $
- * @(#) $Id: config.h,v 29.1 1999/12/14 09:15:35 chongo Exp $
+ * @(#) $Id: config.h,v 29.2 1999/12/14 19:37:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/config.h,v $
  *
  * Under source code control:	1995/11/01 22:20:17
@@ -145,7 +145,7 @@ struct config {
 	BOOL verbose_quit;	/* TRUE => print Quit or abort executed msg */
 	int ctrl_d;		/* see CTRL_D_xyz below */
 	char *program;		/* our name */
-	char *basename;		/* basename of our name */
+	char *base_name;	/* basename of our name */
 	char *version;		/* calc version string */
 };
 typedef struct config CONFIG;

cscript/Makefile

@@ -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.1 $
+# @(#) $Revision: 29.3 $
-# @(#) $Id: Makefile,v 29.1 1999/12/14 09:15:35 chongo Exp $
+# @(#) $Id: Makefile,v 29.3 1999/12/14 19:30:19 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/Makefile,v $
 #
 # Under source code control:	1999/11/29 11:10:26
@@ -173,7 +173,7 @@ depend:
 	${Q}for i in ${SCRIPT}; do \
 		echo "$$i: $$i.calc"; \
 		echo '	rm -f $$@'; \
-		echo '	$${SED} -e 1s:^#!/usr/local/src/cmd/calc/calc:#!$${SCRIPTDIR}/calc: $$?>$$@'; \
+		echo '	$${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!$${BINDIR}/calc:" $$?>$$@'; \
 		echo '	$${CHMOD} +x $$@'; \
 	done >> makedep.out
 	${Q}echo sample dependency list formed
@@ -231,17 +231,17 @@ install: all
 
 mersenne: mersenne.calc
 	rm -f $@
-	${SED} -e 1s:^#!/usr/local/src/cmd/calc/calc:#!${SCRIPTDIR}/calc: $?>$@
+	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	${CHMOD} +x $@
 piforever: piforever.calc
 	rm -f $@
-	${SED} -e 1s:^#!/usr/local/src/cmd/calc/calc:#!${SCRIPTDIR}/calc: $?>$@
+	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	${CHMOD} +x $@
 plus: plus.calc
 	rm -f $@
-	${SED} -e 1s:^#!/usr/local/src/cmd/calc/calc:#!${SCRIPTDIR}/calc: $?>$@
+	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	${CHMOD} +x $@
 simple: simple.calc
 	rm -f $@
-	${SED} -e 1s:^#!/usr/local/src/cmd/calc/calc:#!${SCRIPTDIR}/calc: $?>$@
+	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	${CHMOD} +x $@

custom/c_sysinfo.c

@@ -18,7 +18,7 @@
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
  * @(#) $Revision: 29.1 $
- * @(#) $Id: c_sysinfo.c,v 29.1 1999/12/14 09:15:37 chongo Exp $
+ * @(#) $Id: c_sysinfo.c,v 29.1 1999/12/14 09:15:37 chongo Exp chongo $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_sysinfo.c,v $
  *
  * Under source code control:	1997/03/09 23:14:40
@@ -319,8 +319,7 @@ dump_name_value(void)
 	for (p = sys_info; p->name != NULL; ++p) {
 		if (p->str == NULL) {
 #if LONG_BITS == FULL_BITS || FULL_BITS == 32 || !defined(HAVE_LONGLONG)
-			fmt = "%s%-23s\t%-8lu\t(0x%lx)\n";
+			printf("%s%-23s\t%-8lu\t(0x%lx)\n",
-			printf(fmt,
 			    (conf->tab_ok ? "\t" : ""), p->name,
 			    (unsigned long)p->nmbr,
 			    (unsigned long)p->nmbr);
@@ -333,7 +332,7 @@ dump_name_value(void)
 			 * So we will only try %lld if %ld does not work.
 			 */
 # if defined(L64_FORMAT)
-			printf("%s%-23s\t%-8lu\t(0x%lx)\n".
+			printf("%s%-23s\t%-8lu\t(0x%lx)\n",
 			    (conf->tab_ok ? "\t" : ""), p->name,
 			    (unsigned long long)p->nmbr,
 			    (unsigned long long)p->nmbr);

hash.c

@@ -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.1 $
+ * @(#) $Revision: 29.2 $
- * @(#) $Id: hash.c,v 29.1 1999/12/14 09:15:38 chongo Exp $
+ * @(#) $Id: hash.c,v 29.2 1999/12/14 19:37:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/hash.c,v $
  *
  * Under source code control:	1995/11/23 05:13:11
@@ -982,7 +982,7 @@ hash_value(int type, void *v, HASH *state)
 		state = hash_bool(type, value->v_config->verbose_quit, state);
 		state = hash_int(type, value->v_config->ctrl_d, state);
 		state = hash_str(type, value->v_config->program, state);
-		state = hash_str(type, value->v_config->basename, state);
+		state = hash_str(type, value->v_config->base_name, state);
 		state = hash_str(type, value->v_config->version, state);
 		break;
 

lib_calc.c

@@ -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.1 $
+ * @(#) $Revision: 29.2 $
- * @(#) $Id: lib_calc.c,v 29.1 1999/12/14 09:16:11 chongo Exp $
+ * @(#) $Id: lib_calc.c,v 29.2 1999/12/14 19:37:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/lib_calc.c,v $
  *
  * Under source code control:	1996/06/17 18:06:19
@@ -95,7 +95,7 @@ int abortlevel;		/* current level of aborts */
 BOOL inputwait;		/* TRUE if in a terminal input wait */
 jmp_buf jmpbuf;		/* for errors */
 char *program = "calc";		/* our name */
-char *basename = "calc";	/* basename of our name */
+char *base_name = "calc";	/* basename of our name */
 char cmdbuf[MAXCMD+1+1+1];	/* command line expression + "\n\0" + guard */
 run run_state = RUN_UNKNOWN;	/* calc startup and run state */
 
@@ -200,9 +200,9 @@ libcalc_call_me_first(void)
 	if (program != NULL) {
 		p = strrchr(program, '/');
 		if (p == NULL) {
-			basename = program;
+			base_name = program;
 		} else {
-			basename = p+1;
+			base_name = p+1;
 		}
 	}
 
@@ -211,7 +211,7 @@ libcalc_call_me_first(void)
 	 */
 	oldstd.epsilon = &_qonesqbase_; /* magic to fake early str2q() */
 	oldstd.program = strdup(program);
-	oldstd.basename = strdup(basename);
+	oldstd.base_name = strdup(base_name);
 	oldstd.version = strdup(version());
 	conf = config_copy(&oldstd); /* more magic to fake early str2q() */
 	conf->tab_ok = FALSE;

quickhash.c

@@ -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.1 $
+ * @(#) $Revision: 29.2 $
- * @(#) $Id: quickhash.c,v 29.1 1999/12/14 09:16:14 chongo Exp $
+ * @(#) $Id: quickhash.c,v 29.2 1999/12/14 19:37:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/quickhash.c,v $
  *
  * Under source code control:	1995/03/04 11:34:23
@@ -436,8 +436,8 @@ config_hash(CONFIG *cfg, QCKHASH val)
 	if (cfg->program) {
 		val = fnv_strhash(cfg->program, val);
 	}
-	if (cfg->basename) {
+	if (cfg->base_name) {
-		val = fnv_strhash(cfg->basename, val);
+		val = fnv_strhash(cfg->base_name, val);
 	}
 	if (cfg->version) {
 		val = fnv_strhash(cfg->version, val);

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.1 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: version.c,v 29.1 1999/12/14 09:16:17 chongo Exp $
+ * @(#) $Id: version.c,v 29.3 1999/12/15 09:13:59 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	""	/* test number or empty string if no patch */
+#define MINOR_PATCH	"1"	/* test number or empty string if no patch */
 
 /*
  * calc version constants
@@ -84,12 +84,8 @@ char *Copyright = "\n"
   "received a copy with calc; if not, write to Free Software Foundation, Inc.\n"
   "59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.\n"
   "\n"
-  "For license details use the command:\t\t\thelp copying\n"
+  "@(#) For license details use the command:\thelp copying\n"
-  "The COPYING-LGPL file may be viewed with the command:\thelp copying-lgpl\n"
+  "The COPYING-LGPL file may be viewed with:\thelp copying-lgpl\n"
-  "\n"
-  "@(#) $Revision: 29.1 $\n"
-  "@(#) $Id: version.c,v 29.1 1999/12/14 09:16:17 chongo Exp $\n"
-  "@(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $\n"
   "\n";