Release calc version 2.11.9.2

BUGS

@@ -29,13 +29,20 @@ The calc web site is located at:
 =-=
 
 If you have tried all of the above and things still are not right,
-then it may be time to send in a bug report.  You can send bug reports to:
+then it may be time to send in a bug report.  You can send bug
+and bug fixes reports to:
 
     calc-bugs at asthe dot com
 
     [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
     [[ NOTE: The EMail address uses 'asthe', the web site URL uses 'isthe' ]]
 
+Your subject must contain the words:
+
+       calc bug report
+
+You may have additional words in your subject line.
+
 When you send your report, please include the following information:
 
     * a description of the problem
@@ -54,18 +61,8 @@ When you send your report, please include the following information:
 
 Stack traces from core dumps are useful to send as well.
 
-=-=
-
-Send any comments, compiler warning messages, suggestions and most
-importantly, fixes (in the form of a context diff patch) to:
-
-    calc-bugs at asthe dot com
-
-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe', the web site URL uses 'isthe' ]]
-
-You should use the above calc-bugs address for bug reports, if you are
-not currently a member of the calc-tester mailing list.
+Fell free to use the above address to send in big fixes (in the form
+of a context diff patch).
 
 =-=
 
@@ -75,10 +72,55 @@ Known bugs:
     us know!  See the above for details on how to report and were to
     EMail your bug reports and hopefully patches to fix them.
 
-=-=
-
 Problems with known work-a-rounds:
 
+    * The gcc as shipped with Redhat 7 perhaps other Linux distributions
+      has a bug causes calc to dump core on startup when calc is:
+
+	  compiled optimized (-O, -O1, -O2 or -O3)
+
+	  	AND
+
+      	  compiled with debugging (-g or -g3)
+
+	  	AND
+
+	  when calc is compiled with readline (see USE_READLINE,
+	    READLINE_LIB and READLINE_INCLUDE in the Makefile)
+
+      On Redhat, the gcc -v which has this problem is:
+
+	gcc version 2.96 20000731 (Red Hat Linux 7.1 2.96-85)
+
+      there may be other gcc versions that also suffer this fate.
+
+      The readlines associated with problem are:
+
+	readline-4.1-5
+	readline2.2.1-2.2.1-2
+	readline-devel-4.1-5
+
+      One work-a-round is to compile calc WITHOUT readline.  In the
+      Makefile be sure that:
+
+	USE_READLINE=
+	READLINE_LIB=
+	READLINE_INCLUDE=
+
+      i.e., these Makefile vars are empty.
+
+      If you must use readline, then an alternate work-a-round is to
+      change the DEBUG Makefile variable to either:
+
+	compile for speed:  -O3		(or -O2 if you do not have -O3)
+	compile to debug:   -g3		(or -g if you do not have -g3)
+
+      but not both.
+
+      See RH bug #57889 for details:
+
+	http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=57889
+
     * There is a bug in gcc-2.95 that causes calc, when compiled with -O2,
       to fail the regression test.  The work-a-round is to compile with -O
       or to use gcc-2.96 or later.
@@ -246,8 +288,8 @@ Problems with known work-a-rounds:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.10 $
-## @(#) $Id: BUGS,v 29.10 2001/04/08 11:32:52 chongo Exp $
+## @(#) $Revision: 29.17 $
+## @(#) $Id: BUGS,v 29.17 2001/12/31 22:12:35 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/BUGS,v $
 ##
 ## Under source code control:	1994/03/18 14:06:13

CHANGES

@@ -1,24 +1,392 @@
-The following are the changes from calc version 2.11.5t4.1 to date:
+The following are the changes from calc version 2.11.9 to date:
+
+    Fixed calc man page examples to move -f to the end of the line.
+    Thanks goes to Michael Somos <somos at grail dot cba dot csuohio
+    dot edu> for pointing this out.
+
+    Linux and gcc now compiled with -Wall -W -Wno-comment.
+
+    Fixed a post increment that was reported by R. Trinler <trinler at
+    web dot de> and fixed by Ernest Bowen <ernie at turing dot une dot
+    edu dot au>.
+
+    Fixed pi.cal to not depend on the buggy pre-2.11.9 post increment
+    behavior.
+
+    Added config("cygwin") to determine if calc was compiled under Cygwin.
+    The config("cygwin") is a read-only configuration value that is 1
+    when calc was compiled under Cygwin and 0 otherwise.  Regression
+    tests 949 and 950 are skipped when config("cygwin") is true.
+
+    The Makefile variable HAVE_NO_IMPLICIT is empty by default so that
+    the Makefile will test if the compiler has a -Wno-implicit flag.
+
+    Added HAVE_UNUSED Makefile variable.  If HAVE_UNUSED is empty,
+    then the Makefile will run the have_unused program to determine
+    if the unused attribute is supported.  If HAVE_UNUSED is set to
+    -DHAVE_NO_UNUSED, then the unused attribute will not be used.
+
+    The Makefile builds have_unused.h which defines, if the unused
+    attribute is supported:
+
+	#define HAVE_UNUSED /* yes */
+	#define UNUSED __attribute__((unused)) /* yes */
+
+    or defines, if the unused is not supported (or if the Makefile
+    variable is HAVE_UNUSED= -DHAVE_NO_UNUSED):
+
+	#undef HAVE_UNUSED /* no */
+	#define UNUSED /* no */
+
+    Fixed numerous warnings about comparison between signed and unsigned
+    value warnings and unused parameter warnings in version.c, zrand.c,
+    string.c, shs1.c, shs.c, qtrans.c, qmath.c, qfunc.c, md5.c, matfunc.c,
+    hist.c, file.c, const.c, blkcpy.c, seed.c, opcodes.c, func.c, qio.c,
+    zrandom.c, custom/c_argv.c, custom/c_devnull.c, custom/c_help.c,
+    custom/c_sysinfo.c, addop.c and calc.c.
+
+    Fixed some typos in this file.
+
+    By default, compile with -O3 -g3.  The Makefile comments on how some
+    distributions might need to use -O2 -g or -O -g.
+
+
+The following are the changes from calc version 2.11.8.0 to 2.11.8.1:
+
+    Updated HOWTO.INSTALL to reflect the new RPM files.
+
+    Clarify that the internal hash as well as the hash builtin
+    function used by calc, while based on the Fowler/Noll/Vo
+    hash is NOT an FNV hash.
+
+    Made slight performance improvements to calc by an optimization of how
+    calc's internal hash is computed.  The "make chk" regression test
+    runs about 1.5% faster (when compiled with -O3 on an AMD Athlon)
+    NO_HASH_CPU_OPTIMIZATION is not defined.  Calc's internal hash values
+    have not changed.  By default, NO_HASH_CPU_OPTIMIZATION is NOT defined
+    and the slightly faster expression is used.
+
+    A slight modification of what was known as the "calc new standard"
+    configuration (calc -n or config("all", "newstd")) is now the default
+    calc configuration.  The flag:
+
+    	calc -O
+
+    was added to get the old classic calc configuration.  The flag command
+    line flag, -n, now does nothing.  Use of -n is deprecated and may go
+    away / be used for something else in the future.
+
+    The following table gives the summary of these changes:
+
+	     pre v2.11.8		     v2.11.8
+	     default         pre v2.11.8     -O & oldstd      v2.11.8
+	     and oldstd	     -n & newstd     classic cfg      default
+	     --------------------------------------------------------
+    epsilon	1e-20		1e-10		1e-20		1e-20
+    quo	    	2		2		2		2
+    outround	2		24		2		24
+    leadzero	0		1		0		1
+    fullzero	0		1		0		0
+    prompt	>		;		>		;
+    more	>>		;;		>>		;;
+
+    With the exception of epsilon being 1e-20, and fullzero being unset,
+    the new default calc config is like it was (pre-2.11.8) with calc -n /
+    config("all", "newstd").
+
+    The new default config is the old classic config with outround being
+    24, leadzero being set, and the prompts being ;'s.
+
+    Fixed a bug in the evaluation of tanh(1e-23) with an epsilon(1e-100).
+    Thanks goes to Dmitry G. Baksheyev <bd at nbsp dot nsk dot su>
+    for reporting the problem, and thanks goes to Ernest Bowen
+    <ernie at turing dot une dot edu dot au> for the fix.
+
+
+The following are the changes from calc version 2.11.7.0 to 2.11.7.1:
+
+    Added support to build calc RPMs thanks to Petteri Kettunen
+    <petterik at users dot sourceforge dot net>.
+
+    Added rpm rule to Makefile to build rpm set.  The rpm rule
+    uses the rpm.mk Makefile and the calc.spec.in spec template.
+
+    The default Makefile is now the Makefile used during rpm
+    creation.  This Makefile assumes that system has readline,
+    ncurses (-lreadline -lhistory -lncurses), and less.
+    It compiled with a high gcc optimization level (-O3 -g3).
+    The Makefile used during rpm creation is the Makefile
+    that appears in the calc-src rpm as well.
+
+    The Makefile shipped with the old style gziped tarball
+    is still the same generic Makefile.
+
+    The Makefile now uses ${MKDIR} ${MKDIR_ARG} when creating
+    directories during installation.  By default, it does
+    a mkdir -p when forming directories.
+
+    Fixed attributes on include and lib calc-devel files.
+
+    Adjusted the interaction between rpm.mk, and the calc.spec.in.
+    Release number now comes from calc.spec.in only.
+
+    Renamed calc and calc-devel RPMs to use .i686 instead of .i386.
+
+
+The following are the changes from calc version 2.11.6.3 to date:
+
+    Fixed a bug in deg.cal where fixdms() was being called with
+    the wrong type of argument.
+
+    Changed the value of digits(1) and digits(0) to be 1.  Now digits()
+    returns number of digits in the standard base-b representation
+    when x is truncated to an integer and the sign is ignored.
+    To be more precise: when abs(int(x)) > 0, this function returns
+    the value 1 + ilog(x, b).  When abs(int(x)) == 0, then this
+    function returns the value 1.
+
+    As the result of the above digits() change, the repeat.cal
+    resource file script was modified to remove the special
+    case for repeating a value of 1.  Also the regress tests
+    #715, #977 and #978 were changed.
+
+    Made a minor improvement to the "help places" documentation.
+
+    Fixed dms_neg(a) in deg.cal thanks to a bug report by kaa
+    <kaa76 at pochtamt dot ru>.
+
+
+The following are the changes from calc version 2.11.6.0 to 2.11.6.2:
+
+    Clarified remark in lucas.cal about use of n mod 2^n == 0.
+
+    Fixed help typos reported by Marc Mezzarobba <mm at mm dot ovh dot org>.
+
+    Forced system("") to return 0 under windoz.
+
+    The direct.h include file is not used when compiling under Cygwin.
+
+    Fixed bug where random(10,11) caused calc to dump core when issued
+    the 2nd time.
+
+    Moved the setting of the Makefile variable ${CALC_INCDIR} to
+    the section where things like ${BINDIR} and ${LIBDIR} are set.
+    Idea from Clifford Kite <kite_public1 at ev1 dot net>.
+
+    The Makefile is shipped mode 0644 since a number of folks
+    edit it (to build and check calc) as a non-root user and later
+    on su to root to install.  Idea from Clifford Kite <kite_public1
+    at ev1 dot net>.
+
+    Added base2() builtin function to calc.  Normally calc prints
+    values according to base().  Frequently some users want to see
+    a value in two bases.  Flipping back and forth between to bases
+    is a bit of a pain.  With base2(), calc will output a value twice:
+
+	; 234567
+		234567
+	; base2(16),
+	; 234567
+		234567 /* 0x39447 */
+	; 131072
+		131072 /* 0x20000 */
+	; base2(0),
+	; 131072
+        131072
+
+    By default, base2() is disabled.  Calling base2(0) will also turn
+    off the double base mode.  Thanks goes to Erik Anggard
+    <erik dot anggard at packetfront dot com> for his idea and
+    his initial patch.
+
+    Added repeat.cal as a calc resource file script:
+
+	repeat(digit_set, repeat_count)
+
+	Return the value of the digit_set repeated repeat_count times.
+	Both digit_set and repeat_count must be integers > 0.
+
+	For example repeat(423,5) returns the value 423423423423423,
+	which is the digit_set 423 repeated 5 times.
+
+    Makefile no longer makes a direct reference to Red Hat 6.0.
+
+    Added missing math_setmode2() prototype to zmath.h.
+
+    Fixed some implicit declarations of functions by either making
+    them explicit or by including the proper system .h files.
+
+    Makefile no longer uses -Wno-implicit flag, by default, for
+    gcc based compiles on calc source.  Makefile now attempts to
+    compile no_implicit.c with an explicit -Wno-implicit arg in an
+    effort to determine of -Wno-implicit is a valid compiler flag.
+    If no_implicit.c is compiled with -Wno-implicit, then
+    the file no_implicit.arg is created with the contents
+    of the -Wno-implicit flag.  Otherwise no_implicit.arg
+    is created as an empty file.
+
+    Added the Makefile variable ${HAVE_NO_IMPLICIT}, which if
+    not set to YES will prevent no_implicit.c from being
+    compiled and prevent the -Wno-implicit flag from being used.
+    If ${HAVE_NO_IMPLICIT} is not YES, then an empty no_implicit.arg
+    file is created and no_implicit.c is not compiled.
+
+    The seed.c file, because the pseudo_seed() function contains
+    calls to a number of various system functions, attempts to
+    compile with the -Wno-implicit flag (if allowed by the
+    formation of the no_implicit.arg file).
+
+    Misc make depend fixes and cleanup.
+
+    Fixed formation of the custom/.all file.
+
+    Fixed repeat(1, repeat_count) bug.
+
+
+The following are the changes from calc version 2.11.5.5 to 2.11.5.9:
+
+    Now using version numbers of one of these forms:
+
+    	x.y.z.w
+    	x.y.z
+    	x.y
+
+    Changed the READLINE_LIB Makefile variable to not link with -lreadline
+    by default.  If you do have readline, we recommend that you use it.
+    If you can install the GNU readline:
+
+	http://freshmeat.net/projects/gnureadline/
+    	http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+
+    we recommend it.  But if not, you should set the USE_READLINE,
+    READLINE_LIB, and READLINE_INCLUDE Makefile variables to empty.
+    NOTE: See the BUGS file for a Linux issue when compiling calc
+    with -O (or -O2 or -O3) AND with -g (or -g3) AND with readline.
+
+    Removed an obsolete reference to TOPDIR.  This was fixed thanks to
+    a bug report by Clifford Kite <kite_public1 at ev1 dot net>.
+    Fixed other inconsistencies related to things like BINDIR.
+
+    Fixed calc man page so that is refers to -f instead of the old -S flag.
+    Fixed thanks to Clifford Kite <kite_public1 at ev1 dot net> for
+    point this out.
+
+    All for loops end with /dev/null to avoid any problems related
+    to systems that cannot grok empty for loops.
+
+    Changed the libcalc functions creal and cimag to c_real and c_imag
+    to about conflicts with new libc such as those used by gcc v3.
+    Thanks Eli Zaretskii <eliz at is dot elta dot co dot il> and
+    Martin Buck <m at rtin-buck dot de> for alerting us to this conflict.
+
+    The Makefile no longer hard code's /usr/include.  Instead it uses
+    the ${INCDIR} Makefile variable.  Thanks goes to Eli Zaretskii
+    <eliz at is dot elta dot co dot il> for pointing out this inconsistency.
+
+    Added mods to support compilation under DJGPP.  DJGPP runs on 386
+    and newer PCs running DOS or dos-compatible operating systems.
+    See http://www.delorie.com/djgpp/.  Thanks goes to Eli Zaretskii
+    <eliz at is dot elta dot co dot il> for sending in these mods.
+
+    Updated README.WINDOWS to include information on building with DJGPP.
+
+    The pld folks are building RPMs based on our calc distributions.
+    See:  ftp://ftp.pld.org.pl/dists/ra/PLD/i686/PLD/RPMS or
+    http://ftp.pld.org.pl/dists/ra/PLD/i686/PLD/RPMS more information.
+    We appreciate their work in this regard.  In the next release, we
+    plan to also build and release our own RPMs based on their efforts.
+
+    Changed the Makefile variable CUSTOMLIBDIR to CUSTOMCALDIR.
+    Changed the Makefile variable CSHAREDIR to CALC_SHAREDIR.
+    Changed the Makefile variable INCDIRCALC to CALC_INCDIR.
+    Removed the Makefile variable SHAREDIR.
+
+    Updated the HOWTO.INSTALL and README.WINDOWS files.
+
+    Fixed definition of MAXUFULL.  Thanks to a bus report from
+    Jill Poland <jpoland at cadence dot com>.
+
+The following are the changes from calc version 2.11.5t4.1 to 2.11.5t4.4:
 
     Updated dependency rules in Makefiles.
 
+    NOTE: -DSRC, as used in 2.11.5t4.1 was renamed -DCALC_SRC
+    in a later version.
+
     Calc include files use #include "foo.h" to include other calc
-    header files if -DSRC.  Otherwise they use <calc/foo.h>.
-    The -DSRC symbol is defined by default in calc's Makefile
+    header files if -DCALC_SRC.  Otherwise they use <calc/foo.h>.
+    The -DCALC_SRC symbol is defined by default in calc's Makefile
     and so it uses the header files from within the calc src tree.
     If an external non-calc program includes an installed calc
     header file (from under /usr/include), and it does NOT define
-    SRC, then it will obtain the calc header files from the
+    CALC_SRC, then it will obtain the calc header files from the
     correct system location (such as /usr/include/calc/foo.h).
 
     Added calc builtin function: version() which returns the calc
     version string.
 
+    Added subject requirements for the calc-tester-request and
+    calc-bugs-mail EMail aliases.  See:
+
+    	http://www.isthe.com/chongo/tech/comp/calc/email.html
+
+    for details.
+
+    Corrected a bug that incorrectly set the default calc path
+    back in version 2.11.5t4.  The default CALCPATH is now:
+
+	.:./cal:~/.cal:/usr/share/calc:/usr/share/calc/custom
+
+    and the default CALCRC is now:
+
+	/usr/share/calc/startup:~/.calcrc:./.calcinit
+
+    This fixes the missing bindings error and it places the calc
+    resource files into the default path.
+
+    If you are using the GNU readline then the Makefile recommends that
+    you link with the ncurses library.
+
+    Applied Makefile, cscript/Makefile and custom/Makefile patches to
+    fix install mode problems, to deal with sorting and dates in I18n
+    environments (such as Japanese), to fix some problems with calc.spec
+    and to fix the cscript #! header lines.  Thanks goes to KAWAMURA Masao
+    (kawamura at mlb.co.jp) for the bug report and patch!
+
+    Fixed headers on fproduct.calc powerterm.calc 4dsphere.calc so
+    that they are correcly changed on installation.
+
+    Added ${GREP} Makefile variable.
+
+    The top level Makefile now sets LANG=C and passes it down to
+    lower level Makefiles.
+
+    Updated URLs in cal/lucas.cal comments.
+
+    Now shipping calc.spec, inst_files, spec-template and Makefile.linux
+    with the standard calc source distribution.  Note that the standard
+    Makefile has not changed.  The Makefile.linux only in minor ways
+    needed to build calc rpms.
+
+    Added $T Makefile variable.  $T is the 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 to install calc somewhere other than into the system area.
+    For example when forming the calc rpm, the Makefile is called with
+    T=$RPM_BUILD_ROOT.  If $T is empty, calc is installed under /.
+
+    Removed all echo_XXX rules except for echo_inst_files from lower
+    level makefile.  The calc.spec will use a make install rule
+    with T=$RPM_BUILD_ROOT.
+
+    Updated LIBRARY file with instructions related to -DCALC_SRC,
+    the new default include file location and -lcustcalc.
+
 
 The following are the changes from calc version 2.11.5t3 to 2.11.5t4:
 
-    The Makefile will now send both stdout and sterr to /dev/null
-    when compiling hsrc intermeriates.
+    The Makefile will now send both stdout and stderr to /dev/null
+    when compiling hsrc intermediates.
 
     The config("verbose_quit") value was restored to a default
     value of FALSE.
@@ -65,7 +433,7 @@ The following are the changes from calc version 2.11.5t3 to 2.11.5t4:
 
     The Makefile variable ${TOPDIR} is no longer used.  In some places
     it has been replaced by a new Makefile variable ${SHAREDIR}.  Some
-    of the old TOPDIR functionality has beenn replaced by ${CSHAREDIR}.
+    of the old TOPDIR functionality has been replaced by ${CSHAREDIR}.
 
     The install rules no longer remove old obsolete files.  We assume
     that these old files have long since vanished!  :-)
@@ -144,7 +512,7 @@ The following are the changes from calc version 2.11.5t0 to 2.11.5t1.1:
 
     An effort was made to make calc easier to build under Windoz
     using the Cygwin project (http://sources.redhat.com/cygwin/).
-    Thanks to the work of Thomas Jones-Low (tjoneslo and softstart
+    Thanks to the work of Thomas Jones-Low (tjoneslo at softstart
     dot com), a number of #if defined(_WIN32)'s have been added
     to calc source.  These changes should not effect Windoz
     free system such as GNU/Linux, Solaris, POSIX-like, etc ...
@@ -155,7 +523,7 @@ The following are the changes from calc version 2.11.5t0 to 2.11.5t1.1:
 
     Added HAVE_MALLOC_H, HAVE_STDLIB_H, HAVE_STRING_H, HAVE_TIMES_H,
     HAVE_SYS_TIMES_H, HAVE_TIME_H, HAVE_SYS_TIME_H, HAVE_UNISTD_H
-    and HAVE_URANDOM to the Makefile.  If these symcols are empty,
+    and HAVE_URANDOM to the Makefile.  If these symbols are empty,
     then the Makefile looks for the appropriate system include file.
     If they are YES, then the Makefile will assume they exist.
     If they are NO, then the Makefile will assume they do not exist.
@@ -176,7 +544,7 @@ The following are the changes from calc version 2.11.5t0 to 2.11.5t1.1:
     under the win32 directory.
 
     Added FPOS_POS_BITS, OFF_T_BITS, DEV_BITS and INODE_BITS Makefile
-    symbiols to allow one to force the size of a file position, file
+    symbols to allow one to force the size of a file position, file
     offset, dev and inode value.  Leaving these values blank will
     Makefile to determine their size.
 
@@ -328,7 +696,7 @@ The following are the changes from calc version 2.11.3t0 to 2.11.4:
 	    calc -q -i "define f(x) = x^2;"
 
     To achieve this, the use of getopts() in calc.c has been dropped in
-    favour of direct reading of the arguments produced by the shell.
+    favor of direct reading of the arguments produced by the shell.
     In effect, until a "--" or "-s" or a calc command (recognized
     by not starting with '-') is encountered, the quotation signs in
     command lines like the above example are ignored.  Dropping getopts()
@@ -457,7 +825,7 @@ The following are the changes from calc version 2.11.3t0 to 2.11.4:
 
     (11) The effect of config("trace", 8) which displays opcodes of
     functions as they are successfully defined has been restricted to
-    functions defioed with explicit use of "define".  Thus, it has been
+    functions defined with explicit use of "define".  Thus, it has been
     deactivated for the ephemeral functions used for evaluation of calc
     command lines or eval() functions.
 
@@ -596,7 +964,7 @@ The following are the changes from calc version 2.11.1 to 2.11.1t2.2:
 	#! files	calc shell script
 
     Renamed 'help stdlib' to 'help resource'.	The 'help stdlib' is
-    aliased to 'help resource' for ard compatibility.
+    aliased to 'help resource' for arg compatibility.
 
     Renamed config("lib_debug") to config("resource_debug").
     The config("lib_debug") will have the same effect as
@@ -626,7 +994,7 @@ The following are the changes from calc version 2.11.0t10 to 2.11.0t11:
     Misc code cleanup.	Removed dead code.  Removed trailing whitespace.
     Fixed whitespace to make the best use of 8 character tabs.
 
-    Fixed some bugs relaing to '// and %' in combination with some
+    Fixed some bugs relating to '// and %' in combination with some
     of the the rounding modes based on a patch from Ernest Bowen
     <ernie at turing dot une dot edu dot au>.
 
@@ -636,7 +1004,7 @@ The following are the changes from calc version 2.11.0t10 to 2.11.0t11:
 
     Minor typos fixed in regress.cal
 
-    Added 8500 test serise and test8500.cal to perform more extensive
+    Added 8500 test series and test8500.cal to perform more extensive
     tests on // and % with various rounding modes.
 
     The 'unused value ignored' messages now start with Line 999: instead
@@ -874,7 +1242,7 @@ The following are the changes from calc version 2.11.0t8.9.1 to 2.11.0t9.4.5:
 
 	    Quit or abort executed
 
-	when a non-interactive ABORT, QUIT or EXIT is encounted.  By default,
+	when a non-interactive ABORT, QUIT or EXIT is encountered.  By default,
 	config("verbose_quit") is TRUE and the message is printed.  If one does:
 
 	    config("verbose_quit", 0)
@@ -1013,11 +1381,11 @@ The following are the changes from calc version 2.11.0t8.9.1 to 2.11.0t9.4.5:
     by default is /usr/local/include.  Include files previously installed
     directly under ${LIBDIR} will be removed.
 
-    Added the piforever() funcion to lib/pi.cal.  It was written by
+    Added the piforever() function to lib/pi.cal.  It was written by
     Klaus Alexander Seistrup <klaus at seistrup dot dk> and was inspired by
     an algorithm conceived by Lambert Meertens.	 (See also the ABC
     Programmer's Handbook, by Geurts, Meertens & Pemberton, published
-    by Prentice-Hall (UK) Ltd., 1990.)	The piforever() funcion prints
+    by Prentice-Hall (UK) Ltd., 1990.)	The piforever() function prints
     digits of pi for as long as your memory and system uptime allows.  :-)
 
     Fixed the URLs found thruout the source and documentation which did
@@ -1031,7 +1399,7 @@ The following are the changes from calc version 2.11.0t8.9.1 to 2.11.0t9.4.5:
 
 	    + comma operator
 	    + separator of arguments in a function call
-	    + separator of arguments in a defintion
+	    + separator of arguments in a definition
 	    etc.
 
 	The expression (mat A[2]), B[3] returns B[3], assuming B already
@@ -1074,7 +1442,7 @@ The following are the changes from calc version 2.11.0t8.9.1 to 2.11.0t9.4.5:
     of including longlong.h will help detect when a system can deal with
     'long long' but not '%lld' in printf.  If a system with 'long long'
     uses '%ld' to print a 64 bit value, then l_format will be > 0;
-    othewise if "%lld" is required, l_format will be < 0.
+    otherwise if "%lld" is required, l_format will be < 0.
 
     Added HAVE_STRDUP Makefile variable as well as the have_strdup.c
     program that forms the have_strdup.h file.	The have_strdup.h file
@@ -1083,7 +1451,7 @@ The following are the changes from calc version 2.11.0t8.9.1 to 2.11.0t9.4.5:
     the real strdup() function.
 
     Calc no longer makes use of sys_errlist and sys_nerr.  Some systems
-    no longer suppor these values (even though they should from a
+    no longer support these values (even though they should from a
     legacy prospective).  Calc now relies on the fact that strerror()
     will return NULL of no such system error exists.  System errors >=
     10000 will be considered calc errors instead.  The Makefile symbol
@@ -1102,7 +1470,7 @@ The following are the changes from calc version 2.11.0t8.9.1 to 2.11.0t9.4.5:
     to V_NOSUBTYPE thruout the source code.
 
     Established a separate calc-bugs address from the calc-tester
-    maining list.  Using anti-spam address forms in order to try and
+    mailing list.  Using anti-spam address forms in order to try and
     stay under the radar of spammers as much as one can do so.
 
 
@@ -1152,7 +1520,7 @@ The following are the changes from calc version 2.11.0t8 to 2.11.0t8.9:
 
     Misc source file cleanup for things such as } else { style consistency.
 
-    Fixed the basis for FNV-1 hashes.  Piror to this fix, the hash()
+    Fixed the basis for FNV-1 hashes.  Prior to this fix, the hash()
     builtin produced FNV hash values that did not match the FNV-1
     algorithm as specified in:
 
@@ -1175,7 +1543,7 @@ The following are the changes from calc version 2.11.0t8 to 2.11.0t8.9:
 	and:
 		{static a = 5} define f(x) = a + x;
 
-    String constants can now be concatenated.  For exmaple:
+    String constants can now be concatenated.  For example:
 
 	s = "curds" ' and ' "whey";
 
@@ -1244,7 +1612,7 @@ The following are the changes from calc version 2.11.0t8 to 2.11.0t8.9:
     an error while processing 'args' and drops into interactive mode
     without the terminal bindings being set.
 
-    Added patch from Ernest Bowen to extablish the abort command as
+    Added patch from Ernest Bowen to establish the abort command as
     well as to clarify the roles of quit and exit.  See the help/command
     file for details.
 
@@ -1391,11 +1759,11 @@ The following are the changes from calc version 2.11.0t7 to 2.11.0t7.5:
     compile is invoked.	 Only the source that must be compiled and run
     on the local machine use ${LCC}; everything else uses ${CC}.
 
-    Fixed memory buffer ovreread problem in eatstring() in token.c.
+    Fixed memory buffer related problem in eatstring() in token.c.
 
     Fixed memory leaks related to putenv().
 
-    Fixed memory leaks realted to srandom().
+    Fixed memory leaks related to srandom().
 
     Fixed compilation warnings and problems on BSDI.
 
@@ -1697,13 +2065,13 @@ The following are the changes from calc version 2.10.3t5.34 to 2.10.3t5.37:
     Fixed the order of prints in regress.cal.  By convention, a print
     of a test line happens after the test.  This is because function
     parsed messages occur after the function is parsed.	 Also the
-    boolean tesrt of vrfy happens before any print statement.
-    Therefore a non-test line is tested and printed as follows:
+    boolean test will verify before any print statements.  Therefore
+    a non-test line is tested and printed as follows:
 
 	y = sha();
 	print '7125: y = sha()';
 
-    The perm(a,b) and comb(a,b) have been extented to arbitrary real a and
+    The perm(a,b) and comb(a,b) have been extended to arbitrary real a and
     integer b.
 
     Fixed a bug in minv().
@@ -1777,7 +2145,7 @@ The following are the changes from calc version 2.10.3t5.34 to 2.10.3t5.37:
 			    A = B
 
 	results in A referring to exactly the same string as B rather than to
-	a copy of what is in B.	 Thie is like the use of character-pointers in
+	a copy of what is in B.	 This is like the use of character-pointers in
 	C, as in
 
 			    char *s1, *s2;
@@ -1990,7 +2358,7 @@ The following are the changes from calc version 2.10.3t5.34 to 2.10.3t5.37:
 	 if n is negative.   I've changed the definitions of head and tail for
 	 lists to be consistent with this interpretation of negative n.
 
-    (23) Similarly I've left strpos ezsentially as at present, but search
+    (23) Similarly I've left strpos essentially as at present, but search
 	 and rsearch have been extended to strings.  For example,
 
 		    search(A, B, m, n)
@@ -2447,16 +2815,16 @@ The following are the changes from calc version 2.10.3t5.28 to 2.10.3t5.33:
 
 	(11) storing the most recently calculated value of qpi(epsilon)i and
 	     epsilon so that when called again with the same epsilon it
-	     is copied rather than recalculateed.
+	     is copied rather than recalculated.
 
 	(12) defining trace() for square matrices
 
 	(13) expression in parentheses may now be followed by a qualifier
-	     computible with its type
+	     computable with its type
 
 	     When an expression in parentheses evaluates to an lvalue
 	     whose current value is a matrix, list or object, it may
-	     now be followed by a qualifier computible with its type.
+	     now be followed by a qualifier compatible with its type.
 
 	     For example:
 
@@ -2528,7 +2896,7 @@ The following are the changes from calc version 2.10.3t5.28 to 2.10.3t5.33:
 
 	define f(x) = 5 + x;
 
-    Fixed bug with lowhex2bin converstion in lib_util.c.  It did not
+    Fixed bug with lowhex2bin conversation in lib_util.c.  It did not
     correctly convert from hex ASCII to binary values due to a table
     loading error.
 
@@ -2591,7 +2959,7 @@ The following are the changes from calc version 2.10.3t5.11 to 2.10.3t5.27:
     blocks that have been created, blocks(id) returns the named block
     with identifying index id.
 
-    Removed the artifical limit of 20 named blocks.
+    Removed the artificial limit of 20 named blocks.
 
     Added name() builtin to return the name of a type of value
     as a string.
@@ -2654,7 +3022,7 @@ The following are the changes from calc version 2.10.3t5.11 to 2.10.3t5.27:
 
     Moved blkcpy() routines have been moved to blkcpy.[ch].
 
-    The blkcpy() & copy() builtings can not copy to/from numbers.
+    The blkcpy() & copy() builtins can not copy to/from numbers.
     For purposes of the copy, only the numerator is ignored.
 
     Resolved a number of missing symbols for libcalc users.
@@ -2800,7 +3168,7 @@ The following are the changes from calc version 2.10.3t5.1 to 2.10.3t5.10:
     surprises that C programmers may encounter.
 
     Updated the 'help', 'intro' and 'overview' to reflect the
-    full ilst of non-builtin function help files.  Reorered the
+    full list of non-builtin function help files.  Reorered the
     'full' help file.
 
     The blkalloc() builtin has been renamed blk().
@@ -2848,13 +3216,13 @@ The following are the changes from calc version 2.10.3t5.1 to 2.10.3t5.10:
 
     Added ${LD_DEBUG} Makefile variable to allow for additional
     libraries to be compiled into calc ... for debugging purposes.
-    In most cases, LD_DEBUG= is sufficent.
+    In most cases, LD_DEBUG= is sufficient.
 
     Added ${CALC_ENV} makefile variable to allow for particular
     environment variables to be supplied for make {check,chk,debug}.
-    In most cases, CALC_ENV= CALCPATH=./lib is sufficent.
+    In most cases, CALC_ENV= CALCPATH=./lib is sufficient.
 
-    Added ${CALC_LIBS} to list the libaraies created and used to
+    Added ${CALC_LIBS} to list the libraries created and used to
     build calc.	 The CALC_LIBS= custom/libcustcalc.a libcalc.a
     is standard for everyone.
 
@@ -2873,14 +3241,14 @@ The following are the changes from calc version 2.10.3t5.1 to 2.10.3t5.10:
     The *.c should do that instead where it is reasonable.
 
     To avoid symbol conflicts, *.h files produced and shipped
-    with calc are inclosed that as similar to the following:
+    with calc are enclosed that as similar to the following:
 
 	#if !defined(__CALC_H__)
 	#define __CALC_H__
 	..
 	#endif /* !__CALC_H__ */
 
-    Added memsize(x) builtin to print the best aproximation of the
+    Added memsize(x) builtin to print the best approximation of the
     size of 'x' including overhead.  The sizeof(x) builtin attempts
     to cover just the storage of the value and not the overhead.
     Because -1, 0 and 1 ZVALUES are static common values, sizeof(x)
@@ -2905,7 +3273,7 @@ The following are the changes from calc version 2.10.3t4.16 to 2.10.3t5.0:
     Added more error() and errno() regression tests.
 
     The convention of using the global variable lib_debug at the
-    end of calc librar scripts has been replaced with config("lib_debug").
+    end of calc library scripts has been replaced with config("lib_debug").
     The "lib_debug" is reserved by convention for calc library scripts.
     This config parameter takes the place of the lib_debug global variable.
     By convention, "lib_debug" has the following meanings:
@@ -2959,7 +3327,7 @@ The following are the changes from calc version 2.10.3t4.16 to 2.10.3t5.0:
 	>0	a greater degree of debugging is performed and more
 		    verbose messages are printed
 
-    Added more code that is deading with the BLOCK type.
+    Added more code related to the BLOCK type.
 
     Added blkalloc() builtin.
 
@@ -3004,14 +3372,14 @@ The following are the changes from calc version 2.10.3t4.16 to 2.10.3t5.0:
     arg is "-f", then 'no-such-file' errors are ignored.
 
     Added errcount([count]) builtin to return or set the error
-    counter.  Added errmax([limit]) to rturn or set the error
+    counter.  Added errmax([limit]) to return or set the error
     count limiter.
 
     Added -n as a calc command line option.  This has the effect
     of calling config("all", "newstd") at startup time.
 
     Added -e as a calc command line option to ignore all environment
-    varialbes at startup time.	The getenv() builtin function will
+    variables at startup time.	The getenv() builtin function will
     still return values, however.
 
     Added -i as a calc command line option.  This has the effect
@@ -3194,7 +3562,7 @@ The following are the changes from calc version 2.10.3t3 to 2.10.3t4.15:
 
     The "blkverbose" determines if all lines, including duplicates
     should be printed.	If TRUE, then all lines are printed.  If false,
-    duplicate lines are skipped and only a "*" is printed in a sytle
+    duplicate lines are skipped and only a "*" is printed in a style
     similar to od.  This config value has not meaning if "blkfmt" is
     "str".  The default value for "blkverbose" is FALSE: duplicate
     lines are not printed.
@@ -3267,7 +3635,7 @@ The following are the changes from calc version 2.10.3t0 to 2.10.3t2:
 
     A lot of work was performed on the code generation by Ernest Bowen
     <ernie at turing dot une dot edu dot au>.	 Declarations no longer
-    need to precese code:
+    need to precede code:
 
 	define f(x) {
 		local i = x^2;
@@ -3401,7 +3769,7 @@ The following are the changes from calc version 2.10.3t0 to 2.10.3t2:
     "break", "continue", or "goto", so that only one jump opcode is
     required.
 
-    A label can now be immediately by a rightbrace.  For example:
+    A label can now be immediately by a right-brace.  For example:
 
 	define test_newop3(x) {if (x < 0) goto l132; ++x; l132: return x;}
 
@@ -3659,7 +4027,7 @@ The following are the changes from calc version 2.10.2t25 to 2.10.2t32:
 	creates four static variables, the first "a" having a very short and
 	useless life.
 
-    Added new tests to verify the new assugnments above.
+    Added new tests to verify the new assignments above.
 
     Added the builtin test(x) which returns 1 or 0 according as x tests
     as true or false for conditions.
@@ -3700,7 +4068,7 @@ The following are the changes from calc version 2.10.2t4 to 2.10.2t24:
 			so that the entire make is verbose and
 			a constructed files are printed
 
-     Improved instuctions in 'BUGS' section on reporting problems.
+     Improved instructions in 'BUGS' section on reporting problems.
      In particular we made it easy for people to send in a full
      diagnostic output by sending 'debug.out' which is made as follows:
 
@@ -3715,13 +4083,13 @@ The following are the changes from calc version 2.10.2t4 to 2.10.2t24:
 
      Attempting to rewind a file this is not open generates an error.
 
-     Noted conversion problems in file.c in tripple X comments.
+     Noted conversion problems in file.c in triple X comments.
 
-     Some extremely braindead shells cannot correctly deal with if
-     cluases that do not have a non-empty else statement.  Their
+     Some extremely brain dead shells cannot correctly deal with if
+     clauses that do not have a non-empty else statement.  Their
      exit bogosity results in make problems.  As a work-a-round,
      Makefile if clauses have 'else true;' clauses for if statements
-     that previously did not have an else cluause.
+     that previously did not have an else clause.
 
      Fixed problems where the input stack depth reached the 10 levels.
 
@@ -3836,7 +4204,7 @@ The following are the changes from calc version 2.10.2t4 to 2.10.2t24:
 	A = {{1,2}, {3,4}};
 
      The config("trace", 8) causes opcodes of newly defined functions
-     are displayed.  Also show can now show the opcides for a function.
+     are displayed.  Also show can now show the opcodes for a function.
      For example:
 
 	config("trace", 8);
@@ -3942,9 +4310,9 @@ The following are the changes from calc version 2.10.2t4 to 2.10.2t24:
     Added rm("file") builtin to remove a file.
 
     The regress test sections that create files also use rm() to remove
-    them before and afterwards.
+    them before and afterward.
 
-    Added 4400-4500 set to test new mat and obj initializaion rules.
+    Added 4400-4500 set to test new mat and obj initialization rules.
 
     Added 4600 to test version file operations.
 
@@ -3960,7 +4328,7 @@ The following are the changes from calc version 2.10.2t4 to 2.10.2t24:
 
     Renumbered some of the early regress.cal test numbers to make room
     for more tests.  Fixed all out of sequence test numbers.  Fixed some
-    malformatted regression reports.
+    malformed regression reports.
 
     Renamed STSIZE_BITS to OFF_T_BITS.	Renamed SWAP_HALF_IN_STSIZE to
     SWAP_HALF_IN_OFF_T.
@@ -4051,7 +4419,7 @@ The following are the changes from calc version 2.10.2t1 to 2.10.2t3:
     tries "w" and "r", and if none work, gives up.  This avoids having
     "open" files with null fp.
 
-    The buildin rewind() calls the C rewind() function, but one may
+    The builtin rewind() calls the C rewind() function, but one may
     now rewind several files at once by a call like rewind(f1, f2).
     With no argument, rewind() rewinds all open files with id >= 3.
 
@@ -4074,7 +4442,7 @@ The following are the changes from calc version 2.10.2t1 to 2.10.2t3:
 	    y = fgetstr(f);	/* returns "Curt" */
 	    z = fgetstr(f);	/* returns "Noll" */
 
-    The buildin fgetfield() returns the next field of non-whitepsace
+    The builtin fgetfield() returns the next field of non-whitepsace
     characters.
 
     The builtins scan(), fscan(), strscan() read tokens (fields of
@@ -4098,10 +4466,10 @@ The following are the changes from calc version 2.10.2t1 to 2.10.2t3:
     or -1 if x is a file but not open.	If s is a string, size(s) returns
     characters in s.
 
-    Added buildin access("foo", "w") returns the null value if a file
-    "foo" exists and is writeable.
+    Added builtin access("foo", "w") returns the null value if a file
+    "foo" exists and is writable.
 
-    Some systems has a libc symbolc qadd() that conflicted with calc's
+    Some systems has a libc symbolic qadd() that conflicted with calc's
     qadd function.  To avoid this, qadd() has been renamed to qqadd().
 
     The calc error codes are produced from the the calcerr.tbl file.
@@ -4256,9 +4624,9 @@ The following are the changes from calc version 2.10.1t20 to 2.10.1t20:
     <ernie at turing dot une dot edu dot au>
 
     A new "bignum" algorithm for evaluating pmod(x,k,m) when
-    N >= config("pow2").  For the multiplications and squarings
+    N >= config("pow2").  For the multiplications and squaring
     modulo m, or their equivalent, when N >= config("redc2"),
-    calc has used evaluations correponding to rcout(x * y, m),
+    calc has used evaluations corresponding to rcout(x * y, m),
     for which the runtime is essentially that of three multiplications.
     <ernie at turing dot une dot edu dot au>
 
@@ -4331,7 +4699,7 @@ The following are the changes from calc version 2.10.1t11 to 2.10.1t19:
 
 	cmp(a,b) = sgn(re(a) - re(b)) + sgn(im(a) - im(b)) * 1i
 
-    The cmp help file has been uptdated.
+    The cmp help file has been updated.
 
     Change HASH type to QCKHASH.  The HASH type is a name better suited
     for the upcoming one-way hash interface.
@@ -4391,7 +4759,7 @@ The following are the changes from calc version 2.10.1t11 to 2.10.1t19:
 	prompt		"; "		(allows full line cut/paste)
 	more		";; "		(allows full line cut/paste)
 
-    The "newstd" is a (hopefully) more perferred configuration than the
+    The "newstd" is a (hopefully) more preferred configuration than the
     historic default.
 
     The fposval.h file defines DEV_BITS and INODE_BITS giving the
@@ -4410,7 +4778,7 @@ The following are the changes from calc version 2.10.1t11 to 2.10.1t19:
     state or RANDOM state.
 
     The lib/cryrand.cal library now no longer keeps the Blum prime
-    factors used to formt he Blum modulus.  The default modulus has
+    factors used to form he Blum modulus.  The default modulus has
     been expanded to 1062 bits product of two Blum primes.
 
     The function hash_init() is called to initialize the hash function
@@ -4441,7 +4809,7 @@ The following are the changes from calc version 2.10.1t11 to 2.10.1t19:
     help/poly file.  Added poly.c.  <ernie at turing dot une dot edu
     dot au>
 
-    Fixes and performance improvemtns to det().  <ernie at turing dot
+    Fixes and performance improvements to det().  <ernie at turing dot
     une dot edu dot au>
 
     Renamed atoq() and atoz() to str2q() and str2z() to avoid conflicts
@@ -4515,7 +4883,7 @@ The following are the changes from calc version 2.10.0t13 to 2.10.1t10:
     signed and unsigned values.
 
     The longbits.h will define HAVE_B64 with a 64 bit type (long or
-    longlong) is available.   If one is, then SB64 abd US64 typedefs
+    longlong) is available.   If one is, then SB64 and US64 typedefs
     are declared.
 
     The U(x) and L(x) macros only used to define 33 to 64 bit signed
@@ -4544,7 +4912,7 @@ The following are the changes from calc version 2.10.0t13 to 2.10.1t10:
 
     The CALCBINDINGS file is searched for along the CALCPATH.  The Makefile
     defines the default CALCBINDINGS is "bindings" (or "altbind") which
-    is now usualy found in ./lib or ${LIBDIR}.
+    is now usually found in ./lib or ${LIBDIR}.
 
     Per Ernest Bowen <ernie at turing dot une dot edu dot au>, an optional
     third argument was added  sqrt() so that in sqrt(x,y,z), y and z have
@@ -4552,7 +4920,7 @@ The following are the changes from calc version 2.10.0t13 to 2.10.1t10:
     what is being approximated is the sqrt of x.  Another difference is
     that two more bits of z are used in sqrt: bit 5 gives the option of
     exact results when they exist (the value of y is then ignored) and
-    bit 6 returns the nonprincipal root rather than the principal value.
+    bit 6 returns the non-principal root rather than the principal value.
 
     If commands are given on the command line, leading tabs are not
     printed in output.	Giving a command on the command line implies
@@ -4592,7 +4960,7 @@ The following are the changes from calc version 2.10.0t13 to 2.10.1t10:
 	6   do not execute any program
 	7   allow everything (default mode)
 
-    Thus if one wished to run calc from a privledged user, one might
+    Thus if one wished to run calc from a privileged user, one might
     want to use -m 0 in an effort to make calc more secure.
 
     The -m flags for reading and writing apply on open.
@@ -4608,7 +4976,7 @@ The following are the changes from calc version 2.10.0t13 to 2.10.1t10:
     The maximum command line size it MAXCMD (16384) bytes.  Calc objects to
     command lines that are longer.
 
-    The -u flag cause calc to unbuffer stdin and stdout.
+    The -u flag cause calc to un-buffer stdin and stdout.
 
     Added more help files.  Improved other help files.
 
@@ -4692,7 +5060,7 @@ The following are the changes from calc version 2.9.3t9.2+ to 2.9.3t10:
     Makefile symbol.  Removed alloc.c.
 
     Added getenv("name"), putenv("name=val") and putenv("name, "val")
-    builts for environment variable support thanks to "Dr." "D.J." Picton
+    builds for environment variable support thanks to "Dr." "D.J." Picton
     <dave at aps2 dot ph dot bham dot ac dot uk>.
 
     Added system("shell command") builtin to execute shell commands,
@@ -4737,7 +5105,7 @@ The following are the changes from calc version 2.9.3t9.2+ to 2.9.3t10:
 
     Expanded the regress.cal regression test suite.
 
-    Fixed -- and ++ with respect to objects and asignment (see the 2300
+    Fixed -- and ++ with respect to objects and assignment (see the 2300
     series in regress.cal).
 
     Added isident(m) to determine if m is an identity matrix.
@@ -4918,7 +5286,7 @@ The following are the changes from calc version 2.9.3t8 to 2.9.3t9.2:
 
     The cryrand.cal library has been modified to use the builtin
     rand() number generator.  The output of this generator is
-    different from pervious versions of this generator because
+    different from previous versions of this generator because
     the rand() builtin does not match the additive 55 / shuffle
     generators from the old cryrand.cal file.
 
@@ -5078,8 +5446,8 @@ The following are the changes from calc version 2.9.2 to 2.9.3t7:
 
 	1/4 < sup(abs(appr(x,e) - x))/e	 <= 1/2.
 
-    Here 'sup' denotes the supremum or least upper bound over values of x.
-    Previousld calc did: 1/4 <= sup(abs(appr(x,e) - x))/e  < 1.
+    Here 'sup' denotes the least upper bound over values of x (supremum).
+    Previously calc did: 1/4 <= sup(abs(appr(x,e) - x))/e  < 1.
 
     Certain 64 bit processors such as the Alpha are now supported.
 
@@ -5267,8 +5635,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1:
     easily extracted and used in other programs.
 
     Two new library files have been added: chrem.cal and cryrand.cal.
-    The first of these solves the chinese remainder problem for a set
-    of modulos and remainders.	The second of these implements several
+    The first of these solves the Chinese remainder problem for a set
+    of modulo's and remainders.	The second of these implements several
     very good random number generators for large numbers.
 
     A small bug which allowed division by zero was fixed.
@@ -5298,8 +5666,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.33 $
-## @(#) $Id: CHANGES,v 29.33 2001/05/29 00:44:57 chongo Exp $
+## @(#) $Revision: 29.64 $
+## @(#) $Id: CHANGES,v 29.64 2004/02/23 10:57:46 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $
 ##
 ## Under source code control:	1993/06/02 18:12:57

COPYING

@@ -12,8 +12,8 @@ This file is Copyrighted
 	Everyone is permitted to copy and distribute verbatim copies
 	of this license document, but changing it is not allowed.
 
-    # @(#) $Revision: 29.5 $
-    # @(#) $Id: COPYING,v 29.5 2000/12/18 10:22:55 chongo Exp $
+    # @(#) $Revision: 29.7 $
+    # @(#) $Id: COPYING,v 29.7 2003/02/26 16:54:59 chongo Exp $
     # @(#) $Source: /usr/local/src/cmd/calc/RCS/COPYING,v $
 
 =-=
@@ -55,13 +55,18 @@ Calc is covered by the GNU Lesser General Public License
 
     The contact addresses for calc is as follows:
 
-	Web:	http://www.isthe.com/chongo/tech/comp/calc/index.html
-	EMail:	calc-contrib at asthe dot com
+	Web:	http://www.isthe.com/chongo/tech/comp/calc/email.html
 
-    To join the calc-tester mailing list.  Send a request to:
+    To join the low volume calc mailing list.  Send a EMail message to:
 
 	calc-tester-request at asthe dot com
 
+    Your subject must contain the words:
+
+	calc mailing list subscription
+
+    You may have additional words in your subject line.
+
     Your message body (not the subject) should consist of:
 
 	 subscribe calc-tester address
@@ -71,13 +76,23 @@ Calc is covered by the GNU Lesser General Public License
     where ``address'' is your EMail address and ``your_full_name'' is
     your full name.
 
-    Calc bug reports, however should be sent to:
+    Feel free to follow the name line with additional EMail text as desired.
+
+=-=
+
+    Calc bug reports and calc bug fixes should be sent to:
 
 	calc-bugs at asthe dot com
 
     [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
     [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
 
+    Your subject must contain the words:
+
+	   calc bug report
+
+    You may have additional words in your subject line.
+
 =-=
 
 Calc's relationship to the GNU Lesser General Public License
@@ -149,6 +164,7 @@ Calc copyrights and exception files
 	Copyright (C) year  Landon Curt Noll
 	Copyright (C) year  Ernest Bowen and Landon Curt Noll
 	Copyright (C) year  Ernest Bowen
+	Copyright (C) year  Petteri Kettunen and Landon Curt Noll
 
     These files are not covered under one of the Copyrights listed above:
 

HOWTO.INSTALL

@@ -1,8 +1,94 @@
-Installing calc in 4 easy steps:
+Installing calc from the gziped tarball in 4 easy steps:
+
+    0)  If your platform supports i686 RPMs, you may want to go to:
+
+	    http://www.isthe.com/chongo/src/calc/
+
+	and use these RPMs:
+
+	    * calc*.i686.rpm
+		- all that is needed if you just want to use calc
+
+	    * calc-devel-*.i686.rpm
+	        - calc *.h header and *.a lib files for use in other programs
+
+	    * calc.*.src.rpm
+	        - calc source in RPM package form
+
+	The following 4 steps apply to calc source tree that comes from either:
+
+		gunzip -c calc-*.tar.gz | tar -xvf -
+
+	or from:
+
+		rpm -ivh calc-*.src.rpm
+		cd /var/tmp
+		gunzip -c /usr/src/redhat/SOURCES/calc-*.tar.gz | tar -xvf -
 
     1)	Look at the makefile, and adjust it to suit your needs.
 
-       Here are some Makefile hints:
+	The Makefile, as shipped, is suitable for installation under
+	Linux and Un*x-like environments.  For the most part, the default
+	values should work.  If in doubt, follow the 'When in doubt'
+	suggestion.
+
+	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	! If you are building under Windoz or a Windoz-like environment !
+	! (such as Cygwin or DJGPP), read the README.WINDOWS file.      !
+	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+	You should determine if these Makefile variables are reasonable:
+
+	    INCDIR		Where the system include (.h) files are kept.
+	    BINDIR		Where to install calc binary files.
+	    LIBDIR		Where to install calc link library (*.a) files.
+	    CALC_SHAREDIR	Where to install calc help, .cal, startup, and
+	    			config files.
+
+	You may want to change the default installation locations for
+	these values, which are based on the 4 values listed above:
+
+	    HELPDIR            where the help directory is installed
+	    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
+	    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
+	    to install calc somewhere other than into the system area.
+
+	    For example, if:
+
+	    	BINDIR= /usr/bin
+		LIBDIR= /usr/lib
+		CALC_SHAREDIR= /usr/share/calc
+
+	    and if:
+
+	    	T= /var/tmp/testing
+
+	    Then the installation locations will be:
+
+		calc binary files:	/var/tmp/testing/usr/bin
+		calc link library:	/var/tmp/testing/usr/lib
+		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.
+
+	Look for the section that starts:
+
+	    ################
+	    # compiler set #
+	    ################
 
 	    Select a compiler set by commenting in the appropriate set
 	    of cc options.  As shipped the Makefile assumes a gcc-like
@@ -10,21 +96,31 @@ Installing calc in 4 easy steps:
 	    found below, comment out the Linux set and comment in that
 	    set or edit the gcc set or the common cc set as needed.
 
+	You may want to change these Makrfile variables from their defaults:
+
+	    RANLIB
+
 		You may or may not need RANLIB when building libraries.
 		As shipped the Makefile assumes RANLIB is needed.
 		Comment the in/out the RANLIB value if ranlib does
 		not work or does not exist.
 
+	    CALCPAGER
+
 		You may want to change the default pager used by calc.
 		As shipped the Makefile assumes 'more'.  On your system
 		you may find 'less' to be a better pager.
 
-	   Set TOPDIR to be the place under which help files, calc,
-	   include files and calc libs are to be installed.  As shipped
-	   the Makefile assumes a TOPDIR of /usr/local/lib.
+	    DEBUG
 
-	   Set BINDIR to the place where calc is installed.  As shipped
-	   the Makefile assumes a BINDIR /usr/local/bin.
+	       Some compilers (to put it mildly) have bugs.  Sometimes the
+	       DEBUG Makefile variable causes the compiler / optimizer to
+	       produce bad code.  Other compilers do just fine.
+
+	       If possible try to use DEBUG=-O3 -g3 (maximum optimization
+	       and debug symbols).  If the calc test fails (see step 3),
+	       try lowering either the -O value and/or the -g3.  Also try
+	       using -Osomething without -g.
 
 	   Adjust other Makefile variables as needed.
 
@@ -40,7 +136,8 @@ Installing calc in 4 easy steps:
 
 	make check
 
-	==> If you run into problems, follow the BUGS file instructions.
+	==> If you run into problems, read the BUGS file and follow
+	    the instructions found in there.
 
     4)	install calc:
 
@@ -65,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.2 $
-## @(#) $Id: HOWTO.INSTALL,v 29.2 2000/06/07 14:02:13 chongo Exp $
+## @(#) $Revision: 29.7 $
+## @(#) $Id: HOWTO.INSTALL,v 29.7 2003/04/15 03:38:34 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/HOWTO.INSTALL,v $
 ##
 ## Under source code control:	1999/09/27 20:48:44

LIBRARY

@@ -48,12 +48,30 @@ convenient for outside use.  So you should read the source for a routine
 to see if it really does what you think it does.  I won't guarantee that
 obscure internal routines won't change or disappear in future releases!
 
-When calc is installed, all of the include files needed to build
-libcalc.a along with the link library itself are installed into ${LIBDIR}.
+When calc is installed, all of libraries are installed into ${LIBDIR}.
+All of the calc header files are installed under ${INCDIRCALC}.
+
+If CALC_SRC is defined, then the calc header files will assume that
+they are in or under the current directory.  However, most external
+programs most likely will not be located under calc'c source tree.
+External programs most likely want to use the installed calc header
+files under ${INCDIRCALC}.  External programs most likely NOT want
+to define CALC_SRC.
 
 External programs may want to compile with:
 
-	-I${LIBDIR} -L${LIBDIR} -lcalc
+	-L${LIBDIR} -lcalc
+
+If custom functions are also used, they may want to compile with:
+
+	-L${LIBDIR} -lcalc -lcustcalc
+
+The CALC_SRC symbol should NOT be defined by default.  However if you are
+feeling pedantic you may want to force CALC_SRC to be undefined:
+
+	-UCALC_SRC
+
+as well.
 
 --------------
 ERROR HANDLING
@@ -471,8 +489,8 @@ need call libcalc_call_me_last() only once.
 ## 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: LIBRARY,v 29.2 2000/06/07 14:02:13 chongo Exp $
+## @(#) $Revision: 29.5 $
+## @(#) $Id: LIBRARY,v 29.5 2001/06/08 22:57:35 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/LIBRARY,v $
 ##
 ## Under source code control:	1993/07/30 19:44:49

README

@@ -73,13 +73,19 @@ for a wish/todo list.  Code contributions are welcome.
 
 =-=
 
-To join the calc-tester mailing list.  Send a request to:
+To join the calc-tester mailing list.  Send an EMail message to:
 
     calc-tester-request at asthe dot com
 
     [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
     [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
 
+Your subject must contain the words:
+
+    calc mailing list subscription
+
+You may have additional words in your subject line.
+
 Your message body (not the subject) should consist of:
 
      subscribe calc-tester address
@@ -89,7 +95,11 @@ Your message body (not the subject) should consist of:
 where ``address'' is your EMail address and ``your_full_name'' is
 your full name.
 
-Calc bug reports, however should be sent to:
+Feel free to follow the name line with additional EMail text as desired.
+
+=-=
+
+Send Calc bug and bug fixes to:
 
     calc-bugs at asthe dot com
 
@@ -98,6 +108,12 @@ Calc bug reports, however should be sent to:
 
 but see the BUGS file first.
 
+Your subject must contain the words:
+
+       calc bug report
+
+You may have additional words in your subject line.
+
 The calc web site is located at:
 
 	http://www.isthe.com/chongo/tech/comp/calc/
@@ -118,8 +134,8 @@ The calc web site is located at:
 ## 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: README,v 29.2 2000/06/07 14:02:13 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: README,v 29.3 2001/06/01 11:26:53 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/README,v $
 ##
 ## Under source code control:	1995/10/25 05:27:59

README.WINDOWS

@@ -3,15 +3,6 @@ Dear calc user on a Windoz based system,
 See the HOWTO.INSTALL file for information on how to build and install calc.
 See also the README file.
 
-NOTE: The Windoz port is extremely experimental, untested and perhaps
-      incomplete.  We are in the process of making it easier.  The
-      following should help anyone who is trying to make a go of this
-      under the current code conditions.
-
-NOTE: We are currently ONLY making an effort to support building under
-      Windoz using the Cygwin project (http://sources.redhat.com/cygwin/)
-      with the GCC compiler and Un*x tools for Windows.
-
 NOTE: The main developers do not have access to a Windoz based platform.
       While we will make an effort to not break calc Windoz based system,
       our lack of a Windoz test environment will mean we will make mistakes
@@ -19,7 +10,68 @@ NOTE: The main developers do not have access to a Windoz based platform.
       Of course you are welcome to send us any patches that fix your
       Windoz build environment.
 
-=-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+=-= compiling under DJGPP =-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+You might want to try using the DJGPP system to compile calc.  See:
+
+	http://www.delorie.com/djgpp/
+
+for DJGPP details and availability.
+
+To compile with DJGPP, one needs to select a number of Makefile
+variable changes.  Eli Zaretskii <eliz at is dot elta dot co dot il>
+recommends the following settings:
+
+	TERMCONTROL= -DUSE_TERMIOS
+	BYTE_ORDER= -DLITTLE_ENDIAN
+	LONG_BITS= 32
+	LONGLONG_BITS= 64
+	HAVE_FPOS_POS= -DHAVE_NO_FPOS_POS
+	FPOS_BITS= 32
+	OFF_T_BITS= 32
+	DEV_BITS= 32
+	INODE_BITS= 32
+	HAVE_USTAT= -DHAVE_NO_USTAT
+	HAVE_GETSID= -DHAVE_NO_GETSID
+	HAVE_GETPGID= -DHAVE_NO_GETPGID
+	HAVE_GETTIME= -DHAVE_NO_GETTIME
+	HAVE_GETPRID= -DHAVE_NO_GETPRID
+	HAVE_URANDOM_H= NO
+	ALIGN32= -UMUST_ALIGN32
+	HAVE_MALLOC_H= YES
+	HAVE_STDLIB_H= YES
+	HAVE_STRING_H= YES
+	HAVE_TIMES_H= NO
+	HAVE_SYS_TIMES_H= YES
+	HAVE_TIME_H= YES
+	HAVE_SYS_TIME_H= YES
+	HAVE_UNISTD_H= YES
+	BINDIR= /dev/env/DJDIR/bin
+	INCDIR= /dev/env/DJDIR/include
+	LIBDIR= /dev/env/DJDIR/lib
+	MANDIR= /dev/env/DJDIR/man/man1
+	CATDIR= /dev/env/DJDIR/man/cat1
+	NROFF= groff
+	CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR}
+	CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
+	CALCPAGER= less.exe -ci
+	DEBUG= -O2 -gstabs+
+
+The 'Linux set' or 'gcc set' (see the Select your compiler type section)
+should work for DJGPP systems if you set the above Makefile variables.
+
+Look for Makefile comments of the form:
+
+	# Select ...something... for DJGPP.
+
+Follow those recommendations.  In cases where they conflict with
+the above Makefile list, follow the recommendation in the Makefile.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+=-= compiling with Cygwin =-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 An effort is being made to allow windows users to compile calc using the
 Cygwin project (http://sources.redhat.com/cygwin/) with the GCC compiler
@@ -61,8 +113,6 @@ needs.  Just copy the win32/*.[ch] files up into the top level calc
 source directory, edited (if needed) and build using the Cygwin GCC
 compiler.
 
-=-=
-
 People who maintain calc need to keep in mind the following:
 
 The following was added to opcodes.h, config.h, zmath.h and value.h:
@@ -89,7 +139,7 @@ was changed to:
     DLL extern int configtype(char*);
 
 
-## Copyright (C) 2001  Landon Curt Noll and Thomas Jones-Low
+## Copyright (C) 2002  Landon Curt Noll and Thomas Jones-Low
 ##
 ## 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
@@ -105,8 +155,8 @@ was changed to:
 ## 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: README.WINDOWS,v 29.6 2001/04/08 22:13:38 chongo Exp $
+## @(#) $Revision: 29.8 $
+## @(#) $Id: README.WINDOWS,v 29.8 2002/03/14 00:28:28 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/README.WINDOWS,v $
 ##
 ## Under source code control:	2001/02/25 14:00:05

addop.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.3 $
- * @(#) $Id: addop.c,v 29.3 2000/07/17 15:35:49 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: addop.c,v 29.4 2004/02/23 07:25:16 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/addop.c,v $
  *
  * Under source code control:	1990/02/15 01:48:10
@@ -44,7 +44,7 @@
 #define OPCODEALLOCSIZE 100	/* reallocate size for opcodes in functions */
 
 
-static long maxopcodes;		/* number of opcodes available */
+static unsigned long maxopcodes;/* number of opcodes available */
 static long newindex;		/* index of new function */
 static char *newname;		/* name of new function */
 static long oldop;		/* previous opcode */
@@ -185,7 +185,7 @@ endfunc(void)
 {
 	register FUNC *fp;		/* function just finished */
 	unsigned long size;		/* size of just created function */
-	long index;
+	unsigned long index;
 
 	if (oldop != OP_RETURN) {
 		addop(OP_UNDEF);
@@ -302,7 +302,7 @@ void
 freefunc(FUNC *fp)
 {
 	long index;
-	long i;
+	unsigned long i;
 
 	if (fp == NULL)
 		return;
@@ -383,7 +383,7 @@ clearopt(void)
 FUNC *
 findfunc(long index)
 {
-	if ((unsigned long) index >= funccount) {
+	if (index >= funccount) {
 		math_error("Undefined function");
 		/*NOTREACHED*/
 	}

alloc.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.3 $
- * @(#) $Id: alloc.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: alloc.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/alloc.h,v $
  *
  * Under source code control:	1990/02/15 01:48:29
@@ -32,7 +32,7 @@
 #define __ALLOC_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "have_malloc.h"
 # include "have_newstr.h"
 # include "have_string.h"

blkcpy.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.3 $
- * @(#) $Id: blkcpy.c,v 29.3 2001/04/10 22:06:46 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: blkcpy.c,v 29.4 2004/02/23 07:47:31 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/blkcpy.c,v $
  *
  * Under source code control:	1997/04/18 20:41:26
@@ -287,13 +287,13 @@ copymat2mat(MATRIX *smat, long ssi, long num, MATRIX *dmat, long dsi)
 
 	if (num < 0)
 		num = smat->m_size - ssi;
-	if ((USB32) ssi + num > smat->m_size)
+	if (ssi + num > smat->m_size)
 		return E_COPY5;
 	if (num == 0)
 		return 0;
 	if (dsi < 0)
 		dsi = 0;
-	if ((USB32) dsi + num > dmat->m_size)
+	if (dsi + num > dmat->m_size)
 		return E_COPY7;
 	vtemp = (VALUE *) malloc(num * sizeof(VALUE));
 	if (vtemp == NULL) {
@@ -335,13 +335,13 @@ copyblk2mat(BLOCK *blk, long ssi, long num, MATRIX *dmat, long dsi)
 		return E_COPY2;
 	if (num < 0)
 		num = blk->datalen - ssi;
-	if ((USB32) ssi + num > blk->datalen)
+	if (ssi + num > blk->datalen)
 		return E_COPY5;
 	if (num == 0)
 		return 0;
 	if (dsi < 0)
 		dsi = 0;
-	if ((USB32) dsi + num > dmat->m_size)
+	if (dsi + num > dmat->m_size)
 		return E_COPY7;
 	op = blk->data + ssi;
 	vtemp = (VALUE *) malloc(num * sizeof(VALUE));
@@ -389,7 +389,7 @@ copymat2blk(MATRIX *smat, long ssi, long num, BLOCK *dblk, long dsi, BOOL norelo
 		num = smat->m_size - ssi;
 	if (num == 0)
 		return 0;
-	if ((USB32) ssi + num > smat->m_size)
+	if (ssi + num > smat->m_size)
 		return E_COPY5;
 	if (dsi < 0)
 		dsi = dblk->datalen;
@@ -436,11 +436,11 @@ copymat2list(MATRIX *smat, long ssi, long num, LIST *lp, long dsi)
 		num = smat->m_size - ssi;
 	if (num == 0)
 		return 0;
-	if ((USB32) ssi + num > smat->m_size)
+	if (ssi + num > smat->m_size)
 		return E_COPY5;
 	if (dsi < 0)
 		dsi = 0;
-	if ((USB32) dsi + num > lp->l_count)
+	if (dsi + num > lp->l_count)
 		return E_COPY7;
 	vtemp = (VALUE *) malloc(num * sizeof(VALUE));
 	if (vtemp == NULL) {
@@ -484,11 +484,11 @@ copylist2mat(LIST *lp, long ssi, long num, MATRIX *dmat, long dsi)
 		num = lp->l_count - ssi;
 	if (num == 0)
 		return 0;
-	if ((USB32) ssi + num > lp->l_count)
+	if (ssi + num > lp->l_count)
 		return E_COPY5;
 	if (dsi < 0)
 		dsi = 0;
-	if ((USB32) dsi + num > dmat->m_size)
+	if (dsi + num > dmat->m_size)
 		return E_COPY7;
 	vtemp = (VALUE *) malloc(num * sizeof(VALUE));
 	if (vtemp == NULL) {
@@ -533,11 +533,11 @@ copylist2list(LIST *slp, long ssi, long num, LIST *dlp, long dsi)
 		num = slp->l_count - ssi;
 	if (num == 0)
 		return 0;
-	if ((USB32) ssi + num > slp->l_count)
+	if (ssi + num > slp->l_count)
 		return E_COPY5;
 	if (dsi < 0)
 		dsi = 0;
-	if ((USB32) dsi + num > dlp->l_count)
+	if (dsi + num > dlp->l_count)
 		return E_COPY7;
 	vtemp = (VALUE *) malloc(num * sizeof(VALUE));
 	if (vtemp == NULL) {
@@ -572,7 +572,7 @@ copyblk2file(BLOCK *sblk, long ssi, long num, FILEID id, long dsi)
 {
 	FILEIO	*fiop;
 	FILE	*fp;
-	unsigned int	numw;
+	long	numw;
 
 	if (ssi > sblk->datalen)
 		return E_COPY2;
@@ -609,7 +609,7 @@ copyfile2blk(FILEID id, long ssi, long num, BLOCK *dblk, long dsi, BOOL noreloc)
 {
 	FILEIO	*fiop;
 	FILE	*fp;
-	unsigned int	numw;
+	long	numw;
 	ZVALUE	fsize;
 	long	filelen;
 	long	newlen;
@@ -639,7 +639,7 @@ copyfile2blk(FILEID id, long ssi, long num, BLOCK *dblk, long dsi, BOOL noreloc)
 		num = filelen - ssi;
 	if (num == 0)
 		return 0;
-	if ((USB32) ssi + num > filelen)
+	if (ssi + num > filelen)
 		return E_COPY5;
 	if (fseek(fp, ssi, 0))		/* using system fseek  XXX */
 		return E_COPYF2;
@@ -677,7 +677,7 @@ copystr2file(STRING *str, long ssi, long num, FILEID id, long dsi)
 {
 	long len;
 	FILEIO *fiop;
-	unsigned int numw;
+	long numw;
 	FILE *fp;
 
 	len = str->s_len;
@@ -688,7 +688,7 @@ copystr2file(STRING *str, long ssi, long num, FILEID id, long dsi)
 		num = len - ssi;
 	if (num <= 0)			/* Nothing to be copied */
 		return 0;
-	if ((USB32) ssi + num > len)
+	if (ssi + num > len)
 		return E_COPY5;		/* Insufficient memory in str */
 	fiop = findid(id, TRUE);
 	if (fiop == NULL)
@@ -726,7 +726,7 @@ copyblk2blk(BLOCK *sblk, long ssi, long num, BLOCK *dblk, long dsi, BOOL noreloc
 		num = sblk->datalen - ssi;
 	if (num == 0)			/* Nothing to be copied */
 		return 0;
-	if ((unsigned int) ssi + num > sblk->datalen)
+	if (ssi + num > sblk->datalen)
 		return E_COPY5;
 	if (dsi < 0)
 		dsi = dblk->datalen;
@@ -888,7 +888,7 @@ copyostr2blk(char *str,long ssi,long num,BLOCK *dblk,long dsi,BOOL noreloc)
 
 	if (ssi > len)
 		return E_COPY2;
-	if (num < 0 || (unsigned long) ssi + num > len)
+	if (num < 0 || ssi + num > len)
 		num = len - ssi;
 	if (num <= 0)			/* Nothing to be copied */
 		return 0;
@@ -991,7 +991,7 @@ copynum2blk(NUMBER *snum, long ssi, long num, BLOCK *dblk, long dsi, BOOL norelo
 		num = snum->num.len - ssi;
 	if (num == 0)			/* Nothing to be copied */
 		return 0;
-	if ((unsigned long) ssi + num > snum->num.len)
+	if (ssi + num > snum->num.len)
 		return E_COPY5;
 	if (dsi < 0)
 		dsi = dblk->datalen;
@@ -1044,7 +1044,7 @@ copyblk2num(BLOCK *sblk, long ssi, long num, NUMBER *dnum, long dsi, NUMBER **re
 		num = sblk->datalen - ssi;
 	if (num == 0)			/* Nothing to be copied */
 		return 0;
-	if ((unsigned long) ssi + num > sblk->datalen)
+	if (ssi + num > sblk->datalen)
 		return E_COPY5;
 	if (dsi < 0)
 		dsi = dnum->num.len;

byteswap.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.3 $
- * @(#) $Id: byteswap.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: byteswap.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/byteswap.h,v $
  *
  * Under source code control:	1995/10/11 04:44:01
@@ -33,7 +33,7 @@
 #define __BYTESWAP_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "longbits.h"
 #else
 # include <calc/longbits.h>

cal/Makefile

@@ -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.9 $
-# @(#) $Id: Makefile,v 29.9 2001/05/28 21:56:08 chongo Exp $
+# @(#) $Revision: 29.15 $
+# @(#) $Id: Makefile,v 29.15 2003/01/05 08:10:56 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/21 05:00:54
@@ -36,16 +36,120 @@
 SHELL = /bin/sh
 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.
-#
-# where to install things
-#SHAREDIR= /usr/local/lib
-#SHAREDIR= /usr/lib
-SHAREDIR= /usr/share
-#SHAREDIR= /usr/libdata
+####
 
-CSHAREDIR= ${SHAREDIR}/calc
+# Where the system include (.h) files are kept
+#
+# For DJGPP, select:
+#
+#	INCDIR= /dev/env/DJDIR/include
+#
+# If in doubt, set:
+#
+#	INCDIR= /usr/include
+#
+
+#INCDIR= /usr/local/include
+#INCDIR= /dev/env/DJDIR/include
+INCDIR= /usr/include
+
+# where to install calc realted things
+#
+# ${BINDIR}		where to install calc binary files
+# ${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.
+#
+# For DJGPP, select:
+#
+#	BINDIR= /dev/env/DJDIR/bin
+#	LIBDIR= /dev/env/DJDIR/lib
+#	CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+#
+# If in doubt, set:
+#
+#	BINDIR= /usr/bin
+#	LIBDIR= /usr/lib
+#	CALC_SHAREDIR= /usr/share/calc
+#
+#BINDIR= /usr/local/bin
+#BINDIR= /dev/env/DJDIR/bin
+BINDIR= /usr/bin
+
+#LIBDIR= /usr/local/lib
+#LIBDIR= /dev/env/DJDIR/lib
+LIBDIR= /usr/lib
+
+#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+CALC_SHAREDIR= /usr/share/calc
+
+# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
+# ---------------------------------------------------------------
+# ${HELPDIR}		where the help directory is installed
+# ${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
+# ${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.
+#
+# If in doubt, set:
+#
+#	HELPDIR= ${CALC_SHAREDIR}/help
+#	CALC_INCDIR= ${INCDIR}/calc
+#	CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+#	CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+#	CUSTOMINCDIR= ${CALC_INCDIR}/custom
+#	SCRIPTDIR= ${BINDIR}/cscript
+#
+HELPDIR= ${CALC_SHAREDIR}/help
+CALC_INCDIR= ${INCDIR}/calc
+CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+CUSTOMINCDIR= ${CALC_INCDIR}/custom
+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
+# to install calc somewhere other than into the system area.
+#
+# For example, if:
+#
+#     BINDIR= /usr/bin
+#     LIBDIR= /usr/lib
+#     CALC_SHAREDIR= /usr/share/calc
+#
+# and if:
+#
+#     T= /var/tmp/testing
+#
+# Then the installation locations will be:
+#
+#     calc binary files:	/var/tmp/testing/usr/bin
+#     calc link library:	/var/tmp/testing/usr/lib
+#     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 in doubt, use T=
+#
+T=
 
 # Makefile debug
 #
@@ -71,8 +175,8 @@ CALC_FILES= README bigprime.cal deg.cal ellip.cal lucas.cal lucas_chk.cal \
 	test2700.cal test3100.cal test3300.cal test3400.cal prompt.cal \
 	test3500.cal seedrandom.cal test4000.cal test4100.cal test4600.cal \
 	beer.cal hello.cal test5100.cal test5200.cal randombitrun.cal \
-	randomrun.cal xx_print.cal natnumset.cal qtime.cal test8400.cal \
-	test8500.cal test8600.cal chi.cal intfile.cal
+	randomrun.cal repeat.cal xx_print.cal natnumset.cal qtime.cal \
+	test8400.cal test8500.cal test8600.cal chi.cal intfile.cal
 
 # These files are found (but not built) in the distribution
 #
@@ -104,8 +208,10 @@ all: ${CALC_FILES} ${MAKE_FILE} .all
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST}; do \
+	${Q}for i in ${DISTLIST} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo cal/$$i; \
+	    fi; \
 	done
 
 distdir:
@@ -124,12 +230,11 @@ calcliblist:
 #
 ##
 
-echo_CALC_FILES: ${MAKE_FILE}
-	@echo ${CALC_FILES}
-
-echo_install.list: ${MAKE_FILE}
-	@for i in ${CALC_FILES}; do \
-	    echo ${CSHAREDIR}/$$i; \
+echo_inst_files:
+	${Q}for i in ${CALC_FILES} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo __file__ ${CALC_SHAREDIR}/$$i; \
+	    fi; \
 	done
 
 ##
@@ -144,30 +249,29 @@ clobber:
 	rm -f .all
 
 install: all
-	-${Q}if [ ! -d ${SHAREDIR} ]; then \
-		echo mkdir ${SHAREDIR}; \
-		mkdir ${SHAREDIR}; \
-		echo ${CHMOD} 0755 ${SHAREDIR}; \
-		${CHMOD} 0755 ${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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${CSHAREDIR} ]; then \
-		echo mkdir ${CSHAREDIR}; \
-		mkdir ${CSHAREDIR}; \
-		echo ${CHMOD} 0755 ${CSHAREDIR}; \
-		${CHMOD} 0755 ${CSHAREDIR}; \
-	else \
-	    true; \
-	fi
-	${Q}for i in ${CALC_FILES}; do \
-	    if ${CMP} -s $$i ${CSHAREDIR}/$$i; then \
+	${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; \
 	    else \
-		rm -f ${CSHAREDIR}/$$i.new; \
-		cp -f $$i ${CSHAREDIR}/$$i.new; \
-		${CHMOD} 0444 ${CSHAREDIR}/$$i.new; \
-		mv -f ${CSHAREDIR}/$$i.new ${CSHAREDIR}/$$i; \
-		echo "installed ${CSHAREDIR}/$$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

cal/README

@@ -480,6 +480,16 @@ randrun.cal
 
     This tests the a55 generator.
 
+repeat.cal
+
+    repeat(digit_set, repeat_count)
+
+    Return the value of the digit_set repeated repeat_count times.
+    Both digit_set and repeat_count must be integers > 0.
+
+    For example repeat(423,5) returns the value 423423423423423,
+    which is the digit_set 423 repeated 5 times.
+
 
 regress.cal
 
@@ -815,8 +825,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.8 $
-## @(#) $Id: README,v 29.8 2001/03/31 16:26:23 chongo Exp $
+## @(#) $Revision: 29.9 $
+## @(#) $Id: README,v 29.9 2003/01/05 08:10:56 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/README,v $
 ##
 ## Under source code control:	1990/02/15 01:50:32

cal/deg.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: deg.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: deg.cal,v 29.4 2003/01/26 19:32:41 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/deg.cal,v $
  *
  * Under source code control:	1990/02/15 01:50:33
@@ -42,7 +42,7 @@ define dms(deg, min, sec)
 	ans.deg = deg;
 	ans.min = min;
 	ans.sec = sec;
-	fixdms(&ans);
+	fixdms(ans);
 	return ans;
 }
 
@@ -66,7 +66,7 @@ define dms_add(a, b)
 		ans.sec += b.sec;
 	} else
 		ans.deg += b;
-	fixdms(&ans);
+	fixdms(ans);
 	return ans;
 }
 
@@ -75,9 +75,9 @@ define dms_neg(a)
 {
 	local obj dms	ans;
 
-	ans.deg = -ans.deg;
-	ans.min = -ans.min;
-	ans.sec = -ans.sec;
+	ans.deg = -a.deg;
+	ans.min = -a.min;
+	ans.sec = -a.sec;
 	return ans;
 }
 
@@ -103,7 +103,7 @@ define dms_mul(a, b)
 		ans.min = b.min * a;
 		ans.sec = b.sec * a;
 	}
-	fixdms(&ans);
+	fixdms(ans);
 	return ans;
 }
 

cal/lucas.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.3 $
- * @(#) $Id: lucas.cal,v 29.3 2001/03/31 13:31:34 chongo Exp $
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: lucas.cal,v 29.6 2002/07/10 09:43:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/lucas.cal,v $
  *
  * Under source code control:	1990/05/03 16:49:51
@@ -28,6 +28,16 @@
  * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
  */
 
+/*
+ * NOTE: This is a standard calc resource file.  For information on calc see:
+ *
+ *	http://www.isthe.com/chongo/tech/comp/calc/index.html
+ *
+ * To obtain your own copy of calc, see:
+ *
+ *	http://www.isthe.com/chongo/tech/comp/calc/calc-download.html
+ */
+
 /*
  * HISTORICAL NOTE:
  *
@@ -52,12 +62,19 @@
  *
  * At the time of discovery, this was the largest known twin prime pair.
  *
+ * See:
+ *
+ *	http://www.isthe.com/chongo/tech/math/prime/amdahl6.html
+ *
+ * for more information on the Amdahl 6 group.
+ *
  * NOTE: Both largest known and largest known twin prime records have been
  *	 broken.  Rather than update this file each time, I'll just
  *	 congratulate the finders and encourage others to try for
  *	 larger finds.	Records were made to be broken afterall!
- *
- * ON GAINING A WORLD RECORD:
+ */
+
+/* ON GAINING A WORLD RECORD:
  *
  * The routines in calc were designed to be portable, and to work on
  * numbers of 'sane' size.  The Amdahl 6 team used a 'ultra-high speed
@@ -73,7 +90,7 @@
  *
  *	test numbers of the form h*2^n-1
  *	fix a value of n and vary the value h
- *	n mod 128 == 0
+ *	n mod 2^x == 0  for some value of x, say > 7 or more
  *	h*2^n-1 is not divisible by any small prime < 2^40
  *	0 < h < 2^39
  *	h*2^n+1 is not divisible by any small prime < 2^40

cal/pi.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: pi.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: pi.cal,v 29.3 2004/02/23 06:06:38 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/pi.cal,v $
  *
  * Under source code control:	1991/05/22 21:56:37
@@ -61,7 +61,7 @@ define qpi(epsilon)
 	yn = sqrt2 - 1;
 	an = 6 - 4 * sqrt2;
 	tn = 2;
-	for (count = 0; count < niter; count++) {
+	for (count = 0; count < niter; ++count) {
 		ym = yn;
 		am = an;
 		tn *= 4;
@@ -104,7 +104,8 @@ define piforever()
 		* Next approximation
 		*/
 		p = k * k;
-		q = k + k++;
+		q = k << 1;
+		++k;
 
 		a2 = a;
 		b2 = b;

cal/regress.cal

@@ -1,7 +1,7 @@
 /*
  * regress - calc regression and correctness test suite
  *
- * Copyright (C) 1999  David I. Bell
+ * Copyright (C) 1999-2003  David I. Bell and 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.10 $
- * @(#) $Id: regress.cal,v 29.10 2001/04/14 22:53:57 chongo Exp $
+ * @(#) $Revision: 29.18 $
+ * @(#) $Id: regress.cal,v 29.18 2004/02/23 05:58:45 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/regress.cal,v $
  *
  * Under source code control:	1990/02/15 01:50:36
@@ -52,7 +52,8 @@ errmax(-1),;				/* prevent errcount from abouting */
 global ecnt;				/* expected value of errcount() */
 ecnt = 0;				/* clear expected errcount() value */
 
-initcfg = config("all", "oldstd");	/* set config to startup default */
+initcfg = config("all", "newstd");	/* set config to startup default */
+defcfg = config("all");			/* capture the default config */
 config("resource_debug", 0),;		/* disable resource startup messages */
 config("calc_debug", 0),;		/* disable internal debugging */
 config("verbose_quit", 0),;		/* disable quit messages */
@@ -380,19 +381,19 @@ define test_config()
 	/* check the set and return of all config */
 	callcfg = config("all");
 	print				'501: callcfg = config("all")';
+	vrfy(callcfg == startcfg,	'502: callcfg == startcfg');
+
 	callcfg = config("all", "oldstd");
-	print				'502: callcfg = config("all","oldstd")';
-	oldcfg = config("all", "newstd");
-	print				'503: oldcfg = config("all","newstd")';
+	print				'503: callcfg = config("all","oldstd")';
 	vrfy(callcfg == startcfg,	'504: callcfg == startcfg');
-	newcfg = config("all");
-	print				'505: newcfg = config("all")';
-	vrfy(config("all") == newcfg,	'506: config("all") == newcfg');
-	vrfy(config("all", oldcfg) == newcfg,
-					'507: config("all", oldcfg) == newcfg');
+	oldcfg = config("all");
+	print				'505: oldcfg = config("all");';
+	vrfy(config("all") == oldcfg,	'506: config("all") == oldcfg');
+	vrfy(oldcfg==config("all","newstd"),
+					'507: oldcfg==config("all","newstd")');
+	vrfy(defcfg == config("all"),	'508: defcfg == config("all")');
 
 	/* vrfy the state of the default config */
-	vrfy(config("all") == oldcfg,	'508: config("all") == oldcfg');
 	vrfy(config("mode") == "real",
 					'509: config("mode") == "real"');
 	vrfy(config("display") == 20,
@@ -429,58 +430,59 @@ define test_config()
 					'525: config("cfappr") == 0');
 	vrfy(config("cfsim") == 8,
 					'526: config("cfsim") == 8');
-	vrfy(config("outround") == 2,
-					'527: config("outround") == 2');
+	vrfy(config("outround") == 24,
+					'527: config("outround") == 24');
 	vrfy(config("round") == 24,
 					'528: config("round") == 24');
-	vrfy(config("leadzero") == 0,
-					'529: config("leadzero") == 0');
+	vrfy(config("leadzero") == 1,
+					'529: config("leadzero") == 1');
 	vrfy(config("fullzero") == 0,
 					'530: config("fullzero") == 0');
 	vrfy(config("maxscan") == 20,
 					'531: config("maxscan") == 20');
-	vrfy(config("prompt") == "> ",
-					'532: config("prompt") == "> "');
-	vrfy(config("more") == ">> ",
-					'533: config("more") == ">> "');
+	vrfy(config("prompt") == "; ",
+					'532: config("prompt") == "; "');
+	vrfy(config("more") == ";; ",
+					'533: config("more") == ";; "');
 
-	/* convert to "newstd" config by individual changes */
-	vrfy(config("display", 10) == 20,
-					'534: config("display") == 20');
-	vrfy(config("epsilon",1e-10)==1e-20,
-					'535: config("epsilon",1e-10)==1e-20');
-	vrfy(config("quo", 0) == 2,	'536: config("quo", 0) == 2');
-	vrfy(config("outround", 24) == 2,
-					'537: config("outround", 24) == 2');
-	vrfy(config("leadzero","y") == 0,
-				'538: config("leadzero","y") == 0');
-	vrfy(config("fullzero", 1) == 0,
-				'539: config("fullzero", 1) == 0');
-	vrfy(config("prompt", "; ") == "> ",
-					'540: config("prompt", "; ") == "> "');
-	vrfy(config("more", ";; ") == ">> ",
-					'541: config("more", ";; ") == ">> "');
-	vrfy(config("all") == newcfg,	'542: config("all") == newcfg');
+	/* convert to "oldstd" config by individual changes */
+	print				'534: test unused';
+	vrfy(config("outround", 2) == 24,
+					'535: config("outround", 2) == 24');
+	vrfy(config("leadzero","n") == 1,
+					'536: config("leadzero","n") == 1');
+	print				'537: test unused';
+	vrfy(config("prompt", "> ") == "; ",
+					'538: config("prompt", "> ") == "; "');
+	vrfy(config("more", ">> ") == ";; ",
+					'539: config("more", ">> ") == ";; "');
+	vrfy(config("all") == oldcfg,	'540: config("all") == oldcfg');
 
-	/* check on the new config("fullzero") effect */
-	vrfy(config("all","oldstd") == newcfg,
-					'543: config("all",callcfg) == newcfg');
+	/* restore the configation at the start of this function */
+	vrfy(config("all",callcfg) == oldcfg,
+					'541: config("all",callcfg) == oldcfg');
+
+	/* display and fullzero tests */
 	vrfy(config("display",2) == 20,
-					'544: config("display",2) == 20');
+					'542: config("display",2) == 20');
+	vrfy(config("leadzero",0) == 1,
+					'543: config("leadzero",0) == 1');
 	vrfy(config("fullzero",1) == 0,
-					'545: config("fullzero",1) == 0');
+					'544: config("fullzero",1) == 0');
 	vrfy(strprintf("%d %d %d", 0, 1, 2) == ".00 1.00 2.00",
-		'546: strprintf("%d %d %d", 0, 1, 2) == ".00 1.00 2.00"');
+		'545: strprintf("%d %d %d", 0, 1, 2) == ".00 1.00 2.00"');
 	vrfy(config("display",20) == 2,
-					'547: config("display",20) == 2');
-	vrfy(config("fullzero",0),
-					'548: config("fullzero",0)');
+					'546: config("display",20) == 2');
+	vrfy(config("leadzero",1) == 0,
+					'547: config("leadzero",1) == 0');
+	vrfy(config("fullzero",0) == 1,
+					'548: config("fullzero",0) == 1');
 	vrfy(strprintf("%d %d %d", 0, 1, 2) == "0 1 2",
 		'549: strprintf("%d %d %d", 0, 1, 2) == "0 1 2"');
 
 	/* restore calling config */
-	vrfy(config("all",callcfg) == oldcfg,
-					'550: config("all",callcfg) == oldcfg');
+	vrfy(config("all",callcfg) == startcfg,
+		'550: config("all",callcfg) == startcfg');
 	vrfy(config("all") == callcfg,	'551: config("all") == callcfg');
 	vrfy(config("all") == startcfg, '552: config("all") == startcfg');
 
@@ -492,7 +494,11 @@ define test_config()
 	vrfy(strlen(config("version")) > 0,
 					'555: strlen(config("version")) > 0');
 
-	print '556: Ending test_config';
+	/* mode2 is off by default */
+	vrfy(config("mode2") == "off",
+					'556: config("mode2") == "off"');
+
+	print '557: Ending test_config';
 }
 print '010: parsed test_config()';
 
@@ -755,7 +761,7 @@ define test_functions()
 	vrfy(den(17) == 1,		'712: den(17) == 1');
 	vrfy(den(3/7) == 7,		'713: den(3/7) == 7');
 	vrfy(den(-2/3) == 3,		'714: den(-2/3) == 3');
-	vrfy(digits(0) == 0,		'715: digits(0) == 0');
+	vrfy(digits(0) == 1,		'715: digits(0) == 1');
 	vrfy(digits(9) == 1,		'716: digits(9) == 1');
 	vrfy(digits(10) == 2,		'717: digits(10) == 2');
 	vrfy(digits(-691) == 3,		'718: digits(-691) == 3');
@@ -996,9 +1002,9 @@ define test_functions()
 	vrfy(strpos(a, "abc") == 1,	'946: strpos(a, "abc") == 1');
 	vrfy(strpos(a, "xyz") == 0,	'947: strpos(a, "xyz") == 0');
 	vrfy(strpos(a, a) == 1,		'948: strpos(a, a) == 1');
-	if (config("windows")) {
-	    print '949: test skipped for windows systems';
-	    print '950: test skipped for windows systems';
+	if (config("windows") || config("cygwin")) {
+	    print '949: test skipped for windows or cygwin systems';
+	    print '950: test skipped for windows or cygwin systems';
 	} else {
 	    vrfy(system("") == 0,		'949: system("") == 0');
 	    vrfy(system("true") == 0,		'950: system("true") == 0');
@@ -1034,8 +1040,8 @@ define test_functions()
 	vrfy(digit(a,-1) == 4,		'974: digit(a,-1) == 4');
 	vrfy(digit(a,-2) == 2,		'975: digit(a,-2) == 2');
 	vrfy(digit(a,-3) == 8,		'976: digit(a,-3) == 8');
-	vrfy(digits(0) == 0,		'977: digits(0) == 0');
-	vrfy(digits(0.0123) == 0,	'978: digits(0.0123) == 0');
+	vrfy(digits(0) == 1,		'977: digits(0) == 1');
+	vrfy(digits(0.0123) == 1,	'978: digits(0.0123) == 1');
 	vrfy(digits(3.7) == 1,		'979: digits(3.7) == 1');
 	vrfy(digits(-27) == 2,		'980: digits(-27) == 2');
 	vrfy(digits(-99.7) == 2,	'981: digits(-99.7) == 2');
@@ -1793,7 +1799,23 @@ define test_mode()
 	vrfy(str(3e9) == "3000000000", \
 		'1650: str(3e9) == \"3000000000\"');
 
-	print '1651: Ending mode/base test';
+	/* test base2() functionality */
+	vrfy(base2() == 0,		'1651: base2() == 0');
+	vrfy(base2(0) == 0,		'1652: base2(0) == 0');
+	vrfy(base2() == 0,		'1653: base2() == 0');
+	vrfy(base2(16) == 0,		'1654: base2(16) == 0');
+	vrfy(base2() == 16,		'1655: base2() == 16');
+	vrfy(str(3e9) == "3000000000 /* 0xb2d05e00 */",
+		'1656: str(3e9) == "3000000000 /* 0xb2d05e00 */"');
+	vrfy(base2(1/3) == 16,		'1657: base2(16) == 16');
+	vrfy(str(23209) == "23209 /* 23209 */",
+		'1658: str(23209) == "23209 /* 23209 */"');
+	vrfy(str(3/2) == "1.5 /* 3/2 */",
+		'1659: str(3/2) == "1.5 /* 3/2 */"');
+	vrfy(base() == 10,		'1660: base() == 10');
+	vrfy(base2(0) == 1/3,		'1661: base2(0) == 1/3');
+
+	print '1662: Ending mode/base test';
 }
 print '026: parsed test_mode()';
 
@@ -2188,6 +2210,7 @@ print '033: read -once test2300';
 define test_xx_incdec()
 {
 	local A, B;
+	local n;
 
 	print '2300: Beginning object increment/decrement test';
 
@@ -2220,6 +2243,20 @@ define test_xx_incdec()
 	vrfy(ckmat(B,1,2,3) == 1,
 				'2314: ckmat(B,1,2,3) == 1');
 
+	n = 1;
+	print			'2315: n = 1';
+	vrfy(n + n + n + n++ == 4,
+				'2316: n + n + n + n++ == 4');
+	vrfy(n == 2,		'2317: n == 2');
+	n = 1;
+	print			'2318: n = 1';
+	vrfy(n + n + n++ == 3,	'2319: n + n + n++ == 3');
+	vrfy(n == 2,		'2320: n == 2');
+	n = 1;
+	print			'2321: n = 1';
+	vrfy(n + n++ == 2,	'2322: n + n++ == 3');
+	vrfy(n == 2,		'2323: n == 2');
+
 	print '2315: Ending object increment/decrement test';
 }
 print '034: parsed test_xx_incdec()';
@@ -4547,7 +4584,14 @@ define test_random()
 	vrfy(seed() < 2^64,		  '5465: seed() < 2^64');
 	vrfy(israndom(srandom(seed())),	  '5466: israndom(srandom(seed()))');
 
-	print '5467: Ending test_random';
+	/* verify random(10,11) double bug fix */
+	vrfy(random(10,11) == 10,	  '5467: random(10,11) == 10');
+	vrfy(random(10,11) == 10,	  '5468: random(10,11) == 10');
+	vrfy(random(10,11) == 10,	  '5469: random(10,11) == 10');
+	vrfy(random(0,1) == 0,		  '5470: random(0,1) == 0');
+	vrfy(random(0,1) == 0,		  '5471: random(0,1) == 0');
+
+	print '5472: Ending test_random';
 }
 print '137: parsed test_random()';
 

cal/repeat.cal

@@ -0,0 +1,53 @@
+/*
+ * repeat - return the value of a repeated set of digits
+ *
+ * Copyright (C) 2003  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.4 $
+ * @(#) $Id: repeat.cal,v 29.4 2003/01/26 19:42:03 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/repeat.cal,v $
+ *
+ * Under source code control:	2003/01/05 00:00:01
+ * File existed as early as:	2003
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+/*
+ * repeat - return the value of a repeated set of digits
+ *
+ * usage:
+ *	repeat(digit_set, repeat_count)
+ */
+define repeat(digit_set, repeat_count)
+{
+    local digit_count;	/* digits in the digit_set */
+
+    /* firewall */
+    if (!isint(digit_set) || digit_set <= 0) {
+	quit "digit set must be an integer > 0";
+    }
+    if (!isint(repeat_count) || repeat_count <= 0) {
+	quit "repeat count must be an integer > 0";
+    }
+
+    /* return repeated set of digits */
+    digit_count = digits(digit_set);
+    return digit_set * (10^(digit_count*repeat_count)-1) / (10^digit_count-1);
+}

calc.c

@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.8 $
- * @(#) $Id: calc.c,v 29.8 2001/04/10 22:03:13 chongo Exp $
+ * @(#) $Revision: 29.10 $
+ * @(#) $Id: calc.c,v 29.10 2004/02/23 09:21:35 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.c,v $
  *
  * Under source code control:	1990/02/15 01:48:11
@@ -83,6 +83,8 @@
 # define strdup(x) calc_strdup((CONST char *)(x))
 #endif /* HAVE_STRDUP */
 
+#include "have_unused.h"
+
 
 /*
  * static definitions and functions
@@ -214,7 +216,13 @@ main(int argc, char **argv)
 					havearg = TRUE;
 					break;
 				case 'n':
-					new_std = TRUE;
+					/*
+					 * -n is deprecated and may be reused
+					 * for another purpose in the future
+					 */
+					break;
+				case 'O':
+					use_old_std = TRUE;
 					break;
 				case 'p':
 					p_flag = TRUE;
@@ -425,7 +433,7 @@ main(int argc, char **argv)
 					fprintf(stderr,
 		"usage: %s [-a] [-c] [-C] [-d] [-e] [-h] [-i] [-m mode]\n"
 		"\t[-D calc_debug[:resource_debug[:user_debug]]]\n"
-		"\t[-n] [-p] [-q] [-u] [-v] "
+		"\t[-O] [-p] [-q] [-u] [-v] "
 		"[--] [calc_cmd ...]\n",
 		program);
 					exit(1);
@@ -700,7 +708,7 @@ main(int argc, char **argv)
  */
 /*ARGSUSED*/
 static void
-intint(int arg)
+intint(int UNUSED arg)
 {
 	(void) signal(SIGINT, intint);
 	if (inputwait || (++abortlevel >= ABORT_NOW)) {

calc.h

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.7 $
- * @(#) $Id: calc.h,v 29.7 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.11 $
+ * @(#) $Id: calc.h,v 29.11 2003/08/26 04:36:10 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.h,v $
  *
  * Under source code control:	1990/02/15 01:48:31
@@ -32,7 +32,7 @@
 #define __CALC_H__
 
 #include <setjmp.h>
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "win32dll.h"
 # include "value.h"
 # include "have_const.h"
@@ -60,7 +60,11 @@
 #define HOMECHAR	'~'	/* char which indicates home directory */
 #define DOTCHAR		'.'	/* char which indicates current directory */
 #define PATHCHAR	'/'	/* char which separates path components */
+#if defined(__MSDOS__) || defined(__WIN32)
+#define LISTCHAR	';'	/* char which separates paths in a list */
+#else
 #define LISTCHAR	':'	/* char which separates paths in a list */
+#endif
 #define MAXCMD		16384	/* maximum length of command invocation */
 #define MAXERROR	512	/* maximum length of error message string */
 
@@ -228,7 +232,7 @@ extern DLL char *program;	/* our name (argv[0]) */
 
 extern DLL int no_env;		/* TRUE (-e) => ignore env vars on startup */
 extern DLL int errmax;	/* if >= 0, error when errcount exceeds errmax */
-extern DLL int new_std;		/* TRUE (-n) => use newstd configuration */
+extern DLL int use_old_std;	/* TRUE (-O) => use classic configuration */
 
 extern DLL int allow_read;	/* FALSE => dont open any files for reading */
 extern DLL int allow_write; 	/* FALSE => dont open any files for writing */
@@ -258,7 +262,7 @@ extern DLL char *run_state_name(run state);
 extern int calc_major_ver;
 extern int calc_minor_ver;
 extern int calc_major_patch;
-extern char *calc_minor_patch;
+extern int calc_minor_patch;
 extern char *Copyright;
 extern DLL char *version(void);
 

calc.man

@@ -15,8 +15,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: calc.man,v 29.6 2001/04/10 21:48:46 chongo Exp $
+.\" @(#) $Revision: 29.12 $
+.\" @(#) $Id: calc.man,v 29.12 2004/02/23 05:21:24 chongo Exp $
 .\" @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.man,v $
 .\"
 .\" Under source code control:	    1991/07/23 05:48:26
@@ -44,7 +44,7 @@ calc \- arbitrary precision calculator
 .RB [ \-h ]
 .RB [ \-i ]
 .RB [ \-m\ \&mode ]
-.RB [ \-n ]
+.RB [ \-O ]
 .br
 .RB [ \-p ]
 .RB [ \-q ]
@@ -54,7 +54,7 @@ calc \- arbitrary precision calculator
 .RB [ calc_cmd\ \&.\|.\|. ]
 .in -5n
 .sp
-\fI#!${BINDIR}/calc\fP\ \fB\-S\fP\ [other_flags\ \&...]
+\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-f\fP\
 .SH DESCRIPTION
 \&
 .br
@@ -302,11 +302,22 @@ The reading of key bindings is also disabled
 when the mode disables opening of files for reading.
 
 .TP
-.B \-n
-Use the new configuration defaults instead of the old
-default classic defaults.
+.B \-O
+Use the old classic defaults instead of the
+default configuration.
 This flag as the same effect
-as executing \fBconfig("all", "newcfg")\fP at startup time.
+as executing \fBconfig("all", "oldcfg")\fP at startup time.
+.sp 1
+NOTE: Older versions of calc used
+.B \-n
+to setup a modified form of the default calc configuration.
+The
+.B \-n
+flag currently does nothing.
+Use of the
+.B \-n
+flag is now deprecated and may be used for
+something else in the future.
 
 .TP
 .B \-p
@@ -514,8 +525,8 @@ searches in succession:
 ./myfile.cal
 ${LIBDIR}/myfile
 ${LIBDIR}/myfile.cal
-${CUSTOMLIBDIR}/myfile
-${CUSTOMLIBDIR}/myfile.cal
+${CUSTOMCALDIR}/myfile
+${CUSTOMCALDIR}/myfile.cal
 .fi
 .in -5n
 .sp 1
@@ -572,27 +583,25 @@ If first line of an executable file begins
 followed by the absolute pathname of the
 .B calc
 program and the flag
-.B \-S
+.B \-f
 as in:
 .sp 1
 .in +5n
 .nf
-\fI#!${BINDIR}/calc\fP\ \fB\-S\fP\ [other_flags\ \&...]
+\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-f\fP\
 .fi
 .in -5n
 .sp 1
 the rest of the file will be processed in
 .BR "shell script mode" .
 Note that
-.B \-S
-(UPPER CASE
-.BR \-S )
+.B \-f
 must be the first \-flag on the ``#!'' line.
 Any other optional
 .B "other_flags"
 must come after
 the
-.BR \-S .
+.BR \-f .
 .sp 1
 In
 .B "shell script mode"
@@ -625,7 +634,7 @@ the file
 .sp 1
 .in +5n
 .nf
-\fI#!${BINDIR}/calc\fP\ \fB\-S\fP\ \&\fB\-q\fP
+\fI#!${BINDIR}/calc\fP\ \&\fB\-q\fP \fB\-f\fP\
 #
 # mersenne - an example of a calc \fBshell script file\fP
 
@@ -839,7 +848,7 @@ ${LIBDIR}/bindings
 non-GNU-readline command line editor bindings
 .sp 1
 .TP 5
-${INCDIRCALC}/*.h
+${CALC_INCDIR}/*.h
 include files for C interface use
 .sp 1
 .TP 5
@@ -851,7 +860,7 @@ ${LIBDIR}/libcustcalc.a
 custom binary link library
 .sp 1
 .TP 5
-${CUSTOMLIBDIR}/*.cal
+${CUSTOMCALDIR}/*.cal
 custom resource files
 .sp 1
 .TP 5
@@ -994,25 +1003,58 @@ Copyright (C) 1999  Landon Curt Noll
 and is covered under version 2.1 GNU Lesser General
 Public License.
 .sp
-.SH "BUG REPORTS / BUG FIXES / ENHANCEMENTS"
+.SH "CALC MAILING LIST / CALC UPDATES / ENHANCEMENTS"
 \&
 .br
 .sp
-Send comments, suggestions, bug fixes, enhancements
+To contribute comments, suggestions, enhancements
 and interesting
 .B calc
-resource files,
-.B calc
-shell scripts that you would like you see included
-in future distributions to:
+resource files, and
+shell scripts please join the low volume calc mailing list.
+.sp
+To join the low volume calc mailing list, send EMail to:
 .sp
 .in +0.5i
 .nf
-calc-contrib at asthe dot com
+calc-tester-request at asthe dot com
 .fi
 .in -0.5i
 .sp
-Bug reports are sent to:
+Your subject must contain the words:
+.sp
+.in +0.5i
+.nf
+calc mailing list subscription
+.fi
+.in -0.5i
+.sp
+You may have additional words in your subject line.
+.sp
+Your message body must contain:
+.sp
+.in +0.5i
+.nf
+subscribe calc-tester address
+end
+name your_full_name
+.fi
+.in -0.5i
+.sp
+where
+.B address
+s your EMail address and
+.B your_full_name
+is your full name.
+Feel free to follow the
+.B name
+line with additional EMail text as desired.
+.sp
+.SH "BUG REPORTS / BUG FIXES"
+\&
+.br
+.sp
+Send bug reports and bug fixes to:
 .sp
 .in +0.5i
 .nf
@@ -1023,6 +1065,16 @@ calc-bugs at asthe dot com
 .fi
 .in -0.5i
 .sp
+Your subject must contain the words:
+.sp
+.in +0.5i
+.nf
+calc bug report
+.fi
+.in -0.5i
+.sp
+You may have additional words in your subject line.
+.sp
 See the
 .I BUGS
 source file or use the
@@ -1037,7 +1089,7 @@ help bugs
 .sp
 for more information about bug reporting.
 .sp
-.SH "CALC WEB SITE / MAILING LIST"
+.SH "CALC WEB SITE"
 \&
 .br
 Landon Noll maintains the the
@@ -1045,33 +1097,7 @@ Landon Noll maintains the the
 web site is located at:
 .sp
 .in +0.5i
-http://www.isthe.com/chongo/tech/comp/calc/
+www.isthe.com/chongo/tech/comp/calc/
 .in -0.5i
 .sp
-One may join the
-.B calc
-testing group by sending a request to:
-.sp
-.in +0.5i
-.nf
-calc-tester-request at asthe dot com
-
-[[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-[[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
-.fi
-.in -0.5i
-.sp
-Your message body (not the subject) should consist of:
-.sp
-.in +0.5i
-.nf
-subscribe calc-tester address
-end
-name your_full_name
-.fi
-.in -0.5i
-.sp
-where "address" is your EMail address and "your_full_name"
-is your full name.
-.sp
 Share and Enjoy! :\-)

calc.spec.in

@@ -0,0 +1,116 @@
+#****h* calc/calc.spec.in
+#
+# calc.spec.in - template specfile for calc
+#
+# Copyright (C) 2003  Petteri Kettunen and 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.12 $
+# @(#) $Id: calc.spec.in,v 29.12 2003/04/15 03:37:59 chongo Exp $
+# @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.spec.in,v $
+#
+# Under source code control:	2003/02/16 20:21:39
+# File existed as early as:	2003
+#
+# calculator by David I. Bell with help/mods from others
+# Makefile by Petteri Kettunen with modifications from Landon Curt Noll
+
+# BUGS
+#  - Uninstalling calc and calc-devel leaves empty dirs /usr/include/calc
+#    and /usr/share/calc and its subdird. In case e.g. %{_includedir}/calc
+#    is defined in `%files devel' section, then rpmbuild complains that
+#    header files are defined twice - rpmbuild bug or bug in specfile conf???
+
+Summary: Arbitrary precision calculator.
+Name: calc
+Version: <<<PROJECT_VERSION>>>
+Release: 0
+Copyright: LGPL
+Group: Applications/Engineering
+Source: %{name}-%{version}.tar.gz
+URL: http://www.isthe.com/chongo/tech/comp/calc/index.html
+Requires: ncurses >= 5.2-26, readline >= 4.2, less >= 358
+BuildRequires: ncurses-devel >= 5.2-26, readline-devel >= 4.2
+BuildRoot: %{_tmppath}/%{name}-root
+
+%description
+Calc is arbitrary precision C-like arithmetic system that is a
+calculator, an algorithm prototyper and mathematical research
+tool. Calc comes with a rich set of builtin mathematical and
+programmatic functions.
+
+For the latest calc release, see the project home page:
+
+    http://www.isthe.com/chongo/tech/comp/calc/index.html
+
+%package devel
+Summary: Development files and documentation for calc.
+Group: Development/Libraries
+PreReq: %{name} = %{version}-%{release}
+
+%description devel
+This package contains the header files and static libraries for developing
+calc (arbitrary precision calculator).
+
+For the latest calc release, see the project home page:
+
+    http://www.isthe.com/chongo/tech/comp/calc/index.html
+
+%prep
+%setup -q
+
+%build
+make %{?_smp_mflags} T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 all chk
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}
+make T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 install
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-, root, root)
+%doc BUGS CHANGES COPYING COPYING-LGPL
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_datadir}/%{name}/*/*
+%{_datadir}/%{name}/bindings
+%{_datadir}/%{name}/README
+%{_datadir}/%{name}/*.cal
+
+%files devel
+%defattr(-, root, root)
+%doc BUGS COPYING COPYING-LGPL LIBRARY
+%attr(644, root, root) %{_includedir}/calc/*
+%attr(644, root, root) %{_libdir}/*.a
+
+%changelog
+* Wed Feb 26 2003 Landon Curt Noll http://www.isthe.com/chongo
+- Release of calc-2.11.7-2
+- Fixed attributes on include and lib calc-devel files
+- Added BUGS to calc-devel as well as calc
+* Tue Feb 25 2003 Landon Curt Noll http://www.isthe.com/chongo
+- Release of calc-2.11.7-1
+- Require ncurses, readline and less to install.
+- Require ncurses-devel and readline-devel to build.
+* Tue Feb 18 2003 Landon Curt Noll http://www.isthe.com/chongo
+- Misc changes to fit local directory setup
+* Sun Feb 16 2003 Petteri Kettunen <petterik@users.sourceforge.net>
+- initial RPM build
+
+#****

cmath.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.4 $
- * @(#) $Id: cmath.h,v 29.4 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: cmath.h,v 29.6 2002/03/12 09:38:26 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/cmath.h,v $
  *
  * Under source code control:	1993/07/30 19:42:45
@@ -32,7 +32,7 @@
 #define __CMATH_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "qmath.h"
 #else
 # include <calc/qmath.h>
@@ -62,6 +62,7 @@ extern void cprintfr(COMPLEX *c);
 /*
  * Basic numeric routines.
  */
+
 extern COMPLEX *cadd(COMPLEX *c1, COMPLEX *c2);
 extern COMPLEX *csub(COMPLEX *c1, COMPLEX *c2);
 extern COMPLEX *cmul(COMPLEX *c1, COMPLEX *c2);
@@ -74,8 +75,8 @@ extern COMPLEX *cscale(COMPLEX *c, long i);
 extern COMPLEX *cshift(COMPLEX *c, long i);
 extern COMPLEX *csquare(COMPLEX *c);
 extern COMPLEX *cconj(COMPLEX *c);
-extern COMPLEX *creal(COMPLEX *c);
-extern COMPLEX *cimag(COMPLEX *c);
+extern COMPLEX *c_real(COMPLEX *c);
+extern COMPLEX *c_imag(COMPLEX *c);
 extern COMPLEX *cneg(COMPLEX *c);
 extern COMPLEX *cinv(COMPLEX *c);
 extern COMPLEX *cint(COMPLEX *c);

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.6 $
- * @(#) $Id: codegen.c,v 29.6 2001/05/08 06:29:24 chongo Exp $
+ * @(#) $Revision: 29.8 $
+ * @(#) $Id: codegen.c,v 29.8 2004/02/23 05:39:35 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/codegen.c,v $
  *
  * Under source code control:	1990/02/15 01:48:13
@@ -45,7 +45,7 @@
 #include "func.h"
 #include "conf.h"
 
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(__CYGWIN__)
 # include <direct.h>
 #endif
 
@@ -1749,6 +1749,8 @@ getrelation(void)
 			rescantoken();
 			return type;
 	}
+	if (islvalue(type))
+		addop(OP_GETVALUE);
 	(void) getsum();
 	addop(op);
 	return EXPR_RVALUE;
@@ -1788,6 +1790,8 @@ getsum(void)
 				rescantoken();
 				return type;
 		}
+		if (islvalue(type))
+			addop(OP_GETVALUE);
 		(void) getproduct();
 		addop(op);
 		type = EXPR_RVALUE;
@@ -1817,6 +1821,8 @@ getproduct(void)
 				rescantoken();
 				return type;
 		}
+		if (islvalue(type))
+			addop(OP_GETVALUE);
 		(void) getorexpr();
 		addop(op);
 		type = EXPR_RVALUE;
@@ -1836,6 +1842,8 @@ getorexpr(void)
 
 	type = getandexpr();
 	while (gettoken() == T_OR) {
+		if (islvalue(type))
+			addop(OP_GETVALUE);
 		(void) getandexpr();
 		addop(OP_OR);
 		type = EXPR_RVALUE;
@@ -1867,6 +1875,8 @@ getandexpr(void)
 				rescantoken();
 				return type;
 		}
+		if (islvalue(type))
+			addop(OP_GETVALUE);
 		(void) getshiftexpr();
 		addop(op);
 		type = EXPR_RVALUE;
@@ -1919,6 +1929,8 @@ getshiftexpr(void)
 			rescantoken();
 			return type;
 	}
+	if (islvalue(type))
+		addop(OP_GETVALUE);
 	(void) getshiftexpr();
 	addop(op);
 	return EXPR_RVALUE;

commath.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.2 $
- * @(#) $Id: commath.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: commath.c,v 29.3 2002/03/12 09:38:26 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/commath.c,v $
  *
  * Under source code control:	1990/02/15 01:48:10
@@ -381,7 +381,7 @@ cconj(COMPLEX *c)
  * Return the real part of a complex number.
  */
 COMPLEX *
-creal(COMPLEX *c)
+c_real(COMPLEX *c)
 {
 	COMPLEX *r;
 
@@ -400,7 +400,7 @@ creal(COMPLEX *c)
  * Return the imaginary part of a complex number as a real.
  */
 COMPLEX *
-cimag(COMPLEX *c)
+c_imag(COMPLEX *c)
 {
 	COMPLEX *r;
 

config.c

@@ -1,7 +1,7 @@
 /*
  * config - configuration routines
  *
- * Copyright (C) 1999  David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999-2002  David I. Bell and Landon Curt Noll
  *
  * Primary author:  David I. Bell
  *
@@ -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.7 $
- * @(#) $Id: config.c,v 29.7 2001/04/25 07:15:22 chongo Exp $
+ * @(#) $Revision: 29.12 $
+ * @(#) $Id: config.c,v 29.12 2004/02/23 05:59:50 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/config.c,v $
  *
  * Under source code control:	1991/07/20 00:21:56
@@ -51,6 +51,7 @@
 NAMETYPE configs[] = {
 	{"all",		CONFIG_ALL},
 	{"mode",	CONFIG_MODE},
+	{"mode2",	CONFIG_MODE2},
 	{"display",	CONFIG_DISPLAY},
 	{"epsilon",	CONFIG_EPSILON},
 	/*epsilonprec -- tied to epsilon not a configuration type*/
@@ -91,6 +92,7 @@ NAMETYPE configs[] = {
 	{"program",	CONFIG_PROGRAM},
 	{"basename",	CONFIG_BASENAME},
 	{"windows",	CONFIG_WINDOWS},
+	{"cygwin",	CONFIG_CYGWIN},
 	{"version",	CONFIG_VERSION},
 	{NULL,		0}
 };
@@ -101,6 +103,7 @@ NAMETYPE configs[] = {
  */
 CONFIG oldstd = {	/* backward compatible standard configuration */
 	MODE_INITIAL,		/* current output mode */
+	MODE2_INITIAL,		/* current secondary output mode */
 	20,			/* current output digits for float or exp */
 	NULL,	/* loaded in at startup - default error for real functions */
 	EPSILONPREC_DEFAULT,	/* binary precision of epsilon */
@@ -141,14 +144,20 @@ CONFIG oldstd = {	/* backward compatible standard configuration */
 	TRUE,			/* running under windows */
 #else
 	FALSE,			/* congrats, you are not using windows */
+#endif
+#if defined(__CYGWIN__)
+	TRUE,			/* compiled under cygwin */
+#else
+	FALSE,			/* not compiled with cygwin */
 #endif
 	NULL			/* version */
 };
 CONFIG newstd = {	/* new non-backward compatible configuration */
 	MODE_INITIAL,		/* current output mode */
-	10,			/* current output digits for float or exp */
+	MODE2_INITIAL,		/* current output mode */
+	20,			/* current output digits for float or exp */
 	NULL,	/* loaded in at startup - default error for real functions */
-	NEW_EPSILONPREC_DEFAULT,	/* binary precision of epsilon */
+	EPSILONPREC_DEFAULT,	/* binary precision of epsilon */
 	FALSE,			/* tracing flags */
 	MAXPRINT_DEFAULT,	/* number of elements to print */
 	MUL_ALG2,		/* size of number to use multiply alg 2 */
@@ -158,7 +167,7 @@ CONFIG newstd = {	/* new non-backward compatible configuration */
 	TRUE,			/* ok to print a tilde on approximations */
 	TRUE,			/* ok to print tab before numeric values */
 	0,			/* quomod() default rounding mode */
-	0,			/* quotient // default rounding mode */
+	2,			/* quotient // default rounding mode */
 	0,			/* mod % default rounding mode */
 	24,			/* sqrt() default rounding mode */
 	24,			/* appr() default rounding mode */
@@ -167,7 +176,7 @@ CONFIG newstd = {	/* new non-backward compatible configuration */
 	24,			/* output default rounding mode */
 	24,			/* round()/bround() default rounding mode */
 	TRUE,			/* ok to print leading 0 before decimal pt */
-	1,			/* ok to print trailing 0's */
+	0,			/* ok to print trailing 0's */
 	MAXSCANCOUNT,		/* max scan errors before abort */
 	"; ",			/* normal prompt */
 	";; ",			/* prompt when inside multi-line input */
@@ -186,6 +195,11 @@ CONFIG newstd = {	/* new non-backward compatible configuration */
 	TRUE,			/* running under windows */
 #else
 	FALSE,			/* congrats, you are not using windows */
+#endif
+#if defined(__CYGWIN__)
+	TRUE,			/* compiled under cygwin */
+#else
+	FALSE,			/* not compiled with cygwin */
 #endif
 	NULL			/* version */
 };
@@ -212,6 +226,7 @@ static NAMETYPE modes[] = {
 	{"oct",		MODE_OCTAL},
 	{"binary",	MODE_BINARY},
 	{"bin",		MODE_BINARY},
+	{"off",		MODE2_OFF},
 	{NULL,		0}
 };
 
@@ -467,6 +482,19 @@ setconfig(int type, VALUE *vp)
 		math_setmode((int) temp);
 		break;
 
+	case CONFIG_MODE2:
+		if (vp->v_type != V_STR) {
+			math_error("Non-string for mode");
+			/*NOTREACHED*/
+		}
+		temp = lookup_long(modes, vp->v_str->s_str);
+		if (temp < 0) {
+			math_error("Unknown mode \"%s\"", vp->v_str);
+			/*NOTREACHED*/
+		}
+		math_setmode2((int) temp);
+		break;
+
 	case CONFIG_EPSILON:
 		if (vp->v_type != V_NUM) {
 			math_error("Non-numeric for epsilon");
@@ -840,6 +868,10 @@ setconfig(int type, VALUE *vp)
 		math_error("The windows config parameter is read-only");
 		/*NOTREACHED*/
 
+	case CONFIG_CYGWIN:
+		math_error("The cygwin config parameter is read-only");
+		/*NOTREACHED*/
+
 	case CONFIG_VERSION:
 		math_error("The version config parameter is read-only");
 		/*NOTREACHED*/
@@ -1018,6 +1050,16 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		vp->v_str = makenewstring(p);
 		return;
 
+	case CONFIG_MODE2:
+		vp->v_type = V_STR;
+		p = lookup_name(modes, cfg->outmode2);
+		if (p == NULL) {
+			math_error("invalid secondary output mode: %d", cfg->outmode2);
+			/*NOTREACHED*/
+		}
+		vp->v_str = makenewstring(p);
+		return;
+
 	case CONFIG_EPSILON:
 		vp->v_num = qlink(cfg->epsilon);
 		return;
@@ -1212,6 +1254,14 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		}
 		return;
 
+	case CONFIG_CYGWIN:
+		if (cfg->cygwin) {
+			vp->v_num = itoq(1);
+		} else {
+			vp->v_num = itoq(0);
+		}
+		return;
+
 	case CONFIG_VERSION:
 		vp->v_type = V_STR;
 		if (cfg->version == NULL) {
@@ -1267,6 +1317,7 @@ config_cmp(CONFIG *cfg1, CONFIG *cfg2)
 	return cfg1->traceflags != cfg2->traceflags ||
 	       cfg1->outdigits != cfg2->outdigits ||
 	       cfg1->outmode != cfg2->outmode ||
+	       cfg1->outmode2 != cfg2->outmode2 ||
 	       qcmp(cfg1->epsilon, cfg2->epsilon) ||
 	       cfg1->epsilonprec != cfg2->epsilonprec ||
 	       cfg1->maxprint != cfg2->maxprint ||

config.h

@@ -1,7 +1,7 @@
 /*
  * config - configuration routines
  *
- * Copyright (C) 1999  Landon Curt Noll and David I. Bell
+ * Copyright (C) 1999-2002  Landon Curt Noll and David I. Bell
  *
  * Primary author:  Landon Curt Noll
  *
@@ -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.10 $
- * @(#) $Id: config.h,v 29.10 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.15 $
+ * @(#) $Id: config.h,v 29.15 2004/02/23 06:08:29 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/config.h,v $
  *
  * Under source code control:	1995/11/01 22:20:17
@@ -35,7 +35,7 @@
 #define __CONFIG_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "win32dll.h"
 # include "nametype.h"
 # include "qmath.h"
@@ -90,6 +90,8 @@
 #define CONFIG_BASENAME	36
 #define CONFIG_VERSION	37
 #define CONFIG_WINDOWS	38
+#define CONFIG_MODE2	39
+#define CONFIG_CYGWIN	40
 
 
 /*
@@ -98,8 +100,6 @@
 #define DISPLAY_DEFAULT 20	/* default digits for float display */
 #define EPSILON_DEFAULT "1e-20" /* allowed error for float calculations */
 #define EPSILONPREC_DEFAULT 67	/* 67 ==> 2^-67 <= EPSILON_DEFAULT < 2^-66 */
-#define NEW_EPSILON_DEFAULT "1e-10"	/* newstd EPSILON_DEFAULT */
-#define NEW_EPSILONPREC_DEFAULT 34	/* 34 ==> 2^-34 <= 1e-10 < 2^-33 */
 #define MAXPRINT_DEFAULT 16	/* default number of elements printed */
 #define MAXSCANCOUNT 20		/* default max scan errors before an abort */
 
@@ -118,6 +118,7 @@
  */
 struct config {
 	int outmode;		/* current output mode */
+	int outmode2;		/* current secondary output mode */
 	LEN outdigits;		/* current output digits for float or exp */
 	NUMBER *epsilon;	/* default error for real functions */
 	    long epsilonprec;	/* epsilon binary precision (tied to epsilon) */
@@ -155,6 +156,7 @@ struct config {
 	char *program;		/* our name */
 	char *base_name;	/* basename of our name */
 	BOOL windows;		/* TRUE => running under MS windows */
+	BOOL cygwin;		/* TRUE => compiled with cygwin */
 	char *version;		/* calc version string */
 };
 typedef struct config CONFIG;
@@ -194,8 +196,8 @@ typedef struct config CONFIG;
  * global configuration states and aliases
  */
 extern DLL CONFIG *conf;	/* current configuration */
-extern DLL CONFIG oldstd;	/* backward compatible standard configuration */
-extern DLL CONFIG newstd;	/* new non-backward compatible configuration */
+extern DLL CONFIG oldstd;	/* old classic standard configuration */
+extern DLL CONFIG newstd;	/* default compatible configuration */
 extern DLL char *calc_debug;	/* !=NULL => value of config("calc_debug") */
 extern DLL char *resource_debug; /* !=NULL => config("resource_debug") value */
 extern DLL char *user_debug;	/* !=NULL => value of config("user_debug") */

const.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.2 $
- * @(#) $Id: const.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: const.c,v 29.3 2004/02/23 07:50:41 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/const.c,v $
  *
  * Under source code control:	1990/02/15 01:48:14
@@ -34,7 +34,7 @@
 
 #define CONSTALLOCSIZE 400	/* number of constants to allocate */
 
-static long constcount;		/* number of constants defined */
+static unsigned long constcount;/* number of constants defined */
 static long constavail;		/* number of constants available */
 static NUMBER **consttable;	/* table of constants */
 
@@ -92,7 +92,7 @@ addqconstant(NUMBER *q)
 {
 	register NUMBER **tp;	/* pointer to current number */
 	register NUMBER *t;	/* number being tested */
-	long index;		/* index into constant table */
+	unsigned long index;	/* index into constant table */
 	long numlen;		/* numerator length */
 	long denlen;		/* denominator length */
 	HALF numlow;		/* bottom value of numerator */
@@ -221,7 +221,7 @@ trimconstants(void)
 void
 showconstants(void)
 {
-	long index;
+	unsigned long index;
 	NUMBER **qp;
 	long count;
 

cscript/4dsphere.calc

@@ -1,4 +1,4 @@
-#!/usr/local/bin/calc -q -s -f
+#!/usr/local/src/cmd/calc/calc -q -s -f
 /*
  * 4dsphere - determine if 6 points lie on the surface of a sphere in R^4
  *
@@ -26,8 +26,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: 1.1 $
- * @(#) $Id: 4dsphere.calc,v 1.1 2001/05/28 23:05:56 chongo Exp $
+ * @(#) $Revision: 1.3 $
+ * @(#) $Id: 4dsphere.calc,v 1.3 2001/06/06 09:06:29 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/4dsphere.calc,v $
  *
  * Under source code control:   2001/05/03 19:02:03

cscript/Makefile

@@ -17,8 +17,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.14 $
-# @(#) $Id: Makefile,v 29.14 2001/05/28 23:08:22 chongo Exp $
+# @(#) $Revision: 29.23 $
+# @(#) $Id: Makefile,v 29.23 2003/01/14 01:58:18 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/Makefile,v $
 #
 # Under source code control:	1999/11/29 11:10:26
@@ -36,15 +36,121 @@
 SHELL= /bin/sh
 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.
+####
+
+# Where the system include (.h) files are kept
+#
+# For DJGPP, select:
+#
+#	INCDIR= /dev/env/DJDIR/include
+#
+# If in doubt, set:
+#
+#	INCDIR= /usr/include
+#
+
+#INCDIR= /usr/local/include
+#INCDIR= /dev/env/DJDIR/include
+INCDIR= /usr/include
+
+# where to install calc realted things
+#
+# ${BINDIR}		where to install calc binary files
+# ${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.
+#
+# For DJGPP, select:
+#
+#	BINDIR= /dev/env/DJDIR/bin
+#	LIBDIR= /dev/env/DJDIR/lib
+#	CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+#
+# If in doubt, set:
+#
+#	BINDIR= /usr/bin
+#	LIBDIR= /usr/lib
+#	CALC_SHAREDIR= /usr/share/calc
 #
 #BINDIR= /usr/local/bin
+#BINDIR= /dev/env/DJDIR/bin
 BINDIR= /usr/bin
-#BINDIR= /usr/contrib/bin
+
+#LIBDIR= /usr/local/lib
+#LIBDIR= /dev/env/DJDIR/lib
+LIBDIR= /usr/lib
+
+#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+CALC_SHAREDIR= /usr/share/calc
+
+# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
+# ---------------------------------------------------------------
+# ${HELPDIR}		where the help directory is installed
+# ${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
+# ${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.
+#
+# If in doubt, set:
+#
+#	HELPDIR= ${CALC_SHAREDIR}/help
+#	CALC_INCDIR= ${INCDIR}/calc
+#	CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+#	CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+#	CUSTOMINCDIR= ${CALC_INCDIR}/custom
+#	SCRIPTDIR= ${BINDIR}/cscript
+#
+HELPDIR= ${CALC_SHAREDIR}/help
+CALC_INCDIR= ${INCDIR}/calc
+CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+CUSTOMINCDIR= ${CALC_INCDIR}/custom
 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
+# to install calc somewhere other than into the system area.
+#
+# For example, if:
+#
+#     BINDIR= /usr/bin
+#     LIBDIR= /usr/lib
+#     CALC_SHAREDIR= /usr/share/calc
+#
+# and if:
+#
+#     T= /var/tmp/testing
+#
+# Then the installation locations will be:
+#
+#     calc binary files:	/var/tmp/testing/usr/bin
+#     calc link library:	/var/tmp/testing/usr/lib
+#     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 in doubt, use T=
+#
+T=
+
 # Makefile debug
 #
 # Q=@	do not echo internal makefile actions (quiet mode)
@@ -77,11 +183,11 @@ CMP= cmp
 #
 #		make detaillist
 #
-SCRIPT= 4dsphere fproduct mersenne piforever plus powerterm simple \
-	square
+SCRIPT= 4dsphere fproduct mersenne piforever plus powerterm \
+	simple square
 
-SCRIPT_SRC= 4dsphere.calc fproduct.calc mersenne.calc piforever.calc \
-	plus.calc powerterm.calc simple.calc square.calc
+SCRIPT_SRC= 4dsphere.calc fproduct.calc mersenne.calc \
+	piforever.calc plus.calc powerterm.calc simple.calc square.calc
 
 # These files are found (but not built) in the distribution
 #
@@ -123,8 +229,10 @@ all: ${TARGETS} .all
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST}; 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:
@@ -136,23 +244,27 @@ calcliblist:
 #
 detaillist:
 	${Q}-(echo "xxxxxxx"; \
-	   for i in ${SCRIPT}; do \
+	   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; \
 		else \
 		    echo $$i; \
 		fi; \
+	    fi; \
 	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}; do \
+	   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; \
 		else \
 		    echo $$i.calc; \
 		fi; \
+	    fi; \
 	done | LANG=C ${SORT}) | ${FMT} -70 | \
 	    ${SED} -e '1s/xxxxxxxxxxx/SCRIPT_SRC=/' -e '2,$$s/^/	/' \
 		   -e 's/$$/ \\/' -e '$$s/ \\$$//'
@@ -181,11 +293,13 @@ depend:
 	${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
 		makedep.out
 	${Q}echo "" >> makedep.out
-	${Q}for i in ${SCRIPT}; do \
+	${Q}for i in ${SCRIPT} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo "$$i: $$i.calc"; \
-		echo '	rm -f $$@'; \
-		echo '	$${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!$${BINDIR}/calc:" $$?>$$@'; \
-		echo '	$${CHMOD} +x $$@'; \
+		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
@@ -216,14 +330,13 @@ depend:
 #
 ##
 
-echo_SCRIPT: ${MAKE_FILE}
-	@echo ${SCRIPT}
-
-
-echo_install.list: ${MAKE_FILE}
-	@for i in ${SCRIPT}; do \
-	    echo ${SCRIPTDIR}/$$i; \
+echo_inst_files:
+	${Q}for i in ${SCRIPT} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo __file__ ${SCRIPTDIR}/$$i; \
+	    fi; \
 	done
+
 ##
 #
 # Utility rules
@@ -237,65 +350,76 @@ clobber:
 	-rm -f ${TARGETS}
 
 install: all
-	-${Q}if [ ! -d ${BINDIR} ]; then \
-	    echo mkdir ${BINDIR}; \
-	    mkdir ${BINDIR}; \
-	    echo ${CHMOD} 0755 ${BINDIR}; \
-	    ${CHMOD} 0755 ${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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${SCRIPTDIR} ]; then \
-	    echo mkdir ${SCRIPTDIR}; \
-	    mkdir ${SCRIPTDIR}; \
-	    echo ${CHMOD} 0755 ${SCRIPTDIR}; \
-	    ${CHMOD} 0755 ${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}; \
 	else \
 	    true; \
 	fi
-	${Q}for i in ${SCRIPT}; do \
-	    if ${CMP} -s $$i ${SCRIPTDIR}/$$i; then \
+	${Q}for i in ${SCRIPT} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if ${CMP} -s $$i $T${SCRIPTDIR}/$$i; then \
 		true; \
 	    else \
-		rm -f ${SCRIPTDIR}/$$i.new; \
-		cp -f $$i ${SCRIPTDIR}/$$i.new; \
-		${CHMOD} 0555 ${SCRIPTDIR}/$$i; \
-		mv -f ${SCRIPTDIR}/$$i.new ${SCRIPTDIR}/$$i; \
-		echo "installed ${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
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 4dsphere: 4dsphere.calc
-	rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@rm -f $@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${CHMOD} +x $@
 fproduct: fproduct.calc
-	rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@rm -f $@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${CHMOD} +x $@
 mersenne: mersenne.calc
-	rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@rm -f $@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${CHMOD} +x $@
 piforever: piforever.calc
-	rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@rm -f $@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${CHMOD} +x $@
 plus: plus.calc
-	rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@rm -f $@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${CHMOD} +x $@
 powerterm: powerterm.calc
-	rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@rm -f $@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${CHMOD} +x $@
 simple: simple.calc
-	rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@rm -f $@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${CHMOD} +x $@
 square: square.calc
-	rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@rm -f $@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${CHMOD} +x $@

cscript/README

@@ -21,9 +21,9 @@ For more info, see:
 
 4dsphere
 
-    determine if 6 points lie on the surface of a sphere in R^4
+    Determine if 6 points lie on the surface of a 4-dimensional sphere in R^4.
 
-     usage: 4dsphere x0 y0 z0 w0 x1 y1 z1 w1 ... x5 y5 z5 w5
+    4dsphere x0 y0 z0 w0   x1 y1 z1 w1   ...   x5 y5 z5 w5
 
 	x0 y0 z0 w0     point 0 in R^4
 	x1 y1 z1 w1     point 1 in R^4
@@ -77,8 +77,8 @@ simple
 ## 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: README,v 29.7 2001/05/28 23:08:22 chongo Exp $
+## @(#) $Revision: 29.10 $
+## @(#) $Id: README,v 29.10 2001/06/10 19:34:40 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/README,v $
 ##
 ## Under source code control:	1999/12/17 10:23:40

cscript/fproduct.calc

@@ -1,4 +1,4 @@
-#!/usr/local/bin/calc -q -s -f
+#!/usr/local/src/cmd/calc/calc -q -s -f
 /*
  * fproduct - write the big Endian product of terms to a file
  *
@@ -24,8 +24,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: fproduct.calc,v 29.1 2001/04/08 08:25:15 chongo Exp $
+ * @(#) $Revision: 29.2 $
+ * @(#) $Id: fproduct.calc,v 29.2 2001/06/06 09:06:29 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/fproduct.calc,v $
  *
  * Under source code control:   2001/04/07 20:13:11

cscript/powerterm.calc

@@ -1,4 +1,4 @@
-#!/usr/local/bin/calc -q -s -f
+#!/usr/local/src/cmd/calc/calc -q -s -f
 /*
  * powerterm - print the argument as a sum of powers of integers
  *
@@ -24,8 +24,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.5 $
- * @(#) $Id: powerterm.calc,v 29.5 2001/04/25 08:41:36 chongo Exp $
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: powerterm.calc,v 29.6 2001/06/06 09:06:29 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/powerterm.calc,v $
  *
  * Under source code control:   2001/04/24 23:49:11

custom/Makefile

@@ -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.13 $
-# @(#) $Id: Makefile,v 29.13 2001/05/28 23:54:53 chongo Exp $
+# @(#) $Revision: 29.21 $
+# @(#) $Id: Makefile,v 29.21 2004/02/23 09:23:08 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile,v $
 #
 # Under source code control:	1997/03/09 02:28:54
@@ -88,33 +88,120 @@ CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o
 #Q=
 Q=@
 
+####
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
+####
+
+# Where the system include (.h) files are kept
 #
-# where to install things
+# For DJGPP, select:
 #
-# ${SHAREDIR}		where most common shared files are kept
-# ${INCDIR}		where most .h files are kept
+#	INCDIR= /dev/env/DJDIR/include
 #
-# ${CSHAREDIR}		where most common shared calc files are kept
-# ${HELPDIR}		where the help directory is installed.
-# ${INCDIRCALC}		where the calc include files are installed
-# ${CUSTOMLIBDIR}	where custom *.cal files & libcustcalc.a are installed.
-# ${CUSTOMHELPDIR}	where custom help files are installed.
-# ${CUSTOMINCPDIR}	where custom .h files are installed.
+# If in doubt, set:
 #
-#SHAREDIR= /usr/local/lib
-SHAREDIR= /usr/share
+#	INCDIR= /usr/include
 #
+
 #INCDIR= /usr/local/include
+#INCDIR= /dev/env/DJDIR/include
 INCDIR= /usr/include
+
+# where to install calc realted things
 #
-CSHAREDIR= ${SHAREDIR}/calc
-HELPDIR= ${CSHAREDIR}/help
-INCDIRCALC= ${INCDIR}/calc
-CUSTOMLIBDIR= ${CSHAREDIR}/custom
-CUSTOMHELPDIR= ${CSHAREDIR}/custhelp
-CUSTOMINCDIR= ${INCDIRCALC}/custom
+# ${BINDIR}		where to install calc binary files
+# ${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.
+#
+# For DJGPP, select:
+#
+#	BINDIR= /dev/env/DJDIR/bin
+#	LIBDIR= /dev/env/DJDIR/lib
+#	CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+#
+# If in doubt, set:
+#
+#	BINDIR= /usr/bin
+#	LIBDIR= /usr/lib
+#	CALC_SHAREDIR= /usr/share/calc
+#
+#BINDIR= /usr/local/bin
+#BINDIR= /dev/env/DJDIR/bin
+BINDIR= /usr/bin
+
+#LIBDIR= /usr/local/lib
+#LIBDIR= /dev/env/DJDIR/lib
+LIBDIR= /usr/lib
+
+#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+CALC_SHAREDIR= /usr/share/calc
+
+# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
+# ---------------------------------------------------------------
+# ${HELPDIR}		where the help directory is installed
+# ${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
+# ${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.
+#
+# If in doubt, set:
+#
+#	HELPDIR= ${CALC_SHAREDIR}/help
+#	CALC_INCDIR= ${INCDIR}/calc
+#	CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+#	CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+#	CUSTOMINCDIR= ${CALC_INCDIR}/custom
+#	SCRIPTDIR= ${BINDIR}/cscript
+#
+HELPDIR= ${CALC_SHAREDIR}/help
+CALC_INCDIR= ${INCDIR}/calc
+CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+CUSTOMINCDIR= ${CALC_INCDIR}/custom
+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
+# to install calc somewhere other than into the system area.
+#
+# For example, if:
+#
+#     BINDIR= /usr/bin
+#     LIBDIR= /usr/lib
+#     CALC_SHAREDIR= /usr/share/calc
+#
+# and if:
+#
+#     T= /var/tmp/testing
+#
+# Then the installation locations will be:
+#
+#     calc binary files:	/var/tmp/testing/usr/bin
+#     calc link library:	/var/tmp/testing/usr/lib
+#     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 in doubt, use T=
+#
+T=
 
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
@@ -263,7 +350,7 @@ REQUIRED_SRC= custtbl.c
 #
 REQUIRED_OBJ= custtbl.o
 
-# These .h files are installed under ${CUSTOMLIBDIR} by the install rule.
+# These .h files are installed under ${CUSTOMCALDIR} by the install rule.
 #
 INSTALL_H_SRC= ${CUSTOM_H_SRC}
 
@@ -365,8 +452,10 @@ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE}
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST}; do \
+	${Q}for i in ${DISTLIST} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo custom/$$i; \
+	    fi; \
 	done
 
 distdir:
@@ -402,11 +491,13 @@ depend:
 	-${Q}rm -rf skel
 	${Q}mkdir skel
 	${Q}mkdir skel/custom
-	-${Q}for i in ${C_SRC}; do \
+	-${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 /dev/null ${H_SRC}; do \
+	-${Q}for i in ${H_SRC} /dev/null; do \
 		if [ "$$i" = "/dev/null" ]; then \
 		    continue; \
 		fi; \
@@ -421,7 +512,10 @@ depend:
 	${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'`; do \
+				    -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"; \
@@ -435,8 +529,10 @@ depend:
 	${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}; do \
+	-${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
@@ -468,27 +564,26 @@ depend:
 #
 ##
 
-echo_INSTALL_H_SRC: ${MAKE_FILE}
-	@echo ${INSTALL_H_SRC}
-
-echo_CUSTOM_CALC_FILES: ${MAKE_FILE}
-	@echo ${CUSTOM_CALC_FILES}
-
-echo_CUSTOM_HELP: ${MAKE_FILE}
-	@echo ${CUSTOM_HELP}
-
-echo_install.list: ${MAKE_FILE}
-	@for i in ${INSTALL_H_SRC}; do \
-	    echo ${CUSTOMINCDIR}/$$i; \
+echo_inst_files:
+	${Q}for i in ${INSTALL_H_SRC} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo __file__ ${CUSTOMINCDIR}/$$i; \
+	    fi; \
 	done
-	@for i in ${CUSTOM_HELP}; do \
-	    echo ${CUSTOMHELPDIR}/$$i; \
+	${Q}for i in ${CUSTOM_HELP} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo __file__ ${CUSTOMHELPDIR}/$$i; \
+	    fi; \
 	done
-	@for i in ${CUSTOM_CALC_FILES}; do \
-	    echo ${CUSTOMLIBDIR}/$$i; \
+	${Q}for i in ${CUSTOM_CALC_FILES} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo __file__ ${CUSTOMCALDIR}/$$i; \
+	    fi; \
 	done
-	@for i in ${CALC_LIBCUSTOM}; do \
-	    echo ${CUSTOMLIBDIR}/$$i; \
+	${Q}for i in ${CALC_LIBCUSTOM} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo __file__ ${CUSTOMCALDIR}/$$i; \
+	    fi; \
 	done
 
 ##
@@ -505,118 +600,144 @@ clobber:
 	rm -f .all Makefile.tmp Makefile.bak
 
 install: all
-	-${Q}if [ ! -d ${SHAREDIR} ]; then \
-		echo mkdir ${SHAREDIR}; \
-		mkdir ${SHAREDIR}; \
-		echo ${CHMOD} 0755 ${SHAREDIR}; \
-		${CHMOD} 0755 ${SHAREDIR}; \
+	-${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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${INCDIR} ]; then \
-		echo mkdir ${INCDIR}; \
-		mkdir ${INCDIR}; \
-		echo ${CHMOD} 0755 ${INCDIR}; \
-		${CHMOD} 0755 ${INCDIR}; \
+	-${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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${CSHAREDIR} ]; then \
-		echo mkdir ${CSHAREDIR}; \
-		mkdir ${CSHAREDIR}; \
-		echo ${CHMOD} 0755 ${CSHAREDIR}; \
-		${CHMOD} 0755 ${CSHAREDIR}; \
+	-${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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${INCDIRCALC} ]; then \
-		echo mkdir ${INCDIRCALC}; \
-		mkdir ${INCDIRCALC}; \
-		echo ${CHMOD} 0755 ${INCDIRCALC}; \
-		${CHMOD} 0755 ${INCDIRCALC}; \
+	-${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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${HELPDIR} ]; then \
-		echo mkdir ${HELPDIR}; \
-		mkdir ${HELPDIR}; \
-		echo ${CHMOD} 0755 ${HELPDIR}; \
-		${CHMOD} 0755 ${HELPDIR}; \
+	-${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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${CUSTOMLIBDIR} ]; then \
-		echo mkdir ${CUSTOMLIBDIR}; \
-		mkdir ${CUSTOMLIBDIR}; \
-		echo ${CHMOD} 0755 ${CUSTOMLIBDIR}; \
-		${CHMOD} 0755 ${CUSTOMLIBDIR}; \
+	-${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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${CUSTOMHELPDIR} ]; then \
-		echo mkdir ${CUSTOMHELPDIR}; \
-		mkdir ${CUSTOMHELPDIR}; \
-		echo ${CHMOD} 0755 ${CUSTOMHELPDIR}; \
-		${CHMOD} 0755 ${CUSTOMHELPDIR}; \
+	-${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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${CUSTOMINCDIR} ]; then \
-		echo mkdir ${CUSTOMINCDIR}; \
-		mkdir ${CUSTOMINCDIR}; \
-		echo ${CHMOD} 0755 ${CUSTOMINCDIR}; \
-		${CHMOD} 0755 ${CUSTOMINCDIR}; \
-	else \
-	    true; \
-	fi
-	-${Q}for i in ${INSTALL_H_SRC}; do \
-	    rm -f tmp; \
-	    ${SED} -e 's/^\(#[ 	]*include[ 	][ 	]*\)"/\1"calc\//' $$i > tmp; \
-	    if ${CMP} -s tmp ${CUSTOMINCDIR}/$$i; then \
+	-${Q}for i in ${INSTALL_H_SRC} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if ${CMP} -s tmp $T${CUSTOMINCDIR}/$$i; then \
 		true; \
 	    else \
-		rm -f ${CUSTOMINCDIR}/$$i; \
-		cp -f tmp ${INCDIRCALC}/$$i.new; \
-		cp -f $$i ${CUSTOMINCDIR}/$$i.new; \
-		${CHMOD} 0444 ${CUSTOMINCDIR}/$$i.new; \
-		mv -f ${CUSTOMINCDIR}/$$i.new ${CUSTOMINCDIR}/$$i; \
-		echo "installed ${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}rm -f tmp
-	-${Q}for i in ${CUSTOM_CALC_FILES}; do \
-	    if ${CMP} -s $$i ${CUSTOMLIBDIR}/$$i; then \
+	-${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; \
 	    else \
-		rm -f ${CUSTOMLIBDIR}/$$i; \
-		cp -f $$i ${CUSTOMLIBDIR}/$$i; \
-		${CHMOD} 0444 ${CUSTOMLIBDIR}/$$i.new; \
-		mv -f ${CUSTOMLIBDIR}/$$i.new ${CUSTOMLIBDIR}/$$i; \
-		echo "installed ${CUSTOMLIBDIR}/$$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}; do \
-	    if ${CMP} -s $$i ${CUSTOMHELPDIR}/$$i; then \
+	-${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; \
 	    else \
-		rm -f ${CUSTOMHELPDIR}/$$i; \
-		cp -f $$i ${CUSTOMHELPDIR}/$$i.new; \
-		${CHMOD} 0444 ${CUSTOMHELPDIR}/$$i.new; \
-		mv -f ${CUSTOMHELPDIR}/$$i.new ${CUSTOMHELPDIR}/$$i; \
-		echo "installed ${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 ${CUSTOMLIBDIR}/libcustcalc.a; then \
+	    if ${CMP} -s libcustcalc.a $T${CUSTOMCALDIR}/libcustcalc.a; then \
 		true; \
 	    else \
-		rm -f ${CUSTOMLIBDIR}/libcustcalc.a.new; \
-		cp -f libcustcalc.a ${CUSTOMLIBDIR}/libcustcalc.a.new; \
-		${CHMOD} 0644 ${CUSTOMLIBDIR}/libcustcalc.a; \
-		mv -f ${CUSTOMLIBDIR}/libcustcalc.a.new \
-		      ${CUSTOMLIBDIR}/libcustcalc.a; \
-		${RANLIB} ${CUSTOMLIBDIR}/libcustcalc.a; \
-		echo "installed ${CUSTOMLIBDIR}/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
 
@@ -628,7 +749,6 @@ install: all
 
 # DO NOT DELETE THIS LINE
 
-
 c_argv.o: ../alloc.h
 c_argv.o: ../block.h
 c_argv.o: ../byteswap.h
@@ -645,6 +765,7 @@ c_argv.o: ../have_memmv.h
 c_argv.o: ../have_newstr.h
 c_argv.o: ../have_stdlib.h
 c_argv.o: ../have_string.h
+c_argv.o: ../have_unused.h
 c_argv.o: ../longbits.h
 c_argv.o: ../md5.h
 c_argv.o: ../nametype.h
@@ -671,6 +792,7 @@ c_devnull.o: ../have_memmv.h
 c_devnull.o: ../have_newstr.h
 c_devnull.o: ../have_stdlib.h
 c_devnull.o: ../have_string.h
+c_devnull.o: ../have_unused.h
 c_devnull.o: ../longbits.h
 c_devnull.o: ../md5.h
 c_devnull.o: ../nametype.h
@@ -697,6 +819,7 @@ c_help.o: ../have_memmv.h
 c_help.o: ../have_newstr.h
 c_help.o: ../have_stdlib.h
 c_help.o: ../have_string.h
+c_help.o: ../have_unused.h
 c_help.o: ../longbits.h
 c_help.o: ../md5.h
 c_help.o: ../nametype.h
@@ -723,6 +846,7 @@ c_pzasusb8.o: ../have_memmv.h
 c_pzasusb8.o: ../have_newstr.h
 c_pzasusb8.o: ../have_stdlib.h
 c_pzasusb8.o: ../have_string.h
+c_pzasusb8.o: ../have_unused.h
 c_pzasusb8.o: ../longbits.h
 c_pzasusb8.o: ../md5.h
 c_pzasusb8.o: ../nametype.h
@@ -752,6 +876,7 @@ c_sysinfo.o: ../have_memmv.h
 c_sysinfo.o: ../have_newstr.h
 c_sysinfo.o: ../have_stdlib.h
 c_sysinfo.o: ../have_string.h
+c_sysinfo.o: ../have_unused.h
 c_sysinfo.o: ../hist.h
 c_sysinfo.o: ../longbits.h
 c_sysinfo.o: ../longlong.h

custom/c_argv.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.2 $
- * @(#) $Id: c_argv.c,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: c_argv.c,v 29.3 2004/02/23 09:19:18 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_argv.c,v $
  *
  * Under source code control:	1997/03/09 20:27:37
@@ -40,6 +40,8 @@
 #include "../config.h"
 #include "../calc.h"
 
+#include "../have_unused.h"
+
 /*
  * c_argv - a custom function display info about its args
  *
@@ -51,7 +53,7 @@
  */
 /*ARGSUSED*/
 VALUE
-c_argv(char *name, int count, VALUE **vals)
+c_argv(char UNUSED *name, int count, VALUE **vals)
 {
 	VALUE result;		/* what we will return */
 	ZVALUE zfilelen;	/* length of a file as a ZVALUE */

custom/c_devnull.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.2 $
- * @(#) $Id: c_devnull.c,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: c_devnull.c,v 29.3 2004/02/23 09:19:18 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_devnull.c,v $
  *
  * Under source code control:	1997/03/09 17:49:12
@@ -36,6 +36,8 @@
 #include "../value.h"
 #include "../custom.h"
 
+#include "../have_unused.h"
+
 
 /*
  * c_devnull - a custom function that does nothing
@@ -45,7 +47,7 @@
  */
 /*ARGSUSED*/
 VALUE
-c_devnull(char *name, int count, VALUE **vals)
+c_devnull(char UNUSED *name, int UNUSED count, VALUE UNUSED **vals)
 {
 	VALUE result;		/* what we will return */
 

custom/c_help.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.2 $
- * @(#) $Id: c_help.c,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: c_help.c,v 29.3 2004/02/23 09:19:18 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_help.c,v $
  *
  * Under source code control:	1997/03/09 05:25:41
@@ -36,6 +36,8 @@
 #include "../value.h"
 #include "../custom.h"
 
+#include "../have_unused.h"
+
 
 /*
  * c_help - custom help function
@@ -56,7 +58,7 @@
  */
 /*ARGSUSED*/
 VALUE
-c_help(char *name, int count, VALUE **vals)
+c_help(char UNUSED *name, int UNUSED count, VALUE **vals)
 {
 	VALUE result;		/* what we will return */
 

custom/c_pzasusb8.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.2 $
- * @(#) $Id: c_pzasusb8.c,v 29.2 2000/06/07 14:03:03 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: c_pzasusb8.c,v 29.3 2004/02/23 09:19:18 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_pzasusb8.c,v $
  *
  * Under source code control:	1999/10/06 03:12:25
@@ -37,6 +37,8 @@
 #include "../custom.h"
 #include "../zmath.h"
 
+#include "../have_unused.h"
+
 /*
  * c_pzasusb8 - print numereator as a string of USB8s
  *
@@ -49,7 +51,7 @@
  */
 /*ARGSUSED*/
 VALUE
-c_pzasusb8(char *name, int count, VALUE **vals)
+c_pzasusb8(char UNUSED *name, int UNUSED count, VALUE **vals)
 {
 	VALUE result;		/* what we will return */
 	ZVALUE z;		/* numerator of the value */

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.5 $
- * @(#) $Id: c_sysinfo.c,v 29.5 2001/04/14 23:04:17 chongo Exp $
+ * @(#) $Revision: 29.7 $
+ * @(#) $Id: c_sysinfo.c,v 29.7 2004/02/23 09:19:18 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_sysinfo.c,v $
  *
  * Under source code control:	1997/03/09 23:14:40
@@ -53,6 +53,8 @@
 #include "../zrand.h"
 #include "../zrandom.h"
 
+#include "../have_unused.h"
+
 
 /*
  * sys_info - names and values of selected #defines
@@ -128,8 +130,6 @@ static struct infoname sys_info[] = {
     {"MAX_SM_PRIME", "larest 32 bit prime", NULL, (FULL)MAX_SM_PRIME},
     {"MAX_SM_VAL", "larest 32 bit value", NULL, (FULL)MAX_SM_VAL},
     {"MUL_ALG2", "default size for alternative multiply", NULL, (FULL)MUL_ALG2},
-    {"NEW_EPSILONPREC_DEFAULT", "2^-EPSILON_DEFAULT <= EPSILON_DEFAULT", NULL, (FULL)NEW_EPSILONPREC_DEFAULT},
-    {"NEW_EPSILON_DEFAULT", "newstd EPSILON_DEFAULT", NEW_EPSILON_DEFAULT, (FULL)0},
     {"NXT_MAP_PRIME", "smallest odd prime not in pr_map", NULL, (FULL)NXT_MAP_PRIME},
     {"NXT_PFACT_VAL", "next prime for higher pfact values", NULL, (FULL)NXT_PFACT_VAL},
     {"OFF_T_BITS", "file offset size in bits", NULL, (FULL)OFF_T_BITS},
@@ -181,7 +181,7 @@ static void dump_mening_value(void);	/* custom("sysinfo", 2) */
  */
 /*ARGSUSED*/
 VALUE
-c_sysinfo(char *name, int count, VALUE **vals)
+c_sysinfo(char UNUSED *name, int count, VALUE **vals)
 {
 	VALUE result;		/* what we will return */
 	struct infoname *p;	/* current infoname */

endian.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.3 $
- * @(#) $Id: endian.c,v 29.3 2001/03/18 02:59:42 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: endian.c,v 29.4 2003/01/14 01:50:01 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/endian.c,v $
  *
  * Under source code control:	1993/11/15 04:32:58
@@ -36,6 +36,11 @@
 
 #include <stdio.h>
 
+#include "have_stdlib.h"
+#if defined(HAVE_STDLIB_H)
+#include <stdlib.h>
+#endif
+
 #include "have_unistd.h"
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>

file.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.7 $
- * @(#) $Id: file.c,v 29.7 2001/04/10 22:06:46 chongo Exp $
+ * @(#) $Revision: 29.8 $
+ * @(#) $Id: file.c,v 29.8 2004/02/23 07:53:12 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/file.c,v $
  *
  * Under source code control:	1991/07/20 00:21:56
@@ -810,7 +810,7 @@ idprintf(FILEID id, char *fmt, int count, VALUE **vals)
 	VALUE *vp;
 	char *str;
 	int ch;
-	unsigned long len;
+	long len;
 	int oldmode, newmode;
 	long olddigits, newdigits;
 	long width, precision;

file.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.4 $
- * @(#) $Id: file.h,v 29.4 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: file.h,v 29.5 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/file.h,v $
  *
  * Under source code control:	1996/05/24 05:55:58
@@ -35,7 +35,7 @@
 #define __FILE_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "have_fpos.h"
 #else
 # include <calc/have_fpos.h>

func.c

@@ -1,7 +1,7 @@
 /*
  * func - built-in functions implemented here
  *
- * Copyright (C) 1999  David I. Bell, Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2002  David I. Bell, Landon Curt Noll and Ernest Bowen
  *
  * Primary author:  David I. Bell
  *
@@ -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.10 $
- * @(#) $Id: func.c,v 29.10 2001/05/29 00:41:22 chongo Exp $
+ * @(#) $Revision: 29.13 $
+ * @(#) $Id: func.c,v 29.13 2004/02/23 07:25:41 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/func.c,v $
  *
  * Under source code control:	1990/02/15 01:48:15
@@ -84,6 +84,7 @@
 #endif
 
 #include "have_const.h"
+#include "have_unused.h"
 #include "calc.h"
 #include "calcerr.h"
 #include "opcodes.h"
@@ -107,7 +108,7 @@
 /*
  * forward declarations
  */
-static NUMBER *base_value(long mode);
+static NUMBER *base_value(long mode, int defval);
 static int strscan(char *s, int count, VALUE **vals);
 static int filescan(FILEID id, int count, VALUE **vals);
 static VALUE f_eval(VALUE *vp);
@@ -307,7 +308,7 @@ f_display(int count, VALUE **vals)
 
 /*ARGSUSED*/
 static VALUE
-f_null(int count, VALUE **vals)
+f_null(int UNUSED count, VALUE UNUSED **vals)
 {
 	VALUE res;
 
@@ -4729,7 +4730,7 @@ f_list(int count, VALUE **vals)
 
 /*ARGSUSED*/
 static VALUE
-f_assoc(int count, VALUE **vals)
+f_assoc(int UNUSED count, VALUE UNUSED **vals)
 {
 	VALUE result;
 
@@ -6910,9 +6911,9 @@ f_system(VALUE *vp)
 		printf("%s\n", vp->v_str->s_str);
 	}
 #if defined(_WIN32)
-	/* if the execute length is 0 then use NULL in system call */
+	/* if the execute length is 0 then just return 0 */
 	if (strlen(vp->v_str->s_str) == 0) {
-		result.v_num = itoq((long)system(NULL));
+		result.v_num = itoq((long)0);
 	} else {
 		result.v_num = itoq((long)system(vp->v_str->s_str));
 	}
@@ -6978,15 +6979,15 @@ f_base(int count, NUMBER **vals)
 
 	/* deal with just a query */
 	if (count != 1) {
-		return base_value(conf->outmode);
+		return base_value(conf->outmode, conf->outmode);
 	}
 
 	/* deal with the specal modes first */
 	if (qisfrac(vals[0])) {
-		return base_value(math_setmode(MODE_FRAC));
+		return base_value(math_setmode(MODE_FRAC), conf->outmode);
 	}
 	if (vals[0]->num.len > 64/BASEB) {
-		return base_value(math_setmode(MODE_EXP));
+		return base_value(math_setmode(MODE_EXP), conf->outmode);
 	}
 
 	/* set the base, if possible */
@@ -7014,7 +7015,61 @@ f_base(int count, NUMBER **vals)
 	}
 
 	/* return the old base */
-	return base_value(oldbase);
+	return base_value(oldbase, conf->outmode);
+}
+
+
+/*
+ * set the default secondary output base/mode
+ */
+static NUMBER *
+f_base2(int count, NUMBER **vals)
+{
+	long base;	/* output base/mode */
+	long oldbase=0; /* output base/mode */
+
+	/* deal with just a query */
+	if (count != 1) {
+		return base_value(conf->outmode2, conf->outmode2);
+	}
+
+	/* deal with the specal modes first */
+	if (qisfrac(vals[0])) {
+		return base_value(math_setmode2(MODE_FRAC), conf->outmode2);
+	}
+	if (vals[0]->num.len > 64/BASEB) {
+		return base_value(math_setmode2(MODE_EXP), conf->outmode2);
+	}
+
+	/* set the base, if possible */
+	base = qtoi(vals[0]);
+	switch (base) {
+	case 0:
+		oldbase = math_setmode2(MODE2_OFF);
+		break;
+	case -10:
+		oldbase = math_setmode2(MODE_INT);
+		break;
+	case 2:
+		oldbase = math_setmode2(MODE_BINARY);
+		break;
+	case 8:
+		oldbase = math_setmode2(MODE_OCTAL);
+		break;
+	case 10:
+		oldbase = math_setmode2(MODE_REAL);
+		break;
+	case 16:
+		oldbase = math_setmode2(MODE_HEX);
+		break;
+	default:
+		math_error("Unsupported base");
+		/*NOTREACHED*/
+		break;
+	}
+
+	/* return the old base */
+	return base_value(oldbase, conf->outmode2);
 }
 
 
@@ -7022,14 +7077,14 @@ f_base(int count, NUMBER **vals)
  * return a numerical 'value' of the mode/base
  */
 static NUMBER *
-base_value(long mode)
+base_value(long mode, int defval)
 {
 	NUMBER *result;
 
 	/* return the old base */
 	switch (mode) {
 	case MODE_DEFAULT:
-		switch (conf->outmode) {
+		switch (defval) {
 		case MODE_DEFAULT:
 			result = itoq(10);
 			break;
@@ -7056,6 +7111,9 @@ base_value(long mode)
 		case MODE_BINARY:
 			result = itoq(2);
 			break;
+		case MODE2_OFF:
+			result = itoq(0);
+			break;
 		default:
 			result = itoq(0);
 			break;
@@ -7084,6 +7142,9 @@ base_value(long mode)
 	case MODE_BINARY:
 		result = itoq(2);
 		break;
+	case MODE2_OFF:
+		result = itoq(0);
+		break;
 	default:
 		result = itoq(0);
 		break;
@@ -7825,6 +7886,8 @@ static CONST struct builtin builtins[] = {
 	 "arithmetic mean of values"},
 	{"base", 0, 1, 0, OP_NOP, f_base, 0,
 	 "set default output base"},
+	{"base2", 0, 1, 0, OP_NOP, f_base2, 0,
+	 "set default secondary output base"},
 	{"bernoulli", 1, 1, 0, OP_NOP, 0, f_bern,
 	 "Bernoulli number for index a"},
 	{"bit", 2, 2, 0, OP_BIT, 0, 0,

func.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.3 $
- * @(#) $Id: func.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: func.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/func.h,v $
  *
  * Under source code control:	1990/02/15 01:48:33
@@ -32,7 +32,7 @@
 #define __FUNC_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "calc.h"
 # include "label.h"
 #else

hash.c

@@ -1,7 +1,7 @@
 /*
  * hash - one-way hash routines
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999-2002  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.4 $
- * @(#) $Id: hash.c,v 29.4 2001/04/14 22:47:21 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: hash.c,v 29.5 2002/12/29 09:20:25 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/hash.c,v $
  *
  * Under source code control:	1995/11/23 05:13:11
@@ -941,6 +941,7 @@ hash_value(int type, void *v, HASH *state)
 
 		/* hash the CONFIG state */
 		state = hash_int(type, value->v_config->outmode, state);
+		state = hash_int(type, value->v_config->outmode2, state);
 		state = hash_long(type,(long)value->v_config->outdigits, state);
 		state = hash_number(type, value->v_config->epsilon, state);
 		state = hash_long(type,

hash.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.3 $
- * @(#) $Id: hash.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: hash.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/hash.h,v $
  *
  * Under source code control:	1995/11/14 23:57:45
@@ -33,7 +33,7 @@
 #define __HASH_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "shs.h"
 # include "shs1.h"
 # include "md5.h"

have_unused.c

@@ -0,0 +1,89 @@
+/*
+ * have_unused - Determine if we want or can support the unused attribute
+ *
+ * Copyright (C) 2004  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: have_unused.c,v 29.2 2004/02/23 08:35:42 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/have_unused.c,v $
+ *
+ * Under source code control:	2004/02/22 22:36:10
+ * File existed as early as:	2004
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * usage:
+ *	have_unused
+ *
+ * Not all compilers support the unused attribute, so this may not compile
+ * on your system.
+ *
+ * This prog outputs several defines:
+ *
+ *	HAVE_UNUSED
+ *		defined ==> ok to use unused
+ *		undefined ==> do not use unused
+ *
+ *	UNUSED
+ *		unused ==> use unused
+ *		(nothing) ==> unused not used
+ */
+
+
+#include <stdio.h>
+
+#if !defined(HAVE_NO_UNUSED)
+
+/* make sure that we can use the __attribute__((unused)) in #define's */
+#undef UNUSED
+#define UNUSED __attribute__((unused))
+
+/*
+ * unused_str - a function with an unused argument
+ */
+static char *
+unused_str(char UNUSED *str)
+{
+    return "__attribute__((unused))";
+}
+
+#endif /* !HAVE_NO_UNUSED */
+
+
+int
+main(void)
+{
+#if defined(HAVE_NO_UNUSED)
+
+	printf("#undef HAVE_UNUSED /* no */\n");
+	printf("#undef UNUSED\n");
+	printf("#define UNUSED /* no */\n");
+
+#else /* HAVE_NO_UNUSED */
+
+	printf("#define HAVE_UNUSED /* yes */\n");
+	printf("#undef UNUSED\n");
+	printf("#define UNUSED %s /* yes */\n", unused_str(NULL));
+
+#endif /* HAVE_NO_UNUSED */
+
+	/* exit(0); */
+	return 0;
+}

help/Makefile

@@ -2,7 +2,7 @@
 #
 # help - makefile for calc help files
 #
-# Copyright (C) 1999  Landon Curt Noll
+# Copyright (C) 1999-2002  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.13 $
-# @(#) $Id: Makefile,v 29.13 2001/05/29 00:41:11 chongo Exp $
+# @(#) $Revision: 29.23 $
+# @(#) $Id: Makefile,v 29.23 2003/01/14 02:24:48 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/help/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/23 06:47:57
@@ -36,16 +36,120 @@
 SHELL= /bin/sh
 MAKE_FILE = Makefile
 
-# ${SHAREDIR}		where most common shared files are kept
-#
-# ${CSHAREDIR}		where most common shared calc files are kept
-# ${HELPDIR}		where the help directory is installed.
-#
-#SHAREDIR= /usr/local/lib
-SHAREDIR= /usr/share
+####
+# Normally, the upper level makefile will set these values.  We provide
+# a default here just in case you want to build from this directory.
+####
 
-CSHAREDIR= ${SHAREDIR}/calc
-HELPDIR= ${CSHAREDIR}/help
+# Where the system include (.h) files are kept
+#
+# For DJGPP, select:
+#
+#	INCDIR= /dev/env/DJDIR/include
+#
+# If in doubt, set:
+#
+#	INCDIR= /usr/include
+#
+
+#INCDIR= /usr/local/include
+#INCDIR= /dev/env/DJDIR/include
+INCDIR= /usr/include
+
+# where to install calc realted things
+#
+# ${BINDIR}		where to install calc binary files
+# ${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.
+#
+# For DJGPP, select:
+#
+#	BINDIR= /dev/env/DJDIR/bin
+#	LIBDIR= /dev/env/DJDIR/lib
+#	CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+#
+# If in doubt, set:
+#
+#	BINDIR= /usr/bin
+#	LIBDIR= /usr/lib
+#	CALC_SHAREDIR= /usr/share/calc
+#
+#BINDIR= /usr/local/bin
+#BINDIR= /dev/env/DJDIR/bin
+BINDIR= /usr/bin
+
+#LIBDIR= /usr/local/lib
+#LIBDIR= /dev/env/DJDIR/lib
+LIBDIR= /usr/lib
+
+#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+CALC_SHAREDIR= /usr/share/calc
+
+# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
+# ---------------------------------------------------------------
+# ${HELPDIR}		where the help directory is installed
+# ${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
+# ${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.
+#
+# If in doubt, set:
+#
+#	HELPDIR= ${CALC_SHAREDIR}/help
+#	CALC_INCDIR= ${INCDIR}/calc
+#	CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+#	CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+#	CUSTOMINCDIR= ${CALC_INCDIR}/custom
+#	SCRIPTDIR= ${BINDIR}/cscript
+#
+HELPDIR= ${CALC_SHAREDIR}/help
+CALC_INCDIR= ${INCDIR}/calc
+CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+CUSTOMINCDIR= ${CALC_INCDIR}/custom
+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
+# to install calc somewhere other than into the system area.
+#
+# For example, if:
+#
+#     BINDIR= /usr/bin
+#     LIBDIR= /usr/lib
+#     CALC_SHAREDIR= /usr/share/calc
+#
+# and if:
+#
+#     T= /var/tmp/testing
+#
+# Then the installation locations will be:
+#
+#     calc binary files:	/var/tmp/testing/usr/bin
+#     calc link library:	/var/tmp/testing/usr/lib
+#     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 in doubt, use T=
+#
+T=
 
 # Makefile debug
 #
@@ -142,11 +246,11 @@ BLT_HELP_FILES= ${BLT_HELP_FILES_3} ${BLT_HELP_FILES_5} \
 # This list is prodiced by the detaillist rule when no WARNINGS are detected.
 #
 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 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 dereference det \
-	digit digits dp epsilon errcount errmax errno error euler eval \
+	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 dereference \
+	det digit digits dp epsilon errcount errmax errno error euler eval \
 	exp fact factor fclose fcnt feof ferror fflush fgetc fgetfield \
 	fgetline fgets fgetstr fib files floor fopen forall fprintf fputc \
 	fputs fputstr frac free freebernoulli freeeuler freeglobals freeredc \
@@ -240,7 +344,8 @@ changes: ../CHANGES
 
 libcalc: ../LIBRARY
 	rm -f $@
-	${SED} -e 's:$${LIBDIR}:${LIBDIR}:g' < ../LIBRARY > $@
+	${SED} -e 's:$${LIBDIR}:${LIBDIR}:g' \
+	       -e 's:$${CALC_INCDIR}:${CALC_INCDIR}:g' < ../LIBRARY > $@
 	${CHMOD} 0444 $@
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
@@ -391,11 +496,13 @@ full: ${FULL_HELP_FILES} ${MAKE_FILE}
 # Singular files are the same files as their plural form.
 #
 ${SINGULAR_FILES}: ${PLURAL_FILES}
-	${Q}for i in ${SINGULAR_FILES}; 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}; \
+	    fi; \
 	done
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
@@ -428,7 +535,8 @@ builtin: builtin.top builtin.end ../func.c funclist.sed
 	-${Q}rm -f funclist.c
 	${Q}${SED} -n -f funclist.sed ../func.c > funclist.c
 	-${Q}rm -f funclist.o funclist
-	${Q}${LCC} ${ICFLAGS} -DFUNCLIST -I/usr/include -I.. funclist.c -c
+	${Q}${LCC} ${ICFLAGS} -DFUNCLIST -I/usr/include \
+	    -I.. funclist.c -c 2>/dev/null
 	${Q}${LCC} ${ILDFLAGS} funclist.o -o funclist
 	-${Q}rm -f builtin
 	${Q}cat builtin.top > builtin
@@ -455,8 +563,10 @@ builtin: builtin.top builtin.end ../func.c funclist.sed
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST}; 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:
@@ -481,12 +591,14 @@ bsdi: all
 #
 detaillist:
 	${Q}-(echo "xxxxx"; \
-	   for i in ${DETAIL_HELP}; do \
+	   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; \
 		fi; \
+	    fi; \
 	done | LANG=C ${SORT}) | ${FMT} -70 | \
 	    ${SED} -e '1s/xxxxx/DETAIL_HELP=/' -e '2,$$s/^/	/' \
 		   -e 's/$$/ \\/' -e '$$s/ \\$$//'
@@ -497,24 +609,14 @@ detaillist:
 #
 ##
 
-echo_STD_HELP_FILES: ${MAKE_FILE}
-	@echo ${STD_HELP_FILES}
-
-echo_BLT_HELP_FILES: ${MAKE_FILE}
-	@echo ${BLT_HELP_FILES}
-
-echo_DETAIL_HELP: ${MAKE_FILE}
-	@echo ${DETAIL_HELP}
-
-echo_SINGULAR_FILES: ${MAKE_FILE}
-	@echo ${SINGULAR_FILES}
-
-echo_install.list: ${MAKE_FILE}
-	@for i in ${STD_HELP_FILES} full ${BLT_HELP_FILES} \
-		  builtin ${DETAIL_HELP} ${SINGULAR_FILES}; do \
-	    echo ${HELPDIR}/$$i; \
+echo_inst_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
-	@echo ${HELPDIR}/obj
+	${Q}echo __file__ ${HELPDIR}/obj
 
 ##
 #
@@ -533,48 +635,51 @@ clobber:
 	rm -f ${SINGULAR_FILES} ${DETAIL_CLONE}
 
 install: all
-	-${Q}if [ ! -d ${SHAREDIR} ]; then \
-		echo mkdir ${SHAREDIR}; \
-		mkdir ${SHAREDIR}; \
-		echo ${CHMOD} 0755 ${SHAREDIR}; \
-		${CHMOD} 0755 ${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}; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d ${CSHAREDIR} ]; then \
-		echo mkdir ${CSHAREDIR}; \
-		mkdir ${CSHAREDIR}; \
-		echo ${CHMOD} 0755 ${CSHAREDIR}; \
-		${CHMOD} 0755 ${CSHAREDIR}; \
-	else \
-	    true; \
-	fi
-	-${Q}if [ ! -d ${HELPDIR} ]; then \
-		echo mkdir ${HELPDIR}; \
-		mkdir ${HELPDIR}; \
-		echo ${CHMOD} 0755 ${HELPDIR}; \
-		${CHMOD} 0755 ${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}; \
 	else \
 	    true; \
 	fi
 	-${Q}for i in ${STD_HELP_FILES} ${BLT_HELP_FILES} builtin \
-		  full ${DETAIL_HELP} ${SINGULAR_FILES}; do \
-	    if ${CMP} -s $$i ${HELPDIR}/$$i; then \
+		  full ${DETAIL_HELP} ${SINGULAR_FILES} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if ${CMP} -s $$i $T${HELPDIR}/$$i; then \
 		true; \
 	    else \
-		rm -f ${HELPDIR}/$$i.new; \
-		cp -f $$i ${HELPDIR}/$$i.new; \
-		${CHMOD} 0444 ${HELPDIR}/$$i.new; \
-		mv -f ${HELPDIR}/$$i.new ${HELPDIR}/$$i; \
-		echo "installed ${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 ${HELPDIR}/obj; then \
+	-${Q}if ${CMP} -s obj.file $T${HELPDIR}/obj; then \
 	    true; \
 	else \
-	    rm -f ${HELPDIR}/obj.new; \
-	    cp -f obj.file ${HELPDIR}/obj.new; \
-	    ${CHMOD} 0444 ${HELPDIR}/obj.new; \
-	    mv -f ${HELPDIR}/obj.new ${HELPDIR}/obj; \
-	    echo "installed ${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

help/address

@@ -23,7 +23,7 @@ DESCRIPTION
     0 <= i < sizeof(B).	 &B[i] then returns the address at which this
     octet is located until the block is freed or relocated.  Freeing
     of an unnamed block B occurs when a new value is assigned to B or
-    when B ceases to exist; a named block B is freed by blkfree(B().
+    when B ceases to exist; a named block B is freed by blkfree(B).
     A block is relocated when an operation like copying to B requires
     a change of sizeof(B).
 
@@ -70,18 +70,18 @@ DESCRIPTION
 			> p = &"abc"
 			> A = "abc"
 
-    The address &*A of the value of A will be equal to p.
+    the address &*A of the value of A will be equal to p.
 
     Except in cases like strcat(A, "") when *A identified with a literal
     string as above, definitions of string values using strcat() or substr()
     will copy the relevant strings to newly allocated addresses which will
     be useable only while the variables retain these defined values.
-    For example,
+    For example, after
 
 			> B = C = strcat("a", "bc");
 
     &*B and &*C will be different.  If p is defined by p = &*B, p should
-    not be used after a mew value is assigned to B, or B ceases to exist,
+    not be used after a new value is assigned to B, or B ceases to exist,
     etc.
 
     When compilation of a function encounters for the first time a particular
@@ -117,7 +117,7 @@ DESCRIPTION
 
 		> A = B = C = f(2);
 
-    which, not only performs the addition n f() only once, but stores the
+    which, not only performs the addition in f() only once, but stores the
     number values for A, B and C at the same address.
 
     Whether a value V is a pointer and if so, its type, is indicated by the
@@ -176,8 +176,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.2 $
-## @(#) $Id: address,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: address,v 29.3 2002/07/10 11:47:04 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/address,v $
 ##
 ## Under source code control:	1997/09/06 20:03:34

help/arrow

@@ -13,7 +13,7 @@ TYPES
 DESCRIPTION
     p->X returns the same as (*p).X.  Thus the current value of *p is
     to be an object of a type for which X identifies one element.
-    p->X then returns the lvalue corresponding to that element of of the
+    p->X then returns the lvalue corresponding to that element of the
     value of *p.
 
     The expression *p.X will cause a runtime error since this is
@@ -66,8 +66,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.2 $
-## @(#) $Id: arrow,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: arrow,v 29.3 2002/07/10 11:47:04 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/arrow,v $
 ##
 ## Under source code control:	1997/09/06 20:03:34

help/asin

@@ -14,7 +14,7 @@ DESCRIPTION
     Returns the asin of x to a multiple of eps with error less in
     absolute value than .75 * eps.
 
-    v = asin(x) is the number in [-p1/2, pi/2] for which sin(v) = x.
+    v = asin(x) is the number in [-pi/2, pi/2] for which sin(v) = x.
 
 EXAMPLE
     > print asin(.5, 1e-5), asin(.5, 1e-10), asin(.5, 1e-15), asin(.5, 1e-20)
@@ -45,8 +45,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.2 $
-## @(#) $Id: asin,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: asin,v 29.3 2002/07/10 11:47:04 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/asin,v $
 ##
 ## Under source code control:	1994/03/19 01:40:24

help/assoc

@@ -32,10 +32,9 @@ DESCRIPTION
     may have different numbers (between 1 and 4 inclusive) of indices,
     and these indices need not be integers in specified ranges.
 
-    Assignments of a null value
-    to an element of an association does not delete the element, but
-    a later reference to that element will return the null value as if
-    the element is undefined.
+    Assignment of a null value to an element of an association does not
+    delete the element, but a later reference to that element will return
+    the null value as if the element is undefined.
 
     The elements of an association are stored in a hash table for
     quick access.  The index values are hashed to select the correct
@@ -99,8 +98,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.2 $
-## @(#) $Id: assoc,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: assoc,v 29.3 2002/07/10 11:47:04 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/assoc,v $
 ##
 ## Under source code control:	1994/09/25 20:22:31

help/atan

@@ -14,7 +14,7 @@ DESCRIPTION
     Returns the atan of x to a multiple of eps with error less in
     absolute value than .75 * eps.
 
-    v = atan(x) is the number in (-p1/2, pi/2) for which tan(v) = x.
+    v = atan(x) is the number in (-pi/2, pi/2) for which tan(v) = x.
 
 EXAMPLE
     > print atan(2, 1e-5), atan(2, 1e-10), atan(2, 1e-15), atan(2, 1e-20)
@@ -45,8 +45,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.2 $
-## @(#) $Id: atan,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: atan,v 29.3 2002/07/10 11:47:04 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/atan,v $
 ##
 ## Under source code control:	1994/03/19 01:40:25

help/base

@@ -57,7 +57,7 @@ DESCRIPTION
 	base(1e20)	base(2^64)	base(2^8191-1)
 
     However the base() function will only return one of the base values
-    lised in the table above.
+    listed in the table above.
 
 EXAMPLE
     > base()
@@ -79,7 +79,7 @@ LINK LIBRARY
 	  MODE_REAL, MODE_EXP, MODE_HEX, MODE_OCTAL, MODE_BINARY
 
 SEE ALSO
-    config
+    base2, config, str
 
 ## Copyright (C) 1999  Landon Curt Noll
 ##
@@ -97,8 +97,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.2 $
-## @(#) $Id: base,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.5 $
+## @(#) $Id: base,v 29.5 2002/12/29 09:17:54 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/base,v $
 ##
 ## Under source code control:	1994/09/30 00:09:39

help/base2

@@ -0,0 +1,120 @@
+NAME
+    base2 - set 2nd output base
+
+SYNOPSIS
+    base2([mode])
+
+TYPES
+    mode	real
+
+    return	real
+
+DESCRIPTION
+    By default, calc will output values according to the default base
+    as controlled by the base() builtin function.
+
+    The base2() builtin function, if given a non-zero argument, enables
+    double base output mode.  In double base output mode, calc values
+    are displayed twice, once according to base() and again according
+    to base2().  In double base output mode, the second time a value is
+    displayed, it is displayed within comments:
+
+	21701 /* 0x54c5 */
+
+    The arguments for base2() are identical to base() with the addition
+    of the 0 value:
+
+	     base2	equivalent
+		      config("mode2")'s
+
+	       2	"binary"	base 2 fractions
+			"bin"
+
+	       8	"octal"		base 8 fractions
+			"oct"
+
+	      10	"real"		base 10 floating point
+			"float"
+			"default"
+
+	     -10	"integer"	base 10 integers
+			"int"
+
+	      16	"hexadecimal"	base 16 fractions
+			"hex"
+
+	     1/3	"fraction"	base 10 fractions
+			"frac"
+
+	    1e20	"scientific"	base 10 scientific notation
+			"sci"
+			"exp"
+
+	       0	"off"		disable double base output
+
+    For convenience, any non-integer non-zero value is assumed to mean
+    base 10 fractions and any integer >= 2^64 is assumed to mean base 10
+    scientific notation.
+
+    These base2() calls have the same meaning as config("mode2", "fraction"):
+
+	base2(1/3)	base2(0.1415)	base2(16/37)
+
+    These base2() calls have the same meaning as config("mode2", "scientific"):
+
+	base2(1e20)	base2(2^64)	base2(2^8191-1)
+
+    However the base2() function will only return one of the base values
+    listed in the table above.
+
+EXAMPLE
+    > base2()
+	    0
+    > base2(8)
+	    0 /* 0 */
+    > print 10
+    10 /* 012 */
+    > base2(16),
+    > 131072
+    	131072 /* 0x20000 */
+    > 2345
+	2345 /* 0x929 */
+
+LIMITS
+    none
+
+LINK LIBRARY
+    int math_setmode2(int newmode)
+
+    NOTE: newmode must be one of MODE_DEFAULT, MODE_FRAC, MODE_INT,
+	  MODE_REAL, MODE_EXP, MODE_HEX, MODE_OCTAL, MODE_BINARY,
+	  MODE2_OFF
+
+SEE ALSO
+    base, config, str
+
+## Copyright (C) 2002  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: 1.3 $
+## @(#) $Id: base2,v 1.3 2002/12/29 09:17:54 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/base2,v $
+##
+## Under source code control:	2002/12/29 00:21:07
+## File existed as early as:	2002
+##
+## chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/

help/bernoulli

@@ -15,7 +15,7 @@ DESCRIPTION
 
 		t/(exp(t) - 1) = Sum B_n * t^n/n!
 
-    bernouuli(n) is zero both for n < 0 and for n odd and > 2.
+    bernoulli(n) is zero both for n < 0 and for n odd and > 2.
     When bernoulli(n) is computed for positive even n, the values for
     n and smaller positive even indices are stored in a table so that
     a later call to bernoulli(k) with 0 <= k < n will be executed quickly.
@@ -57,8 +57,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.4 $
-## @(#) $Id: bernoulli,v 29.4 2000/12/17 12:27:58 chongo Exp $
+## @(#) $Revision: 29.5 $
+## @(#) $Id: bernoulli,v 29.5 2002/07/10 11:47:04 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/bernoulli,v $
 ##
 ## Under source code control:	2000/07/13 01:33:00

help/blk

@@ -122,7 +122,7 @@ DESCRIPTION
     Named blocks are assigned index numbers 0, 1, 2, ..., in the order
     of their creation.	The block with index id is returned by blocks(id).
     With no argument, blocks() returns the number of current unfreed
-    named blocks.  A named block may be used
+    named blocks.
 
     The memory allocated to a named block is freed by the blkfree()
     function with argument the named block, its name, or its id number.
@@ -234,8 +234,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.2 $
-## @(#) $Id: blk,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: blk,v 29.3 2002/07/10 11:47:04 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/blk,v $
 ##
 ## Under source code control:	1997/04/05 13:07:13

help/blocks

@@ -1,5 +1,5 @@
 NAME
-    blocks - return a named file or number of unfreed named blocks
+    blocks - return a named block or number of unfreed named blocks
 
 SYNOPSIS
     blocks([id])
@@ -58,8 +58,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.2 $
-## @(#) $Id: blocks,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: blocks,v 29.3 2002/07/10 11:47:04 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/blocks,v $
 ##
 ## Under source code control:	1997/04/05 13:07:13

help/config

@@ -16,6 +16,7 @@ Configuration parameters
 	    "epsilon"		sets error value for transcendentals.
 	    "maxprint"		sets maximum number of elements printed.
 	    "mode"		sets printout mode.
+	    "mode2"		sets 2nd base printout mode.
 	    "mul2"		sets size for alternative multiply.
 	    "sq2"		sets size for alternative squaring.
 	    "pow2"		sets size for alternate powering.
@@ -48,6 +49,7 @@ Configuration parameters
 	    "program"		Read-only calc program or shell script path
 	    "basename"		Read-only basename of the program value
 	    "windows"		Read-only indicator of MS windows
+	    "cygwin"		TRUE=>calc compiled with cygwin, Read-only
 	    "version"		Read-only calc version
 
     The "all" config value allows one to save/restore the configuration
@@ -184,6 +186,7 @@ Detailed config descriptions
     =-=
 
     config("mode", "mode_string")
+    config("mode2", "mode_string")
 
     The "mode" parameter is a string specifying the mode for printing of
     numbers by the unformatted print functions, and the default
@@ -219,7 +222,17 @@ Detailed config descriptions
     Where multiple strings are given, the first string listed is what
     config("mode") will return.
 
-    The default "mode" is "real".
+    The "mode2" controls the double base output.  When set to a value
+    other than "off", calc outputs files in both the "base" mode as
+    well as the "base2" mode.  The "mode2" value may be any of the
+    "mode" values with the addition of:
+
+	    "off"		disable 2nd base output mode	base2(0)
+
+    The base() builtin function sets and returns the "mode" value.
+    The base2() builtin function sets and returns the "mode2" value.
+
+    The default "mode" is "real".  The default "mode2" is "off".
 
     =-=
 
@@ -687,6 +700,16 @@ Detailed config descriptions
     Returns TRUE if you are running on a MS windows system, false if you
     are running on an operating system that does not hate you.
 
+    This config parameter is read-only and cannot be set.
+
+    =-=
+
+    config("cygwin")		<== NOTE: This is a read-only config value
+
+    Returns TRUE if you calc was compiled with cygwin, false otherwise.
+
+    This config parameter is read-only and cannot be set.
+
     =-=
 
     config("version")		<== NOTE: This is a read-only config value
@@ -713,8 +736,8 @@ Detailed config descriptions
 ## 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: config,v 29.6 2001/04/25 07:17:38 chongo Exp $
+## @(#) $Revision: 29.8 $
+## @(#) $Id: config,v 29.8 2004/02/23 05:59:22 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/config,v $
 ##
 ## Under source code control:	1991/07/21 04:37:17

help/contrib

@@ -35,24 +35,41 @@ If your change is large, you should send entire files (either
 as a diff -c /dev/null your-file patch, or as a uuencoded and
 gziped (or compressed) tar file).
 
-You should send submissions to:
+To contribute code, scripts, resource files and/or to help please
+join the low volume calc mailing list by sending EMail to:
 
     calc-contrib at asthe dot com
 
     [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
     [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
 
+Your subject must contain the words:
+
+    calc mailing list subscription
+
+You may have additional words in your subject line.
+
+Feel free to follow the name line with additional EMail text as desired.
+
 Thanks for considering submitting code to calc.	 Calc is a collective
 work by a number of people.  It would not be what it is today without
 your efforts and submissions!
 
-Calc bug reports, however, should be sent to:
+=-=
+
+Calc bug reports and calc bug fixes should be sent to:
 
     calc-bugs at asthe dot com
 
     [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
     [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
 
+Your subject must contain the words:
+
+       calc bug report
+
+You may have additional words in your subject line.
+
 See the BUGS file or try the help command:
 
     help bugs
@@ -61,26 +78,10 @@ for details on bug reporting.
 
 =-=
 
-One may join the calc testing group by sending a request to:
-
-	calc-tester-request at asthe dot com
-
-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
-
-    Your message body (not the subject) should consist of:
-
-	subscribe calc-tester address
-	end
-	name your_full_name
-
-    where "address" is your EMail address and "your_full_name"
-    is your full name.
-
 Landon Curt Noll
 http://www.isthe.com/chongo/
 
-chongo <was here> /\../\
+chongo (share and enjoy) /\../\
 
 ## Copyright (C) 1999  Landon Curt Noll
 ##
@@ -98,8 +99,8 @@ chongo <was here> /\../\
 ## 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: contrib,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.4 $
+## @(#) $Id: contrib,v 29.4 2001/06/01 11:37:14 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/contrib,v $
 ##
 ## Under source code control:	1997/03/09 16:33:22

help/digits

@@ -11,20 +11,38 @@ TYPES
     return	integer
 
 DESCRIPTION
-    Returns the least non-negative integer n for which abs(x) < b^n.
+    Returns number of digits in the standard base-b representation
+    when x is truncated to an integer and the sign is ignored.
 
-    digits(x, b) = 0  if and only if abs(x) < 1.
+    To be more precise: when abs(int(x)) > 0, this function returns
+    the value 1 + ilog(x, b).  When abs(int(x)) == 0, then this
+    function returns the value 1.
 
-    For real x with absolute value >= 1, digits(x, b) is the number
-    of digits in the standard base-b "decimal" representation of int(abs(x));
-    this is also given by  1 + ilog(x, b).
+    If omitted, b is assumed to be 10.  If given, b must be an
+    integer > 1.
+
+    One should remember these special cases:
+
+	digits(12.3456) == 2    computes with the integer part only
+	digits(-1234) == 4      computes with the absolute value only
+	digits(0) == 1          specical case
+	digits(-0.123) == 1     combination of all of the above
 
 EXAMPLE
-    > print digits(0), digits(0.0123), digits(3.7), digits(-27), digits(-99.7)
-    0 0 1 2 2
+    > print digits(100), digits(23209), digits(2^72)
+    3 5 22
+
+    > print digits(0), digits(1), digits(-1)
+    1 1 1
+
+    > print digits(-1234), digits(12.3456), digits(107.207)
+    4 2 3
+
+    > print digits(17^463-1, 17), digits(10000, 100), digits(21701, 2)
+    3, 15 14
 
 LIMITS
-    none
+    b > 1
 
 LINK LIBRARY
     long qdigits(NUMBER *q, ZVALUE base)
@@ -32,7 +50,7 @@ LINK LIBRARY
 SEE ALSO
     digit, places
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999-2003  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
@@ -48,8 +66,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.3 $
-## @(#) $Id: digits,v 29.3 2000/12/14 10:32:24 chongo Exp $
+## @(#) $Revision: 29.5 $
+## @(#) $Id: digits,v 29.5 2003/01/26 19:41:35 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/digits,v $
 ##
 ## Under source code control:	1995/10/03 10:40:01

help/hash

@@ -1,5 +1,5 @@
 NAME
-    hash - FNV-1 hash value
+    hash - return the calc hash value
 
 SYNOPSIS
     hash(x_1 [, x_2, x_3, ...])
@@ -12,27 +12,16 @@ TYPES
 DESCRIPTION
     Returns a hash value for one or more values of arbitrary types.
 
-    The basis of this hash algorithm was taken from an idea sent
-    as reviewer comments to the IEEE POSIX P1003.2 committee by:
+    The calc hash value is based on the core Fowler/Noll/Vo hash
+    known as FNV-1.  The return value, however, cannot be used
+    as an FNV hash value because calc's internal function also
+    takes into account more abstract concepts such as data types.
 
-	 Phong Vo (http://www.research.att.com/info/kpv/)
-	 Glenn Fowler (http://www.research.att.com/~gsf/)
-
-    In a subsequent ballot round:
-
-	 Landon Curt Noll (http://www.isthe.com/chongo/)
-
-    improved on their algorithm.  Some people tried this hash
-    and found that it worked rather well.  In an EMail message
-    to Landon, they named it ``Fowler/Noll/Vo'' or the FNV hash.
-
-    FNV hashes are architected to be fast while maintaining a low
-    collision rate. The FNV speed allows one to quickly hash lots
-    of data while maintaining a reasonable collision rate.  See:
+    See:
 
 	 http://www.isthe.com/chongo/tech/comp/fnv/
 
-    for more details as well as other forms of the FNV hash.
+    information about the Fowler/Noll/Vo (FNV) hash.
 
 EXAMPLE
     > a = isqrt(2e1000); s = "xyz";
@@ -48,7 +37,7 @@ LINK LIBRARY
 SEE ALSO
     sha, sha1, md5
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999-2003  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
@@ -64,8 +53,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.2 $
-## @(#) $Id: hash,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: hash,v 29.3 2003/03/01 01:16:02 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/hash,v $
 ##
 ## Under source code control:	1996/03/12 23:10:01

help/im

@@ -20,7 +20,7 @@ LIMITS
     none
 
 LINK LIBRARY
-    COMPLEX *cimag(COMPLEX *x)
+    COMPLEX *c_imag(COMPLEX *x)
 
 SEE ALSO
     re
@@ -41,8 +41,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.2 $
-## @(#) $Id: im,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: im,v 29.3 2002/03/12 09:38:26 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/im,v $
 ##
 ## Under source code control:	1995/10/05 04:52:26

help/places

@@ -16,6 +16,9 @@ DESCRIPTION
 
     places(x,b) = 0 if and only if x is an integer.
 
+    If omitted, b is assumed to be 10.  If given, b must be an
+    integer > 1.
+
     places(x,b) = n > 0 if and only if the fractional part of abs(x)
     has a finite base-b "decimal" representation with n digits of which
     the last digit is nonzero.  This occurs if and only if every prime
@@ -29,7 +32,7 @@ EXAMPLE
     -1 3 1
 
 LIMITS
-    none
+    b > 1
 
 LINK LIBRARY
     long qplaces(NUMBER *q, ZVALUE base)
@@ -37,7 +40,7 @@ LINK LIBRARY
 SEE ALSO
     digit, digits
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999-2003  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
@@ -53,8 +56,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.4 $
-## @(#) $Id: places,v 29.4 2000/12/17 12:27:58 chongo Exp $
+## @(#) $Revision: 29.5 $
+## @(#) $Id: places,v 29.5 2003/01/26 19:43:45 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/places,v $
 ##
 ## Under source code control:	1995/10/03 10:40:02

help/re

@@ -20,7 +20,7 @@ LIMITS
     none
 
 LINK LIBRARY
-    COMPLEX *cimag(COMPLEX *x)
+    COMPLEX *c_imag(COMPLEX *x)
 
 SEE ALSO
     im
@@ -41,8 +41,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.2 $
-## @(#) $Id: re,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: re,v 29.3 2002/03/12 09:38:26 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/re,v $
 ##
 ## Under source code control:	1995/10/05 04:52:27

help/str

@@ -18,7 +18,7 @@ DESCRIPTION
 
     For real or complex x, str(x) returns the string representing x
     in the current printing mode; configuration parameters affecting
-    this are "mode", "display", "outround", "tilde", "leadzero",
+    this are "mode", "mode2", "display", "outround", "tilde", "leadzero",
 
 EXAMPLE
     > str("")
@@ -28,6 +28,10 @@ EXAMPLE
     > print str(123), str("+"), str(4i), str("is the same as"), str(123+4i)
     123 + 4i is the same as 3+4i
 
+    > base2(16),
+    > print str(23209)
+    23209 /* 0x5aa9 */
+
 LIMITS
     none
 
@@ -41,9 +45,9 @@ LINK LIBRARY
     char *math_getdivertedio();
 
 SEE ALSO
-    XXX - fill in
+    base, base2, config
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999-2002  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
@@ -59,8 +63,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.2 $
-## @(#) $Id: str,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: str,v 29.3 2002/12/29 09:19:56 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/str,v $
 ##
 ## Under source code control:	1995/10/05 04:52:27

help/todo

@@ -59,6 +59,15 @@ Very High priority items:
     * Fix any 'Known bugs' 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.
+
+    * Consider using GNU autoconf / configure to build the calc Makefile.
+
 =-=
 
 High priority items:
@@ -76,8 +85,6 @@ High priority items:
     * Perform a code coverage analysis of the 'make check' action
       and improve the coverage (within reason) of the regress.cal suite.
 
-    * Create a Linux rpm (Red Hat Package Manager) package for calc.
-
     * Address, if possible and reasonable, any Calc Mis-features
       as noted in the BUGS file or as displayed by 'calc help bugs'.
 
@@ -115,9 +122,7 @@ Medium priority items:
     * Add a builtin function to access the 64 bit FNV hash which
       is currently being used internally in seed.c.
 
-    * Consider using configure to build the calc Makefile.
-
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999-2003  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
@@ -133,8 +138,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.2 $
-## @(#) $Id: todo,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.5 $
+## @(#) $Id: todo,v 29.5 2003/02/25 20:26:17 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/todo,v $
 ##
 ## Under source code control:	1999/10/20 07:42:55

help/usage

@@ -148,10 +148,14 @@ Calc command line
 	       when the mode disables opening of files for reading.
 
 
-	  -n   Use the new configuration defaults instead of the old
-	       default classic defaults.  This flag as the same effect
-	       as executing config("all", "newcfg") at startup time.
+	  -O   Use the old classic defaults instead of the default
+	       configuration.  This flag as the same effect as executing
+	       config("all", "oldcfg") at startup time.
 
+	       NOTE: Older versions of calc used -n to setup a modified
+	       form of the default calc configuration.  The -n flag
+	       currently does  nothing.   Use of the -n flag is now
+	       deprecated and may used for something else in the future.
 
 	  -p   Pipe processing is enabled by use of -p.	 For example:
 
@@ -249,8 +253,8 @@ Calc command line
 			./myfile.cal
 			${LIBDIR}/myfile
 			${LIBDIR}/myfile.cal
-			${CUSTOMLIBDIR}/myfile
-			${CUSTOMLIBDIR}/myfile.cal
+			${CUSTOMCALDIR}/myfile
+			${CUSTOMCALDIR}/myfile.cal
 
 	  If the file is found, the search stops and the commands in
 	  the file are executed.  It is an error if no readable file
@@ -353,8 +357,8 @@ For more information use the following calc commands:
 ## 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: usage,v 29.3 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.6 $
+## @(#) $Id: usage,v 29.6 2003/06/10 21:39:34 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/usage,v $
 ##
 ## Under source code control:	1991/07/21 04:37:25

help/version

@@ -12,8 +12,7 @@ DESCRIPTION
 
     Calc version strings can be of the form:
 
-    	x.y.ztw.v
-    	x.y.ztw
+    	x.y.z.w
     	x.y.z
     	x.y
 
@@ -22,7 +21,7 @@ DESCRIPTION
 
 EXAMPLE
     > version()
-    	    "2.11.5t4.1"
+    	    "2.11.5.4"
 
 LIMITS
     none
@@ -49,8 +48,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.2 $
-## @(#) $Id: version,v 29.2 2001/05/29 00:43:54 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: version,v 29.3 2001/06/09 23:32:45 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/version,v $
 ##
 ## Under source code control:	2001/05/28 17:38:01

hist.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.3 $
- * @(#) $Id: hist.c,v 29.3 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: hist.c,v 29.5 2004/02/23 10:29:55 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/hist.c,v $
  *
  * Under source code control:	1993/05/02 20:09:19
@@ -67,6 +67,8 @@
 # include <string.h>
 #endif
 
+#include "have_unused.h"
+
 #if !defined(USE_READLINE)
 
 extern FILE *curstream(void);
@@ -193,8 +195,8 @@ static char	esc_map_name[] = "esc-map";
 
 
 static KEY_MAP	maps[] = {
-	{base_map_name},
-	{esc_map_name}
+	{base_map_name, {NULL, NULL}, {NULL, NULL}},
+	{esc_map_name, {NULL, NULL}, {NULL, NULL}},
 };
 
 
@@ -407,7 +409,7 @@ hist_term(void)
 static KEY_MAP *
 find_map(char *map)
 {
-	int	i;
+	unsigned int i;
 
 	for (i = 0; i < sizeof(maps) / sizeof(maps[0]); i++) {
 		if (strcmp(map, maps[i].name) == 0)
@@ -1489,7 +1491,7 @@ my_stifle_history (void)
 
 
 int
-hist_init(char *filename)
+hist_init(char UNUSED *filename)
 {
 	/* used when parsing conditionals in ~/.inputrc */
 	rl_readline_name = "calc";

hist.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.3 $
- * @(#) $Id: hist.h,v 29.3 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: hist.h,v 29.4 2002/03/12 09:40:57 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/hist.h,v $
  *
  * Under source code control:	1993/05/02 20:09:20
@@ -50,7 +50,11 @@
 #define HOMECHAR	'~'	/* char which indicates home directory */
 #define DOTCHAR		'.'	/* char which indicates current directory */
 #define PATHCHAR	'/'	/* char which separates path components */
+#if defined(__MSDOS__) || defined(__WIN32)
+#define LISTCHAR	';'	/* char which separates paths in a list */
+#else
 #define LISTCHAR	':'	/* char which separates paths in a list */
+#endif
 
 
 /*

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.5 $
- * @(#) $Id: input.c,v 29.5 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: input.c,v 29.6 2002/03/12 09:40:57 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/input.c,v $
  *
  * Under source code control:	1990/02/15 01:48:16
@@ -46,6 +46,12 @@
 #include <unistd.h>
 #endif
 
+#if defined(__MSDOS__)
+#include <limits.h>
+#define _fullpath(f,n,s) (_fixpath(n,f),f)
+#define _MAX_PATH PATH_MAX
+#endif
+
 #include "calc.h"
 #include "conf.h"
 #include "hist.h"
@@ -816,11 +822,12 @@ runrcfiles(void)
  * given:
  *	sbuf		stat of the inode in question
  */
+
 static int
 isinoderead(struct stat *sbuf)
 {
 	int i;
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(__MSDOS__)
 	char fullpathname[_MAX_PATH];
 #endif
 
@@ -832,9 +839,9 @@ isinoderead(struct stat *sbuf)
 
 	/* scan the entire readset */
 	for (i=0; i < maxreadset; ++i) {
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(__MSDOS__)
 		if (readset[i].active &&
-		    strcmp(readset[i].path,
+		    strcasecmp(readset[i].path,
 		    	       _fullpath(fullpathname,cip->i_name,
 			       _MAX_PATH)) == 0) {
 			/* found a match */
@@ -954,14 +961,18 @@ addreadset(char *name, char *path, struct stat *sbuf)
 		return -1;
 	}
 	strcpy(readset[ret].name, name);
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(__MSDOS__)
 	/*
 	 * For WIN32, _fullpath expands the path to a fully qualified
 	 * path name, which under WIN32 FAT and NTFS is unique, just
 	 * like UNIX inodes. _fullpath also allocated the memory for
 	 * this new longer path name.
 	 */
-	readset[ret].path = _fullpath(NULL, path, 0);
+ 	 {
+	 	char fullpathname[_MAX_PATH];
+
+		readset[ret].path = _fullpath(fullpathname, path, _MAX_PATH);
+	 }
 #else /* Windoz free systems */
 	readset[ret].path = (char *)malloc(strlen(path)+1);
 	if (readset[ret].path == NULL) {

jump.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.3 $
- * @(#) $Id: jump.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: jump.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/jump.h,v $
  *
  * Under source code control:	1994/06/29 04:03:55
@@ -66,7 +66,7 @@
 #define __JUMP_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "have_const.h"
 #else
 # include <calc/have_const.h>

label.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.3 $
- * @(#) $Id: label.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: label.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/label.h,v $
  *
  * Under source code control:	1990/02/15 01:48:33
@@ -32,7 +32,7 @@
 #define __LABEL_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "zmath.h"
 #else
 # include <calc/zmath.h>

lib_calc.c

@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.7 $
- * @(#) $Id: lib_calc.c,v 29.7 2001/04/08 22:05:40 chongo Exp $
+ * @(#) $Revision: 29.9 $
+ * @(#) $Id: lib_calc.c,v 29.9 2003/08/26 04:36:10 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/lib_calc.c,v $
  *
  * Under source code control:	1996/06/17 18:06:19
@@ -106,7 +106,7 @@ extern uid_t geteuid();
 /*
  * Common definitions
  */
-int new_std = FALSE;	/* TRUE (-n) => use newstd configuration */
+int use_old_std = FALSE;	/* TRUE => use old classic configuration */
 int abortlevel;			/* current level of aborts */
 BOOL inputwait;			/* TRUE if in a terminal input wait */
 jmp_buf jmpbuf;			/* for errors */
@@ -217,6 +217,11 @@ libcalc_call_me_first(void)
 	 */
 	if (program != NULL) {
 		p = strrchr(program, '/');
+#if defined(_WIN32) || defined(__MSDOS__)
+		if (p == NULL) {
+			p = strrchr(program, '\\');
+		}
+#endif
 		if (p == NULL) {
 			base_name = program;
 		} else {
@@ -227,23 +232,23 @@ libcalc_call_me_first(void)
 	/*
 	 * initialize old and new configuration values
 	 */
-	oldstd.epsilon = &_qonesqbase_; /* magic to fake early str2q() */
-	oldstd.program = strdup(program);
-	oldstd.base_name = strdup(base_name);
-	oldstd.version = strdup(version());
-	conf = config_copy(&oldstd); /* more magic to fake early str2q() */
+	newstd.epsilon = &_qonesqbase_; /* magic to fake early str2q() */
+	newstd.program = strdup(program);
+	newstd.base_name = strdup(base_name);
+	newstd.version = strdup(version());
+	conf = config_copy(&newstd); /* more magic to fake early str2q() */
 	conf->tab_ok = FALSE;
+	newstd.epsilon = str2q(EPSILON_DEFAULT);
 	oldstd.epsilon = str2q(EPSILON_DEFAULT);
-	newstd.epsilon = str2q(NEW_EPSILON_DEFAULT);
 
 	/*
-	 * make oldstd our default config
+	 * make newstd our default config, unless -O
 	 */
 	config_free(conf);
-	if (new_std) {
-		conf = config_copy(&newstd);
-	} else {
+	if (use_old_std) {
 		conf = config_copy(&oldstd);
+	} else {
+		conf = config_copy(&newstd);
 	}
 
 	/*

matfunc.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.2 $
- * @(#) $Id: matfunc.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: matfunc.c,v 29.3 2004/02/23 07:55:54 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/matfunc.c,v $
  *
  * Under source code control:	1990/02/15 01:48:18
@@ -36,6 +36,8 @@
 #include "zrand.h"
 #include "calcerr.h"
 
+#include "have_unused.h"
+
 extern long irand(long s);
 
 static void matswaprow(MATRIX *m, long r1, long r2);
@@ -853,7 +855,7 @@ matfrac(MATRIX *m)
  */
 /*ARGSUSED*/
 VALUE *
-matindex(MATRIX *mp, BOOL create, long dim, VALUE *indices)
+matindex(MATRIX *mp, BOOL UNUSED create, long dim, VALUE *indices)
 {
 	NUMBER *q;		/* index value */
 	VALUE *vp;

math_error.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.4 $
- * @(#) $Id: math_error.h,v 29.4 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: math_error.h,v 29.5 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/math_error.h,v $
  *
  * Under source code control:	1997/03/23 18:37:10
@@ -33,7 +33,7 @@
 #define __MATH_ERROR_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "win32dll.h"
 #else
 # include <calc/win32dll.h>

md5.c

@@ -10,8 +10,8 @@
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR  IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * @(#) $Revision: 29.1 $
- * @(#) $Id: md5.c,v 29.1 1999/12/14 09:16:12 chongo Exp $
+ * @(#) $Revision: 29.2 $
+ * @(#) $Id: md5.c,v 29.2 2004/02/23 07:58:06 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/md5.c,v $
  *
  * This file is not covered under version 2.1 of the GNU LGPL.
@@ -432,7 +432,7 @@ static void
 MD5_note(int special, HASH *state)
 {
 	MD5_CTX *dig = &state->h_union.h_md5;	/* digest state */
-	int i;
+	unsigned int i;
 
 	/*
 	 * change state to reflect a special value
@@ -463,7 +463,7 @@ static void
 MD5_type(int type, HASH *state)
 {
 	MD5_CTX *dig = &state->h_union.h_md5;	/* digest state */
-	int i;
+	unsigned int i;
 
 	/*
 	 * ignore NUMBER and COMPLEX
@@ -531,7 +531,7 @@ MD5_final_state(HASH *state)
 {
 	MD5_CTX *dig = &state->h_union.h_md5;		/* digest state */
 	ZVALUE ret;		/* return ZVALUE of completed hash state */
-	int i;
+	unsigned int i;
 
 	/*
 	 * malloc and initialize if state is NULL
@@ -571,7 +571,7 @@ MD5_final_state(HASH *state)
 	}
 #endif
 
-	for (i=0; i < ret.len; ++i) {
+	for (i=0; i < (unsigned int)ret.len; ++i) {
 		ret.v[ret.len-i-1] = ((HALF*)dig->digest)[i];
 	}
 

no_implicit.c

@@ -0,0 +1,47 @@
+/*
+ * no-implicit - Determine if the compiler allows -Wno-implicit
+ *
+ * Copyright (C) 2003  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.1 $
+ * @(#) $Id: no_implicit.c,v 29.1 2003/01/14 01:45:19 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/no_implicit.c,v $
+ *
+ * Under source code control:	2003/01/14 01:45:19
+ * File existed as early as:	2003
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * If we are able to compile this program, then we the compiler must
+ * allow the -Wno-implicit flag so we output the -Wno-implicit symbol.
+ */
+
+
+#include <stdio.h>
+
+int
+main(void)
+{
+	/* -Wno-implicit flag is allowed */
+	printf("-Wno-implicit\n");
+
+	/* exit(0); */
+	return 0;
+}

obj.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.2 $
- * @(#) $Id: obj.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: obj.c,v 29.3 2004/02/23 09:13:15 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/obj.c,v $
  *
  * Under source code control:	1990/02/15 01:48:19
@@ -115,7 +115,7 @@ static struct objectinfo {
 	{1, A_VALUE, ERR_NONE,	"backslash", "unary backslash op"},
 	{2, A_VALUE, ERR_NONE,	"setminus", "binary backslash op"},
 	{1, A_VALUE, ERR_NONE,	"plus", "unary + op"},
-	{0, 0, 0, NULL}
+	{0, 0, 0, NULL, NULL}
 };
 
 

opcodes.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.4 $
- * @(#) $Id: opcodes.c,v 29.4 2001/04/25 07:16:26 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: opcodes.c,v 29.5 2004/02/23 07:34:08 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/opcodes.c,v $
  *
  * Under source code control:	1990/02/15 01:48:19
@@ -48,6 +48,8 @@
 #include "block.h"
 #include "string.h"
 
+#include "have_unused.h"
+
 #define QUICKLOCALS	20		/* local vars to handle quickly */
 
 
@@ -115,7 +117,7 @@ extern void setconfig(int type, VALUE *vp);
 void
 initstack(void)
 {
-	int i;
+	unsigned int i;
 
 	/* on first init, setup the stack array */
 	if (stack == NULL) {
@@ -163,7 +165,7 @@ o_localaddr(FUNC *fp, VALUE *locals, long index)
 
 /*ARGSUSED*/
 static void
-o_globaladdr(FUNC *fp, GLOBAL *sp)
+o_globaladdr(FUNC UNUSED *fp, GLOBAL *sp)
 {
 	if (sp == NULL) {
 		math_error("Global variable \"%s\" not initialized", sp->g_name);
@@ -178,9 +180,9 @@ o_globaladdr(FUNC *fp, GLOBAL *sp)
 
 /*ARGSUSED*/
 static void
-o_paramaddr(FUNC *fp, int argcount, VALUE *args, long index)
+o_paramaddr(FUNC UNUSED *fp, int argcount, VALUE *args, long index)
 {
-	if ((unsigned long)index >= argcount) {
+	if ((long)index >= argcount) {
 		math_error("Bad parameter index");
 		/*NOTREACHED*/
 	}
@@ -210,7 +212,7 @@ o_localvalue(FUNC *fp, VALUE *locals, long index)
 
 /*ARGSUSED*/
 static void
-o_globalvalue(FUNC *fp, GLOBAL *sp)
+o_globalvalue(FUNC UNUSED *fp, GLOBAL *sp)
 {
 	if (sp == NULL) {
 		math_error("Global variable not defined");
@@ -222,9 +224,9 @@ o_globalvalue(FUNC *fp, GLOBAL *sp)
 
 /*ARGSUSED*/
 static void
-o_paramvalue(FUNC *fp, int argcount, VALUE *args, long index)
+o_paramvalue(FUNC UNUSED *fp, int argcount, VALUE *args, long index)
 {
-	if ((unsigned long)index >= argcount) {
+	if ((long)index >= argcount) {
 		math_error("Bad parameter index");
 		/*NOTREACHED*/
 	}
@@ -267,7 +269,7 @@ o_argvalue(FUNC *fp, int argcount, VALUE *args)
 
 /*ARGSUSED*/
 static void
-o_number(FUNC *fp, long arg)
+o_number(FUNC UNUSED *fp, long arg)
 {
 	NUMBER *q;
 
@@ -285,7 +287,7 @@ o_number(FUNC *fp, long arg)
 
 /*ARGSUSED*/
 static void
-o_imaginary(FUNC *fp, long arg)
+o_imaginary(FUNC UNUSED *fp, long arg)
 {
 	NUMBER *q;
 	COMPLEX *c;
@@ -312,7 +314,7 @@ o_imaginary(FUNC *fp, long arg)
 
 /*ARGSUSED*/
 static void
-o_string(FUNC *fp, long arg)
+o_string(FUNC UNUSED *fp, long arg)
 {
 	stack++;
 	stack->v_str = slink(findstring(arg));
@@ -332,7 +334,7 @@ o_undef(void)
 
 /*ARGSUSED*/
 static void
-o_matcreate(FUNC *fp, long dim)
+o_matcreate(FUNC UNUSED *fp, long dim)
 {
 	register MATRIX *mp;	/* matrix being defined */
 	NUMBER *num1;		/* first number from stack */
@@ -400,7 +402,7 @@ o_matcreate(FUNC *fp, long dim)
 
 /*ARGSUSED*/
 static void
-o_eleminit(FUNC *fp, long index)
+o_eleminit(FUNC UNUSED *fp, long index)
 {
 	VALUE *vp;
 	static VALUE *oldvp;
@@ -501,7 +503,7 @@ o_eleminit(FUNC *fp, long index)
  */
 /*ARGSUSED*/
 static void
-o_indexaddr(FUNC *fp, long dim, long writeflag)
+o_indexaddr(FUNC UNUSED *fp, long dim, long writeflag)
 {
 	int i;
 	BOOL flag;
@@ -653,7 +655,7 @@ o_indexaddr(FUNC *fp, long dim, long writeflag)
 
 /*ARGSUSED*/
 static void
-o_elemaddr(FUNC *fp, long index)
+o_elemaddr(FUNC UNUSED *fp, long index)
 {
 	VALUE *vp;
 	MATRIX *mp;
@@ -708,7 +710,7 @@ o_elemvalue(FUNC *fp, long index)
 
 /*ARGSUSED*/
 static void
-o_objcreate(FUNC *fp, long arg)
+o_objcreate(FUNC UNUSED *fp, long arg)
 {
 	stack++;
 	stack->v_type = V_OBJ;
@@ -2558,7 +2560,7 @@ o_return(void)
 
 /*ARGSUSED*/
 static void
-o_jumpz(FUNC *fp, BOOL *dojump)
+o_jumpz(FUNC UNUSED *fp, BOOL *dojump)
 {
 	VALUE *vp;
 	int i;			/* result of comparison */
@@ -2582,7 +2584,7 @@ o_jumpz(FUNC *fp, BOOL *dojump)
 
 /*ARGSUSED*/
 static void
-o_jumpnz(FUNC *fp, BOOL *dojump)
+o_jumpnz(FUNC UNUSED *fp, BOOL *dojump)
 {
 	VALUE *vp;
 	int i;			/* result of comparison */
@@ -2609,7 +2611,7 @@ o_jumpnz(FUNC *fp, BOOL *dojump)
  */
 /*ARGSUSED*/
 static void
-o_jumpnn(FUNC *fp, BOOL *dojump)
+o_jumpnn(FUNC UNUSED *fp, BOOL *dojump)
 {
 	if (stack->v_addr->v_type) {
 		*dojump = TRUE;
@@ -2620,7 +2622,7 @@ o_jumpnn(FUNC *fp, BOOL *dojump)
 
 /*ARGSUSED*/
 static void
-o_condorjump(FUNC *fp, BOOL *dojump)
+o_condorjump(FUNC UNUSED *fp, BOOL *dojump)
 {
 	VALUE *vp;
 
@@ -2646,7 +2648,7 @@ o_condorjump(FUNC *fp, BOOL *dojump)
 
 /*ARGSUSED*/
 static void
-o_condandjump(FUNC *fp, BOOL *dojump)
+o_condandjump(FUNC UNUSED *fp, BOOL *dojump)
 {
 	VALUE *vp;
 
@@ -2677,7 +2679,7 @@ o_condandjump(FUNC *fp, BOOL *dojump)
  */
 /*ARGSUSED*/
 static void
-o_casejump(FUNC *fp, BOOL *dojump)
+o_casejump(FUNC UNUSED *fp, BOOL *dojump)
 {
 	VALUE *v1, *v2;
 	int r;
@@ -2699,7 +2701,7 @@ o_casejump(FUNC *fp, BOOL *dojump)
 
 /*ARGSUSED*/
 static void
-o_jump(FUNC *fp, BOOL *dojump)
+o_jump(FUNC UNUSED *fp, BOOL *dojump)
 {
 	*dojump = TRUE;
 }
@@ -2719,7 +2721,7 @@ o_usercall(FUNC *fp, long index, long argcount)
 
 /*ARGSUSED*/
 static void
-o_call(FUNC *fp, long index, long argcount)
+o_call(FUNC UNUSED *fp, long index, long argcount)
 {
 	VALUE result;
 
@@ -3073,7 +3075,7 @@ o_rightshift(void)
 
 /*ARGSUSED*/
 static void
-o_debug(FUNC *fp, long line)
+o_debug(FUNC UNUSED *fp, long line)
 {
 	funcline = line;
 	if (abortlevel >= ABORT_STATEMENT) {
@@ -3104,7 +3106,7 @@ o_printresult(void)
 
 /*ARGSUSED*/
 static void
-o_print(FUNC *fp, long flags)
+o_print(FUNC UNUSED *fp, long flags)
 {
 	VALUE *vp;
 
@@ -3138,7 +3140,7 @@ o_printspace(void)
 
 /*ARGSUSED*/
 static void
-o_printstring(FUNC *fp, long index)
+o_printstring(FUNC UNUSED *fp, long index)
 {
 	STRING *s;
 	char *cp;
@@ -3437,7 +3439,7 @@ o_initfill(void)
 static void
 o_show(FUNC *fp, long arg)
 {
-	int size;
+	unsigned int size;
 
 	switch((int) arg) {
 		case 1: showbuiltins(); return;
@@ -3662,7 +3664,7 @@ calculate(FUNC *fp, int argcount)
 	long oldline;			/* old value of line counter */
 	unsigned int opnum;		/* current opcode number */
 	int origargcount;		/* original number of arguments */
-	int i;				/* loop counter */
+	unsigned int i;			/* loop counter */
 	BOOL dojump;			/* TRUE if jump is to occur */
 	char *oldname;			/* old function name being executed */
 	VALUE *beginstack;		/* beginning of stack frame */
@@ -3677,7 +3679,7 @@ calculate(FUNC *fp, int argcount)
 	go = TRUE;
 	++calc_depth;
 	origargcount = argcount;
-	while (argcount < fp->f_paramcount) {
+	while ((unsigned)argcount < fp->f_paramcount) {
 		stack++;
 		stack->v_type = V_NULL;
 		stack->v_subtype = V_NOSUBTYPE;

opcodes.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.5 $
- * @(#) $Id: opcodes.h,v 29.5 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: opcodes.h,v 29.6 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/opcodes.h,v $
  *
  * Under source code control:	1990/02/15 01:48:35
@@ -32,7 +32,7 @@
 #define __OPCODES_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "win32dll.h"
 #else
 # include <calc/win32dll.h>

prime.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.3 $
- * @(#) $Id: prime.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: prime.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/prime.h,v $
  *
  * Under source code control:	1994/06/04 03:26:15
@@ -33,7 +33,7 @@
 #define __PRIME_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "qmath.h"
 # include "have_const.h"
 #else

qfunc.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.4 $
- * @(#) $Id: qfunc.c,v 29.4 2000/12/17 13:07:32 chongo Exp $
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: qfunc.c,v 29.6 2004/02/23 07:59:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/qfunc.c,v $
  *
  * Under source code control:	1990/02/15 01:48:20
@@ -623,8 +623,16 @@ qilog(NUMBER *q, ZVALUE base)
 /*
  * Return the number of digits in the representation to a specified
  * base of the integral part of a number.
+ *
  * Examples: qdigits(3456,10) = 4, qdigits(-23.45, 10) = 2.
  *
+ * One should remember these special cases:
+ *
+ *	digits(12.3456) == 2    computes with the integer part only
+ *	digits(-1234) == 4      computes with the absolute value only
+ *	digits(0) == 1          specical case
+ *	digits(-0.123) == 1     combination of all of the above
+ *
  * given:
  *	q		number to count digits of
  */
@@ -634,8 +642,8 @@ qdigits(NUMBER *q, ZVALUE base)
 	long n;			/* number of digits */
 	ZVALUE temp;		/* temporary value */
 
-	if (zabsrel(q->num, q->den) < 1)
-		return 0;
+	if (zabsrel(q->num, q->den) < 0)
+		return 1;
 	if (qisint(q))
 		return 1 + zlog(q->num, base);
 	zquo(q->num, q->den, &temp, 2);
@@ -1732,7 +1740,7 @@ qgcdrem(NUMBER *q1, NUMBER *q2)
 NUMBER *
 qlowfactor(NUMBER *q1, NUMBER *q2)
 {
-	long count;
+	unsigned long count;
 
 	if (qisfrac(q1) || qisfrac(q2)) {
 		math_error("Non-integers for lowfactor");

qio.c

@@ -1,7 +1,7 @@
 /*
  * qio - scanf and printf routines for arbitrary precision rational numbers
  *
- * Copyright (C) 1999  David I. Bell
+ * Copyright (C) 1999-2002  David I. Bell
  *
  * 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.3 $
- * @(#) $Id: qio.c,v 29.3 2000/07/17 15:35:49 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: qio.c,v 29.5 2004/02/23 09:10:59 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/qio.c,v $
  *
  * Under source code control:	1993/07/30 19:42:46
@@ -32,6 +32,8 @@
 #include "config.h"
 #include "args.h"
 
+#include "have_unused.h"
+
 
 #define PUTCHAR(ch)		math_chr(ch)
 #define PUTSTR(str)		math_str(str)
@@ -180,9 +182,12 @@ qprintnum(NUMBER *q, int outmode)
 {
 	NUMBER tmpval;
 	long prec, exp;
+	int outmode2 = MODE2_OFF;
 
-	if (outmode == MODE_DEFAULT)
+	if (outmode == MODE_DEFAULT) {
 		outmode = conf->outmode;
+		outmode2 = conf->outmode2;
+	}
 	switch (outmode) {
 		case MODE_INT:
 			if (conf->tilde_ok && qisfrac(q))
@@ -248,6 +253,12 @@ qprintnum(NUMBER *q, int outmode)
 			math_error("Bad mode for print");
 			/*NOTREACHED*/
 	}
+
+	if (outmode2 != MODE2_OFF) {
+		PUTSTR(" /* ");
+		qprintnum(q, outmode2);
+		PUTSTR(" */");
+	}
 }
 
 
@@ -290,7 +301,7 @@ qprintff(NUMBER *q, long width, long precision)
  */
 /*ARGSUSED*/
 void
-qprintfe(NUMBER *q, long width, long precision)
+qprintfe(NUMBER *q, long UNUSED width, long precision)
 {
 	long exponent;
 	NUMBER q2;

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.3 $
- * @(#) $Id: qmath.c,v 29.3 2000/07/17 15:35:49 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: qmath.c,v 29.4 2004/02/23 08:07:43 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/qmath.c,v $
  *
  * Under source code control:	1990/02/15 01:48:21
@@ -1296,7 +1296,7 @@ qreli(NUMBER *q, long n)
 	if (n == 0)
 		return (q->num.sign ? -1 : 0);
 
-	if (q->num.sign != n < 0)
+	if (q->num.sign != (n < 0))
 		return ((n < 0) ? 1 : -1);
 
 	itoz(n, &z1);

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.4 $
- * @(#) $Id: qmath.h,v 29.4 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: qmath.h,v 29.5 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/qmath.h,v $
  *
  * Under source code control:	1993/07/30 19:42:47
@@ -32,7 +32,7 @@
 #define __QMATH_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "zmath.h"
 #else
 # include <calc/zmath.h>

qtrans.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: qtrans.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: qtrans.c,v 29.4 2004/02/23 08:12:43 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/qtrans.c,v $
  *
  * Under source code control:	1990/02/15 01:48:22
@@ -479,7 +479,8 @@ qacos(NUMBER *q, NUMBER *epsilon)
 NUMBER *
 qatan(NUMBER *q, NUMBER *epsilon)
 {
-	long m, k, i, d;
+	long m, k, i;
+	FULL d;
 	ZVALUE X, D, DD, sum, mul, term, ztmp1, ztmp2;
 	NUMBER *qtmp, *res;
 	BOOL sign;

quickhash.c

@@ -1,7 +1,7 @@
 /*
- * quickhash - quickly hash a calc value using a partial Fowler/Noll/Vo hash
+ * quickhash - quickly hash a calc value using a quasi Fowler/Noll/Vo hash
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999-2002  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.4 $
- * @(#) $Id: quickhash.c,v 29.4 2001/04/14 22:47:21 chongo Exp $
+ * @(#) $Revision: 29.7 $
+ * @(#) $Id: quickhash.c,v 29.7 2003/03/01 01:21:12 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/quickhash.c,v $
  *
  * Under source code control:	1995/03/04 11:34:23
@@ -31,26 +31,6 @@
 /*
  * NOTE: This file does not contain a hash interface.  It is used by
  *	 associative arrays and other internal processes.
- *
- * We will compute a hash value for any type of calc value
- * for use in associative arrays and the hash() builtin.
- * Hash speed is of primary importance to make associative
- * arrays work at a reasonable speed.  For this reason, we
- * cut corners by hashing only a small part of a calc value.
- *
- * The Fowler/Noll/Vo hash does a very good job in producing
- * a 32 bit hash from ASCII strings in a short amount of time.
- * It is not bad for hashing calc data as well.	 So doing a
- * quick and dirty job of hashing on a part of a calc value,
- * combined with using a reasonable hash function will result
- * acceptable associative array performance.
- *
- * See:
- *	http://www.isthe.com/chongo/src/fnv/fnv_hash.tar.gz
- *	http://www.isthe.com/chongo/src/fnv/hash_32.c
- *	http://www.isthe.com/chongo/src/fnv/hash_64.c
- *
- * for information on 32bit and 64bit Fowler/Noll/Vo hashs.
  */
 
 
@@ -77,7 +57,7 @@ static QCKHASH blk_hash(BLOCK *blk, QCKHASH val);
 
 
 /*
- * FNV-0 - Fowler/Noll/Vo-0 32 bit hash
+ * quasi_fnv - quasi Fowler/Noll/Vo-0 32 bit hash
  *
  * The basis of this hash algorithm was taken from an idea sent
  * as reviewer comments to the IEEE POSIX P1003.2 committee by:
@@ -97,7 +77,7 @@ static QCKHASH blk_hash(BLOCK *blk, QCKHASH val);
  * collision rate. The FNV speed allows one to quickly hash lots
  * of data while maintaining a reasonable collision rate.  See:
  *
- *	http://www.isthe.com/chongo/tech/comp/fnv/
+ *	http://www.isthe.com/chongo/tech/comp/fnv/index.html
  *
  * for more details as well as other forms of the FNV hash.
  *
@@ -107,8 +87,55 @@ static QCKHASH blk_hash(BLOCK *blk, QCKHASH val);
  *
  * returns:
  *	the next 32 bit QCKHASH
+ *
+ * Example:
+ * 	QCKHASH val;
+ * 	int x;
+ *
+ * 	quasi_fnv(x, val);
+ *
+ * NOTE: The (x) argument may be an expression such as something with
+ * 	 a ++ or --.  The macro must only use (x) once.
+ *
+ * NOTE: The (val) argument just be a lvalue / something to which
+ * 	 a value can be assigned.
+ *
+ * The careful observer will note that (x) need not be a simple
+ * octet.  This is not a bug, but a feature.  The FNV hash was
+ * designed to operate on octets, not abstract objects such
+ * as associations, file descriptors and PRNG states.
+ * You will also notice that we sometimes add values directly
+ * to the (val) hash state.  This is a simulation of hashing
+ * a variable type.
+ *
+ * The Fowler/Noll/Vo hash does a very good job in producing
+ * a 32 bit hash arrays of octets in a short amount of time.
+ * It is not bad for hashing calc data as well.	 So doing a
+ * quick and dirty job of hashing on a part of a calc value
+ * is all that calc really needs.
+ *
+ * The core of the of the FNV hash has been adopted as the calc
+ * quick hash with the provision that it operates on 32 bit
+ * objects instead of octets.  For calc's internal purposes,
+ * this is sufficent.  For general FNV hashing, this is not
+ * recommended.
+ *
+ * It has been observed that gcc, when using -O, -O2, -O3 or
+ * better on an AMD or AMD-like processor (such as i686) will
+ * produce slightly faster code when using the shift/add
+ * expression than when performing a multiply with a constant.
  */
-#define fnv(x,val) (((QCKHASH)(val)*(QCKHASH)16777619) ^ ((QCKHASH)(x)))
+#if defined(NO_HASH_CPU_OPTIMIZATION)
+#define quasi_fnv(x,val) \
+    ((val) = (((QCKHASH)(val)*(QCKHASH)16777619) ^ ((QCKHASH)(x))))
+#else
+#define quasi_fnv(x,val) ( \
+    ((val) += (((QCKHASH)(val)<<1) + ((QCKHASH)(val)<<4) + \
+	       ((QCKHASH)(val)<<7) + ((QCKHASH)(val)<<8) + \
+	       ((QCKHASH)(val)<<24))), \
+    ((val) ^= (QCKHASH)(x)) \
+)
+#endif
 
 
 /*
@@ -159,7 +186,8 @@ hashvalue(VALUE *vp, QCKHASH val)
 {
 	switch (vp->v_type) {
 		case V_INT:
-			return fnv(vp->v_int, V_NUM+val);
+			val += V_NUM;
+			return quasi_fnv(vp->v_int, val);
 		case V_NUM:
 			return fnv_qhash(vp->v_num, val);
 		case V_COM:
@@ -177,7 +205,8 @@ hashvalue(VALUE *vp, QCKHASH val)
 		case V_MAT:
 			return mathash(vp->v_mat, val);
 		case V_FILE:
-			return fnv(vp->v_file, V_FILE+val);
+			val += V_FILE;
+			return quasi_fnv(vp->v_file, val);
 		case V_RAND:
 			return randhash(vp->v_rand, val);
 		case V_RANDOM:
@@ -189,7 +218,8 @@ hashvalue(VALUE *vp, QCKHASH val)
 		case V_BLOCK:
 			return blk_hash(vp->v_block, val);
 		case V_OCTET:
-			return fnv((int)*vp->v_octet, V_OCTET+val);
+			val += V_OCTET;
+			return quasi_fnv((int)*vp->v_octet, val);
 		case V_NBLOCK:
 			return blk_hash(vp->v_nblock->blk, val);
 		default:
@@ -207,7 +237,8 @@ static QCKHASH
 assochash(ASSOC *ap, QCKHASH val)
 {
 	/* XXX - hash the first and last values??? */
-	return fnv(ap->a_count, V_ASSOC+val);
+        val += V_ASSOC;
+	return quasi_fnv(ap->a_count, val);
 }
 
 
@@ -250,15 +281,16 @@ mathash(MATRIX *m, QCKHASH val)
 	/*
 	 * hash size parts of the matrix
 	 */
-	val = fnv(m->m_dim, V_MAT+val);
-	val = fnv(m->m_size, val);
+	val += V_MAT;
+	quasi_fnv(m->m_dim, val);
+	quasi_fnv(m->m_size, val);
 
 	/*
 	 * hash the matrix index bounds
 	 */
 	for (i = m->m_dim - 1; i >= 0; i--) {
-		val = fnv(m->m_min[i], val);
-		val = fnv(m->m_max[i], val);
+		quasi_fnv(m->m_min[i], val);
+		quasi_fnv(m->m_max[i], val);
 	}
 
 	/*
@@ -294,7 +326,7 @@ objhash(OBJECT *op, QCKHASH val)
 {
 	int i;
 
-	val = fnv(op->o_actions->oa_index, val);
+	quasi_fnv(op->o_actions->oa_index, val);
 
 	i = op->o_actions->oa_count;
 	while (--i >= 0)
@@ -323,10 +355,11 @@ randhash(RAND *r, QCKHASH val)
 		return V_RAND+val;
 	} else {
 		/* hash control values */
-		val = fnv(r->j, V_RAND+val);
-		val = fnv(r->k, val);
-		val = fnv(r->bits, val);
-		val = fnv(r->need_to_skip, val);
+	    	val += V_RAND;
+		quasi_fnv(r->j, val);
+		quasi_fnv(r->k, val);
+		quasi_fnv(r->bits, val);
+		quasi_fnv(r->need_to_skip, val);
 
 		/* hash the state arrays */
 		return fnv_fullhash(&r->buffer[0], SLEN+SCNT+SHUFLEN, val);
@@ -356,7 +389,8 @@ randomhash(RANDOM *state, QCKHASH val)
 	/*
 	 * hash a seeded RANDOM state
 	 */
-	val = fnv(state->buffer+state->bits, V_RANDOM+val);
+	val += V_RANDOM;
+	quasi_fnv(state->buffer+state->bits, val);
 	if (state->r.v != NULL) {
 		val = fnv_zhash(state->r, val);
 	}
@@ -382,6 +416,7 @@ config_hash(CONFIG *cfg, QCKHASH val)
 	 */
 	value = cfg->outmode;
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->outmode);
+	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->outmode2);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->outdigits);
 	/* epsilon is handeled out of order */
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->epsilonprec);
@@ -423,7 +458,8 @@ config_hash(CONFIG *cfg, QCKHASH val)
 	/*
 	 * hash the built up scalar
 	 */
-	val = fnv(value, V_CONFIG+val);
+	val += V_CONFIG;
+	quasi_fnv(value, val);
 
 	/*
 	 * hash the strings if possible
@@ -471,7 +507,7 @@ fnv_strhash(char *ch, QCKHASH val)
 	 * hash each character in the string
 	 */
 	while (*ch) {
-		val = fnv(*ch++, val);
+		quasi_fnv(*ch++, val);
 	}
 	return val;
 }
@@ -499,7 +535,7 @@ fnv_STRhash(STRING *str, QCKHASH val)
 	 * hash each character in the string
 	 */
 	while (n-- > 0) {
-		val = fnv(*ch++, val);
+		quasi_fnv(*ch++, val);
 	}
 	return val;
 }
@@ -523,7 +559,7 @@ fnv_fullhash(FULL *v, LEN len, QCKHASH val)
 	 * hash each character in the string
 	 */
 	while (len-- > 0) {
-		val = fnv(*v++, val);
+		quasi_fnv(*v++, val);
 	}
 	return val;
 }
@@ -551,7 +587,8 @@ fnv_zhash(ZVALUE z, QCKHASH val)
 	/*
 	 * hash the sign
 	 */
-	val = fnv(z.sign, val + V_NUM);
+	val += V_NUM;
+	quasi_fnv(z.sign, val);
 
 	n = z.len;
 	hp = z.v;
@@ -560,15 +597,15 @@ fnv_zhash(ZVALUE z, QCKHASH val)
 	while (n > 1) {
 		f = (FULL) *hp++;
 		f |= (FULL) *hp++ << BASEB;
-		val = fnv(f, val);
+		quasi_fnv(f, val);
 		n -= 2;
 	}
 	if (n) {
-		val = fnv(*hp, val);
+		quasi_fnv(*hp, val);
 	}
 #else
 	while (n--  > 0) {
-		val = fnv(*hp, val);
+		quasi_fnv(*hp, val);
 		++hp;
 	}
 #endif
@@ -595,7 +632,7 @@ hash_hash(HASH *hash, QCKHASH val)
 	 * hash each USB8 in the BLOCK
 	 */
 	for (i=0; i < hash->unionsize; ++i) {
-		val = fnv(hash->h_union.data[i], val);
+		quasi_fnv(hash->h_union.data[i], val);
 	}
 	return val;
 }
@@ -624,7 +661,7 @@ blk_hash(BLOCK *blk, QCKHASH val)
 	 */
 	if (blk->datalen > 0) {
 		for (i=0; i < blk->datalen; ++i) {
-			val = fnv(blk->data[i], val);
+			quasi_fnv(blk->data[i], val);
 		}
 	}
 	return val;

rpm.mk

@@ -0,0 +1,183 @@
+#!/bin/make
+#****h* calc/rpm.mk
+#
+# rpm.mk - Makefile for building rpm packages for calc
+#
+# Copyright (C) 2003  Petteri Kettunen and 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.
+#
+MAKEFILE_REV= $$Revision: 29.13 $$
+# @(#) $Id: rpm.mk,v 29.13 2003/04/15 03:39:17 chongo Exp $
+# @(#) $Source: /usr/local/src/cmd/calc/RCS/rpm.mk,v $
+#
+# Under source code control:	2003/02/16 20:21:39
+# File existed as early as:	2003
+#
+# chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+# Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+#
+# calculator by David I. Bell with help/mods from others
+# Makefile by Petteri Kettunen with modifications from Landon Curt Noll
+
+# setup
+#
+SHELL= /bin/sh
+RPMBUILD_TOOL= rpmbuild
+TARCH= i686
+RPMBUILD_OPTION= -ba --target=${TARCH}
+RPM_TOOL= rpm
+MD5SUM= md5sum
+SHA1SUM= sha1sum
+SED= sed
+
+# rpm-related parameters
+#
+PROJECT_NAME= calc
+PROJECT_VERSION=
+PROJECT_RELEASE=
+PROJECT= $(PROJECT_NAME)-$(PROJECT_VERSION)
+SPECFILE= $(PROJECT_NAME).spec
+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
+TMPDIR= /var/tmp
+RHDIR= /usr/src/redhat
+
+all: calc.spec ver_calc
+	$(MAKE) -f rpm.mk PROJECT_VERSION="`./ver_calc`" \
+		PROJECT_RELEASE="`${SED} -n -e '/^Release:/s/^Release: *//p' \
+				  calc.spec.in`" rpm
+
+pkgme: $(PROJECT_NAME)-spec.tar.gz
+
+ver_calc:
+	$(MAKE) -f Makefile ver_calc
+
+.PHONY: vers
+vers:
+	$(MAKE) -f Makefile ver_calc
+
+calc.spec: calc.spec.in ver_calc
+	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 > $(RHDIR)/SOURCES/$(TARBALL))
+	rm -fr $(TMPDIR)/$(PROJECT)
+
+.PHONY: rpm
+rpm: srcpkg calc.spec
+	$(MAKE) -f Makefile clean
+	cp $(SPECFILE) $(RHDIR)/SPECS/$(SPECFILE)
+	rm -f $(RHDIR)/RPMS/${TARCH}/$(RPM686)
+	rm -f $(RHDIR)/RPMS/${TARCH}/$(DRPM686)
+	rm -f $(RHDIR)/SRPMS/$(SRPM)
+	${RPMBUILD_TOOL} ${RPMBUILD_OPTION} $(RHDIR)/SPECS/$(SPECFILE)
+	@if [ ! -f "$(RHDIR)/SRPMS/$(SRPM)" ]; then \
+	    echo "SRPMS/$(SRPM) not found" 1>&2; \
+	    exit 3; \
+	fi
+	@echo
+	@echo "RPM package sizes:"
+	@echo
+	@cd $(RHDIR); ls -1s RPMS/${TARCH}/$(RPM686) \
+	    RPMS/${TARCH}/$(DRPM686) SRPMS/$(SRPM)
+	@echo
+	@echo "RPM package md5 hashes:"
+	@echo
+	-@cd $(RHDIR); ${MD5SUM} RPMS/${TARCH}/$(RPM686) \
+	    RPMS/${TARCH}/$(DRPM686) SRPMS/$(SRPM)
+	@echo
+	@echo "RPM package sha1 hashes:"
+	@echo
+	-@cd $(RHDIR); ${SHA1SUM} RPMS/${TARCH}/$(RPM686) \
+	    RPMS/${TARCH}/$(DRPM686) SRPMS/$(SRPM)
+	@echo
+	@echo "RPM package locations:"
+	@echo
+	@ls -1 $(RHDIR)/RPMS/${TARCH}/$(RPM686) \
+	    $(RHDIR)/RPMS/${TARCH}/$(DRPM686) $(RHDIR)/SRPMS/$(SRPM)
+	@echo
+	@echo "All done! -- Jessica Noll, Age 2"
+	@echo
+
+.PHONY: make_rhdir
+make_rhdir:
+	for i in $(RHDIR) $(RHDIR)/RPMS $(RHDIR)/SOURCES \
+	  $(RHDIR)/SPECS $(RHDIR)/SRPMS $(RHDIR)/BUILD; do \
+	    if [ ! -d $$i ] ; then \
+		mkdir -p $$i; \
+	    fi; \
+	done;
+
+# date format for spec file
+.PHONY: logdate
+logdate:
+	echo "`date +'* %a %b %d %Y'` `whoami`"
+
+.PHONY: chkpkg
+chkpkg:
+	for i in $(RHDIR)/RPMS/${TARCH}/$(RPM686) \
+		 $(RHDIR)/RPMS/${TARCH}/$(DRPM686) \
+	  	 $(RHDIR)/SRPMS/$(SRPM) ; do \
+	    echo "***** start $$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
+
+.PHONY: test
+test: ver_calc
+	@if [ X"`id -u`" != X"0" ]; then \
+	    echo "test needs to install, must be root to test" 1>&2; \
+	    exit 4; \
+	fi
+	$(MAKE) -f rpm.mk PROJECT_VERSION="`./ver_calc`" installrpm chksys
+
+.PHONY: installrpm
+installrpm:
+	@if [ X"`id -u`" != X"0" ]; then \
+	    echo "must be root to install RPMs" 1>&2; \
+	    exit 5; \
+	fi
+	${RPM_TOOL} -ivh $(RHDIR)/RPMS/${TARCH}/$(RPM686)
+	${RPM_TOOL} -ivh $(RHDIR)/RPMS/${TARCH}/$(DRPM686)
+
+.PHONY: uninstallrpm
+uninstallrpm:
+	@if [ X"`id -u`" != X"0" ]; then \
+	    echo "must be root to uninstall RPMs" 1>&2; \
+	    exit 6; \
+	fi
+	${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 > $@
+
+#****

sample/Makefile

@@ -17,8 +17,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.11 $
-# @(#) $Id: Makefile,v 29.11 2001/05/28 23:54:53 chongo Exp $
+# @(#) $Revision: 29.17 $
+# @(#) $Id: Makefile,v 29.17 2003/01/14 02:00:23 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/sample/RCS/Makefile,v $
 #
 # Under source code control:	1997/04/19 22:46:49
@@ -75,34 +75,120 @@ SAMPLE_OBJ= many_random.o test_random.o
 #Q=
 Q=@
 
+####
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
+####
+
+# Where the system include (.h) files are kept
 #
-# where things go
+# For DJGPP, select:
 #
-# ${BINDIR}		where to install binary files
-# ${SHAREDIR}		where most common shared files are kept
-# ${INCDIR}		where most .h files are kept
-# ${LIBDIR}		where *.a files are installed
+#	INCDIR= /dev/env/DJDIR/include
 #
-# ${CSHAREDIR}		where most common shared calc files are kept
-# ${HELPDIR}		where the help directory is installed.
+# If in doubt, set:
+#
+#	INCDIR= /usr/include
+#
+
+#INCDIR= /usr/local/include
+#INCDIR= /dev/env/DJDIR/include
+INCDIR= /usr/include
+
+# where to install calc realted things
+#
+# ${BINDIR}		where to install calc binary files
+# ${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.
+#
+# For DJGPP, select:
+#
+#	BINDIR= /dev/env/DJDIR/bin
+#	LIBDIR= /dev/env/DJDIR/lib
+#	CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+#
+# If in doubt, set:
+#
+#	BINDIR= /usr/bin
+#	LIBDIR= /usr/lib
+#	CALC_SHAREDIR= /usr/share/calc
 #
 #BINDIR= /usr/local/bin
+#BINDIR= /dev/env/DJDIR/bin
 BINDIR= /usr/bin
-#BINDIR= /usr/contrib/bin
-#
-#SHAREDIR= /usr/local/lib
-SHAREDIR= /usr/share
-#
-#INCDIR= /usr/local/include
-INCDIR= /usr/include
-#
+
 #LIBDIR= /usr/local/lib
+#LIBDIR= /dev/env/DJDIR/lib
 LIBDIR= /usr/lib
 
-CSHAREDIR= ${SHAREDIR}/calc
-HELPDIR= ${LIBDIR}/help
+#CALC_SHAREDIR= /usr/local/lib/calc
+#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+CALC_SHAREDIR= /usr/share/calc
+
+# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
+# ---------------------------------------------------------------
+# ${HELPDIR}		where the help directory is installed
+# ${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
+# ${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.
+#
+# If in doubt, set:
+#
+#	HELPDIR= ${CALC_SHAREDIR}/help
+#	CALC_INCDIR= ${INCDIR}/calc
+#	CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+#	CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+#	CUSTOMINCDIR= ${CALC_INCDIR}/custom
+#	SCRIPTDIR= ${BINDIR}/cscript
+#
+HELPDIR= ${CALC_SHAREDIR}/help
+CALC_INCDIR= ${INCDIR}/calc
+CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
+CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
+CUSTOMINCDIR= ${CALC_INCDIR}/custom
+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
+# to install calc somewhere other than into the system area.
+#
+# For example, if:
+#
+#     BINDIR= /usr/bin
+#     LIBDIR= /usr/lib
+#     CALC_SHAREDIR= /usr/share/calc
+#
+# and if:
+#
+#     T= /var/tmp/testing
+#
+# Then the installation locations will be:
+#
+#     calc binary files:	/var/tmp/testing/usr/bin
+#     calc link library:	/var/tmp/testing/usr/lib
+#     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 in doubt, use T=
+#
+T=
 
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
@@ -343,8 +429,10 @@ many_random: many_random.o ../libcalc.a
 ##
 
 distlist: ${DISTLIST}
-	${Q}for i in ${DISTLIST}; do \
+	${Q}for i in ${DISTLIST} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo sample/$$i; \
+	    fi; \
 	done
 
 distdir:
@@ -380,11 +468,14 @@ depend:
 	-${Q}rm -rf skel
 	${Q}mkdir skel
 	${Q}mkdir skel/sample
-	-${Q}for i in ${C_SRC}; do \
+	-${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 \
+	    if [ X"$$i" != X"/dev/null" ]; then \
 		if [ X"$$i" != X"/dev/null" ]; then \
 		    tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
 		    echo "#if !defined($$tag)" > "skel/sample/$$i"; \
@@ -393,18 +484,21 @@ depend:
 			>> "skel/sample/$$i"; \
 		    echo '#endif /* '"$$tag"' */' >> "skel/sample/$$i"; \
 		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'`; do \
+				    -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"; \
 		echo "#define $$tag" >> "skel/$$i"; \
 		${SED} -n '/^#[	 ]*include[	 ]*"/p' "../$$i" \
 		    >> "skel/$$i"; \
 		echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
+	    fi; \
 	done
 	-${Q}rm -f skel/sample/makedep.out
 	${Q}echo sample/skel formed
@@ -412,8 +506,10 @@ depend:
 	${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}; do \
+	-${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
@@ -445,7 +541,7 @@ depend:
 #
 ##
 
-echo_install.list: Makefile
+echo_inst_files: Makefile
 
 
 ##
@@ -475,7 +571,6 @@ install: all
 
 # DO NOT DELETE THIS LINE
 
-
 many_random.o: ../alloc.h
 many_random.o: ../block.h
 many_random.o: ../byteswap.h

seed.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.5 $
- * @(#) $Id: seed.c,v 29.5 2001/05/08 06:44:29 chongo Exp $
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: seed.c,v 29.6 2003/01/14 00:51:53 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/seed.c,v $
  *
  * Under source code control:	1999/10/03 10:06:53
@@ -41,6 +41,11 @@
 #include <stdio.h>
 #include <errno.h>
 
+#include "have_stdlib.h"
+#if defined(HAVE_STDLIB_H)
+#include <stdlib.h>
+#endif
+
 #include "have_unistd.h"
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>

shs.c

@@ -31,8 +31,8 @@
  * Based on Version 2.11 (09 Mar 1995) from Landon Curt Noll's
  * (http://www.isthe.com/chongo/) shs hash program.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: shs.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: shs.c,v 29.3 2004/02/23 08:14:15 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/shs.c,v $
  *
  * This file is not covered under version 2.1 of the GNU LGPL.
@@ -286,7 +286,7 @@ shsUpdate(HASH *state, USB8 *buffer, USB32 count)
 	USB32 datalen = dig->datalen;
 	USB32 cpylen;
 #if CALC_BYTE_ORDER == LITTLE_ENDIAN
-	int i;
+	unsigned int i;
 #endif
 
 	/*
@@ -365,7 +365,7 @@ shsFinal(HASH *state)
 	USB32 highBitcount;
 	USB8 *data = (USB8 *) dig->data;
 #if CALC_BYTE_ORDER == LITTLE_ENDIAN
-	int i;
+	unsigned int i;
 #endif
 
 	/*
@@ -433,7 +433,7 @@ shs_chkpt(HASH *state)
 {
 	SHS_INFO *dig = &state->h_union.h_shs;	/* digest state */
 #if CALC_BYTE_ORDER == LITTLE_ENDIAN
-	int i;
+	unsigned int i;
 #endif
 
 	/*
@@ -478,7 +478,7 @@ static void
 shs_note(int special, HASH *state)
 {
 	SHS_INFO *dig = &state->h_union.h_shs;	/* digest state */
-	int i;
+	unsigned int i;
 
 	/*
 	 * change state to reflect a special value
@@ -509,7 +509,7 @@ static void
 shs_type(int type, HASH *state)
 {
 	SHS_INFO *dig = &state->h_union.h_shs;	/* digest state */
-	int i;
+	unsigned int i;
 
 	/*
 	 * ignore NUMBER and COMPLEX

shs1.c

@@ -22,8 +22,8 @@
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR  IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: shs1.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: shs1.c,v 29.3 2004/02/23 08:15:52 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/shs1.c,v $
  *
  * This file is not covered under version 2.1 of the GNU LGPL.
@@ -261,7 +261,7 @@ shs1Update(HASH *state, USB8 *buffer, USB32 count)
 	USB32 datalen = dig->datalen;
 	USB32 cpylen;
 #if CALC_BYTE_ORDER == LITTLE_ENDIAN
-	int i;
+	unsigned int i;
 #endif
 
 	/*
@@ -341,7 +341,7 @@ shs1Final(HASH *state)
 	USB32 highBitcount;
 	USB8 *data = (USB8 *) dig->data;
 #if CALC_BYTE_ORDER == LITTLE_ENDIAN
-	int i;
+	unsigned int i;
 #endif
 
 	/* Pad to end of chunk */
@@ -411,7 +411,7 @@ shs1_chkpt(HASH *state)
 {
 	SHS1_INFO *dig = &state->h_union.h_shs1;	/* digest state */
 #if CALC_BYTE_ORDER == LITTLE_ENDIAN
-	int i;
+	unsigned int i;
 #endif
 
 	/*
@@ -455,7 +455,7 @@ static void
 shs1_note(int special, HASH *state)
 {
 	SHS1_INFO *dig = &state->h_union.h_shs1;	/* digest state */
-	int i;
+	unsigned int i;
 
 	/*
 	 * change state to reflect a special value
@@ -486,7 +486,7 @@ static void
 shs1_type(int type, HASH *state)
 {
 	SHS1_INFO *dig = &state->h_union.h_shs1;	/* digest state */
-	int i;
+	unsigned int i;
 
 	/*
 	 * ignore NUMBER and COMPLEX

spec-template

@@ -1,98 +0,0 @@
-Summary: C-style arbitrary precision calculator
-Name: calc
-Version: ${VERSION}
-Release: ${RELEASE}
-Copyright: LGPL
-Group: Applications/Engineering
-Source: http://www.isthe.com/chongo/src/calc/calc-${VER_CALC}.tar.gz
-BuildRoot: /var/tmp/%{name}-buildroot
-
-%description
-Calc is an interactive calculator which provides for easy large numeric
-calculations, but which also can be easily programmed for difficult or
-long calculations.
-
-All numbers are represented as fractions with arbitrarily large numerators
-and denominators which are always reduced to lowest terms.  Real or
-exponential format numbers are converted to the equivalent fraction.
-One use enter decinal, hex, octal, binary and complex values.
-
-Commands are statements in a C-like language, where each input line is
-treated as the body of a procedure.  You can define your own functions
-by using the 'define' keyword, followed by a function declaration very
-similar to C.  Calc also comes with a rich set of builtin functions
-and calc shell commands.
-
-In addition to numeric global, local and static variables, Calc as
-lists, associated arrays, matrices, byte blocks, dymanic strings and
-user defined objects.
-
-%prep
-%setup -q
-
-%build
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT${BINDIR}
-mkdir -p $RPM_BUILD_ROOT${SHAREDIR}
-mkdir -p $RPM_BUILD_ROOT${INCDIR}
-mkdir -p $RPM_BUILD_ROOT${LIBDIR}
-mkdir -p $RPM_BUILD_ROOT${CSHAREDIR}
-mkdir -p $RPM_BUILD_ROOT${HELPDIR}
-mkdir -p $RPM_BUILD_ROOT${INCDIRCALC}
-mkdir -p $RPM_BUILD_ROOT${CUSTOMLIBDIR}
-mkdir -p $RPM_BUILD_ROOT${CUSTOMHELPDIR}
-mkdir -p $RPM_BUILD_ROOT${CUSTOMINCDIR}
-mkdir -p $RPM_BUILD_ROOT${SCRIPTDIR}
-mkdir -p $RPM_BUILD_ROOT${MANDIR}
-
-install -m 0555 calc $RPM_BUILD_ROOT${BINDIR}
-
-(cd help
- install -m 0444 ${STD_HELP_FILES} $RPM_BUILD_ROOT${HELPDIR}
- install -m 0444 ${BLT_HELP_FILES} $RPM_BUILD_ROOT${HELPDIR}
- install -m 0444 builtin full $RPM_BUILD_ROOT${HELPDIR}
- install -m 0444 ${DETAIL_HELP} $RPM_BUILD_ROOT${HELPDIR}
- install -m 0444 ${SINGULAR_FILES} $RPM_BUILD_ROOT${HELPDIR}
- install -m 0444 obj.file $RPM_BUILD_ROOT${HELPDIR}/obj
-)
-
-(cd cal; install -m 0444 ${CALC_FILES} $RPM_BUILD_ROOT${LIBDIR})
-
-(cd custom
- if [ ! -z "${INSTALL_H_SRC}" ]; then
-     install -m 0444 ${INSTALL_H_SRC} $RPM_BUILD_ROOT${CUSTOMINCDIR}
- fi
- install -m 0444 ${CUSTOM_CALC_FILES} $RPM_BUILD_ROOT${CUSTOMLIBDIR}
- install -m 0444 ${CUSTOM_HELP} $RPM_BUILD_ROOT${CUSTOMHELPDIR}
- if [ ! -z "${ALLOW_CUSTOM}" ]; then
-    install -m 0644 libcustcalc.a $RPM_BUILD_ROOT${CUSTOMLIBDIR}
-    ${RANLIB} $RPM_BUILD_ROOT${CUSTOMLIBDIR}
- fi
-)
-
-(cd cscript
- install -m 0555 ${SCRIPT} $RPM_BUILD_ROOT${SCRIPTDIR}
-)
-
-install -m 0444 libcalc.a $RPM_BUILD_ROOT${LIBDIR}
-${RANLIB} $RPM_BUILD_ROOT${LIBDIR}
-install -m 0444 ${LIB_H_SRC} $RPM_BUILD_ROOT${INCDIRCALC}
-install -m 0444 ${BUILD_H_SRC} $RPM_BUILD_ROOT${INCDIRCALC}
-install -m 0444 calc.1 $RPM_BUILD_ROOT${MANDIR}.${MANEXT}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f install.list
-%defattr(-,root,root)
-%doc BUGS README COPYING COPYING-LGPL HOWTO.INSTALL
-%doc README LIBRARY README.WINDOWS calc.1
-%doc help/resource help/errorcodes help/custom_cal help/new_custom
-%doc help/cscript help/full
-
-%changelog
-* ${DATE} Landon Curt Noll <http://www.isthe.com/chongo/index.html>
-- calc version ${VER_CALC}

string.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: string.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: string.c,v 29.3 2004/02/23 08:18:27 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/string.c,v $
  *
  * Under source code control:	1990/02/15 01:48:10
@@ -184,7 +184,7 @@ namestr(STRINGHEAD *hp, long n)
 {
 	register char *str;	/* current string */
 
-	if ((unsigned long)n >= hp->h_count)
+	if (n >= hp->h_count)
 		return "";
 	str = hp->h_list;
 	while (*str) {

string.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.3 $
- * @(#) $Id: string.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: string.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/string.h,v $
  *
  * Under source code control:	1990/02/15 01:48:36
@@ -32,7 +32,7 @@
 #define __CALCSTRING_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "zmath.h"
 #else
 # include <calc/zmath.h>

symbol.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.3 $
- * @(#) $Id: symbol.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: symbol.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/symbol.h,v $
  *
  * Under source code control:	1990/02/15 01:48:37
@@ -32,7 +32,7 @@
 #define __SYMBOL_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "zmath.h"
 #else
 # include <calc/zmath.h>

token.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.3 $
- * @(#) $Id: token.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: token.h,v 29.4 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/token.h,v $
  *
  * Under source code control:	1990/02/15 01:48:37
@@ -32,7 +32,7 @@
 #define __TOKEN_H__
 
 
-#if defined(SRC)	/* if we are building from the calc source tree */
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
 # include "zmath.h"
 #else
 # include <calc/zmath.h>