Release calc version 2.12.1.6

BUGS

@@ -80,6 +80,25 @@ mis-features in calc:
     work better.  The following is a list of mis-features that should be
     addressed and improved someday.
 
+    * When statement is of the form { ... }, the leading { MUST BE ON
+      THE SAME LINE as the if, for, while or do keyword.
+
+      This works as expected:
+
+	if (expr) {
+	    ...
+	}
+
+      However this WILL NOT WORK AS EXPECTED:
+
+	if (expr)
+	{
+	    ...
+	}
+
+      This needs to be changed.  See also "help statement", "help unexpected",
+      and "help todo".
+
     * The chi.cal resource file does not work well with odd degrees
       of freedom.  Can someone improve this algorithm?
 
@@ -141,8 +160,8 @@ Problems with old systems that have 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.25 $
-## @(#) $Id: BUGS,v 29.25 2006/08/20 17:51:25 chongo Exp $
+## @(#) $Revision: 29.26 $
+## @(#) $Id: BUGS,v 29.26 2007/01/03 21:26:22 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/BUGS,v $
 ##
 ## Under source code control:	1994/03/18 14:06:13

CHANGES

@@ -1,4 +1,93 @@
-The following are the changes from calc version 2.12.0 to date:
+The following are the changes from calc version 2.12.1.6 to date:
+
+    Added the calc builtin function, usertime(), to return the amount of
+    user CPU time used by the current process.  Unlike the old runtime()
+    builtin, the CPU time reported for long running processes will not
+    wrap around to 0 after only a few months.
+
+    Added the calc builtin function, systime(), to return the amount of
+    kernel CPU time used by the current process.
+
+    The runtime() builtin function now returns the total amount of CPU
+    time used by the current process.  This time includes both user mode
+    and kernel mode time.  Unlike the old runtime() builtin, the builtin
+    includes time spent executing operating system code on behalf of
+    the current process.
+
+    Fixed runtime() so that the CPU time reported for long running
+    processes will wrap around to 0 for a long time.
+
+    Added config("hz") to return the clock tick rate.  This is
+    a read-only configuration value.
+
+    Added regression tests for recently added config() parameters.
+
+    Fixed the #define symbols that were created in have_strdup.h.
+    Previously this file looked as if have_rusage.h has been
+    included already.
+
+    Restored the function of "help" (without any args) printing the
+    default help file.  Thanks for this fix goes to Silvan Minghetti
+    <bullet at users dot sourceforge dot net>.
+
+    Fixed a problem where some old MS environments failed some of the
+    regression tests because "read -once foo.cal" was not behaving
+    correctly due to how the _fullpath() was being called.  Thanks for
+    this fix goes to Anatoly <notexistent-anb at yandex dot ru>.
+
+    Documented the mis-feature about how calc parses if, for, while
+    and do statements in an unexpected way.   For example:
+
+	This works as expected:
+
+	    if (expr) {
+		...
+	    }
+
+	However this WILL NOT WORK AS EXPECTED:
+
+	    if (expr)
+	    {
+		...
+	    }
+
+	because calc will parse the if being terminated by
+	an empty statement followed by a
+
+	    if (expr) ;
+	    {
+		...
+	    }
+
+    See also "help statement", "help unexpected", "help todo", and
+    "help bugs".
+
+
+The following are the changes from calc version 2.12.1 to 2.12.1.5:
+
+    Fixed minor typos in the 'version 2.12.0 to 2.12.0.8' section below.
+    Made minor formatting changes as well.
+
+    Changed use of ${Q} in the Makefile to avoid an make "feature"
+    related to OpenBSD.  Added ${RM} make variable for make tools that
+    do not have builtin defined terms.
+
+    Removed the ECHO_PROG Makefile variable.  Also removed it from
+    the sysinfo() custom function.
+
+    Improved the support for cross-compiled environmens by using
+    make symbols for all non-shell commands executed by Makefiles.
+
+    Fixed a problem with the make chk awk script which failed under
+    OS X 10.4.7.
+
+    Fixed a few minor variables that were not set to default values in
+    lower level Makefiles.
+
+    Fixed a reference to a non-existent make variable in HOWTO.INSTALL.
+
+
+The following are the changes from calc version 2.12.0 to 2.12.0.8:
 
     Fixed ellip.cal to deal with a calc syntax change that happened
     many ages ago but was never applied to this file until now.
@@ -109,34 +198,34 @@ The following are the changes from calc version 2.12.0 to date:
     <ebowen at une dot edu dot au>, the dotest evaluates individual
     lines from a file.  The dotest() function takes 1 to 3 arguments:
 
-    dotest(dotest_file [,dotest_code [,dotest_maxcond]])
+	dotest(dotest_file [,dotest_code [,dotest_maxcond]])
 
-    dotest_file
+	dotest_file
 
-        Search along CALCPATH for dotest_file, which contains lines that
-        should evaluate to 1.  Comment lines and empty lines are ignored.
-        Comment lines should use ## instead of the multi like /* ... */
-        because lines are evaluated one line at a time.
+	    Search along CALCPATH for dotest_file, which contains lines that
+	    should evaluate to 1.  Comment lines and empty lines are ignored.
+	    Comment lines should use ## instead of the multi like /* ... */
+	    because lines are evaluated one line at a time.
 
-    dotest_code
+	dotest_code
 
-        Assign the code number that is to be printed at the start of
-        each non-error line and after **** in each error line.
-        The default code number is 999.
+	    Assign the code number that is to be printed at the start of
+	    each non-error line and after **** in each error line.
+	    The default code number is 999.
 
-    dotest_maxcond
+	dotest_maxcond
 
-        The maximum number of error conditions that may be detected.
-        An error condition is not a sign of a problem, in some cases
-        a line deliberately forces an error condition.  A value of -1,
-        the default, implies a maximum of 2147483647.
+	    The maximum number of error conditions that may be detected.
+	    An error condition is not a sign of a problem, in some cases
+	    a line deliberately forces an error condition.  A value of -1,
+	    the default, implies a maximum of 2147483647.
 
-    Global variables and functions must be declared ahead of time because
-    the dotest scope of evaluation is a line at a time.  For example:
+	Global variables and functions must be declared ahead of time because
+	the dotest scope of evaluation is a line at a time.  For example:
 
-        ; read dotest.cal
-        ; read set8700.cal
-        ; dotest("set8700.line");
+	    ; read dotest.cal
+	    ; read set8700.cal
+	    ; dotest("set8700.line");
 
     Updated the todo / wish list items.  The top priority now is to
     convert calc to GNU autoconf / configure to build the calc.
@@ -164,7 +253,7 @@ The following are the changes from calc version 2.12.0 to date:
     Made math_error() in math_error.c more robust against a error
     message constant that is too long.
 
-    Made read_bindings() in hist.c more robust against very line bindings
+    Made read_bindings() in hist.c more robust against very long bindings
     config lines.
 
     Made listsort() in listfunc.c and matsort() matfunc.c more robust
@@ -179,8 +268,7 @@ The following are the changes from calc version 2.12.0 to date:
     no other compile errors, only the unterminated comment will stop
     completion of the function being defined.
 
-    Added the reading of more calc resource files to the cal/regress.cal
-    regression test.
+    The cal/regress.cal now reads most of the calc resource files.
 
     The issq() test had a slight performance boost.  A minor note
     was added to the help/issq file.
@@ -192,25 +280,18 @@ The following are the changes from calc version 2.12.0 to date:
     the number of bits in the fundamental base in which calculations
     are performed.  This is a read-only configuration value.
 
-    Calc now permits such as:
-
-    	++*p--       ++*----*++p----
-
+    Calc now will allow syntax such as ++*p-- and  ++*----*++p----
     where p is an lvalue; successful evaluation of course require the
     successive operations to be performed to have operands of appropriate
     types; e.g. in *A, A is usually an lvalue whose current value is a
     pointer. ++ and -- act on lvalues. In the above examples there are
     implied parentheses from the beginning to immediately after p. If
-    there are no pre ++ or -- operations, as in
-
-	**p++
-
-    the implied parentheses are from immediately before p to the end.
+    there are no pre ++ or -- operations, as in **p++.  The implied
+    parentheses are from immediately before p to the end.
 
     Improved the error message when && is used as a prefix operator.
 
-    Changed the help/config file to read like a builtin function
-    help file.
+    Changed the help/config file to read like a builtin function help file.
 
     One can no longer set to 1, or to a value < 0, the config()
     parameters: "mul2", "sq2", "pow2", and "redc2".  These values
@@ -224,10 +305,10 @@ The following are the changes from calc version 2.12.0 to date:
 	config("sq2") == 3388
 	config("pow2") == 176
 
-    These values were determined established on a 1.8GHz AMD 32-bit
-    CPU of ~3406 BogoMIPS by the new resource file:
+	These values were determined established on a 1.8GHz AMD 32-bit
+	CPU of ~3406 BogoMIPS by the new resource file:
 
-        cal/alg_config.cal
+	    cal/alg_config.cal
 
    Regarding the alg_config.cal resource file:
 
@@ -255,7 +336,7 @@ The following are the changes from calc version 2.12.0 to date:
 	inaccuracy in CPU timings will cause the best value returned to
 	differ slightly from run to run.
 
-    See "help resource" for more information on alg_config.cal.
+	See "help resource" for more information on alg_config.cal.
 
     Updated the "help variable" text to reflect the current calc
     use of ` (backquote), * (star), and & (ampersand).
@@ -304,24 +385,22 @@ The following are the changes from calc version 2.12.0 to date:
 	silly to use the same identifier for both a parameter and local
 	variable, it should not be illegal.
 
-    The provision of warnings for possibly questionable programming in
-    function definitions.
+    Added warnings for possibly questionable code in function definitions.
 
     Added config("redecl_warn", boolean) to control if calc issues
     warnings about variables being declared.  The config("redecl_warn")
     value is TRUE by default.
 
     Added config("dupvar_warn", boolean) to control if calc issues
-    warnings about when variable names collide.  Examples of variable name
-    collisions include when:
+    warnings about when variable names collide.  The config("dupvar_warn")
+    value is TRUE by default.  Examples of variable name collisions
+    include when:
 
     	* both local and static variables have the same name
     	* both local and global variables have the same name
     	* both function parameter and local variables have the same name
     	* both function parameter and global variables have the same name
 
-    The config("dupvar_warn") value is TRUE by default.
-
     Fix of a bug which causes some static variables not to be correctly
     unscoped when their identifiers are used in a global declaration.
 
@@ -351,7 +430,7 @@ The following are the changes from calc version 2.12.0 to date:
     	read sumtimes
 	doalltimes(1e6)
 
-    Calc now ignores carrage returns (\r), vertical tabs (\v), and
+    Calc now ignores carriage returns (\r), vertical tabs (\v), and
     form feeds (\f) when token parsing.  Thus users on Windoz systems
     can write files using their \r\n format and users on non-Windoz
     systems can read them without errors.
@@ -359,7 +438,7 @@ The following are the changes from calc version 2.12.0 to date:
     The quomod() builtin function now takes an optional 5th argument
     which controls the rounding mode like config("quomod") does, but
     only for that call.  Now quomod() is in line with quo() and mod()
-    in that the final augument is an optional rounding mode.
+    in that the final argument is an optional rounding mode.
 
     Added a "make uninstall" rule which will attempt to remove everything
     that was installed by a "make install".
@@ -6202,8 +6281,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.86 $
-## @(#) $Id: CHANGES,v 29.86 2006/08/20 16:18:10 chongo Exp $
+## @(#) $Revision: 29.91 $
+## @(#) $Id: CHANGES,v 29.91 2007/01/03 21:27:55 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $
 ##
 ## Under source code control:	1993/06/02 18:12:57

HOWTO.INSTALL

@@ -52,14 +52,14 @@ Installing calc from the gziped tarball in 4 easy steps:
 	    CALC_INCDIR        where the calc include files are installed
 	    CUSTOMCALDIR       where custom *.cal files are installed
 	    CUSTOMHELPDIR      where custom help files are installed
-	    CUSTOMINCPDIR      where custom .h files are installed
+	    CUSTOMINCDIR       where custom .h files are installed
 	    SCRIPTDIR          where calc shell scripts are installed
 
 	If you want to install calc files under a top level directory,
 	then set the T value:
 
-	    The calc install is performed under $T, the calc build is
-	    performed under /.	The purpose for $T is to allow someone
+	    The calc install is performed under ${T}, the calc build is
+	    performed under /.	The purpose for ${T} is to allow someone
 	    to install calc somewhere other than into the system area.
 
 	    For example, if:
@@ -79,10 +79,10 @@ Installing calc from the gziped tarball in 4 easy steps:
 		calc help, .cal ...:	/var/tmp/testing/usr/share/calc
 		... etc ...		/var/tmp/testing/...
 
-	    If $T is empty, calc is installed under /, which is the same
-	    top of tree for which it was built.  If $T is non-empty, then
-	    calc is installed under $T, as if one had to chroot under
-	    $T for calc to operate.
+	    If ${T} is empty, calc is installed under /, which is the same
+	    top of tree for which it was built.  If ${T} is non-empty, then
+	    calc is installed under ${T}, as if one had to chroot under
+	    ${T} for calc to operate.
 
 	Look for the section that starts:
 
@@ -162,8 +162,8 @@ the calc help subsystem.  See the README file for details.
 ## 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.7 $
-## @(#) $Id: HOWTO.INSTALL,v 29.7 2003/04/15 03:38:34 chongo Exp $
+## @(#) $Revision: 29.9 $
+## @(#) $Id: HOWTO.INSTALL,v 29.9 2006/09/18 13:11:57 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/HOWTO.INSTALL,v $
 ##
 ## Under source code control:	1999/09/27 20:48:44

cal/Makefile

@@ -2,7 +2,7 @@
 #
 # cal - makefile for calc standard resource files
 #
-# Copyright (C) 1999  Landon Curt Noll
+# Copyright (C) 1999-2006  Landon Curt Noll
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -18,8 +18,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.21 $
-# @(#) $Id: Makefile,v 29.21 2006/06/26 05:46:06 chongo Exp $
+# @(#) $Revision: 29.24 $
+# @(#) $Id: Makefile,v 29.24 2006/09/18 13:13:25 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/21 05:00:54
@@ -33,8 +33,8 @@
 
 # required vars
 #
-SHELL = /bin/sh
-MAKE_FILE = Makefile
+SHELL= /bin/sh
+MAKE_FILE= Makefile
 
 ####
 # Normally, the upper level makefile will set these values.  We provide
@@ -62,9 +62,9 @@ INCDIR= /usr/include
 # ${LIBDIR}		where calc link library (*.a) files are installed
 # ${CALC_SHAREDIR}	where to install calc help, .cal, startup, config files
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # For DJGPP, select:
 #
@@ -96,12 +96,12 @@ CALC_SHAREDIR= /usr/share/calc
 # ${CALC_INCDIR}	where the calc include files are installed
 # ${CUSTOMCALDIR}	where custom *.cal files are installed
 # ${CUSTOMHELPDIR}	where custom help files are installed
-# ${CUSTOMINCPDIR}	where custom .h files are installed
+# ${CUSTOMINCDIR}	where custom .h files are installed
 # ${SCRIPTDIR}		where calc shell scripts are installed
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # If in doubt, set:
 #
@@ -121,8 +121,8 @@ SCRIPTDIR= ${BINDIR}/cscript
 
 # T - top level directory under which calc will be installed
 #
-# The calc install is performed under $T, the calc build is
-# performed under /.	The purpose for $T is to allow someone
+# The calc install is performed under ${T}, the calc build is
+# performed under /.	The purpose for ${T} is to allow someone
 # to install calc somewhere other than into the system area.
 #
 # For example, if:
@@ -142,10 +142,10 @@ SCRIPTDIR= ${BINDIR}/cscript
 #     calc help, .cal ...:	/var/tmp/testing/usr/share/calc
 #     ... etc ...		/var/tmp/testing/...
 #
-# If $T is empty, calc is installed under /, which is the same
-# top of tree for which it was built.  If $T is non-empty, then
-# calc is installed under $T, as if one had to chroot under
-# $T for calc to operate.
+# If ${T} is empty, calc is installed under /, which is the same
+# top of tree for which it was built.  If ${T} is non-empty, then
+# calc is installed under ${T}, as if one had to chroot under
+# ${T} for calc to operate.
 #
 # If in doubt, use T=
 #
@@ -163,6 +163,14 @@ Q=@
 #
 CHMOD= chmod
 CMP= cmp
+RM= rm
+MKDIR= mkdir
+RMDIR= rmdir
+CP= cp
+MV= mv
+CO= co
+TRUE= true
+TOUCH= touch
 
 # The calc files to install
 #
@@ -192,8 +200,8 @@ all: ${CALC_FILES} ${MAKE_FILE} .all
 # used by the upper level Makefile to determine of we have done all
 #
 .all:
-	rm -f .all
-	touch .all
+	${RM} -f .all
+	${TOUCH} .all
 
 ##
 #
@@ -209,17 +217,17 @@ all: ${CALC_FILES} ${MAKE_FILE} .all
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST} /dev/null; do \
+	${Q} for i in ${DISTLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo cal/$$i; \
 	    fi; \
 	done
 
 distdir:
-	${Q}echo cal
+	${Q} echo cal
 
 calcliblist:
-	${Q}for i in ${CALCLIBLIST} /dev/null; do \
+	${Q} for i in ${CALCLIBLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo cal/$$i; \
 	    fi; \
@@ -232,7 +240,7 @@ calcliblist:
 ##
 
 echo_inst_files:
-	${Q}for i in ${CALC_FILES} /dev/null; do \
+	${Q} for i in ${CALC_FILES} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo __file__ ${CALC_SHAREDIR}/$$i; \
 	    fi; \
@@ -247,37 +255,37 @@ echo_inst_files:
 clean:
 
 clobber:
-	rm -f .all
+	${RM} -f .all
 
 # install everything
 #
 # NOTE: Keep the uninstall rule in reverse order to the install rule
 #
 install: all
-	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-	    echo mkdir $T${CALC_SHAREDIR}; \
-	    mkdir $T${CALC_SHAREDIR}; \
-	    if [ ! -d "$T${CALC_SHAREDIR}" ]; then \
-		echo mkdir -p "$T${CALC_SHAREDIR}"; \
-		mkdir -p "$T${CALC_SHAREDIR}"; \
+	-${Q} if [ ! -d ${T}${CALC_SHAREDIR} ]; then \
+	    echo ${MKDIR} ${T}${CALC_SHAREDIR}; \
+	    ${MKDIR} ${T}${CALC_SHAREDIR}; \
+	    if [ ! -d "${T}${CALC_SHAREDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${CALC_SHAREDIR}"; \
+		${MKDIR} -p "${T}${CALC_SHAREDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
-	    ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
+	    echo ${CHMOD} 0755 ${T}${CALC_SHAREDIR}; \
+	    ${CHMOD} 0755 ${T}${CALC_SHAREDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	${Q}for i in ${CALC_FILES} /dev/null; do \
+	${Q} for i in ${CALC_FILES} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if ${CMP} -s $$i $T${CALC_SHAREDIR}/$$i; then \
-		true; \
+	    if ${CMP} -s $$i ${T}${CALC_SHAREDIR}/$$i; then \
+		${TRUE}; \
 	    else \
-		rm -f $T${CALC_SHAREDIR}/$$i.new; \
-		cp -f $$i $T${CALC_SHAREDIR}/$$i.new; \
-		${CHMOD} 0444 $T${CALC_SHAREDIR}/$$i.new; \
-		mv -f $T${CALC_SHAREDIR}/$$i.new $T${CALC_SHAREDIR}/$$i; \
-		echo "installed $T${CALC_SHAREDIR}/$$i"; \
+		${RM} -f ${T}${CALC_SHAREDIR}/$$i.new; \
+		${CP} -f $$i ${T}${CALC_SHAREDIR}/$$i.new; \
+		${CHMOD} 0444 ${T}${CALC_SHAREDIR}/$$i.new; \
+		${MV} -f ${T}${CALC_SHAREDIR}/$$i.new ${T}${CALC_SHAREDIR}/$$i; \
+		echo "installed ${T}${CALC_SHAREDIR}/$$i"; \
 	    fi; \
 	done
 
@@ -286,22 +294,22 @@ install: all
 # NOTE: Keep the uninstall rule in reverse order to the install rule
 #
 uninstall:
-	-${Q}for i in ${CALC_FILES} /dev/null; do \
+	-${Q} for i in ${CALC_FILES} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if [ -f "$T${CALC_SHAREDIR}/$$i" ]; then \
-	    	rm -f "$T${CALC_SHAREDIR}/$$i"; \
-		if [ -f "$T${CALC_SHAREDIR}/$$i" ]; then \
-		   echo "cannot uninstall $T${CALC_SHAREDIR}/$$i"; \
+	    if [ -f "${T}${CALC_SHAREDIR}/$$i" ]; then \
+	    	${RM} -f "${T}${CALC_SHAREDIR}/$$i"; \
+		if [ -f "${T}${CALC_SHAREDIR}/$$i" ]; then \
+		   echo "cannot uninstall ${T}${CALC_SHAREDIR}/$$i"; \
 		else \
-		   echo "uninstalled $T${CALC_SHAREDIR}/$$i"; \
+		   echo "uninstalled ${T}${CALC_SHAREDIR}/$$i"; \
 		fi; \
 	    fi; \
 	done
-	-${Q}for i in ${CALC_SHAREDIR}; do \
-	    if [ -d "$T$$i" ]; then \
-		rmdir "$T$$i" 2>/dev/null; \
-		echo "cleaned up $T$$i"; \
+	-${Q} for i in ${CALC_SHAREDIR}; do \
+	    if [ -d "${T}$$i" ]; then \
+		${RMDIR} "${T}$$i" 2>/dev/null; \
+		echo "cleaned up ${T}$$i"; \
 	    fi; \
 	done

cal/README

@@ -714,7 +714,7 @@ sumtimes.cal
     timehmean(N,M)
     doalltimes(N)
 
-    Give the runtimes for various ways of evaluating sums, sums of
+    Give the user CPU time for various ways of evaluating sums, sums of
     squares, etc, for large lists and matrices.  N is the size of
     the list or matrix to use.  The doalltimes() function will run
     all fo the sumtimes tests.  For example:
@@ -1014,8 +1014,8 @@ xx_print.cal
 ## 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.15 $
-## @(#) $Id: README,v 29.15 2006/06/23 00:34:55 chongo Exp $
+## @(#) $Revision: 29.16 $
+## @(#) $Id: README,v 29.16 2006/12/16 11:18:46 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/README,v $
 ##
 ## Under source code control:	1990/02/15 01:50:32

cal/alg_config.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.14 $
- * @(#) $Id: alg_config.cal,v 29.14 2006/06/11 07:22:05 chongo Exp $
+ * @(#) $Revision: 29.15 $
+ * @(#) $Id: alg_config.cal,v 29.15 2006/12/16 11:18:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/alg_config.cal,v $
  *
  * Under source code control:	2006/06/07 14:10:11
@@ -85,7 +85,7 @@ define mul_loop(repeat, x)
     }
 
     /* multiply pairwise, all sets of a given length */
-    start = runtime();
+    start = usertime();
     for (i=0; i < repeat; ++i) {
 
 	if (len == 1) {
@@ -130,7 +130,7 @@ define mul_loop(repeat, x)
     /*
      * return duration
      */
-    end = runtime();
+    end = usertime();
     return end-start;
 }
 
@@ -477,7 +477,7 @@ define sq_loop(repeat, x)
     }
 
     /* square pairwise, all sets of a given length */
-    start = runtime();
+    start = usertime();
     for (i=0; i < repeat; ++i) {
 
 	if (len == 1) {
@@ -524,7 +524,7 @@ define sq_loop(repeat, x)
     /*
      * return duration
      */
-    end = runtime();
+    end = usertime();
     return end-start;
 }
 
@@ -874,7 +874,7 @@ define pow_loop(repeat, x, ex)
     }
 
     /* pmod pairwise, all sets of a given length */
-    start = runtime();
+    start = usertime();
     for (i=0; i < repeat; ++i) {
 
 	if (len == 1) {
@@ -927,7 +927,7 @@ define pow_loop(repeat, x, ex)
     /*
      * return duration
      */
-    end = runtime();
+    end = usertime();
     return end-start;
 }
 

cal/mfactor.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: mfactor.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: mfactor.cal,v 29.3 2006/12/16 11:18:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/mfactor.cal,v $
  *
  * Under source code control:	1996/07/06 06:09:40
@@ -261,7 +261,7 @@ define mfactor(n, start_k, rept_loop, p_elim)
 	} else {
 		/* report this loop */
 		printf("at 2*%d*%d+1, cpu: %f\n",
-			(q-1)/(2*n), n, runtime());
+			(q-1)/(2*n), n, usertime());
 		fflush(files(1));
 		loop = 0;
 	}
@@ -274,7 +274,7 @@ define mfactor(n, start_k, rept_loop, p_elim)
 		if (rept_loop <= ++loop) {
 			/* report this loop */
 			printf("at 2*%d*%d+1, cpu: %f\n",
-				(q-1)/(2*n), n, runtime());
+				(q-1)/(2*n), n, usertime());
 			fflush(files(1));
 			loop = 0;
 		}

cal/randmprime.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: randmprime.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: randmprime.cal,v 29.3 2006/12/16 11:18:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/randmprime.cal,v $
  *
  * Under source code control:	1994/03/14 23:11:21
@@ -88,8 +88,8 @@ randmprime(bits, seed, dbg)
      * loop until we find a prime
      */
     if (dbg >= 1) {
-	start = runtime();
-	init = runtime();
+	start = usertime();
+	init = usertime();
 	plush = 0;
 	print "DEBUG1: testing (h+" : plush : ")*2^" : n : "-1";
     }
@@ -97,7 +97,7 @@ randmprime(bits, seed, dbg)
 
 	/* bump h, and n if needed */
 	if (dbg >= 2) {
-	    stop = runtime();
+	    stop = usertime();
 	    print "DEBUG2: last test:", stop-start, "	total time:", stop-init;
 	}
 	if (dbg >= 1) {
@@ -116,7 +116,7 @@ randmprime(bits, seed, dbg)
 
     /* found a prime */
     if (dbg >= 2) {
-	stop = runtime();
+	stop = usertime();
 	print "DEBUG2: last test:", stop-start, "   total time:", stop-init;
 	print "DEBUG3: " : h : "*2^" : n : "-1 is prime";
     }

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.35 $
- * @(#) $Id: regress.cal,v 29.35 2006/08/20 16:16:11 chongo Exp $
+ * @(#) $Revision: 29.36 $
+ * @(#) $Id: regress.cal,v 29.36 2006/12/16 11:18:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/regress.cal,v $
  *
  * Under source code control:	1990/02/15 01:50:36
@@ -497,7 +497,33 @@ define test_config()
 	vrfy(config("mode2") == "off",
 					'556: config("mode2") == "off"');
 
-	print '557: Ending test_config';
+	/* hz is numeric */
+	vrfy(isint(config("hz")),	'557: isint(config("hz"))');
+
+	/* compile_custom is simple */
+	vrfy(issimple(config("compile_custom")),
+		'558: issimple(config("compile_custom"))');
+
+	/* allow_custom is simple */
+	vrfy(issimple(config("allow_custom")),
+		'559: issimple(config("allow_custom"))');
+
+	/* allow_custom is simple */
+	vrfy(issimple(config("allow_custom")),
+		'559: issimple(config("allow_custom"))');
+
+	/* baseb is numeric */
+	vrfy(isint(config("baseb")),	'560: isint(config("baseb"))');
+
+	/* redecl_warn is simple */
+	vrfy(issimple(config("redecl_warn")),
+		'561: issimple(config("redecl_warn"))');
+
+	/* dupvar_warn is simple */
+	vrfy(issimple(config("dupvar_warn")),
+		'562: issimple(config("rdupvar_warn"))');
+
+	print '563: Ending test_config';
 }
 print '010: parsed test_config()';
 
@@ -1375,7 +1401,12 @@ define test_functions()
 	vrfy(a == -4,			'1203: a == -4');
 	vrfy(b == 2,			'1204: b == 2');
 
-	print '1205: Ending test_functions';
+	/* runtime(), systime(), usertime() return numeric values */
+	vrfy(isnum(runtime()),		'1205: isnum(runtime())');
+	vrfy(isnum(systime()),		'1206: isnum(systime())');
+	vrfy(isnum(usertime()),		'1207: isnum(usertime())');
+
+	print '1208: Ending test_functions';
 }
 print '017: parsed test_functions()';
 

cal/sumtimes.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.1 $
- * @(#) $Id: sumtimes.cal,v 29.1 2006/06/23 00:35:30 chongo Exp $
+ * @(#) $Revision: 29.2 $
+ * @(#) $Id: sumtimes.cal,v 29.2 2006/12/16 11:18:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/sumtimes.cal,v $
  *
  * Under source code control:	2006/06/22 17:29
@@ -40,13 +40,13 @@ define timematsum(N) {
     for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
 
     ptop = &sumtimes_A[n-1];
-    sumtimes_t0 = runtime();
+    sumtimes_t0 = usertime();
     for (s = n = 0; n < N; n++) s += sumtimes_A[n];
-    sumtimes_t1 = runtime();
+    sumtimes_t1 = usertime();
     for (s = 0, p = &sumtimes_A[0]; p <= ptop; p++) s += *p;
-    sumtimes_t2 = runtime();
+    sumtimes_t2 = usertime();
     s = matsum(sumtimes_A);
-    sumtimes_t3 = runtime();
+    sumtimes_t3 = usertime();
 
     print "Matrix sum runtimes";
     printf('\tStandard "for" loop:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);
@@ -60,11 +60,11 @@ define timelistsum(N) {
     sumtimes_A = makelist(N);
     for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
 
-    sumtimes_t0 = runtime();
+    sumtimes_t0 = usertime();
     for (s = n = 0; n < N; n++) s += sumtimes_A[n];
-    sumtimes_t1 = runtime();
+    sumtimes_t1 = usertime();
     s = sum(sumtimes_A);
-    sumtimes_t2 = runtime();
+    sumtimes_t2 = usertime();
     print "List sum runtimes";
     printf('\tStandard "for" loop:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);
     printf('\tUsing builtin "sum":\t\t%.4f\n', sumtimes_t2 - sumtimes_t1);
@@ -76,9 +76,9 @@ define timematsort(N) {
 
     sumtimes_A = mat[N];
     for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
-    sumtimes_t0 = runtime();
+    sumtimes_t0 = usertime();
     sort(sumtimes_A);
-    sumtimes_t1 = runtime();
+    sumtimes_t1 = usertime();
     printf('\tMatrix sort runtime:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);
 }
 
@@ -88,9 +88,9 @@ define timelistsort(N) {
 
     sumtimes_A = makelist(N);
     for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
-    sumtimes_t0 = runtime();
+    sumtimes_t0 = usertime();
     sort(sumtimes_A);
-    sumtimes_t1 = runtime();
+    sumtimes_t1 = usertime();
     printf('\tList sort runtime:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);
 }
 
@@ -99,9 +99,9 @@ define timematreverse(N) {
 
     sumtimes_A = mat[N];
     for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
-    sumtimes_t0 = runtime();
+    sumtimes_t0 = usertime();
     reverse(sumtimes_A);
-    sumtimes_t1 = runtime();
+    sumtimes_t1 = usertime();
     printf('\tMatrix reverse runtime        %.4f\n', sumtimes_t1 - sumtimes_t0);
 }
 
@@ -110,9 +110,9 @@ define timelistreverse(N) {
 
     sumtimes_A = makelist(N);
     for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
-    sumtimes_t0 = runtime();
+    sumtimes_t0 = usertime();
     reverse(sumtimes_A);
-    sumtimes_t1 = runtime();
+    sumtimes_t1 = usertime();
     printf('\tList reverse runtime:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);
 }
 
@@ -124,11 +124,11 @@ define timematssq(N) {
     for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
 
     ptop = &sumtimes_A[n-1];
-    sumtimes_t0 = runtime();
+    sumtimes_t0 = usertime();
     for (s = n = 0; n < N; n++) s += sumtimes_A[n]^2;
-    sumtimes_t1 = runtime();
+    sumtimes_t1 = usertime();
     for (s = 0, p = &sumtimes_A[0]; p <= ptop; p++) s += (*p)^2;
-    sumtimes_t2 = runtime();
+    sumtimes_t2 = usertime();
 
     print "Matrix sum of squares runtimes";
     printf('\tStandard "for" loop:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);
@@ -141,11 +141,11 @@ define timelistssq(N) {
     sumtimes_A = makelist(N);
     for (n = 0; n < N; n++) sumtimes_A[n] = rand(N);
 
-    sumtimes_t0 = runtime();
+    sumtimes_t0 = usertime();
     for (s = n = 0; n < N; n++) s += sumtimes_A[n]^2;
-    sumtimes_t1 = runtime();
+    sumtimes_t1 = usertime();
     s = ssq(sumtimes_A);
-    sumtimes_t2 = runtime();
+    sumtimes_t2 = usertime();
     print "List sum of squares runtimes";
     printf('\tStandard "for" loop:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);
     printf('\tUsing builtin "ssq":\t\t%.4f\n', sumtimes_t2 - sumtimes_t1);
@@ -157,12 +157,12 @@ define timehmean(N, M = 10) {
     sumtimes_A = makelist(N);
     for (n = 0; n < N; n++) sumtimes_A[n] = rand(1, M);
 
-    sumtimes_t0 = runtime();
+    sumtimes_t0 = usertime();
     for (s = n = 0; n < N; n++) s += 1/sumtimes_A[n];
     v1 = N/s;
-    sumtimes_t1 = runtime();
+    sumtimes_t1 = usertime();
     v2 = hmean(sumtimes_A);
-    sumtimes_t2 = runtime();
+    sumtimes_t2 = usertime();
     print v1, v2;
     print "List harmonic meanruntimes";
     printf('\tStandard "for" loop:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0);

cal/test3300.cal

@@ -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.3 $
- * @(#) $Id: test3300.cal,v 29.3 2006/06/20 09:29:16 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: test3300.cal,v 29.5 2006/12/16 11:19:45 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test3300.cal,v $
  *
  * Under source code control:	1995/12/02 04:27:41
@@ -81,9 +81,9 @@ define testr(str, n, N, verbose)
 	for (i = 0; i < n; i++)
 		for (j = 0; j < n; j++)
 			A[i,j] = rand(-(N^2), N^2)/rand(1, N);
-	t = runtime();
+	t = usertime();
 	d1 = det(A);
-	t = runtime() - t;
+	t = usertime() - t;
 	d2 = det(A^2);
 	if (d2 != d1^2) {
 		if (verbose > 0) {

cal/test4000.cal

@@ -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.3 $
- * @(#) $Id: test4000.cal,v 29.3 2006/06/20 09:29:16 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: test4000.cal,v 29.4 2006/12/16 11:18:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test4000.cal,v $
  *
  * Under source code control:	1996/03/13 02:38:45
@@ -145,7 +145,7 @@ define ptimes(str, N, n, count, skip, verbose)
 	mat A[n];
 	for (i = 0; i < n; i++)
 		A[i] = plen(N);
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++) {
 		p = ptest(A[i], count, skip);
 		if (!p) {
@@ -159,7 +159,7 @@ define ptimes(str, N, n, count, skip, verbose)
 		if (m) {
 			printf("*** %d error(s)\n", m);
 		} else {
-			t = round(runtime() - t, 4);
+			t = round(usertime() - t, 4);
 			if (verbose > 1) {
 				printf("%d probable primes: time = %d\n", n, t);
 			} else {
@@ -194,7 +194,7 @@ define ctimes(str, N, n, count, skip, verbose)
 	mat A[n];
 	for (i = 0; i < n; i++)
 		A[i] = clen(N);
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++) {
 		p = ptest(A[i], count, skip);
 		if (p) {
@@ -208,7 +208,7 @@ define ctimes(str, N, n, count, skip, verbose)
 		if (m) {
 			printf("*** %d error(s)\n", m);
 		} else {
-			t = round(runtime() - t, 4);
+			t = round(usertime() - t, 4);
 			if (verbose > 1) {
 				printf("%d probable primes: time = %d\n", n, t);
 			} else {
@@ -242,7 +242,7 @@ define crtimes(str, a, b, n, count, skip, verbose)
 		A[i] = rand(a,b);
 		P[i] = ptest(A[i], 20, 0);
 	}
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++) {
 		p = ptest(A[i], count, skip);
 		if (p != P[i]) {
@@ -257,7 +257,7 @@ define crtimes(str, a, b, n, count, skip, verbose)
 		if (m) {
 			printf("*** %d error(s)?\n", m);
 		} else {
-			t = round(runtime() - t, 4);
+			t = round(usertime() - t, 4);
 			if (verbose > 1) {
 				printf("%d probable primes: time = %d\n", n, t);
 			} else {
@@ -295,16 +295,16 @@ define ntimes(str, N, n, count, skip, residue, modulus, verbose)
 	mat A[n];
 	for (i = 0; i < n; i++)
 		A[i] = rlen(N);
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++) {
 		p = nextcand(A[i], count, skip, residue, modulus);
 	}
-	tnext = round(runtime() - t, 4);
-	t = runtime();
+	tnext = round(usertime() - t, 4);
+	t = usertime();
 	for (i = 0; i < n; i++) {
 		p = prevcand(A[i], count, skip, residue, modulus);
 	}
-	tprev = round(runtime() - t, 4);
+	tprev = round(usertime() - t, 4);
 	if (verbose > 0) {
 		printf("%d evaluations, nextcand: %d, prevcand: %d\n", n, tnext, tprev);
 	}

cal/test4100.cal

@@ -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.4 $
- * @(#) $Id: test4100.cal,v 29.4 2006/06/20 09:29:16 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: test4100.cal,v 29.5 2006/12/16 11:18:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test4100.cal,v $
  *
  * Under source code control:	1996/03/13 03:53:22
@@ -245,38 +245,38 @@ define times(str,N,n,verbose)
 		C[i] = rand(m2);
 	}
 	z = rcin(0,m);	/* to initialize redc and maybe lastmod information */
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z = rcin(A[i],m);
-	trcin = round(runtime() - t, 3);
-	t = runtime();
+	trcin = round(usertime() - t, 3);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z = rcout(A[i],m);
-	trcout = round(runtime() - t, 3);
-	t = runtime();
+	trcout = round(usertime() - t, 3);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z = rcmul(A[i],B[i],m);
-	trcmul = round(runtime() - t, 3);
-	t = runtime();
+	trcmul = round(usertime() - t, 3);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z = rcsq(A[i],m);
-	trcsq = round(runtime() - t, 3);
-	t = runtime();
+	trcsq = round(usertime() - t, 3);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z = A[i] * B[i];
-	tmul = round(runtime() - t, 3);
-	t = runtime();
+	tmul = round(usertime() - t, 3);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z = A[i]^2;
-	tsq = round(runtime() - t, 3);
-	t = runtime();
+	tsq = round(usertime() - t, 3);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z = C[i] % A[i];
-	tmod = round(runtime() - t, 3);
-	t = runtime();
+	tmod = round(usertime() - t, 3);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		quomod(C[i], A[i], x, y);
-	tquomod = round(runtime() - t,3);
+	tquomod = round(usertime() - t,3);
 
 	if (verbose > 1) {
 		printf("rcin: %d, rcout: %d, rcmul: %d, rcsq: %d\n",
@@ -326,29 +326,29 @@ define powtimes(str, N1, N2, n, verbose)
 		Ar[i] = rcin(A[i], v);
 		B[i] = rlen_4100(N2);
 	}
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z1 += pmod(A[i], B[i], v);
-	tbignum = round(runtime() - t, 4);
+	tbignum = round(usertime() - t, 4);
 	config("pow2", 1e6);
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z2 += pmod(A[i], B[i], v);
-	tnormal = round(runtime() - t, 4);
+	tnormal = round(usertime() - t, 4);
 	config("redc2",1e6);
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z3 += pmod(A[i], B[i], v);
-	tsmall = round(runtime() - t, 4);
-	t = runtime();
+	tsmall = round(usertime() - t, 4);
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z4 += rcpow(Ar[i], B[i], v);
-	trcsmall = round(runtime() - t, 4);
+	trcsmall = round(usertime() - t, 4);
 	config("redc2", 2);
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++)
 		z5 += rcpow(Ar[i], B[i], v);
-	trcbig = round(runtime() - t, 4);
+	trcbig = round(usertime() - t, 4);
 
 	if (z1 != z2) {
 		++m;
@@ -419,13 +419,13 @@ define inittimes(str,N,n,verbose)
 		M[i] = olen(N);
 		A[i] = rand(M[i]);
 	}
-	t = runtime();
+	t = usertime();
 	for (i = 0; i < n; i++)
 		R[i] = rcin(A[i], M[i]);
-	trcin = round(runtime() - t, 4);
+	trcin = round(usertime() - t, 4);
 	for (i = 0; i < n; i++)
 		B[i] = rcout(R[i], M[i]);
-	trcout = round(runtime() - t, 4);
+	trcout = round(usertime() - t, 4);
 	for (i = 0; i < n; i++) {
 		if (B[i] != A[i]) {
 			++m;

check.awk

@@ -18,8 +18,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.4 $
-# @(#) $Id: check.awk,v 29.4 2006/08/20 16:16:31 chongo Exp $
+# @(#) $Revision: 29.5 $
+# @(#) $Id: check.awk,v 29.5 2006/09/18 08:01:13 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/check.awk,v $
 #
 # Under source code control:	1996/05/25 22:07:58
@@ -64,7 +64,7 @@ NF == 0 {
 	end_seen = 1;
 }
 
-$1 ~ /^[0-9]+:/ || $1 ~ /^[0-9]+-[0-9]*:/ || $1 ~ /^"))$/ {
+$1 ~ /^[0-9]+:/ || $1 ~ /^[0-9]+-[0-9]*:/ || $1 ~ /^"\)\)$/ {
 	if (error > 0) {
 		if (havebuf2) {
 			print buf2;

codegen.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.21 $
- * @(#) $Id: codegen.c,v 29.21 2006/06/20 10:28:06 chongo Exp $
+ * @(#) $Revision: 29.22 $
+ * @(#) $Id: codegen.c,v 29.22 2006/12/15 16:25:09 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/codegen.c,v $
  *
  * Under source code control:	1990/02/15 01:48:13
@@ -144,6 +144,7 @@ getcommands(BOOL toplevel)
 		case T_HELP:
 			for (i=1;;i++) {
 				switch(getfilename(name, MAXCMD+1, NULL)) {
+				case 1:
 				case -1:
 					if(i == 1) {
 						strcpy(name, DEFAULTCALCHELP);

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.22 $
- * @(#) $Id: config.c,v 29.22 2006/06/25 22:05:38 chongo Exp $
+ * @(#) $Revision: 29.23 $
+ * @(#) $Id: config.c,v 29.23 2006/12/15 16:17:18 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/config.c,v $
  *
  * Under source code control:	1991/07/20 00:21:56
@@ -31,6 +31,24 @@
 
 
 #include <stdio.h>
+
+#include "have_times.h"
+#if defined(HAVE_TIME_H)
+#include <time.h>
+#endif
+
+#if defined(HAVE_TIMES_H)
+#include <times.h>
+#endif
+
+#if defined(HAVE_SYS_TIME_H)
+#include <sys/time.h>
+#endif
+
+#if defined(HAVE_SYS_TIMES_H)
+#include <sys/times.h>
+#endif
+
 #include "calc.h"
 #include "token.h"
 #include "zrand.h"
@@ -45,6 +63,15 @@
 # define strdup(x) calc_strdup((CONST char *)(x))
 #endif /* HAVE_STRDUP */
 
+/*
+ * deal with systems that lack a defined CLK_TCK
+ */
+#if defined(CLK_TCK)
+# define CALC_HZ ((long)(CLK_TCK))
+#else
+# define CALC_HZ (0L)	/* no defined clock tick rate */
+#endif
+
 
 /*
  * Table of configuration types that can be set or read.
@@ -100,6 +127,7 @@ NAMETYPE configs[] = {
 	{"baseb",	CONFIG_BASEB},
 	{"redecl_warn",	CONFIG_REDECL_WARN},
 	{"dupvar_warn",	CONFIG_DUPVAR_WARN},
+	{"hz",		CONFIG_HZ},
 	{NULL,		0}
 };
 
@@ -941,6 +969,10 @@ setconfig(int type, VALUE *vp)
 		}
 		break;
 
+	case CONFIG_HZ:
+		math_error("The clock tick rate config parameter is read-only");
+		/*NOTREACHED*/
+
 	default:
 		math_error("Setting illegal config parameter");
 		/*NOTREACHED*/
@@ -1330,6 +1362,10 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		i = (cfg->dupvar_warn ? 1 : 0);
 		break;
 
+	case CONFIG_HZ:
+		i = CALC_HZ;
+		break;
+
 	default:
 		math_error("Getting illegal CONFIG element");
 		/*NOTREACHED*/

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.20 $
- * @(#) $Id: config.h,v 29.20 2006/06/25 22:05:38 chongo Exp $
+ * @(#) $Revision: 29.21 $
+ * @(#) $Id: config.h,v 29.21 2006/12/15 16:16:59 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/config.h,v $
  *
  * Under source code control:	1995/11/01 22:20:17
@@ -97,6 +97,7 @@
 #define CONFIG_BASEB	43
 #define CONFIG_REDECL_WARN	44
 #define CONFIG_DUPVAR_WARN	45
+#define CONFIG_HZ	46
 
 
 /*

cscript/Makefile

@@ -1,7 +1,7 @@
 #
 # cscript - makefile for calc shell script files
 #
-# Copyright (C) 1999  Landon Curt Noll
+# Copyright (C) 1999-2006  Landon Curt Noll
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -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.24 $
-# @(#) $Id: Makefile,v 29.24 2006/06/26 05:46:06 chongo Exp $
+# @(#) $Revision: 29.28 $
+# @(#) $Id: Makefile,v 29.28 2006/09/18 13:13:25 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/Makefile,v $
 #
 # Under source code control:	1999/11/29 11:10:26
@@ -34,7 +34,7 @@
 # required vars
 #
 SHELL= /bin/sh
-MAKE_FILE = Makefile
+MAKE_FILE= Makefile
 
 ####
 # Normally, the upper level makefile will set these values.  We provide
@@ -62,9 +62,9 @@ INCDIR= /usr/include
 # ${LIBDIR}		where calc link library (*.a) files are installed
 # ${CALC_SHAREDIR}	where to install calc help, .cal, startup, config files
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # For DJGPP, select:
 #
@@ -96,12 +96,12 @@ CALC_SHAREDIR= /usr/share/calc
 # ${CALC_INCDIR}	where the calc include files are installed
 # ${CUSTOMCALDIR}	where custom *.cal files are installed
 # ${CUSTOMHELPDIR}	where custom help files are installed
-# ${CUSTOMINCPDIR}	where custom .h files are installed
+# ${CUSTOMINCDIR}	where custom .h files are installed
 # ${SCRIPTDIR}		where calc shell scripts are installed
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # If in doubt, set:
 #
@@ -121,8 +121,8 @@ SCRIPTDIR= ${BINDIR}/cscript
 
 # T - top level directory under which calc will be installed
 #
-# The calc install is performed under $T, the calc build is
-# performed under /.	The purpose for $T is to allow someone
+# The calc install is performed under ${T}, the calc build is
+# performed under /.	The purpose for ${T} is to allow someone
 # to install calc somewhere other than into the system area.
 #
 # For example, if:
@@ -142,10 +142,10 @@ SCRIPTDIR= ${BINDIR}/cscript
 #     calc help, .cal ...:	/var/tmp/testing/usr/share/calc
 #     ... etc ...		/var/tmp/testing/...
 #
-# If $T is empty, calc is installed under /, which is the same
-# top of tree for which it was built.  If $T is non-empty, then
-# calc is installed under $T, as if one had to chroot under
-# $T for calc to operate.
+# If ${T} is empty, calc is installed under /, which is the same
+# top of tree for which it was built.  If ${T} is non-empty, then
+# calc is installed under ${T}, as if one had to chroot under
+# ${T} for calc to operate.
 #
 # If in doubt, use T=
 #
@@ -166,6 +166,14 @@ SED= sed
 SORT= sort
 FMT= fmt
 CMP= cmp
+MKDIR= mkdir
+RMDIR= rmdir
+RM= rm
+TOUCH= touch
+MV= mv
+CP= cp
+CO= co
+TRUE= true
 
 # The ${SCRIPT} list is the list of calc shell script files (without the .calc
 # extension) which will be installed.
@@ -199,7 +207,7 @@ CALCLIBLIST=
 
 # complete list of targets
 #
-# NOTE: This list MUST be co-ordinated with the ${CSCRIPT_TARGETS} variable
+# NOTE: This list MUST be coordinated with the ${CSCRIPT_TARGETS} variable
 #	in the upper level ../Makefile
 #
 CSCRIPT_TARGETS= ${SCRIPT}
@@ -215,8 +223,8 @@ all: ${TARGETS} .all
 #	a non-empty else clause for every if condition.  *sigh*
 #
 .all:
-	rm -f .all
-	touch .all
+	${RM} -f .all
+	${TOUCH} .all
 
 ##
 #
@@ -229,21 +237,22 @@ all: ${TARGETS} .all
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST} /dev/null; do \
+	${Q} for i in ${DISTLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo cscript/$$i; \
 	    fi; \
 	done | LANG=C ${SORT}
 
 distdir:
-	${Q}echo cscript
+	${Q} echo cscript
 
 calcliblist:
 
-# These next rule help me form the ${DETAIL_HELP} makefile variables above.
+# These next rule help me form the ${SCRIPT} and ${SCRIPT_SRC} makefile
+# variables above.
 #
 detaillist:
-	${Q}-(echo "xxxxxxx"; \
+	${Q} -(echo "xxxxxxx"; \
 	   for i in ${SCRIPT} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		if [ ! -f RCS/$$i.calc,v ]; then \
@@ -255,9 +264,9 @@ detaillist:
 	done | LANG=C ${SORT}) | ${FMT} -70 | \
 	    ${SED} -e '1s/xxxxxxx/SCRIPT=/' -e '2,$$s/^/	/' \
 		   -e 's/$$/ \\/' -e '$$s/ \\$$//'
-	${Q}echo
-	${Q}-(echo "xxxxxxxxxxx"; \
-	   for i in ${SCRIPT} /dev/null; do \
+	${Q} echo
+	${Q} -(echo "xxxxxxxxxxx"; \
+	    for i in ${SCRIPT} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		if [ ! -f RCS/$$i.calc,v ]; then \
 		    echo "WARNING: $$i.calc not under RCS control" 1>&2; \
@@ -282,46 +291,46 @@ detaillist:
 ##
 
 depend:
-	${Q}if [ -f Makefile.bak ]; then \
-		echo "Makefile.bak exists, remove or move it out of the way"; \
-		exit 1; \
+	${Q} if [ -f Makefile.bak ]; then \
+	    echo "Makefile.bak exists, remove or move it out of the way"; \
+	    exit 1; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}rm -f makedep.out
-	${Q}echo forming cscript dependency list
-	${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
+	-${Q} ${RM} -f makedep.out
+	${Q} echo forming cscript dependency list
+	${Q} echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
 		makedep.out
-	${Q}echo "" >> makedep.out
-	${Q}for i in ${SCRIPT} /dev/null; do \
+	${Q} echo "" >> makedep.out
+	${Q} for i in ${SCRIPT} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo "$$i: $$i.calc"; \
-		echo '	@rm -f $$@'; \
+		echo '	@$${RM} -f $$@'; \
 		echo '	@$${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!$${BINDIR}/calc:" $$?>$$@'; \
 		echo '	@$${CHMOD} +x $$@'; \
 	    fi; \
 	done >> makedep.out
-	${Q}echo sample dependency list formed
-	${Q}echo forming new cscript/Makefile
-	-${Q}rm -f Makefile.bak
-	${Q}mv Makefile Makefile.bak
-	${Q}${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile
-	${Q}echo "" >> Makefile
-	${Q}${SED} -n '3,$$p' makedep.out >> Makefile
-	-${Q}rm -f makedep.out
-	-${Q}if ${CMP} -s Makefile.bak Makefile; then \
-		echo 'sample Makefile was already up to date'; \
-		mv -f Makefile.bak Makefile; \
+	${Q} echo sample dependency list formed
+	${Q} echo forming new cscript/Makefile
+	-${Q} ${RM} -f Makefile.bak
+	${Q} ${MV} Makefile Makefile.bak
+	${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile
+	${Q} echo "" >> Makefile
+	${Q} ${SED} -n '3,$$p' makedep.out >> Makefile
+	-${Q} ${RM} -f makedep.out
+	-${Q} if ${CMP} -s Makefile.bak Makefile; then \
+	    echo 'sample Makefile was already up to date'; \
+	    ${MV} -f Makefile.bak Makefile; \
 	else \
-		rm -f Makefile.tmp; \
-		mv Makefile Makefile.tmp; \
-		if [ -d RCS ]; then \
-		    co -l Makefile; \
-		fi; \
-		mv Makefile.tmp Makefile; \
-		if [ -d RCS ]; then \
-		    echo new sample Makefile formed, you need to check it in; \
-		fi; \
+	    ${RM} -f Makefile.tmp; \
+	    ${MV} Makefile Makefile.tmp; \
+	    if [ -d RCS ]; then \
+		${CO} -l Makefile; \
+	    fi; \
+	    ${MV} Makefile.tmp Makefile; \
+	    if [ -d RCS ]; then \
+		echo new sample Makefile formed, you need to check it in; \
+	    fi; \
 	fi
 
 ##
@@ -331,7 +340,7 @@ depend:
 ##
 
 echo_inst_files:
-	${Q}for i in ${SCRIPT} /dev/null; do \
+	${Q} for i in ${SCRIPT} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo __file__ ${SCRIPTDIR}/$$i; \
 	    fi; \
@@ -344,52 +353,52 @@ echo_inst_files:
 ##
 
 clean:
-	-rm -f makedep.out
+	-${RM} -f makedep.out
 
 clobber:
-	-rm -f ${TARGETS}
+	-${RM} -f ${TARGETS}
 
 # install everything
 #
 # NOTE: Keep the uninstall rule in reverse order to the install rule
 #
 install: all
-	-${Q}if [ ! -d $T${BINDIR} ]; then \
-	    echo mkdir $T${BINDIR}; \
-	    mkdir $T${BINDIR}; \
-	    if [ ! -d "$T${BINDIR}" ]; then \
-		echo mkdir -p "$T${BINDIR}"; \
-		mkdir -p "$T${BINDIR}"; \
+	-${Q} if [ ! -d ${T}${BINDIR} ]; then \
+	    echo ${MKDIR} ${T}${BINDIR}; \
+	    ${MKDIR} ${T}${BINDIR}; \
+	    if [ ! -d "${T}${BINDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${BINDIR}"; \
+		${MKDIR} -p "${T}${BINDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${BINDIR}; \
-	    ${CHMOD} 0755 $T${BINDIR}; \
+	    echo ${CHMOD} 0755 ${T}${BINDIR}; \
+	    ${CHMOD} 0755 ${T}${BINDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${SCRIPTDIR} ]; then \
-	    echo mkdir $T${SCRIPTDIR}; \
-	    mkdir $T${SCRIPTDIR}; \
-	    if [ ! -d "$T${SCRIPTDIR}" ]; then \
-		echo mkdir -p "$T${SCRIPTDIR}"; \
-		mkdir -p "$T${SCRIPTDIR}"; \
+	-${Q} if [ ! -d ${T}${SCRIPTDIR} ]; then \
+	    echo ${MKDIR} ${T}${SCRIPTDIR}; \
+	    ${MKDIR} ${T}${SCRIPTDIR}; \
+	    if [ ! -d "${T}${SCRIPTDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${SCRIPTDIR}"; \
+		${MKDIR} -p "${T}${SCRIPTDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${SCRIPTDIR}; \
-	    ${CHMOD} 0755 $T${SCRIPTDIR}; \
+	    echo ${CHMOD} 0755 ${T}${SCRIPTDIR}; \
+	    ${CHMOD} 0755 ${T}${SCRIPTDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	${Q}for i in ${SCRIPT} /dev/null; do \
+	${Q} for i in ${SCRIPT} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if ${CMP} -s $$i $T${SCRIPTDIR}/$$i; then \
-		true; \
+	    if ${CMP} -s $$i ${T}${SCRIPTDIR}/$$i; then \
+		${TRUE}; \
 	    else \
-		rm -f $T${SCRIPTDIR}/$$i.new; \
-		cp -f $$i $T${SCRIPTDIR}/$$i.new; \
-		${CHMOD} 0555 $T${SCRIPTDIR}/$$i.new; \
-		mv -f $T${SCRIPTDIR}/$$i.new $T${SCRIPTDIR}/$$i; \
-		echo "installed $T${SCRIPTDIR}/$$i"; \
+		${RM} -f ${T}${SCRIPTDIR}/$$i.new; \
+		${CP} -f $$i ${T}${SCRIPTDIR}/$$i.new; \
+		${CHMOD} 0555 ${T}${SCRIPTDIR}/$$i.new; \
+		${MV} -f ${T}${SCRIPTDIR}/$$i.new ${T}${SCRIPTDIR}/$$i; \
+		echo "installed ${T}${SCRIPTDIR}/$$i"; \
 	    fi; \
 	done
 
@@ -398,57 +407,57 @@ install: all
 # NOTE: Keep the uninstall rule in reverse order to the install rule
 #
 uninstall:
-	-${Q}for i in ${SCRIPT} /dev/null; do \
+	-${Q} for i in ${SCRIPT} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if [ -f "$T${SCRIPTDIR}/$$i" ]; then \
-	    	rm -f "$T${SCRIPTDIR}/$$i"; \
-		if [ -f "$T${SCRIPTDIR}/$$i" ]; then \
-		   echo "cannot uninstall $T${SCRIPTDIR}/$$i"; \
+	    if [ -f "${T}${SCRIPTDIR}/$$i" ]; then \
+	    	${RM} -f "${T}${SCRIPTDIR}/$$i"; \
+		if [ -f "${T}${SCRIPTDIR}/$$i" ]; then \
+		   echo "cannot uninstall ${T}${SCRIPTDIR}/$$i"; \
 		else \
-		   echo "uninstalled $T${SCRIPTDIR}/$$i"; \
+		   echo "uninstalled ${T}${SCRIPTDIR}/$$i"; \
 		fi; \
 	    fi; \
 	done
-	-${Q}for i in ${SCRIPTDIR} ${BINDIR}; do \
-	    if [ -d "$T$$i" ]; then \
-		rmdir "$T$$i" 2>/dev/null; \
-		echo "cleaned up $T$$i"; \
+	-${Q} for i in ${SCRIPTDIR} ${BINDIR}; do \
+	    if [ -d "${T}$$i" ]; then \
+		${RMDIR} "${T}$$i" 2>/dev/null; \
+		echo "cleaned up ${T}$$i"; \
 	    fi; \
 	done
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 4dsphere: 4dsphere.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@
 fproduct: fproduct.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@
 mersenne: mersenne.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@
 piforever: piforever.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@
 plus: plus.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@
 powerterm: powerterm.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@
 simple: simple.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@
 square: square.calc
-	@rm -f $@
+	@${RM} -f $@
 	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	@${CHMOD} +x $@

custom/Makefile

@@ -2,7 +2,7 @@
 #
 # custom - makefile for calc custom routines
 #
-# Copyright (C) 1999,2004  Landon Curt Noll
+# Copyright (C) 1999-2006  Landon Curt Noll
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -18,8 +18,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.25 $
-# @(#) $Id: Makefile,v 29.25 2006/06/26 05:46:06 chongo Exp $
+# @(#) $Revision: 29.29 $
+# @(#) $Id: Makefile,v 29.29 2006/09/18 13:13:25 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile,v $
 #
 # Under source code control:	1997/03/09 02:28:54
@@ -114,9 +114,9 @@ INCDIR= /usr/include
 # ${LIBDIR}		where calc link library (*.a) files are installed
 # ${CALC_SHAREDIR}	where to install calc help, .cal, startup, config files
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # For DJGPP, select:
 #
@@ -148,12 +148,12 @@ CALC_SHAREDIR= /usr/share/calc
 # ${CALC_INCDIR}	where the calc include files are installed
 # ${CUSTOMCALDIR}	where custom *.cal files are installed
 # ${CUSTOMHELPDIR}	where custom help files are installed
-# ${CUSTOMINCPDIR}	where custom .h files are installed
+# ${CUSTOMINCDIR}	where custom .h files are installed
 # ${SCRIPTDIR}		where calc shell scripts are installed
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # If in doubt, set:
 #
@@ -173,8 +173,8 @@ SCRIPTDIR= ${BINDIR}/cscript
 
 # T - top level directory under which calc will be installed
 #
-# The calc install is performed under $T, the calc build is
-# performed under /.	The purpose for $T is to allow someone
+# The calc install is performed under ${T}, the calc build is
+# performed under /.	The purpose for ${T} is to allow someone
 # to install calc somewhere other than into the system area.
 #
 # For example, if:
@@ -194,10 +194,10 @@ SCRIPTDIR= ${BINDIR}/cscript
 #     calc help, .cal ...:	/var/tmp/testing/usr/share/calc
 #     ... etc ...		/var/tmp/testing/...
 #
-# If $T is empty, calc is installed under /, which is the same
-# top of tree for which it was built.  If $T is non-empty, then
-# calc is installed under $T, as if one had to chroot under
-# $T for calc to operate.
+# If ${T} is empty, calc is installed under /, which is the same
+# top of tree for which it was built.  If ${T} is non-empty, then
+# calc is installed under ${T}, as if one had to chroot under
+# ${T} for calc to operate.
 #
 # If in doubt, use T=
 #
@@ -249,6 +249,20 @@ NO_SHARED=
 #NO_SHARED= -dn
 #NO_SHARED= -non_shared
 
+# On some systems where you are disabling dynamic shared link libs, you may
+# need to pass a special flag to ${CC} and ${LCC} during linking stage.
+#
+#    System type			    NO_SHARED recommendation
+#
+#	IRIX with NO_SHARED= -non_shared    LD_NO_SHARED= -Wl,-rdata_shared
+#	IRIX with NO_SHARED=		    LD_NO_SHARED=
+#	others				    LD_NO_SHARED=
+#
+# If in doubt, use LD_NO_SHARED=
+#
+LD_NO_SHARED=
+#LD_NO_SHARED= -Wl,-rdata_shared
+
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
 #
@@ -275,12 +289,13 @@ MAKE_FILE= Makefile
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
 #
-# If you do not wish to use purify, leave PURIFY commented out.
+# If you do not wish to use purify, set PURIFY to an empty string.
 #
-# If in doubt, leave PURIFY commented out.
+# If in doubt, use PURIFY=
 #
 #PURIFY= purify -logfile=pure.out
 #PURIFY= purify
+PURIFY=
 
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
@@ -402,6 +417,16 @@ MAKEDEPEND= makedepend
 CHMOD= chmod
 SORT= sort
 CMP= cmp
+AR= ar
+RM= rm
+TOUCH= touch
+MKDIR= mkdir
+RMDIR= rmdir
+MV= mv
+CP= cp
+CO= co
+TRUE= true
+MAKE= make
 
 ##
 #
@@ -413,8 +438,8 @@ all: ${TARGETS} ${INSTALL_H_SRC} ${CUSTOM_CALC_FILES} \
 	${CUSTOM_HELP} ${MAKE_FILE} .all
 
 libcustcalc.a: ${CUSTCALC_OBJ} ${MAKE_FILE} ../${MAKE_FILE}
-	-rm -f libcustcalc.a
-	ar qc libcustcalc.a ${CUSTCALC_OBJ}
+	-${RM} -f libcustcalc.a
+	${AR} qc libcustcalc.a ${CUSTCALC_OBJ}
 	${RANLIB} libcustcalc.a
 
 ##
@@ -435,8 +460,8 @@ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE}
 # to determine of we have done all
 #
 .all:
-	rm -f .all
-	touch .all
+	${RM} -f .all
+	${TOUCH} .all
 
 ##
 #
@@ -452,17 +477,17 @@ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE}
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST} /dev/null; do \
+	${Q} for i in ${DISTLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo custom/$$i; \
 	    fi; \
 	done
 
 distdir:
-	${Q}echo custom
+	${Q} echo custom
 
 calcliblist: ${CALCLIBLIST}
-	${Q}for i in ${CALCLIBLIST} /dev/null; do \
+	${Q} for i in ${CALCLIBLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo custom/$$i; \
 	    fi; \
@@ -481,81 +506,81 @@ calcliblist: ${CALCLIBLIST}
 ##
 
 depend:
-	${Q}if [ -f Makefile.bak ]; then \
-		echo "Makefile.bak exists, remove or move it out of the way"; \
-		exit 1; \
+	${Q} if [ -f Makefile.bak ]; then \
+	    echo "Makefile.bak exists, remove or move it out of the way"; \
+	    exit 1; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	${Q}echo forming custom/skel
-	-${Q}rm -rf skel
-	${Q}mkdir skel
-	${Q}mkdir skel/custom
-	-${Q}for i in ${C_SRC} /dev/null; do \
+	${Q} echo forming custom/skel
+	-${Q} ${RM} -rf skel
+	${Q} ${MKDIR} skel
+	${Q} ${MKDIR} skel/custom
+	-${Q} for i in ${C_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		${SED} -n '/^#[	 ]*include[	 ]*"/p' \
 		    "$$i" > "skel/custom/$$i"; \
 	    fi; \
 	done
-	-${Q}for i in ${H_SRC} /dev/null; do \
-		if [ "$$i" = "/dev/null" ]; then \
-		    continue; \
-		fi; \
-		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
-		echo "#if !defined($$tag)" > "skel/custom/$$i"; \
-		echo "#define $$tag" >> "skel/custom/$$i"; \
-		${SED} -n '/^#[	 ]*include[	 ]*"/p' "$$i" \
-		    >> "skel/custom/$$i"; \
-		echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
+	-${Q} for i in ${H_SRC} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
+	    echo "#if !defined($$tag)" > "skel/custom/$$i"; \
+	    echo "#define $$tag" >> "skel/custom/$$i"; \
+	    ${SED} -n '/^#[	 ]*include[	 ]*"/p' "$$i" \
+		>> "skel/custom/$$i"; \
+	    echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
 	done
-	${Q}(cd ..; ${MAKE} hsrc)
-	${Q}for i in `cd ..; ${MAKE} h_list 2>&1 | \
-			     ${SED} -e '/Entering directory/d' \
-				    -e '/Nothing to be done/d' \
-				    -e '/Leaving directory/d'` /dev/null; do \
-		if [ "$$i" = "/dev/null" ]; then \
-		    continue; \
-		fi; \
-		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
-		echo "#if !defined($$tag)" > "skel/$$i"; \
-		echo "#define $$tag" >> "skel/$$i"; \
-		${SED} -n '/^#[	 ]*include[	 ]*"/p' "../$$i" \
-		    >> "skel/$$i"; \
-		echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
+	${Q} (cd ..; $(MAKE) hsrc)
+	${Q} for i in `cd ..; $(MAKE) h_list 2>&1 | \
+	    ${SED} -e '/Entering directory/d' \
+		   -e '/Nothing to be done/d' \
+		   -e '/Leaving directory/d'` /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
+	    echo "#if !defined($$tag)" > "skel/$$i"; \
+	    echo "#define $$tag" >> "skel/$$i"; \
+	    ${SED} -n '/^#[	 ]*include[	 ]*"/p' "../$$i" \
+		>> "skel/$$i"; \
+	    echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
 	done
-	-${Q}rm -f skel/custom/makedep.out
-	${Q}echo custom/skel formed
-	${Q}echo forming custom dependency list
-	${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
+	-${Q} ${RM} -f skel/custom/makedep.out
+	${Q} echo custom/skel formed
+	${Q} echo forming custom dependency list
+	${Q} echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
 	    skel/custom/makedep.out
-	${Q}cd skel/custom; ${MAKEDEPEND} -w 1 -f makedep.out ${C_SRC}
-	-${Q}for i in ${C_SRC} /dev/null; do \
+	${Q} cd skel/custom; ${MAKEDEPEND} -w 1 -f makedep.out ${C_SRC}
+	-${Q} for i in ${C_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
 	    fi; \
 	done >> skel/custom/makedep.out
-	${Q}echo custom dependency list formed
-	${Q}echo forming new custom/Makefile
-	-${Q}rm -f Makefile.bak
-	${Q}mv Makefile Makefile.bak
-	${Q}${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile
-	${Q}echo "" >> Makefile
-	${Q}${SED} -n '3,$$p' skel/custom/makedep.out | \
+	${Q} echo custom dependency list formed
+	${Q} echo forming new custom/Makefile
+	-${Q} ${RM} -f Makefile.bak
+	${Q} ${MV} Makefile Makefile.bak
+	${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile
+	${Q} echo "" >> Makefile
+	${Q} ${SED} -n '3,$$p' skel/custom/makedep.out | \
 		LANG=C ${SORT} -u >> Makefile
-	-${Q}rm -rf skel
-	-${Q}if ${CMP} -s Makefile.bak Makefile; then \
-		echo 'custom Makefile was already up to date'; \
-		mv -f Makefile.bak Makefile; \
+	-${Q} ${RM} -rf skel
+	-${Q} if ${CMP} -s Makefile.bak Makefile; then \
+	    echo 'custom Makefile was already up to date'; \
+	    ${MV} -f Makefile.bak Makefile; \
 	else \
-		rm -f Makefile.tmp; \
-		mv Makefile Makefile.tmp; \
-		if [ -d RCS ]; then \
-		    co -l Makefile; \
-		fi ;\
-		mv Makefile.tmp Makefile; \
-		if [ -d RCS ]; then \
-		echo 'new custom Makefile formed -- you need to check it in'; \
-		fi; \
+	    ${RM} -f Makefile.tmp; \
+	    ${MV} Makefile Makefile.tmp; \
+	    if [ -d RCS ]; then \
+		${CO} -l Makefile; \
+	    fi ;\
+	    ${MV} Makefile.tmp Makefile; \
+	    if [ -d RCS ]; then \
+	    echo 'new custom Makefile formed -- you need to check it in'; \
+	    fi; \
 	fi
 
 ##
@@ -565,22 +590,22 @@ depend:
 ##
 
 echo_inst_files:
-	${Q}for i in ${INSTALL_H_SRC} /dev/null; do \
+	${Q} for i in ${INSTALL_H_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo __file__ ${CUSTOMINCDIR}/$$i; \
 	    fi; \
 	done
-	${Q}for i in ${CUSTOM_HELP} /dev/null; do \
+	${Q} for i in ${CUSTOM_HELP} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo __file__ ${CUSTOMHELPDIR}/$$i; \
 	    fi; \
 	done
-	${Q}for i in ${CUSTOM_CALC_FILES} /dev/null; do \
+	${Q} for i in ${CUSTOM_CALC_FILES} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo __file__ ${CUSTOMCALDIR}/$$i; \
 	    fi; \
 	done
-	${Q}for i in ${CALC_LIBCUSTOM} /dev/null; do \
+	${Q} for i in ${CALC_LIBCUSTOM} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo __file__ ${CUSTOMCALDIR}/$$i; \
 	    fi; \
@@ -593,154 +618,154 @@ echo_inst_files:
 ##
 
 clean:
-	-rm -f ${CUSTCALC_OBJ}
+	-${RM} -f ${CUSTCALC_OBJ}
 
 clobber:
-	-rm -f ${TARGETS}
-	rm -f .all Makefile.tmp Makefile.bak
+	-${RM} -f ${TARGETS}
+	${RM} -f .all Makefile.tmp Makefile.bak
 
 # install everything
 #
 # NOTE: Keep the uninstall rule in reverse order to the install rule
 #
 install: all
-	-${Q}if [ ! -d $T${INCDIR} ]; then \
-	    echo mkdir $T${INCDIR}; \
-	    mkdir $T${INCDIR}; \
-	    if [ ! -d "$T${INCDIR}" ]; then \
-		echo mkdir -p "$T${INCDIR}"; \
-		mkdir -p "$T${INCDIR}"; \
+	-${Q} if [ ! -d ${T}${INCDIR} ]; then \
+	    echo ${MKDIR} ${T}${INCDIR}; \
+	    ${MKDIR} ${T}${INCDIR}; \
+	    if [ ! -d "${T}${INCDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${INCDIR}"; \
+		${MKDIR} -p "${T}${INCDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${INCDIR}; \
-	    ${CHMOD} 0755 $T${INCDIR}; \
+	    echo ${CHMOD} 0755 ${T}${INCDIR}; \
+	    ${CHMOD} 0755 ${T}${INCDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-	    echo mkdir $T${CALC_SHAREDIR}; \
-	    mkdir $T${CALC_SHAREDIR}; \
-	    if [ ! -d "$T${CALC_SHAREDIR}" ]; then \
-		echo mkdir -p "$T${CALC_SHAREDIR}"; \
-		mkdir -p "$T${CALC_SHAREDIR}"; \
+	-${Q} if [ ! -d ${T}${CALC_SHAREDIR} ]; then \
+	    echo ${MKDIR} ${T}${CALC_SHAREDIR}; \
+	    ${MKDIR} ${T}${CALC_SHAREDIR}; \
+	    if [ ! -d "${T}${CALC_SHAREDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${CALC_SHAREDIR}"; \
+		${MKDIR} -p "${T}${CALC_SHAREDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
-	    ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
+	    echo ${CHMOD} 0755 ${T}${CALC_SHAREDIR}; \
+	    ${CHMOD} 0755 ${T}${CALC_SHAREDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${CALC_INCDIR} ]; then \
-	    echo mkdir $T${CALC_INCDIR}; \
-	    mkdir $T${CALC_INCDIR}; \
-	    if [ ! -d "$T${CALC_INCDIR}" ]; then \
-		echo mkdir -p "$T${CALC_INCDIR}"; \
-		mkdir -p "$T${CALC_INCDIR}"; \
+	-${Q} if [ ! -d ${T}${CALC_INCDIR} ]; then \
+	    echo ${MKDIR} ${T}${CALC_INCDIR}; \
+	    ${MKDIR} ${T}${CALC_INCDIR}; \
+	    if [ ! -d "${T}${CALC_INCDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${CALC_INCDIR}"; \
+		${MKDIR} -p "${T}${CALC_INCDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CALC_INCDIR}; \
-	    ${CHMOD} 0755 $T${CALC_INCDIR}; \
+	    echo ${CHMOD} 0755 ${T}${CALC_INCDIR}; \
+	    ${CHMOD} 0755 ${T}${CALC_INCDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${HELPDIR} ]; then \
-	    echo mkdir $T${HELPDIR}; \
-	    mkdir $T${HELPDIR}; \
-	    if [ ! -d "$T${HELPDIR}" ]; then \
-		echo mkdir -p "$T${HELPDIR}"; \
-		mkdir -p "$T${HELPDIR}"; \
+	-${Q} if [ ! -d ${T}${HELPDIR} ]; then \
+	    echo ${MKDIR} ${T}${HELPDIR}; \
+	    ${MKDIR} ${T}${HELPDIR}; \
+	    if [ ! -d "${T}${HELPDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${HELPDIR}"; \
+		${MKDIR} -p "${T}${HELPDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${HELPDIR}; \
-	    ${CHMOD} 0755 $T${HELPDIR}; \
+	    echo ${CHMOD} 0755 ${T}${HELPDIR}; \
+	    ${CHMOD} 0755 ${T}${HELPDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${CUSTOMCALDIR} ]; then \
-	    echo mkdir $T${CUSTOMCALDIR}; \
-	    mkdir $T${CUSTOMCALDIR}; \
-	    if [ ! -d "$T${CUSTOMCALDIR}" ]; then \
-		echo mkdir -p "$T${CUSTOMCALDIR}"; \
-		mkdir -p "$T${CUSTOMCALDIR}"; \
+	-${Q} if [ ! -d ${T}${CUSTOMCALDIR} ]; then \
+	    echo ${MKDIR} ${T}${CUSTOMCALDIR}; \
+	    ${MKDIR} ${T}${CUSTOMCALDIR}; \
+	    if [ ! -d "${T}${CUSTOMCALDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${CUSTOMCALDIR}"; \
+		${MKDIR} -p "${T}${CUSTOMCALDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CUSTOMCALDIR}; \
-	    ${CHMOD} 0755 $T${CUSTOMCALDIR}; \
+	    echo ${CHMOD} 0755 ${T}${CUSTOMCALDIR}; \
+	    ${CHMOD} 0755 ${T}${CUSTOMCALDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${CUSTOMHELPDIR} ]; then \
-	    echo mkdir $T${CUSTOMHELPDIR}; \
-	    mkdir $T${CUSTOMHELPDIR}; \
-	    if [ ! -d "$T${CUSTOMHELPDIR}" ]; then \
-		echo mkdir -p "$T${CUSTOMHELPDIR}"; \
-		mkdir -p "$T${CUSTOMHELPDIR}"; \
+	-${Q} if [ ! -d ${T}${CUSTOMHELPDIR} ]; then \
+	    echo ${MKDIR} ${T}${CUSTOMHELPDIR}; \
+	    ${MKDIR} ${T}${CUSTOMHELPDIR}; \
+	    if [ ! -d "${T}${CUSTOMHELPDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${CUSTOMHELPDIR}"; \
+		${MKDIR} -p "${T}${CUSTOMHELPDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CUSTOMHELPDIR}; \
-	    ${CHMOD} 0755 $T${CUSTOMHELPDIR}; \
+	    echo ${CHMOD} 0755 ${T}${CUSTOMHELPDIR}; \
+	    ${CHMOD} 0755 ${T}${CUSTOMHELPDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${CUSTOMINCDIR} ]; then \
-	    echo mkdir $T${CUSTOMINCDIR}; \
-	    mkdir $T${CUSTOMINCDIR}; \
-	    if [ ! -d "$T${CUSTOMINCDIR}" ]; then \
-		echo mkdir -p "$T${CUSTOMINCDIR}"; \
-		mkdir -p "$T${CUSTOMINCDIR}"; \
+	-${Q} if [ ! -d ${T}${CUSTOMINCDIR} ]; then \
+	    echo ${MKDIR} ${T}${CUSTOMINCDIR}; \
+	    ${MKDIR} ${T}${CUSTOMINCDIR}; \
+	    if [ ! -d "${T}${CUSTOMINCDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${CUSTOMINCDIR}"; \
+		${MKDIR} -p "${T}${CUSTOMINCDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CUSTOMINCDIR}; \
-	    ${CHMOD} 0755 $T${CUSTOMINCDIR}; \
+	    echo ${CHMOD} 0755 ${T}${CUSTOMINCDIR}; \
+	    ${CHMOD} 0755 ${T}${CUSTOMINCDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}for i in ${INSTALL_H_SRC} /dev/null; do \
+	-${Q} for i in ${INSTALL_H_SRC} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if ${CMP} -s "$$i" $T${CUSTOMINCDIR}/$$i; then \
-		true; \
+	    if ${CMP} -s "$$i" ${T}${CUSTOMINCDIR}/$$i; then \
+		${TRUE}; \
 	    else \
-		rm -f $T${CUSTOMINCDIR}/$$i.new; \
-		cp -f $$i $T${CUSTOMINCDIR}/$$i.new; \
-		${CHMOD} 0444 $T${CUSTOMINCDIR}/$$i.new; \
-		mv -f $T${CUSTOMINCDIR}/$$i.new $T${CUSTOMINCDIR}/$$i; \
-		echo "installed $T${CUSTOMINCDIR}/$$i"; \
+		${RM} -f ${T}${CUSTOMINCDIR}/$$i.new; \
+		${CP} -f $$i ${T}${CUSTOMINCDIR}/$$i.new; \
+		${CHMOD} 0444 ${T}${CUSTOMINCDIR}/$$i.new; \
+		${MV} -f ${T}${CUSTOMINCDIR}/$$i.new ${T}${CUSTOMINCDIR}/$$i; \
+		echo "installed ${T}${CUSTOMINCDIR}/$$i"; \
 	    fi; \
 	done
-	-${Q}for i in ${CUSTOM_CALC_FILES} /dev/null; do \
+	-${Q} for i in ${CUSTOM_CALC_FILES} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if ${CMP} -s $$i $T${CUSTOMCALDIR}/$$i; then \
-		true; \
+	    if ${CMP} -s $$i ${T}${CUSTOMCALDIR}/$$i; then \
+		${TRUE}; \
 	    else \
-		rm -f $T${CUSTOMCALDIR}/$$i.new; \
-		cp -f $$i $T${CUSTOMCALDIR}/$$i.new; \
-		${CHMOD} 0444 $T${CUSTOMCALDIR}/$$i.new; \
-		mv -f $T${CUSTOMCALDIR}/$$i.new $T${CUSTOMCALDIR}/$$i; \
-		echo "installed $T${CUSTOMCALDIR}/$$i"; \
+		${RM} -f ${T}${CUSTOMCALDIR}/$$i.new; \
+		${CP} -f $$i ${T}${CUSTOMCALDIR}/$$i.new; \
+		${CHMOD} 0444 ${T}${CUSTOMCALDIR}/$$i.new; \
+		${MV} -f ${T}${CUSTOMCALDIR}/$$i.new ${T}${CUSTOMCALDIR}/$$i; \
+		echo "installed ${T}${CUSTOMCALDIR}/$$i"; \
 	    fi; \
 	done
-	-${Q}for i in ${CUSTOM_HELP} /dev/null; do \
+	-${Q} for i in ${CUSTOM_HELP} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if ${CMP} -s $$i $T${CUSTOMHELPDIR}/$$i; then \
-		true; \
+	    if ${CMP} -s $$i ${T}${CUSTOMHELPDIR}/$$i; then \
+		${TRUE}; \
 	    else \
-		rm -f $T${CUSTOMHELPDIR}/$$i.new; \
-		cp -f $$i $T${CUSTOMHELPDIR}/$$i.new; \
-		${CHMOD} 0444 $T${CUSTOMHELPDIR}/$$i.new; \
-		mv -f $T${CUSTOMHELPDIR}/$$i.new $T${CUSTOMHELPDIR}/$$i; \
-		echo "installed $T${CUSTOMHELPDIR}/$$i"; \
+		${RM} -f ${T}${CUSTOMHELPDIR}/$$i.new; \
+		${CP} -f $$i ${T}${CUSTOMHELPDIR}/$$i.new; \
+		${CHMOD} 0444 ${T}${CUSTOMHELPDIR}/$$i.new; \
+		${MV} -f ${T}${CUSTOMHELPDIR}/$$i.new ${T}${CUSTOMHELPDIR}/$$i; \
+		echo "installed ${T}${CUSTOMHELPDIR}/$$i"; \
 	    fi; \
 	done
-	-${Q}if [ ! -z ${ALLOW_CUSTOM} ]; then \
-	    if ${CMP} -s libcustcalc.a $T${CUSTOMCALDIR}/libcustcalc.a; then \
-		true; \
+	-${Q} if [ ! -z ${ALLOW_CUSTOM} ]; then \
+	    if ${CMP} -s libcustcalc.a ${T}${CUSTOMCALDIR}/libcustcalc.a; then \
+		${TRUE}; \
 	    else \
-		rm -f $T${CUSTOMCALDIR}/libcustcalc.a.new; \
-		cp -f libcustcalc.a $T${CUSTOMCALDIR}/libcustcalc.a.new; \
-		${CHMOD} 0644 $T${CUSTOMCALDIR}/libcustcalc.a.new; \
-		mv -f $T${CUSTOMCALDIR}/libcustcalc.a.new \
-		      $T${CUSTOMCALDIR}/libcustcalc.a; \
-		${RANLIB} $T${CUSTOMCALDIR}/libcustcalc.a; \
-		echo "installed $T${CUSTOMCALDIR}/libcustcalc.a"; \
+		${RM} -f ${T}${CUSTOMCALDIR}/libcustcalc.a.new; \
+		${CP} -f libcustcalc.a ${T}${CUSTOMCALDIR}/libcustcalc.a.new; \
+		${CHMOD} 0644 ${T}${CUSTOMCALDIR}/libcustcalc.a.new; \
+		${MV} -f ${T}${CUSTOMCALDIR}/libcustcalc.a.new \
+		      ${T}${CUSTOMCALDIR}/libcustcalc.a; \
+		${RANLIB} ${T}${CUSTOMCALDIR}/libcustcalc.a; \
+		echo "installed ${T}${CUSTOMCALDIR}/libcustcalc.a"; \
 	    fi; \
 	fi
 
@@ -749,58 +774,58 @@ install: all
 # NOTE: Keep the uninstall rule in reverse order to the install rule
 #
 uninstall:
-	-${Q}if [ -f "$T${CUSTOMCALDIR}/libcustcalc.a" ]; then \
-	    rm -f "$T${CUSTOMCALDIR}/libcustcalc.a"; \
-	    if [ -f "$T${CUSTOMCALDIR}/libcustcalc.a" ]; then \
-		echo "cannot uninstall $T${CUSTOMCALDIR}/libcustcalc.a"; \
+	-${Q} if [ -f "${T}${CUSTOMCALDIR}/libcustcalc.a" ]; then \
+	    ${RM} -f "${T}${CUSTOMCALDIR}/libcustcalc.a"; \
+	    if [ -f "${T}${CUSTOMCALDIR}/libcustcalc.a" ]; then \
+		echo "cannot uninstall ${T}${CUSTOMCALDIR}/libcustcalc.a"; \
 	    else \
-		echo "uninstalled $T${CUSTOMCALDIR}/libcustcalc.a"; \
+		echo "uninstalled ${T}${CUSTOMCALDIR}/libcustcalc.a"; \
 	    fi; \
 	fi
-	-${Q}for i in ${CUSTOM_HELP} /dev/null; do \
+	-${Q} for i in ${CUSTOM_HELP} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if [ -f "$T${CUSTOMHELPDIR}/$$i" ]; then \
-	    	rm -f "$T${CUSTOMHELPDIR}/$$i"; \
-		if [ -f "$T${CUSTOMHELPDIR}/$$i" ]; then \
-		   echo "cannot uninstall $T${CUSTOMHELPDIR}/$$i"; \
+	    if [ -f "${T}${CUSTOMHELPDIR}/$$i" ]; then \
+	    	${RM} -f "${T}${CUSTOMHELPDIR}/$$i"; \
+		if [ -f "${T}${CUSTOMHELPDIR}/$$i" ]; then \
+		   echo "cannot uninstall ${T}${CUSTOMHELPDIR}/$$i"; \
 		else \
-		   echo "uninstalled $T${CUSTOMHELPDIR}/$$i"; \
+		   echo "uninstalled ${T}${CUSTOMHELPDIR}/$$i"; \
 		fi; \
 	    fi; \
 	done
-	-${Q}for i in ${CUSTOM_CALC_FILES} /dev/null; do \
+	-${Q} for i in ${CUSTOM_CALC_FILES} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if [ -f "$T${CUSTOMCALDIR}/$$i" ]; then \
-	    	rm -f "$T${CUSTOMCALDIR}/$$i"; \
-		if [ -f "$T${CUSTOMCALDIR}/$$i" ]; then \
-		   echo "cannot uninstall $T${CUSTOMCALDIR}/$$i"; \
+	    if [ -f "${T}${CUSTOMCALDIR}/$$i" ]; then \
+	    	${RM} -f "${T}${CUSTOMCALDIR}/$$i"; \
+		if [ -f "${T}${CUSTOMCALDIR}/$$i" ]; then \
+		   echo "cannot uninstall ${T}${CUSTOMCALDIR}/$$i"; \
 		else \
-		   echo "uninstalled $T${CUSTOMCALDIR}/$$i"; \
+		   echo "uninstalled ${T}${CUSTOMCALDIR}/$$i"; \
 		fi; \
 	    fi; \
 	done
-	-${Q}for i in ${INSTALL_H_SRC} /dev/null; do \
+	-${Q} for i in ${INSTALL_H_SRC} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if [ -f "$T${CUSTOMINCDIR}/$$i" ]; then \
-	    	rm -f "$T${CUSTOMINCDIR}/$$i"; \
-		if [ -f "$T${CUSTOMINCDIR}/$$i" ]; then \
-		   echo "cannot uninstall $T${CUSTOMINCDIR}/$$i"; \
+	    if [ -f "${T}${CUSTOMINCDIR}/$$i" ]; then \
+	    	${RM} -f "${T}${CUSTOMINCDIR}/$$i"; \
+		if [ -f "${T}${CUSTOMINCDIR}/$$i" ]; then \
+		   echo "cannot uninstall ${T}${CUSTOMINCDIR}/$$i"; \
 		else \
-		   echo "uninstalled $T${CUSTOMINCDIR}/$$i"; \
+		   echo "uninstalled ${T}${CUSTOMINCDIR}/$$i"; \
 		fi; \
 	    fi; \
 	done
-	-${Q}for i in ${CUSTOMINCDIR} ${CUSTOMHELPDIR} ${CUSTOMCALDIR} \
+	-${Q} for i in ${CUSTOMINCDIR} ${CUSTOMHELPDIR} ${CUSTOMCALDIR} \
 		    ${HELPDIR} ${CALC_INCDIR} ${CALC_SHAREDIR} ${INCDIR}; do \
-	    if [ -d "$T$$i" ]; then \
-		rmdir "$T$$i" 2>/dev/null; \
-		echo "cleaned up $T$$i"; \
+	    if [ -d "${T}$$i" ]; then \
+		${RMDIR} "${T}$$i" 2>/dev/null; \
+		echo "cleaned up ${T}$$i"; \
 	    fi; \
 	done
 

custom/c_sysinfo.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.11 $
- * @(#) $Id: c_sysinfo.c,v 29.11 2006/05/22 19:04:45 chongo Exp $
+ * @(#) $Revision: 29.12 $
+ * @(#) $Id: c_sysinfo.c,v 29.12 2006/09/18 06:28:47 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_sysinfo.c,v $
  *
  * Under source code control:	1997/03/09 23:14:40
@@ -85,7 +85,6 @@ static struct infoname sys_info[] = {
     {"DEFAULTSHELL", "default shell to use", DEFAULTSHELL, (FULL)0},
     {"DEV_BITS", "device number size in bits", NULL, (FULL)DEV_BITS},
     {"DISPLAY_DEFAULT", "default digits for float display", NULL, (FULL)DISPLAY_DEFAULT},
-    {"ECHO_PROG", "where the echo command is located", ECHO_PROG, (FULL)0},
     {"EPSILONPREC_DEFAULT", "2^-EPSILON_DEFAULT <= EPSILON_DEFAULT", NULL, (FULL)EPSILONPREC_DEFAULT},
     {"EPSILON_DEFAULT", "allowed error for float calculations", EPSILON_DEFAULT, (FULL)0},
     {"ERRMAX", "default errmax value", NULL, (FULL)ERRMAX},

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.30 $
- * @(#) $Id: func.c,v 29.30 2006/08/20 15:01:30 chongo Exp $
+ * @(#) $Revision: 29.32 $
+ * @(#) $Id: func.c,v 29.32 2006/12/16 10:46:07 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/func.c,v $
  *
  * Under source code control:	1990/02/15 01:48:15
@@ -83,6 +83,11 @@
 # define strdup(x) calc_strdup((CONST char *)(x))
 #endif
 
+#include "have_rusage.h"
+#if defined(HAVE_GETRUSAGE)
+# include <sys/resource.h>
+#endif
+
 #include "have_const.h"
 #include "have_unused.h"
 #include "calc.h"
@@ -142,18 +147,6 @@ static int env_pool_max = 0;	/* number of env_pool elements allocated */
 static struct env_pool *e_pool = NULL;	/* env_pool elements */
 
 
-/*
- * if HZ & CLK_TCK are not defined, pick typical values, hope for the best
- */
-#if !defined(HZ)
-#  define HZ 60
-#endif
-#if !defined(CLK_TCK)
-# undef CLK_TCK
-# define CLK_TCK HZ
-#endif
-
-
 /*
  * user-defined error strings
  */
@@ -5067,20 +5060,131 @@ f_listremove(VALUE *vp)
 
 
 /*
- * Return the current runtime of calc in seconds.
- * This is the user mode time only.
+ * Return the current user time of calc in seconds.
+ */
+static NUMBER *
+f_usertime(void)
+{
+#if defined(HAVE_GETRUSAGE)
+	struct rusage usage;		/* system resource usage */
+	int who = RUSAGE_SELF;		/* obtain time for just this process */
+	int status;			/* getrusage() return code */
+	NUMBER *ret;			/* CPU time to return */
+	NUMBER *secret;			/* whole sconds of CPU time to return */
+	NUMBER *usecret;		/* microseconds of CPU time to return */
+
+	/* get the resource informaion for ourself */
+	status = getrusage(who, &usage);
+	if (status < 0) {
+	    /* system call error, so return 0 */
+	    return qlink(&_qzero_);
+	}
+
+	/* add user time */
+	secret = stoq(usage.ru_utime.tv_sec);
+	usecret = iitoq((long)usage.ru_utime.tv_usec, 1000000L);
+	ret = qqadd(secret, usecret);
+	qfree(secret);
+	qfree(usecret);
+
+	/* return user CPU time */
+	return ret;
+
+#else /* HAVE_GETRUSAGE */
+	/* not a POSIX system */
+	return qlink(&_qzero_);
+#endif /* HAVE_GETRUSAGE */
+}
+
+
+/*
+ * Return the current kernel time of calc in seconds.
+ * This is the kernel mode time only.
+ */
+static NUMBER *
+f_systime(void)
+{
+#if defined(HAVE_GETRUSAGE)
+	struct rusage usage;		/* system resource usage */
+	int who = RUSAGE_SELF;		/* obtain time for just this process */
+	int status;			/* getrusage() return code */
+	NUMBER *ret;			/* CPU time to return */
+	NUMBER *secret;			/* whole sconds of CPU time to return */
+	NUMBER *usecret;		/* microseconds of CPU time to return */
+
+	/* get the resource informaion for ourself */
+	status = getrusage(who, &usage);
+	if (status < 0) {
+	    /* system call error, so return 0 */
+	    return qlink(&_qzero_);
+	}
+
+	/* add kernel time */
+	secret = stoq(usage.ru_stime.tv_sec);
+	usecret = iitoq((long)usage.ru_stime.tv_usec, 1000000L);
+	ret = qqadd(secret, usecret);
+	qfree(secret);
+	qfree(usecret);
+
+	/* return kernel CPU time */
+	return ret;
+
+#else /* HAVE_GETRUSAGE */
+	/* not a POSIX system */
+	return qlink(&_qzero_);
+#endif /* HAVE_GETRUSAGE */
+}
+
+
+/*
+ * Return the current user and kernel time of calc in seconds.
  */
 static NUMBER *
 f_runtime(void)
 {
-#if defined(_WIN32)
-	return qlink(&_qzero_);
-#else /* Windoz free systems */
-	struct tms buf;
+#if defined(HAVE_GETRUSAGE)
+	struct rusage usage;		/* system resource usage */
+	int who = RUSAGE_SELF;		/* obtain time for just this process */
+	int status;			/* getrusage() return code */
+	NUMBER *user;			/* user CPU time to return */
+	NUMBER *sys;			/* kernel CPU time to return */
+	NUMBER *ret;			/* total CPU time to return */
+	NUMBER *secret;			/* whole sconds of CPU time to return */
+	NUMBER *usecret;		/* microseconds of CPU time to return */
 
-	times(&buf);
-	return iitoq((long) buf.tms_utime, (long) CLK_TCK);
-#endif /* Windoz free systems */
+	/* get the resource informaion for ourself */
+	status = getrusage(who, &usage);
+	if (status < 0) {
+	    /* system call error, so return 0 */
+	    return qlink(&_qzero_);
+	}
+
+	/* add kernel time */
+	secret = stoq(usage.ru_stime.tv_sec);
+	usecret = iitoq((long)usage.ru_stime.tv_usec, 1000000L);
+	sys = qqadd(secret, usecret);
+	qfree(secret);
+	qfree(usecret);
+
+	/* add user time */
+	secret = stoq(usage.ru_utime.tv_sec);
+	usecret = iitoq((long)usage.ru_utime.tv_usec, 1000000L);
+	user = qqadd(secret, usecret);
+	qfree(secret);
+	qfree(usecret);
+
+	/* total time is user + kernel */
+	ret = qqadd(user, sys);
+	qfree(user);
+	qfree(sys);
+
+	/* return CPU time */
+	return ret;
+
+#else /* HAVE_GETRUSAGE */
+	/* not a POSIX system */
+	return qlink(&_qzero_);
+#endif /* HAVE_GETRUSAGE */
 }
 
 
@@ -8558,7 +8662,7 @@ static CONST struct builtin builtins[] = {
 	{"rsearch", 2, 4, 0, OP_NOP, 0, f_rsearch,
 	 "reverse search matrix or list for value b\n\t\t\tstarting at index c"},
 	{"runtime", 0, 0, 0, OP_NOP, f_runtime, 0,
-	 "user mode cpu time in seconds"},
+	 "user and kernel mode cpu time in seconds"},
 	{"saveval", 1, 1, 0, OP_SAVEVAL, 0, 0,
 	 "set flag for saving values"},
 	{"scale", 2, 2, 0, OP_SCALE, 0, 0,
@@ -8641,6 +8745,8 @@ static CONST struct builtin builtins[] = {
 	 "swap values of variables a and b (can be dangerous)"},
 	{"system", 1, 1, 0, OP_NOP, 0, f_system,
 	 "call Unix command"},
+	{"systime", 0, 0, 0, OP_NOP, f_systime, 0,
+	 "kernel mode cpu time in seconds"},
 	{"tail", 2, 2, 0, OP_NOP, 0, f_tail,
 	 "retain list of specified number at tail of list"},
 	{"tan", 1, 2, 0, OP_NOP, 0, f_tan,
@@ -8655,6 +8761,8 @@ static CONST struct builtin builtins[] = {
 	 "truncate a to b number of decimal places"},
 	{"ungetc", 2, 2, 0, OP_NOP, 0, f_ungetc,
 	 "unget char read from file"},
+	{"usertime", 0, 0, 0, OP_NOP, f_usertime, 0,
+	 "user mode cpu time in seconds"},
 	{"version", 0, 0, 0, OP_NOP, 0, f_version,
 	 "calc version string"},
 	{"xor", 1, IN, 0, OP_NOP, 0, f_xor,

help/Makefile

@@ -2,7 +2,7 @@
 #
 # help - makefile for calc help files
 #
-# Copyright (C) 1999-2002  Landon Curt Noll
+# Copyright (C) 1999-2006  Landon Curt Noll
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -18,8 +18,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.30 $
-# @(#) $Id: Makefile,v 29.30 2006/08/20 15:01:57 chongo Exp $
+# @(#) $Revision: 29.35 $
+# @(#) $Id: Makefile,v 29.35 2006/12/16 10:32:54 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/help/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/23 06:47:57
@@ -34,7 +34,7 @@
 # required vars
 #
 SHELL= /bin/sh
-MAKE_FILE = Makefile
+MAKE_FILE= Makefile
 
 ####
 # Normally, the upper level makefile will set these values.  We provide
@@ -62,9 +62,9 @@ INCDIR= /usr/include
 # ${LIBDIR}		where calc link library (*.a) files are installed
 # ${CALC_SHAREDIR}	where to install calc help, .cal, startup, config files
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # For DJGPP, select:
 #
@@ -99,9 +99,9 @@ CALC_SHAREDIR= /usr/share/calc
 # ${CUSTOMINCPDIR}	where custom .h files are installed
 # ${SCRIPTDIR}		where calc shell scripts are installed
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # If in doubt, set:
 #
@@ -121,8 +121,8 @@ SCRIPTDIR= ${BINDIR}/cscript
 
 # T - top level directory under which calc will be installed
 #
-# The calc install is performed under $T, the calc build is
-# performed under /.	The purpose for $T is to allow someone
+# The calc install is performed under ${T}, the calc build is
+# performed under /.	The purpose for ${T} is to allow someone
 # to install calc somewhere other than into the system area.
 #
 # For example, if:
@@ -142,10 +142,10 @@ SCRIPTDIR= ${BINDIR}/cscript
 #     calc help, .cal ...:	/var/tmp/testing/usr/share/calc
 #     ... etc ...		/var/tmp/testing/...
 #
-# If $T is empty, calc is installed under /, which is the same
-# top of tree for which it was built.  If $T is non-empty, then
-# calc is installed under $T, as if one had to chroot under
-# $T for calc to operate.
+# If ${T} is empty, calc is installed under /, which is the same
+# top of tree for which it was built.  If ${T} is non-empty, then
+# calc is installed under ${T}, as if one had to chroot under
+# ${T} for calc to operate.
 #
 # If in doubt, use T=
 #
@@ -169,6 +169,14 @@ SED= sed
 SORT= sort
 FMT= fmt
 CMP= cmp
+CP= cm
+MV= mv
+TRUE= true
+RM= rm
+MKDIR= mkdir
+RMDIR= rmdir
+TOUCH= touch
+CAT= cat
 
 # Some out of date operating systems require / want an executable to
 # end with a certain file extension.  Some compile systems such as
@@ -269,7 +277,7 @@ DETAIL_HELP= abs access acos acosh acot acoth acsc acsch address agd append \
 	appr arg argv arrow asec asech asin asinh assign atan atan2 atanh \
 	avg base base2 bernoulli bit blk blkcpy blkfree blocks bround \
 	btrunc calc_tty calclevel catalan ceil cfappr cfsim char cmdbuf \
-	cmp comb conj cos cosh cot coth count cp csc csch ctime delete den \
+	cmp comb conj cos cosh cot coth count csc csch ctime delete den \
 	dereference det digit digits display dp epsilon errcount errmax \
 	errno error estr euler eval exp fact factor fclose fcnt feof ferror \
 	fflush fgetc fgetfield fgetfile fgetline fgets fgetstr fib files \
@@ -291,8 +299,8 @@ DETAIL_HELP= abs access acos acosh acot acoth acsc acsch address agd append \
 	saveval scale scan scanf search sec sech seed segment select sgn \
 	sha sha1 sin sinh size sizeof sleep sort sqrt srand srandom ssq \
 	str strcat strcmp strcpy strerror strlen strncmp strncpy strpos \
-	strprintf strscan strscanf substr sum swap system tail tan tanh \
-	test time trunc version xor
+	strprintf strscan strscanf substr sum swap system systime tail tan \
+	tanh test time trunc usertime version xor
 
 # This list is of files that are clones of DETAIL_HELP files.  They are
 # built from DETAIL_HELP files.
@@ -325,175 +333,175 @@ all: ${FULL_HELP_FILES} full ${DETAIL_HELP} ${DETAIL_CLONE} \
 #	an non-emoty else clause for every if condition.  *sigh*
 #
 .all:
-	rm -f .all
-	touch .all
+	${RM} -f .all
+	${TOUCH} .all
 
 bindings: ../cal/bindings
-	rm -f $@
-	cp ../cal/bindings $@
+	${RM} -f $@
+	${CP} ../cal/bindings $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 resource: ../cal/README
-	rm -f $@
-	cp ../cal/README $@
+	${RM} -f $@
+	${CP} ../cal/README $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 changes: ../CHANGES
-	rm -f $@
-	cp ../CHANGES $@
+	${RM} -f $@
+	${CP} ../CHANGES $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 libcalc: ../LIBRARY
-	rm -f $@
+	${RM} -f $@
 	${SED} -e 's:$${LIBDIR}:${LIBDIR}:g' \
 	       -e 's:$${CALC_INCDIR}:${CALC_INCDIR}:g' < ../LIBRARY > $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 bugs: ../BUGS
-	rm -f $@
-	cp ../BUGS $@
+	${RM} -f $@
+	${CP} ../BUGS $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 errorcodes: ../calcerr.h errorcodes.hdr errorcodes.sed
-	rm -f $@
-	cat errorcodes.hdr > $@
+	${RM} -f $@
+	${CAT} errorcodes.hdr > $@
 	${SED} -n -f errorcodes.sed < ../calcerr.h >> $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 calc: usage
-	rm -f $@
-	cp usage $@
+	${RM} -f $@
+	${CP} usage $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 custom_cal: ../custom/CUSTOM_CAL
-	rm -f $@
-	cp ../custom/CUSTOM_CAL $@
+	${RM} -f $@
+	${CP} ../custom/CUSTOM_CAL $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 new_custom: ../custom/HOW_TO_ADD
-	rm -f $@
-	cp ../custom/HOW_TO_ADD $@
+	${RM} -f $@
+	${CP} ../custom/HOW_TO_ADD $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 copy: blkcpy
-	rm -f $@
-	cp blkcpy $@
+	${RM} -f $@
+	${CP} blkcpy $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 COPYING: ../COPYING
-	rm -f $@
-	cp ../COPYING $@
+	${RM} -f $@
+	${CP} ../COPYING $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 COPYING-LGPL: ../COPYING-LGPL
-	rm -f $@
-	cp ../COPYING-LGPL $@
+	${RM} -f $@
+	${CP} ../COPYING-LGPL $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 cscript: ../cscript/README
-	rm -f $@
-	cp ../cscript/README $@
+	${RM} -f $@
+	${CP} ../cscript/README $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 full: ${FULL_HELP_FILES} ${MAKE_FILE}
-	${Q}echo "forming full"
-	-${Q}rm -f $@
-	-${Q}for i in ${FULL_HELP_FILES}; do \
+	${Q} echo "forming full"
+	-${Q} ${RM} -f $@
+	-${Q} for i in ${FULL_HELP_FILES}; do \
 	    if [ Xintro != X"$$i" ]; then \
 		echo ""; \
 	    else \
-		true; \
+		${TRUE}; \
 	    fi; \
 	    if [ Xobj.file = X"$$i" ]; then \
 		j=obj; \
@@ -504,34 +512,34 @@ full: ${FULL_HELP_FILES} ${MAKE_FILE}
 	    echo "* $$j"; \
 	    echo "*************"; \
 	    echo ""; \
-	    cat $$i; \
+	    ${CAT} $$i; \
 	done > $@
-	${Q}echo "full formed"
+	${Q} echo "full formed"
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 # Singular files are the same files as their plural form.
 #
 ${SINGULAR_FILES}: ${PLURAL_FILES}
-	${Q}for i in ${SINGULAR_FILES} /dev/null; do \
+	${Q} for i in ${SINGULAR_FILES} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
-		echo "rm -f $${i}"; \
-		rm -f $${i}; \
-		echo "cp $${i}s $${i}"; \
-		cp $${i}s $${i}; \
+		echo "${RM} -f $${i}"; \
+		${RM} -f $${i}; \
+		echo "${CP} $${i}s $${i}"; \
+		${CP} $${i}s $${i}; \
 	    fi; \
 	done
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/SINGULAR_FILES =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/SINGULAR_FILES =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 # Form the builtin file
@@ -553,25 +561,25 @@ ${SINGULAR_FILES}: ${PLURAL_FILES}
 # do not treat -I.. correctly!
 #
 builtin: builtin.top builtin.end ../func.c funclist.sed
-	${Q}echo "forming builtin help file"
-	-${Q}rm -f funclist.c
-	${Q}${SED} -n -f funclist.sed ../func.c > funclist.c
-	-${Q}rm -f funclist.o funclist${EXT}
-	${Q}${LCC} ${ICFLAGS} -DFUNCLIST -I/usr/include \
+	${Q} echo "forming builtin help file"
+	-${Q} ${RM} -f funclist.c
+	${Q} ${SED} -n -f funclist.sed ../func.c > funclist.c
+	-${Q} ${RM} -f funclist.o funclist${EXT}
+	${Q} ${LCC} ${ICFLAGS} -DFUNCLIST -I/usr/include \
 	    -I.. funclist.c -c 2>/dev/null
-	${Q}${LCC} ${ILDFLAGS} funclist.o -o funclist${EXT}
-	-${Q}rm -f builtin
-	${Q}cat builtin.top > builtin
-	${Q}./funclist${EXT} | \
+	${Q} ${LCC} ${ILDFLAGS} funclist.o -o funclist${EXT}
+	-${Q} ${RM} -f builtin
+	${Q} ${CAT} builtin.top > builtin
+	${Q} ./funclist${EXT} | \
 	    ${SED} -e 's/^/	/' -e 's/[	 ][	 ]*$$//' >> builtin
-	${Q}cat builtin.end >> builtin
-	${Q}echo "builtin help file formed"
+	${Q} ${CAT} builtin.end >> builtin
+	${Q} echo "builtin help file formed"
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
-	    echo '=-=-= skipping the cat of help/$@ =-=-='; \
+	    echo '=-=-= skipping the ${CAT} of help/$@ =-=-='; \
 	    echo ''; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
 
 ##
@@ -585,17 +593,17 @@ builtin: builtin.top builtin.end ../func.c funclist.sed
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST} /dev/null; do \
+	${Q} for i in ${DISTLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo help/$$i; \
 	    fi; \
 	done | LANG=C ${SORT}
 
 distdir:
-	${Q}echo help
+	${Q} echo help
 
 calcliblist:
-	${Q}for i in ${CALCLIBLIST} /dev/null; do \
+	${Q} for i in ${CALCLIBLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo help/$$i; \
 	    fi; \
@@ -606,21 +614,21 @@ calcliblist:
 # ignore this rule.
 #
 bsdi: all
-	rm -f obj
-	cp obj.file obj
+	${RM} -f obj
+	${CP} obj.file obj
 
 # These next rule help me form the ${DETAIL_HELP} makefile variables above.
 #
 detaillist:
-	${Q}-(echo "xxxxx"; \
+	${Q} -(echo "xxxxx"; \
 	   for i in ${DETAIL_HELP} /dev/null; do \
-	    if [ X"$$i" != X"/dev/null" ]; then \
-		if [ ! -f RCS/$$i,v ]; then \
-		    echo "WARNING: $$i not under RCS control" 1>&2; \
-		else \
-		    echo $$i; \
+		if [ X"$$i" != X"/dev/null" ]; then \
+		    if [ ! -f RCS/$$i,v ]; then \
+			echo "WARNING: $$i not under RCS control" 1>&2; \
+		    else \
+			echo $$i; \
+		    fi; \
 		fi; \
-	    fi; \
 	done | LANG=C ${SORT}) | ${FMT} -70 | \
 	    ${SED} -e '1s/xxxxx/DETAIL_HELP=/' -e '2,$$s/^/	/' \
 		   -e 's/$$/ \\/' -e '$$s/ \\$$//'
@@ -632,13 +640,13 @@ detaillist:
 ##
 
 echo_inst_files:
-	${Q}for i in ${STD_HELP_FILES} full ${BLT_HELP_FILES} \
+	${Q} for i in ${STD_HELP_FILES} full ${BLT_HELP_FILES} \
 		  builtin ${DETAIL_HELP} ${SINGULAR_FILES} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo __file__ ${HELPDIR}/$$i; \
 	    fi; \
 	done
-	${Q}echo __file__ ${HELPDIR}/obj
+	${Q} echo __file__ ${HELPDIR}/obj
 
 ##
 #
@@ -647,67 +655,67 @@ echo_inst_files:
 ##
 
 clean:
-	rm -f obj mkbuiltin funclist.c funclist.o funclist${EXT}
-	rm -f COPYING COPYING-LGPL
+	${RM} -f obj mkbuiltin funclist.c funclist.o funclist${EXT}
+	${RM} -f COPYING COPYING-LGPL
 
 clobber:
-	rm -f ${BLT_HELP_FILES} full .all calc
-	rm -f obj mkbuiltin funclist.c funclist.o funclist${EXT}
-	rm -f COPYING COPYING-LGPL
-	rm -f ${SINGULAR_FILES} ${DETAIL_CLONE}
+	${RM} -f ${BLT_HELP_FILES} full .all calc
+	${RM} -f obj mkbuiltin funclist.c funclist.o funclist${EXT}
+	${RM} -f COPYING COPYING-LGPL
+	${RM} -f ${SINGULAR_FILES} ${DETAIL_CLONE}
 
 # install everything
 #
 # NOTE: Keep the uninstall rule in reverse order to the install rule
 #
 install: all
-	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-	    echo mkdir $T${CALC_SHAREDIR}; \
-	    mkdir $T${CALC_SHAREDIR}; \
-	    if [ ! -d "$T${CALC_SHAREDIR}" ]; then \
-		echo mkdir -p "$T${CALC_SHAREDIR}"; \
-		mkdir -p "$T${CALC_SHAREDIR}"; \
+	-${Q} if [ ! -d ${T}${CALC_SHAREDIR} ]; then \
+	    echo ${MKDIR} ${T}${CALC_SHAREDIR}; \
+	    ${MKDIR} ${T}${CALC_SHAREDIR}; \
+	    if [ ! -d "${T}${CALC_SHAREDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${CALC_SHAREDIR}"; \
+		${MKDIR} -p "${T}${CALC_SHAREDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
-	    ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
+	    echo ${CHMOD} 0755 ${T}${CALC_SHAREDIR}; \
+	    ${CHMOD} 0755 ${T}${CALC_SHAREDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}if [ ! -d $T${HELPDIR} ]; then \
-	    echo mkdir $T${HELPDIR}; \
-	    mkdir $T${HELPDIR}; \
-	    if [ ! -d "$T${HELPDIR}" ]; then \
-		echo mkdir -p "$T${HELPDIR}"; \
-		mkdir -p "$T${HELPDIR}"; \
+	-${Q} if [ ! -d ${T}${HELPDIR} ]; then \
+	    echo ${MKDIR} ${T}${HELPDIR}; \
+	    ${MKDIR} ${T}${HELPDIR}; \
+	    if [ ! -d "${T}${HELPDIR}" ]; then \
+		echo ${MKDIR} -p "${T}${HELPDIR}"; \
+		${MKDIR} -p "${T}${HELPDIR}"; \
 	    fi; \
-	    echo ${CHMOD} 0755 $T${HELPDIR}; \
-	    ${CHMOD} 0755 $T${HELPDIR}; \
+	    echo ${CHMOD} 0755 ${T}${HELPDIR}; \
+	    ${CHMOD} 0755 ${T}${HELPDIR}; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	-${Q}for i in ${STD_HELP_FILES} ${BLT_HELP_FILES} builtin \
+	-${Q} for i in ${STD_HELP_FILES} ${BLT_HELP_FILES} builtin \
 		  full ${DETAIL_HELP} ${SINGULAR_FILES} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if ${CMP} -s $$i $T${HELPDIR}/$$i; then \
-		true; \
+	    if ${CMP} -s $$i ${T}${HELPDIR}/$$i; then \
+		${TRUE}; \
 	    else \
-		rm -f $T${HELPDIR}/$$i.new; \
-		cp -f $$i $T${HELPDIR}/$$i.new; \
-		${CHMOD} 0444 $T${HELPDIR}/$$i.new; \
-		mv -f $T${HELPDIR}/$$i.new $T${HELPDIR}/$$i; \
-		echo "installed $T${HELPDIR}/$$i"; \
+		${RM} -f ${T}${HELPDIR}/$$i.new; \
+		${CP} -f $$i ${T}${HELPDIR}/$$i.new; \
+		${CHMOD} 0444 ${T}${HELPDIR}/$$i.new; \
+		${MV} -f ${T}${HELPDIR}/$$i.new ${T}${HELPDIR}/$$i; \
+		echo "installed ${T}${HELPDIR}/$$i"; \
 	    fi; \
 	done
-	-${Q}if ${CMP} -s obj.file $T${HELPDIR}/obj; then \
-	    true; \
+	-${Q} if ${CMP} -s obj.file ${T}${HELPDIR}/obj; then \
+	    ${TRUE}; \
 	else \
-	    rm -f $T${HELPDIR}/obj.new; \
-	    cp -f obj.file $T${HELPDIR}/obj.new; \
-	    ${CHMOD} 0444 $T${HELPDIR}/obj.new; \
-	    mv -f $T${HELPDIR}/obj.new $T${HELPDIR}/obj; \
-	    echo "installed $T${HELPDIR}/obj"; \
+	    ${RM} -f ${T}${HELPDIR}/obj.new; \
+	    ${CP} -f obj.file ${T}${HELPDIR}/obj.new; \
+	    ${CHMOD} 0444 ${T}${HELPDIR}/obj.new; \
+	    ${MV} -f ${T}${HELPDIR}/obj.new ${T}${HELPDIR}/obj; \
+	    echo "installed ${T}${HELPDIR}/obj"; \
 	fi
 
 # Try to remove everything that was installed
@@ -715,31 +723,31 @@ install: all
 # NOTE: Keep the uninstall rule in reverse order to the install rule
 #
 uninstall:
-	-${Q}if [ -f "$T${HELPDIR}/obj" ]; then \
-	    rm -f "$T${HELPDIR}/obj"; \
-	    if [ -f "$T${HELPDIR}/obj" ]; then \
-		echo "cannot uninstall $T${HELPDIR}/obj"; \
+	-${Q} if [ -f "${T}${HELPDIR}/obj" ]; then \
+	    ${RM} -f "${T}${HELPDIR}/obj"; \
+	    if [ -f "${T}${HELPDIR}/obj" ]; then \
+		echo "cannot uninstall ${T}${HELPDIR}/obj"; \
 	    else \
-		echo "uninstalled $T${HELPDIR}/obj"; \
+		echo "uninstalled ${T}${HELPDIR}/obj"; \
 	    fi; \
 	fi
-	-${Q}for i in ${SINGULAR_FILES} ${DETAIL_HELP} full builtin \
+	-${Q} for i in ${SINGULAR_FILES} ${DETAIL_HELP} full builtin \
 	    ${BLT_HELP_FILES} ${STD_HELP_FILES} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if [ -f "$T${HELPDIR}/$$i" ]; then \
-	    	rm -f "$T${HELPDIR}/$$i"; \
-		if [ -f "$T${HELPDIR}/$$i" ]; then \
-		   echo "cannot uninstall $T${HELPDIR}/$$i"; \
+	    if [ -f "${T}${HELPDIR}/$$i" ]; then \
+	    	${RM} -f "${T}${HELPDIR}/$$i"; \
+		if [ -f "${T}${HELPDIR}/$$i" ]; then \
+		   echo "cannot uninstall ${T}${HELPDIR}/$$i"; \
 		else \
-		   echo "uninstalled $T${HELPDIR}/$$i"; \
+		   echo "uninstalled ${T}${HELPDIR}/$$i"; \
 		fi; \
 	    fi; \
 	done
-	-${Q}for i in ${HELPDIR} ${CALC_SHAREDIR}; do \
-	    if [ -d "$T$$i" ]; then \
-		rmdir "$T$$i" 2>/dev/null; \
-		echo "cleaned up $T$$i"; \
+	-${Q} for i in ${HELPDIR} ${CALC_SHAREDIR}; do \
+	    if [ -d "${T}$$i" ]; then \
+		${RMDIR} "${T}$$i" 2>/dev/null; \
+		echo "cleaned up ${T}$$i"; \
 	    fi; \
 	done

help/config

@@ -68,6 +68,7 @@ DESCRIPTION
 	    "baseb"		bits in calculation base, a read-only value
 	    "redecl_warn"	TRUE => warn when redeclaring
 	    "dupvar_warn"	TRUE => warn when variable names collide
+	    "hz"		Read-only operating system tick rate or 0
 
     The "all" config value allows one to save/restore the configuration
     set of values.  The return of:
@@ -867,6 +868,16 @@ DESCRIPTION
 
     The initial "redecl_warn" value is 1.
 
+    =-=
+
+    config("hz")		<== NOTE: This is a read-only config value
+
+    Returns the rate at which the operating system advances the clock
+    on POSIX based systems.  Returns 0 on non-POSIX based systems.
+    The non-zero value returned is in Hetrz.
+
+    This config parameter is read-only and cannot be set.
+
 
 EXAMPLE
     ; current_cfg = config("all");
@@ -928,6 +939,7 @@ EXAMPLE
 	baseb		32
 	redecl_warn	1
 	dupvar_warn	1
+	hz		100
 
     ; display()
 	20
@@ -960,8 +972,8 @@ SEE ALSO
 ## 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.17 $
-## @(#) $Id: config,v 29.17 2006/06/24 19:06:58 chongo Exp $
+## @(#) $Revision: 29.18 $
+## @(#) $Id: config,v 29.18 2006/12/16 11:14:28 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/config,v $
 ##
 ## Under source code control:	1991/07/21 04:37:17

help/cp

@@ -1,63 +0,0 @@
-NAME
-    cp - cross product of two 3 element vectors
-
-SYNOPSIS
-    cp(x, y)
-
-TYPES
-    x, y	1-dimensional matrices with 3 elements
-
-    return	1-dimensional matrix with 3 elements
-
-DESCRIPTION
-    Calculate the product of two 3 1-dimensional matrices.
-    If x has elements (x0, x1, x2), and y has elements (y0, y1, y2),
-    cp(x,y) returns the matrix of type [0:2] with elements:
-
-	{x1 * y2 - x2 * y1, x3 * y1 - x1 * y3, x1 * y2 - x2 * y1}
-
-EXAMPLE
-    ; mat x[3] = {2,3,4}
-    ; mat y[3] = {3,4,5}
-    ; print cp(x,y)
-
-    mat [3] (3 elements, 3 nonzero):
-      [0] = -1
-      [1] = 2
-      [2] = -1
-
-LIMITS
-    The components of the matrices are to be of types for which the
-    required algebraic operations have been defined.
-
-LINK LIBRARY
-    MATRIX *matcross(MATRIX *x, MATRIX *y)
-
-SEE ALSO
-    dp
-
-## Copyright (C) 1999  Landon Curt Noll
-##
-## Calc is open software; you can redistribute it and/or modify it under
-## the terms of the version 2.1 of the GNU Lesser General Public License
-## as published by the Free Software Foundation.
-##
-## Calc is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-## or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
-## Public License for more details.
-##
-## A copy of version 2.1 of the GNU Lesser General Public License is
-## distributed with calc under the filename COPYING-LGPL.  You should have
-## 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.3 $
-## @(#) $Id: cp,v 29.3 2006/05/07 07:25:46 chongo Exp $
-## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/cp,v $
-##
-## Under source code control:	1995/10/05 04:52:26
-## File existed as early as:	1995
-##
-## chongo <was here> /\oo/\	http://www.isthe.com/chongo/
-## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

help/runtime

@@ -1,5 +1,5 @@
 NAME
-    runtime - user runtime
+    runtime - CPU time used by the current process in both user and kernel modes
 
 SYNOPSIS
     runtime()
@@ -8,27 +8,33 @@ TYPES
     return	nonnegative real
 
 DESCRIPTION
-    Returns the current user mode cpu runtime in seconds.
+    In POSIX based systems, this function will return the CPU seconds
+    used by the current process in both user and kernel mode.  Time
+    spent in the kernel executing system calls and time spend executing
+    user code (such as performing computation on behalf of calc) are
+    both included.
+
+    On non-POSIX based systems, this function will always return 0.
+    In particular, most MS windows based systems do not have the required
+    POSIX system call and so this function will always return 0.
 
 EXAMPLE
-
-    The result for this example will depend on the speed and number of
-    of clock-ticks per second for the computer being used.  The result
-    is a multiple of 1/CLK_TCK, where CLK_TCK is usually 60, 100, or 1000.
+    The result for this example will depend on the speed of the CPU
+    and precision of the operating CPU time accounting sub-system:
 
     ; t = runtime();
-    ; pi = pi(1e-1000);
+    ; x = ptest(2^4253-1);
     ; runtime() - t;
-	.2
+	1.288804
 
 LIMITS
-    none
+    On non-POSIX based systems, this function always returns 0.
 
 LINK LIBRARY
     none
 
 SEE ALSO
-    ctime, time
+    config, ctime, systime, time, usertime
 
 ## Copyright (C) 1999-2006  Landon Curt Noll
 ##
@@ -46,8 +52,8 @@ SEE ALSO
 ## 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.5 $
-## @(#) $Id: runtime,v 29.5 2006/06/25 22:16:55 chongo Exp $
+## @(#) $Revision: 29.7 $
+## @(#) $Id: runtime,v 29.7 2006/12/16 10:52:27 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/runtime,v $
 ##
 ## Under source code control:	1996/03/12 23:10:01

help/statement

@@ -3,22 +3,76 @@ Statements
     Statements are very much like C statements.	 Most statements act
     identically to those in C, but there are minor differences and
     some additions.  The following is a list of the statement types,
-    with explanation of the non-C statements.  In this list, upper
-    case words identify the keywords which are actually in lower case.
-    Statements are generally terminated with semicolons, except if the
-    statement is the compound one formed by matching braces.  Various
-    expressions are optional and may be omitted (as in RETURN).
+    with explanation of the non-C statements.
 
+    Statements are generally terminated with semicolons or { ... }.
 
     C-like statements
     -----------------
     { statement }
     { statement; ... statement }
+
+
+    C-like flow control
+    -------------------
     if (expr) statement
-    if (expr) statement ELSE statement
+    if (expr) statement else statement
     for (optionalexpr ; optionalexpr ; optionalexpr) statement
     while (expr) statement
     do statement while (expr)
+
+	    These all work like in normal C.
+
+	    IMPORTANT NOTE: When statement is of the form { ... },
+	    the leading { must be on the same line as the if, for,
+	    while or do keyword.
+
+	    This works as expected:
+
+	    	if (expr) {
+		    ...
+		}
+
+	    However this WILL NOT WORK AS EXPECTED:
+
+	    	if (expr)
+		{
+		    ...
+		}
+
+	    because calc will parse the if being terminated by
+	    an empty statement followed by a
+
+	    	if (expr) ;
+		{
+		    ...
+		}
+
+	    In the same way, use these forms:
+
+		for (optionalexpr ; optionalexpr ; optionalexpr) {
+			...
+		}
+
+		while (expr) {
+			...
+		}
+
+		do {
+			...
+		while (expr);
+
+	    where the initial { is on the SAME LINE as the if, while,
+	    for or do.
+
+	    See 'help expression' for details on expressions.
+	    See 'help builtin' for details on calc builtin functions.
+	    See 'help unexpanded' for things C programmers do not expect.
+	    See also 'help todo' and 'help bugs'.
+
+
+    C-like flow breaks
+    ------------------
     continue
     break
     goto label
@@ -30,8 +84,9 @@ Statements
 
     return
     ------
-    return optionalexpr
-    return ( optionalexpr )
+    return
+    return expr
+    return ( expr )
 	    This returns a value from a function.  Functions always
 	    have a return value, even if this statement is not used.
 	    If no return statement is executed, or if no expression
@@ -241,7 +296,7 @@ Statements
 	    builtin	    calc builtin functions
 	    usage	    how to invoke the calc command and calc -options
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999-2006  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License
@@ -257,8 +312,8 @@ Statements
 ## 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: statement,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: statement,v 29.3 2007/01/03 21:26:22 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/statement,v $
 ##
 ## Under source code control:	1991/07/21 04:37:23

help/systime

@@ -0,0 +1,63 @@
+NAME
+    systime - kernel CPU time used by the current process
+
+SYNOPSIS
+    systime()
+
+TYPES
+    return	nonnegative real
+
+DESCRIPTION
+    In POSIX based systems, this function will return the CPU seconds
+    used by the current process while in kernel mode executing kernel
+    code on behalf of the current process.  Time spent by the current
+    process executing user code (such as performing computation on
+    behalf of calc) is not counted.
+
+    On non-POSIX based systems, this function will always return 0.
+    In particular, most MS windows based systems do not have the required
+    POSIX system call and so this function will always return 0.
+
+EXAMPLE
+    The result for this example will depend on the speed of the CPU
+    and precision of the operating CPU time accounting sub-system:
+
+    ; t = systime();
+    ; system("true"),
+    ; systime() - t;
+	.001
+
+LIMITS
+    On non-POSIX based systems, this function always returns 0.
+
+LINK LIBRARY
+    none
+
+SEE ALSO
+    config, ctime, runtime, systime, time
+
+## Copyright (C) 2006  Landon Curt Noll
+##
+## Calc is open software; you can redistribute it and/or modify it under
+## the terms of the version 2.1 of the GNU Lesser General Public License
+## as published by the Free Software Foundation.
+##
+## Calc is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+## or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+## Public License for more details.
+##
+## A copy of version 2.1 of the GNU Lesser General Public License is
+## distributed with calc under the filename COPYING-LGPL.  You should have
+## 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.3 $
+## @(#) $Id: systime,v 29.3 2006/12/16 10:53:01 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/systime,v $
+##
+## Under source code control:	2006/12/16 10:31:08
+## File existed as early as:	2006
+##
+## chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

help/todo

@@ -24,14 +24,32 @@ Calc Todo Items:
 
 Very High priority items:
 
-    * Consider using GNU autoconf / configure to build calc.
+    * Improve the way that calc parses statements such as if, for, while
+      and do so that when a C programmer does.  This works as expected:
 
-    * Internationalize calc by converting calc error messages and
-      text strings (e.g., calc startup banner, show output, etc.)
-      into calls to the GNU gettext internationalization facility.
-      If somebody translated these strings into another language,
-      setting $LANG would allow calc to produce error messages
-      and text strings in that language.
+	    if (expr) {
+		...
+	    }
+
+      However this WILL NOT WORK AS EXPECTED:
+
+	    if (expr)
+	    {
+		...
+	    }
+
+      because calc will parse the if being terminated by
+      an empty statement followed by a
+
+	    if (expr) ;
+	    {
+		...
+	    }
+
+      See also "help statement", "help unexpected", "help todo", and
+      "help bugs".
+
+    * Consider using GNU autoconf / configure to build calc.
 
     * Fix any 'Known bugs' as noted in the BUGS file or as
       displayed by 'calc help bugs'.
@@ -54,6 +72,13 @@ High priority items:
     * Address, if possible and reasonable, any Calc Mis-features
       as noted in the BUGS file or as displayed by 'calc help bugs'.
 
+    * Internationalize calc by converting calc error messages and
+      text strings (e.g., calc startup banner, show output, etc.)
+      into calls to the GNU gettext internationalization facility.
+      If somebody translated these strings into another language,
+      setting $LANG would allow calc to produce error messages
+      and text strings in that language.
+
 =-=
 
 Medium priority items:
@@ -104,8 +129,8 @@ Medium priority items:
 ## 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.9 $
-## @(#) $Id: todo,v 29.9 2006/09/17 20:54:07 chongo Exp $
+## @(#) $Revision: 29.10 $
+## @(#) $Id: todo,v 29.10 2007/01/03 21:26:22 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/todo,v $
 ##
 ## Under source code control:	1999/10/20 07:42:55

help/unexpected

@@ -248,7 +248,55 @@ Unexpected
     In addition to the C style /* comment lines */, lines that begin with
     #! are treated as comments.
 
-## Copyright (C) 1999  Landon Curt Noll
+
+    The { must be on the same line as an if, for, while or do
+    =========================================================
+
+    When statement is of the form { ... }, the leading { MUST BE ON
+    THE SAME LINE as the if, for, while or do keyword.
+
+    This works as expected:
+
+	if (expr) {
+	    ...
+	}
+
+    However this WILL NOT WORK AS EXPECTED:
+
+	if (expr)
+	{
+	    ...
+	}
+
+    because calc will parse the if being terminated by
+    an empty statement followed by a
+
+	if (expr) ;
+	{
+	    ...
+	}
+
+    In the same way, use these forms:
+
+	for (optionalexpr ; optionalexpr ; optionalexpr) {
+		...
+	}
+
+	while (expr) {
+		...
+	}
+
+	do {
+		...
+	while (expr);
+
+    where the initial { is on the SAME LINE as the if, while,
+    for or do keyword.
+
+    NOTE: See "help statement", "help todo", and "help bugs".
+
+
+## Copyright (C) 1999-2006  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License
@@ -264,8 +312,8 @@ Unexpected
 ## 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: unexpected,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: unexpected,v 29.3 2007/01/03 21:26:22 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/unexpected,v $
 ##
 ## Under source code control:	1997/03/21 13:15:18

help/usertime

@@ -0,0 +1,61 @@
+NAME
+    usertime - user CPU time used by the current process
+
+SYNOPSIS
+    usertime()
+
+TYPES
+    return	nonnegative real
+
+DESCRIPTION
+    In POSIX based systems, this function will return the CPU seconds
+    used by the current process while in user mode.  Time spent in the
+    kernel executing system calls is not included.
+
+    On non-POSIX based systems, this function will always return 0.
+    In particular, most MS windows based systems do not have the required
+    POSIX system call and so this function will always return 0.
+
+EXAMPLE
+    The result for this example will depend on the speed of the CPU
+    and precision of the operating CPU time accounting sub-system:
+
+    ; t = usertime();
+    ; x = ptest(2^4253-1);
+    ; usertime() - t;
+	1.287804
+
+LIMITS
+    On non-POSIX based systems, this function always returns 0.
+
+LINK LIBRARY
+    none
+
+SEE ALSO
+    config, ctime, usertime, systime, time
+
+## Copyright (C) 2006  Landon Curt Noll
+##
+## Calc is open software; you can redistribute it and/or modify it under
+## the terms of the version 2.1 of the GNU Lesser General Public License
+## as published by the Free Software Foundation.
+##
+## Calc is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+## or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+## Public License for more details.
+##
+## A copy of version 2.1 of the GNU Lesser General Public License is
+## distributed with calc under the filename COPYING-LGPL.  You should have
+## 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: usertime,v 29.2 2006/12/16 10:50:19 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/usertime,v $
+##
+## Under source code control:	2006/12/16 10:31:08
+## File existed as early as:	2006
+##
+## chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

input.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.11 $
- * @(#) $Id: input.c,v 29.11 2006/05/19 15:26:10 chongo Exp $
+ * @(#) $Revision: 29.12 $
+ * @(#) $Id: input.c,v 29.12 2006/12/15 17:02:49 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/input.c,v $
  *
  * Under source code control:	1990/02/15 01:48:16
@@ -961,9 +961,6 @@ static int
 isinoderead(struct stat *sbuf)
 {
 	int i;
-#if defined(_WIN32) || defined(__MSDOS__)
-	char fullpathname[_MAX_PATH];
-#endif
 
 	/* deal with the empty case */
 	if (readset == NULL || maxreadset <= 0) {
@@ -974,13 +971,17 @@ isinoderead(struct stat *sbuf)
 	/* scan the entire readset */
 	for (i=0; i < maxreadset; ++i) {
 #if defined(_WIN32) || defined(__MSDOS__)
+		tmp = _fullpath(NULL, cip->i_name, _MAX_PATH);
 		if (readset[i].active &&
-		    strcasecmp(readset[i].path,
-		    	       _fullpath(fullpathname,cip->i_name,
-			       _MAX_PATH)) == 0) {
+		    tmp != NULL &&
+		    strcasecmp(readset[i].path, tmp) == 0) {
 			/* found a match */
+			free(tmp);
 			return i;
 		}
+		if (tmp != NULL) {
+			free(tmp);
+		}
 #else /* Windoz free systems */
 		if (readset[i].active &&
 		    sbuf->st_dev == readset[i].inode.st_dev &&
@@ -1106,9 +1107,10 @@ addreadset(char *name, char *path, struct stat *sbuf)
 	 * this new longer path name.
 	 */
  	 {
-	 	char fullpathname[_MAX_PATH];
-
-		readset[ret].path = _fullpath(fullpathname, path, _MAX_PATH);
+		readset[ret].path = _fullpath(NULL, path, _MAX_PATH);
+		if (readset[ret].path == NULL) {
+			return -1;
+		}
 	 }
 #else /* Windoz free systems */
 	path_len = strlen(path);

qmath.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.6 $
- * @(#) $Id: qmath.c,v 29.6 2006/05/20 08:43:55 chongo Exp $
+ * @(#) $Revision: 29.7 $
+ * @(#) $Id: qmath.c,v 29.7 2006/12/15 16:18:10 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/qmath.c,v $
  *
  * Under source code control:	1990/02/15 01:48:21
@@ -140,6 +140,25 @@ qtou(NUMBER *q)
 }
 
 
+/*
+ * Convert a number to a normal signed integer.
+ *	s = qtos(q);
+ */
+SFULL
+qtos(NUMBER *q)
+{
+	SFULL i;
+	ZVALUE res;
+
+	if (qisint(q))
+		return ztos(q->num);
+	zquo(q->num, q->den, &res, 0);
+	i = ztos(res);
+	zfree(res);
+	return i;
+}
+
+
 /*
  * Convert a normal unsigned integer into a number.
  *	q = utoq(i);
@@ -166,6 +185,32 @@ utoq(FULL i)
 }
 
 
+/*
+ * Convert a normal signed integer into a number.
+ *	q = stoq(s);
+ */
+NUMBER *
+stoq(SFULL i)
+{
+	register NUMBER *q;
+
+	if (i <= 10) {
+		switch ((int) i) {
+		case 0: q = &_qzero_; break;
+		case 1: q = &_qone_; break;
+		case 2: q = &_qtwo_; break;
+		case 10: q = &_qten_; break;
+		default: q = NULL;
+		}
+		if (q)
+			return qlink(q);
+	}
+	q = qalloc();
+	stoz(i, &q->num);
+	return q;
+}
+
+
 /*
  * Create a number from the given FULL numerator and denominator.
  *	q = uutoq(inum, iden);

qmath.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.7 $
- * @(#) $Id: qmath.h,v 29.7 2006/06/25 20:33:26 chongo Exp $
+ * @(#) $Revision: 29.8 $
+ * @(#) $Id: qmath.h,v 29.8 2006/12/15 16:18:10 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/qmath.h,v $
  *
  * Under source code control:	1993/07/30 19:42:47
@@ -65,8 +65,10 @@ extern NUMBER *iitoq(long i1, long i2);
 extern NUMBER *str2q(char *str);
 extern NUMBER *itoq(long i);
 extern NUMBER *utoq(FULL i);
+extern NUMBER *stoq(SFULL i);
 extern long qtoi(NUMBER *q);
 extern FULL qtou(NUMBER *q);
+extern SFULL qtos(NUMBER *q);
 extern long qparse(char *str, int flags);
 extern void qfreenum(NUMBER *q);
 extern void qprintnum(NUMBER *q, int mode);

rpm.mk

@@ -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.
 #
-MAKEFILE_REV= $$Revision: 29.14 $$
-# @(#) $Id: rpm.mk,v 29.14 2006/08/20 16:47:51 chongo Exp $
+MAKEFILE_REV= $$Revision: 29.16 $$
+# @(#) $Id: rpm.mk,v 29.16 2006/09/18 06:33:50 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/rpm.mk,v $
 #
 # Under source code control:	2003/02/16 20:21:39
@@ -42,6 +42,16 @@ RPM_TOOL= rpm
 MD5SUM= md5sum
 SHA1SUM= sha1sum
 SED= sed
+FIND= find
+GZIP_PROG= gzip
+TAR= tar
+RM= rm
+LS= ls
+CPIO= cpio
+CP= cp
+EGREP= egrep
+MKDIR= mkdir
+GREP= GREP
 
 # rpm-related parameters
 #
@@ -50,7 +60,7 @@ PROJECT_VERSION=
 PROJECT_RELEASE=
 PROJECT= $(PROJECT_NAME)-$(PROJECT_VERSION)
 SPECFILE= $(PROJECT_NAME).spec
-TARBALL= $(PROJECT).tar.gz
+TARBALL= $(PROJECT).${TAR}.gz
 RPM686= $(PROJECT)-$(PROJECT_RELEASE).${TARCH}.rpm
 DRPM686= $(PROJECT_NAME)-devel-$(PROJECT_VERSION)-$(PROJECT_RELEASE).${TARCH}.rpm
 SRPM= $(PROJECT)-$(PROJECT_RELEASE).src.rpm
@@ -62,7 +72,7 @@ all: calc.spec ver_calc
 		PROJECT_RELEASE="`${SED} -n -e '/^Release:/s/^Release: *//p' \
 				  calc.spec.in`" rpm
 
-pkgme: $(PROJECT_NAME)-spec.tar.gz
+pkgme: $(PROJECT_NAME)-spec.${TAR}.gz
 
 ver_calc:
 	$(MAKE) -f Makefile ver_calc
@@ -72,26 +82,26 @@ vers:
 	$(MAKE) -f Makefile ver_calc
 
 calc.spec: calc.spec.in ver_calc
-	rm -f calc.spec
+	${RM} -f calc.spec
 	${SED} -e 's/<<<PROJECT_VERSION>>>/'"`./ver_calc`"/g \
 	    calc.spec.in > calc.spec
 
 .PHONY: srcpkg
 srcpkg: make_rhdir
-	find . -depth -print | egrep -v '/RCS|/CVS|/NOTES|\.gone' | \
-	    cpio -dumpv $(TMPDIR)/$(PROJECT)
-	(cd $(TMPDIR); tar cf - $(PROJECT)) | \
-	  gzip -c > $(RPMDIR)/SOURCES/$(TARBALL)
-	rm -fr $(TMPDIR)/$(PROJECT)
+	${FIND} . -depth -print | ${EGREP} -v '/RCS|/CVS|/NOTES|\.gone' | \
+	    ${CPIO} -dumpv "$(TMPDIR)/$(PROJECT)"
+	(cd "$(TMPDIR)"; ${TAR} cf - "$(PROJECT)") | \
+	  ${GZIP_PROG} -c > "$(RPMDIR)/SOURCES/$(TARBALL)"
+	${RM} -fr "$(TMPDIR)/$(PROJECT)"
 
 .PHONY: rpm
 rpm: srcpkg calc.spec
 	$(MAKE) -f Makefile clean
-	cp $(SPECFILE) $(RPMDIR)/SPECS/$(SPECFILE)
-	rm -f $(RPMDIR)/RPMS/${TARCH}/$(RPM686)
-	rm -f $(RPMDIR)/RPMS/${TARCH}/$(DRPM686)
-	rm -f $(RPMDIR)/SRPMS/$(SRPM)
-	${RPMBUILD_TOOL} ${RPMBUILD_OPTION} $(RPMDIR)/SPECS/$(SPECFILE)
+	${CP} "$(SPECFILE)" "$(RPMDIR)/SPECS/$(SPECFILE)"
+	${RM} -f "$(RPMDIR)/RPMS/${TARCH}/$(RPM686)"
+	${RM} -f "$(RPMDIR)/RPMS/${TARCH}/$(DRPM686)"
+	${RM} -f "$(RPMDIR)/SRPMS/$(SRPM)"
+	${RPMBUILD_TOOL} ${RPMBUILD_OPTION} "$(RPMDIR)/SPECS/$(SPECFILE)"
 	@if [ ! -f "$(RPMDIR)/SRPMS/$(SRPM)" ]; then \
 	    echo "SRPMS/$(SRPM) not found" 1>&2; \
 	    exit 3; \
@@ -99,33 +109,33 @@ rpm: srcpkg calc.spec
 	@echo
 	@echo "RPM package sizes:"
 	@echo
-	@cd $(RPMDIR); ls -1s RPMS/${TARCH}/$(RPM686) \
-	    RPMS/${TARCH}/$(DRPM686) SRPMS/$(SRPM)
+	@cd $(RPMDIR); ${LS} -1s "RPMS/${TARCH}/$(RPM686)" \
+	    "RPMS/${TARCH}/$(DRPM686)" "SRPMS/$(SRPM)"
 	@echo
 	@echo "RPM package md5 hashes:"
 	@echo
-	-@cd $(RPMDIR); ${MD5SUM} RPMS/${TARCH}/$(RPM686) \
-	    RPMS/${TARCH}/$(DRPM686) SRPMS/$(SRPM)
+	-@cd $(RPMDIR); ${MD5SUM} "RPMS/${TARCH}/$(RPM686)" \
+	    "RPMS/${TARCH}/$(DRPM686)" "SRPMS/$(SRPM)"
 	@echo
 	@echo "RPM package sha1 hashes:"
 	@echo
-	-@cd $(RPMDIR); ${SHA1SUM} RPMS/${TARCH}/$(RPM686) \
-	    RPMS/${TARCH}/$(DRPM686) SRPMS/$(SRPM)
+	-@cd $(RPMDIR); ${SHA1SUM} "RPMS/${TARCH}/$(RPM686)" \
+	    "RPMS/${TARCH}/$(DRPM686)" "SRPMS/$(SRPM)"
 	@echo
 	@echo "RPM package locations:"
 	@echo
-	@ls -1 $(RPMDIR)/RPMS/${TARCH}/$(RPM686) \
-	    $(RPMDIR)/RPMS/${TARCH}/$(DRPM686) $(RPMDIR)/SRPMS/$(SRPM)
+	@${LS} -1 "$(RPMDIR)/RPMS/${TARCH}/$(RPM686)" \
+	    "$(RPMDIR)/RPMS/${TARCH}/$(DRPM686)" "$(RPMDIR)/SRPMS/$(SRPM)"
 	@echo
 	@echo "All done! -- Jessica Noll, Age 2"
 	@echo
 
 .PHONY: make_rhdir
 make_rhdir:
-	for i in $(RPMDIR) $(RPMDIR)/RPMS $(RPMDIR)/SOURCES \
-	  $(RPMDIR)/SPECS $(RPMDIR)/SRPMS $(RPMDIR)/BUILD; do \
-	    if [ ! -d $$i ] ; then \
-		mkdir -p $$i; \
+	for i in "$(RPMDIR)" "$(RPMDIR)/RPMS" "$(RPMDIR)/SOURCES" \
+	  "$(RPMDIR)/SPECS" "$(RPMDIR)/SRPMS" "$(RPMDIR)/BUILD"; do \
+	    if [ ! -d "$$i" ] ; then \
+		${MKDIR} -p "$$i"; \
 	    fi; \
 	done;
 
@@ -136,20 +146,20 @@ logdate:
 
 .PHONY: chkpkg
 chkpkg:
-	for i in $(RPMDIR)/RPMS/${TARCH}/$(RPM686) \
-		 $(RPMDIR)/RPMS/${TARCH}/$(DRPM686) \
-	  	 $(RPMDIR)/SRPMS/$(SRPM) ; do \
+	for i in "$(RPMDIR)/RPMS/${TARCH}/$(RPM686)" \
+		 "$(RPMDIR)/RPMS/${TARCH}/$(DRPM686)" \
+	  	 "$(RPMDIR)/SRPMS/$(SRPM)" ; do \
 	    echo "***** start $$i" ; \
-		${RPM_TOOL} -qpi $$i ; \
-		echo "***** files $$i" ; \
-	    ${RPM_TOOL} -qpl $$i ; \
+	    ${RPM_TOOL} -qpi "$$"i ; \
+	    echo "***** files $$i" ; \
+	    ${RPM_TOOL} -qpl "$$i" ; \
 	    echo "***** end $$i" ; \
 	done ;
 
 .PHONY: chksys
 chksys:
-	${RPM_TOOL} -qa | grep $(PROJECT_NAME)
-	${RPM_TOOL} -qa | grep $(PROJECT_NAME)-devel
+	${RPM_TOOL} -qa | ${GREP} "$(PROJECT_NAME)"
+	${RPM_TOOL} -qa | ${GREP} "$(PROJECT_NAME)-devel"
 
 .PHONY: test
 test: ver_calc
@@ -165,8 +175,8 @@ installrpm:
 	    echo "must be root to install RPMs" 1>&2; \
 	    exit 5; \
 	fi
-	${RPM_TOOL} -ivh $(RPMDIR)/RPMS/${TARCH}/$(RPM686)
-	${RPM_TOOL} -ivh $(RPMDIR)/RPMS/${TARCH}/$(DRPM686)
+	${RPM_TOOL} -ivh "$(RPMDIR)/RPMS/${TARCH}/$(RPM686)"
+	${RPM_TOOL} -ivh "$(RPMDIR)/RPMS/${TARCH}/$(DRPM686)"
 
 .PHONY: uninstallrpm
 uninstallrpm:
@@ -174,10 +184,11 @@ uninstallrpm:
 	    echo "must be root to uninstall RPMs" 1>&2; \
 	    exit 6; \
 	fi
-	${RPM_TOOL} -e $(PROJECT_NAME)-devel
-	${RPM_TOOL} -e $(PROJECT_NAME)
+	${RPM_TOOL} -e "$(PROJECT_NAME)-devel"
+	${RPM_TOOL} -e "$(PROJECT_NAME)"
 
-$(PROJECT_NAME)-spec.tar.gz: rpm.mk $(PROJECT_NAME).spec.in
-	tar cf - $^ | gzip -c > $@
+$(PROJECT_NAME)-spec.${TAR}.gz: rpm.mk $(PROJECT_NAME).spec.in
+	${RM} -f "$@"
+	${TAR} cf - "$^" | ${GZIP_PROG} -c > "$@"
 
 #****

sample/Makefile

@@ -1,7 +1,7 @@
 #
 # sample - makefile for calc sample programs
 #
-# Copyright (C) 1999  Landon Curt Noll
+# Copyright (C) 1999-2006  Landon Curt Noll
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -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.18 $
-# @(#) $Id: Makefile,v 29.18 2006/06/26 05:46:06 chongo Exp $
+# @(#) $Revision: 29.23 $
+# @(#) $Id: Makefile,v 29.23 2006/09/18 13:13:25 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/sample/RCS/Makefile,v $
 #
 # Under source code control:	1997/04/19 22:46:49
@@ -35,7 +35,6 @@
 ##############################################################################
 
 # Any .h files that are needed by programs that use libcustcalc.a
-# Don't put ${REQUIRED_H_SRC} files in this list.
 #
 # Put any .h files that you add which might be useful to other
 # programs here.
@@ -43,7 +42,6 @@
 SAMPLE_H_SRC=
 
 # Any .c files that are needed to build libcustcalc.a.
-# Don't put ${REQUIRED_SRC} files in this list.
 #
 # There MUST be a .c in SAMPLE_SRC for every .o in SAMPLE_OBJ.
 #
@@ -52,7 +50,6 @@ SAMPLE_H_SRC=
 SAMPLE_SRC= many_random.c test_random.c
 
 # Any .o files that are needed by program that use libcustcalc.a.
-# Don't put ${REQUIRED_OBJ} files in this list.
 #
 # There MUST be a .c in SAMPLE_SRC for every .o in SAMPLE_OBJ.
 #
@@ -101,9 +98,9 @@ INCDIR= /usr/include
 # ${LIBDIR}		where calc link library (*.a) files are installed
 # ${CALC_SHAREDIR}	where to install calc help, .cal, startup, config files
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # For DJGPP, select:
 #
@@ -135,12 +132,12 @@ CALC_SHAREDIR= /usr/share/calc
 # ${CALC_INCDIR}	where the calc include files are installed
 # ${CUSTOMCALDIR}	where custom *.cal files are installed
 # ${CUSTOMHELPDIR}	where custom help files are installed
-# ${CUSTOMINCPDIR}	where custom .h files are installed
+# ${CUSTOMINCDIR}	where custom .h files are installed
 # ${SCRIPTDIR}		where calc shell scripts are installed
 #
-# NOTE: The install rule prepends installation paths with $T, which
-#	by default is empty.  If $T is non-empty, then installation
-#	locations will be relative to the $T directory.
+# NOTE: The install rule prepends installation paths with ${T}, which
+#	by default is empty.  If ${T} is non-empty, then installation
+#	locations will be relative to the ${T} directory.
 #
 # If in doubt, set:
 #
@@ -160,8 +157,8 @@ SCRIPTDIR= ${BINDIR}/cscript
 
 # T - top level directory under which calc will be installed
 #
-# The calc install is performed under $T, the calc build is
-# performed under /.	The purpose for $T is to allow someone
+# The calc install is performed under ${T}, the calc build is
+# performed under /.	The purpose for ${T} is to allow someone
 # to install calc somewhere other than into the system area.
 #
 # For example, if:
@@ -181,10 +178,10 @@ SCRIPTDIR= ${BINDIR}/cscript
 #     calc help, .cal ...:	/var/tmp/testing/usr/share/calc
 #     ... etc ...		/var/tmp/testing/...
 #
-# If $T is empty, calc is installed under /, which is the same
-# top of tree for which it was built.  If $T is non-empty, then
-# calc is installed under $T, as if one had to chroot under
-# $T for calc to operate.
+# If ${T} is empty, calc is installed under /, which is the same
+# top of tree for which it was built.  If ${T} is non-empty, then
+# calc is installed under ${T}, as if one had to chroot under
+# ${T} for calc to operate.
 #
 # If in doubt, use T=
 #
@@ -236,6 +233,20 @@ NO_SHARED=
 #NO_SHARED= -dn
 #NO_SHARED= -non_shared
 
+# On some systems where you are disabling dynamic shared link libs, you may
+# need to pass a special flag to ${CC} and ${LCC} during linking stage.
+#
+#    System type			    NO_SHARED recommendation
+#
+#	IRIX with NO_SHARED= -non_shared    LD_NO_SHARED= -Wl,-rdata_shared
+#	IRIX with NO_SHARED=		    LD_NO_SHARED=
+#	others				    LD_NO_SHARED=
+#
+# If in doubt, use LD_NO_SHARED=
+#
+LD_NO_SHARED=
+#LD_NO_SHARED= -Wl,-rdata_shared
+
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
 #
@@ -262,12 +273,22 @@ MAKE_FILE= Makefile
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
 #
-# If you do not wish to use purify, leave PURIFY commented out.
+# If you do not wish to use purify, set PURIFY to an empty string.
 #
-# If in doubt, leave PURIFY commented out.
+# If in doubt, use PURIFY=
 #
 #PURIFY= purify -logfile=pure.out
 #PURIFY= purify
+PURIFY=
+
+# If you want to use a debugging link library such as a malloc debug link
+# library, or need to add special ld flags after the calc link libraries
+# are included, set ${LD_DEBUG} below.
+#
+# If in doubt, set LD_DEBUG to empty.
+#
+#LD_DEBUG= -lmalloc_cv
+LD_DEBUG=
 
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
@@ -364,7 +385,7 @@ CALCLIBLIST= ${C_SRC} ${H_SRC} ${MAKE_FILE} README_SAMPLE
 
 # complete list of targets
 #
-# NOTE: This list MUST be co-ordinated with the ${SAMPLE_TARGETS} variable
+# NOTE: This list MUST be coordinated with the ${SAMPLE_TARGETS} variable
 #	in the upper level ../Makefile
 #
 SAMPLE_TARGETS= many_random test_random
@@ -381,6 +402,12 @@ MAKEDEPEND= makedepend
 CHMOD= chmod
 SORT= sort
 CMP= cmp
+TRUE= true
+RM= rm
+TOUCH= touch
+MKDIR= mkdir
+MV= mv
+CO= co
 
 ##
 #
@@ -389,7 +416,7 @@ CMP= cmp
 ##
 
 all: ${TARGETS} .all
-	@true
+	@${TRUE}
 
 test_random.o: test_random.c
 	${CC} ${CFLAGS} ${ALLOW_CUSTOM} test_random.c -c
@@ -412,8 +439,8 @@ many_random: many_random.o ../libcalc.a
 # to determine of we have done all
 #
 .all:
-	rm -f .all
-	touch .all
+	${RM} -f .all
+	${TOUCH} .all
 
 ##
 #
@@ -429,17 +456,17 @@ many_random: many_random.o ../libcalc.a
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST} /dev/null; do \
+	${Q} for i in ${DISTLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo sample/$$i; \
 	    fi; \
 	done
 
 distdir:
-	${Q}echo sample
+	${Q} echo sample
 
 calcliblist:
-	${Q}for i in ${CALCLIBLIST} /dev/null; do \
+	${Q} for i in ${CALCLIBLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo sample/$$i; \
 	    fi; \
@@ -458,23 +485,23 @@ calcliblist:
 ##
 
 depend:
-	${Q}if [ -f Makefile.bak ]; then \
+	${Q} if [ -f Makefile.bak ]; then \
 		echo "Makefile.bak exists, remove or move it out of the way"; \
 		exit 1; \
 	else \
-	    true; \
+	    ${TRUE}; \
 	fi
-	${Q}echo forming sample/skel
-	-${Q}rm -rf skel
-	${Q}mkdir skel
-	${Q}mkdir skel/sample
-	-${Q}for i in ${C_SRC} /dev/null; do \
+	${Q} echo forming sample/skel
+	-${Q} ${RM} -rf skel
+	${Q} ${MKDIR} skel
+	${Q} ${MKDIR} skel/sample
+	-${Q} for i in ${C_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		${SED} -n '/^#[	 ]*include[	 ]*"/p' \
 		    "$$i" > "skel/sample/$$i"; \
 	    fi; \
 	done
-	-${Q}for i in ${H_SRC} /dev/null; do \
+	-${Q} for i in ${H_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		if [ X"$$i" != X"/dev/null" ]; then \
 		    tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
@@ -486,11 +513,11 @@ depend:
 		fi; \
 	    fi; \
 	done
-	${Q}(cd ..; ${MAKE} hsrc)
-	${Q}for i in `cd ..; ${MAKE} h_list 2>&1 | \
-			     ${SED} -e '/Entering directory/d' \
-				    -e '/Nothing to be done/d' \
-				    -e '/Leaving directory/d'` /dev/null; do \
+	${Q} (cd ..; $(MAKE) hsrc)
+	${Q} for i in `cd ..; $(MAKE) h_list 2>&1 | \
+	    ${SED} -e '/Entering directory/d' \
+		   -e '/Nothing to be done/d' \
+		   -e '/Leaving directory/d'` /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
 		echo "#if !defined($$tag)" > "skel/$$i"; \
@@ -500,39 +527,39 @@ depend:
 		echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
 	    fi; \
 	done
-	-${Q}rm -f skel/sample/makedep.out
-	${Q}echo sample/skel formed
-	${Q}echo forming sample dependency list
-	${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
+	-${Q} ${RM} -f skel/sample/makedep.out
+	${Q} echo sample/skel formed
+	${Q} echo forming sample dependency list
+	${Q} echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
 	    skel/sample/makedep.out
-	${Q}cd skel/sample; ${MAKEDEPEND} -w 1 -f makedep.out -I.. ${C_SRC}
-	-${Q}for i in ${C_SRC} /dev/null; do \
+	${Q} cd skel/sample; ${MAKEDEPEND} -w 1 -f makedep.out -I.. ${C_SRC}
+	-${Q} for i in ${C_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
 	    fi; \
 	done >> skel/sample/makedep.out
-	${Q}echo sample dependency list formed
-	${Q}echo forming new sample/Makefile
-	-${Q}rm -f Makefile.bak
-	${Q}mv Makefile Makefile.bak
-	${Q}${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile
-	${Q}echo "" >> Makefile
-	${Q}${SED} -n '3,$$p' skel/sample/makedep.out | \
+	${Q} echo sample dependency list formed
+	${Q} echo forming new sample/Makefile
+	-${Q} ${RM} -f Makefile.bak
+	${Q} ${MV} Makefile Makefile.bak
+	${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile
+	${Q} echo "" >> Makefile
+	${Q} ${SED} -n '3,$$p' skel/sample/makedep.out | \
 		LANG=C ${SORT} -u >> Makefile
-	-${Q}rm -rf skel
-	-${Q}if ${CMP} -s Makefile.bak Makefile; then \
-		echo 'sample Makefile was already up to date'; \
-		mv -f Makefile.bak Makefile; \
+	-${Q} ${RM} -rf skel
+	-${Q} if ${CMP} -s Makefile.bak Makefile; then \
+	    echo 'sample Makefile was already up to date'; \
+	    ${MV} -f Makefile.bak Makefile; \
 	else \
-		rm -f Makefile.tmp; \
-		mv Makefile Makefile.tmp; \
-		if [ -d RCS ]; then \
-		    co -l Makefile; \
-		fi; \
-		mv Makefile.tmp Makefile; \
-		if [ -d RCS ]; then \
-		    echo new sample Makefile formed, you need to check it in; \
-		fi; \
+	    ${RM} -f Makefile.tmp; \
+	    ${MV} Makefile Makefile.tmp; \
+	    if [ -d RCS ]; then \
+		${CO} -l Makefile; \
+	    fi; \
+	    ${MV} Makefile.tmp Makefile; \
+	    if [ -d RCS ]; then \
+		echo new sample Makefile formed, you need to check it in; \
+	    fi; \
 	fi
 
 ##
@@ -551,12 +578,12 @@ echo_inst_files: Makefile
 ##
 
 clean:
-	-rm -f ${SAMPLE_OBJ} core
+	-${RM} -f ${SAMPLE_OBJ} core
 
 clobber:
-	-rm -f ${SAMPLE_OBJ}
-	-rm -f ${TARGETS}
-	rm -f .all Makefile.tmp sample
+	-${RM} -f ${SAMPLE_OBJ}
+	-${RM} -f ${TARGETS}
+	${RM} -f .all Makefile.tmp sample
 
 # install everything
 #
@@ -565,7 +592,7 @@ clobber:
 # NOTE: for right now we will not install anything
 #
 install: all
-	@true
+	@${TRUE}
 
 # Try to remove everything that was installed
 #
@@ -574,7 +601,7 @@ install: all
 # NOTE: nothing installed, nothing to uninstall
 #
 uninstall:
-	@true
+	@${TRUE}
 
 ##
 #

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.66 $
- * @(#) $Id: version.c,v 29.66 2006/09/17 20:55:31 chongo Exp $
+ * @(#) $Revision: 29.72 $
+ * @(#) $Id: version.c,v 29.72 2007/01/03 21:27:55 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $
  *
  * Under source code control:	1990/05/22 11:00:58
@@ -48,7 +48,7 @@ static char *program;
 #define MAJOR_VER	2	/* major version */
 #define MINOR_VER	12	/* minor version */
 #define MAJOR_PATCH	1	/* patch level or 0 if no patch */
-#define MINOR_PATCH	0	/* test number or 0 if no minor patch */
+#define MINOR_PATCH	6	/* test number or 0 if no minor patch */
 
 
 /*

win32.mkdef

@@ -57,4 +57,3 @@ CALCPAGER=less.exe
 
 EXT=.exe
 
-ECHO=

win32/conf.h

@@ -32,10 +32,5 @@
 #define DEFAULTCALCPAGER "less.exe"
 #endif /* DEFAULTCALCPAGER */
 
-/* where the echo command is located */
-#if !defined(ECHO_PROG)
-#define ECHO_PROG ""
-#endif /* ECHO_PROG */
-
 
 #endif /* !__CONF_H__ */

win32/have_strdup.h

@@ -3,12 +3,12 @@
  */
 
 
-#if !defined(__HAVE_RUSAGE_H__)
-#define __HAVE_RUSAGE_H__
+#if !defined(__HAVE_STRDUP_H__)
+#define __HAVE_STRDUP_H__
 
 
 /* do we have or want getstrdup()? */
 #define HAVE_STRDUP /* yes */
 
 
-#endif /* !__HAVE_RUSAGE_H__ */
+#endif /* !__HAVE_STRDUP_H__ */

zmath.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: zmath.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: zmath.c,v 29.3 2006/12/15 16:20:04 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/zmath.c,v $
  *
  * Under source code control:	1990/02/15 01:48:28
@@ -355,6 +355,42 @@ utoz(FULL i, ZVALUE *res)
 }
 
 
+/*
+ * Convert a normal signed integer to a number.
+ */
+void
+stoz(SFULL i, ZVALUE *res)
+{
+	long diddle, len;
+
+	res->len = 1;
+	res->sign = 0;
+	diddle = 0;
+	if (i == 0) {
+		res->v = _zeroval_;
+		return;
+	}
+	if (i < 0) {
+		res->sign = 1;
+		i = -i;
+		if (i < 0) {	/* fix most negative number */
+			diddle = 1;
+			i--;
+		}
+	}
+	if (i == 1) {
+		res->v = _oneval_;
+		return;
+	}
+	len = 1 + (((FULL) i) >= BASE);
+	res->len = (LEN)len;
+	res->v = alloc((LEN)len);
+	res->v[0] = (HALF) (i + diddle);
+	if (len == 2)
+		res->v[1] = (HALF) (i / BASE);
+}
+
+
 /*
  * Convert a number to a unsigned normal integer, as far as possible.
  * If the number is out of range, the largest number is returned.
@@ -370,6 +406,41 @@ ztou(ZVALUE z)
 }
 
 
+/*
+ * Convert a number to a signed normal integer, as far as possible.
+ *
+ * If the number is too large to fit into an integer, than the largest
+ * positive or largest negative integer is returned depending on the sign.
+ */
+SFULL
+ztos(ZVALUE z)
+{
+	FULL val;	/* absolute value of the return value */
+
+	/* negative value processing */
+	if (z.sign) {
+	    if (z.len > 2) {
+		return MINSFULL;
+	    }
+	    val = ztofull(z);
+	    if (val > TOPFULL) {
+		return MINSFULL;
+	    }
+	    return (SFULL)(-val);
+	}
+
+	/* positive value processing */
+	if (z.len > 2) {
+	    return (SFULL)MAXFULL;
+	}
+	val = ztofull(z);
+	if (val > MAXFULL) {
+	    return (SFULL)MAXFULL;
+	}
+	return (SFULL)val;
+}
+
+
 /*
  * Make a copy of an integer value
  */

zmath.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.17 $
- * @(#) $Id: zmath.h,v 29.17 2006/06/11 07:07:23 chongo Exp $
+ * @(#) $Revision: 29.18 $
+ * @(#) $Id: zmath.h,v 29.18 2006/12/15 16:20:04 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/zmath.h,v $
  *
  * Under source code control:	1993/07/30 19:42:48
@@ -131,6 +131,7 @@ typedef SB32 SFULL;			/* signed FULL */
 
 #define TOPFULL ((FULL)1 << (FULL_BITS-1))	/* highest bit in FULL */
 #define MAXFULL (TOPFULL - (FULL)1)		/* largest SFULL value */
+#define MINSFULL ((SFULL)(TOPFULL))		/* most negative SFULL value */
 #define MAXUFULL (MAXFULL | TOPFULL)		/* largest FULL value */
 
 #define TOPLONG ((unsigned long)1 << (LONG_BITS-1))	/* top long bit */
@@ -289,9 +290,11 @@ extern DLL void freeh(HALF *);
 extern DLL void zcopy(ZVALUE z, ZVALUE *res);
 extern DLL void itoz(long i, ZVALUE *res);
 extern DLL void utoz(FULL i, ZVALUE *res);
+extern DLL void stoz(SFULL i, ZVALUE *res);
 extern DLL void str2z(char *s, ZVALUE *res);
 extern DLL long ztoi(ZVALUE z);
 extern DLL FULL ztou(ZVALUE z);
+extern DLL SFULL ztos(ZVALUE z);
 extern DLL void zprintval(ZVALUE z, long decimals, long width);
 extern DLL void zprintx(ZVALUE z, long width);
 extern DLL void zprintb(ZVALUE z, long width);