Release calc version 2.11.8.1

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.
 
-=-=
+Fell free to use the above address to send in big fixes (in the form
-
+of a context diff patch).
-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.
 
 =-=
 
@@ -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.
@@ -208,6 +250,28 @@ Problems with known work-a-rounds:
       or performance.  The work-a-round is to ignore these warnings
       under BSDI.
 
+    * The chi.cal resource file does not work well with odd degrees
+      of freedom.  Can someone improve this algorithm?
+
+    * The intfile.cal resource file reads and writes big or little Endian
+      integers to/from files the hard way.  It does NOT use blkcpy.  The
+      following code:
+
+	i = (ord("\n") << 16) | (ord("i") << 8) | ord("H")
+	b = blk()
+	copy(i, b)
+	fd = fopen("file", "w")
+	copy(b, fd);
+	fclose(fd)
+
+      will write an extra NUL octet to the file.  Where as:
+
+	read intfile
+	i = (ord("\n") << 16) | (ord("i") << 8) | ord("H")
+	be2file(i, "file2")
+
+      will not.
+
 ## Copyright (C) 1999  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
@@ -224,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.9 $
+## @(#) $Revision: 29.17 $
-## @(#) $Id: BUGS,v 29.9 2001/03/18 03:34:41 chongo Exp $
+## @(#) $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,4 +1,452 @@
-The following are the changes from calc version 2.11.5t0 to date:
+The following are the changes from calc version 2.11.8.0 to date:
+
+    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 stardard"
+    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 reprting 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 distrbutions.
+    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 -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
+    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 examplewhen 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 locatin 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 config("verbose_quit") value was restored to a default
+    value of FALSE.
+
+    Added the cscript:
+
+	powerterm [base_limit] value
+
+    to write the value as the sum (or difference) of powers <= base_limit
+    where base_limit by default is 10000.
+
+    Applied a bug fix by Dr.D.J.Picton <dave at aps5.ph.bham.ac.uk>
+    to have help with no args print the default help file.
+
+    Renamed lavarand to LavaRnd.
+
+    Added rules to build a calc rpm.
+
+    All installed files are first formed as foo.new, and then moved
+    into place as foo via a atomic rename.
+
+    During installation, only files that are different are installed.
+    If the built file and the installed file are the same, no
+    installation is performed.
+
+    Calc has new default installation locations:
+
+    Makefile var   old location			      new location
+    ------------   ------------			      ------------
+    TOPDIR	   /usr/local/lib		        <<no longer used>>
+    BINDIR	   /usr/local/bin		      /usr/bin
+    SHAREDIR	      <<not set>>		      /usr/share
+    INCDIR	   /usr/local/include		      /usr/include
+    LIBDIR	   /usr/local/lib/calc		      /usr/lib
+    CSHAREDIR	      <<not set>>		      /usr/share/calc
+    HELPDIR	   /usr/local/lib/calc/help           /usr/share/calc/help
+    INCDIRCALC	   /usr/local/include/calc	      /usr/include/calc
+    CUSTOMLIBDIR   /usr/local/lib/calc/custom	      /usr/share/calc/custom
+    CUSTOMHELPDIR  /usr/local/lib/calc/help/custhelp  /usr/share/calc/custhelp
+    CUSTOMINCDIR     <<not set>>		      /usr/include/calc/custom
+    SCRIPTDIR	   /usr/local/bin/cscript	      /usr/bin/cscript
+    MANDIR	     <<not set>>		      /usr/share/man/man1
+    CATDIR	     <<not set>>		        <<not set>>
+
+    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}.
+
+    The install rules no longer remove old obsolete files.  We assume
+    that these old files have long since vanished!  :-)
+
+    Reduced the amount of output when doing a make all where nothing
+    needs to be made.
+
+    Reduced the amount of output when doing a make install where nothing
+    needs to be installed.
+
+    If you install using the new default locations, you can remove
+    old calc files installed in the old default location by doing:
+
+	make olduninstall
+
+
+The following are the changes from calc version 2.11.5t2 to 2.11.5t2.1:
+
+    Fixed a bug, reported by Ernest Bowen <ernie at turing dot
+    une dot edu dot au> that caused command lines to be echoed in
+    interactive mode.  Fixed a bug that sometimes left the terminal
+    in a non-echoing state when calc exited.
+
+    Renamed error codes E_FGETWORD1 and E_FGETWORD2 symbols to
+    E_FGETFIELD1 and E_FGETFIELD2.
+
+    Made a minor format change to the top of the calc man page.
+
+    The findid() function in file.c 2nd argument changed.  The argument
+    is now mostly a writable flag.  This function now finds the file
+    I/O structure for the specified file id, and verifies that
+    it is opened in the required manner (0 for reading or 1 for writing).
+    If the 2nd argument is -1, then no open checks are made at all and
+    NULL is then returned if the id represents a closed file.
+
+    The calc builtin function, fopen(), now allows one to specify
+    opening files in binary modes.  On POSIX / Linux / Un*x-like systems,
+    text file is the same as a binary file and so 'b' to an fopen has
+    no effect and is ignored.  However on systems such as MS Windoz
+    the 'b' / binary mode has meaning.  See 'help fopen' for details.
+
+    On systems (such as MS Windoz), calc will produce a different error
+    message when it attempts to open /dev/tty.  This will condition
+    will occur in things like calc scripts when they switch from ``batch
+    processing'' commands from and want to start interactive mode.
+
+    Regression tests fopen in binary mode in a few places where a
+    difference between text and binary string lengths matter.
+    The intfile calc resource file also uses binary mode.
+
+    Changed the rand() builtin and its related functions srand() and
+    randbit() to use the Subtractive 100 generator instead of the
+    additive 55 generator.  This generator as improved random properties.
+    As a result, of this change, the values produced by rand(),
+    rand() and randbit() are now different.
+
+    Updated regression tests for new rand() and randbit() output.
+
+    Applied a bug fix from Ernest Bowen <ernie at turing dot une dot
+    edu dot au> dealing with one-line "static" declaration like:
+
+    	static a = 1, b;
+
+    Added regression test 8310 to test for the static bug fix.
+
+
+The following are the changes from calc version 2.11.5t0 to 2.11.5t1.1:
 
     Fixed a compile problem with Linux 2.4 / Debian.  Thanks goes
     to Martin Buck <m at rtin-buck dot de> for help with this issue.
@@ -10,7 +458,7 @@ The following are the changes from calc version 2.11.5t0 to date:
 
     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 ...
@@ -48,8 +496,80 @@ The following are the changes from calc version 2.11.5t0 to date:
 
     Fixed a bug in the way file offsets, device and inode values are copied.
 
+    Added chi.cal for a initial stab as a Chi^2 function.  The chi_prob()
+    function does not work well with odd degrees of freedom, however.
 
-The following are the changes from calc version 2.11.4t1 to date:
+    Added big 3 to config("resource_debug").  Calc resource file scripts
+    check for config("resource_debug") & 8 prior to printing internal debug
+    statements.  Thus by default they do not print them.
+
+    Added intfile.cal as a calc resource file script:
+
+	file2be(filename)
+
+	    Read filename and return an integer that is built from the
+	    octets in that file in Big Endian order.  The first octets
+	    of the file become the most significant bits of the integer.
+
+	file2le(filename)
+
+	    Read filename and return an integer that is built from the
+	    octets in that file in Little Endian order.  The first octets
+	    of the file become the most significant bits of the integer.
+
+	be2file(v, filename)
+
+	    Write the absolute value of v into filename in Big Endian order.
+	    The v argument must be on integer.  The most significant bits
+	    of the integer become the first octets of the file.
+
+	le2file(v, filename)
+
+	    Write the absolute value of v into filename in Little Endian order.
+	    The v argument must be on integer.  The least significant bits
+	    of the integer become the last octets of the file.
+
+    Added the following help aliases:
+
+	copy	blkcpy
+	read	command
+	write	command
+	quit	command
+	exit	command
+	abort	command
+	cd	command
+	show	command
+
+    Added the cscript:
+
+	fproduct filename term ...
+
+    to write the big Endian product of terms to a filename.  Use - for stdout.
+
+    Fixed calc path in help/script.
+
+    Added read-only parameter, config("windows") to indicate if the system
+    is MS windowz WIN32 like system.
+
+    Configuration values that used to return "true" or "false" now return
+    1 (a true value) or 0 (a false value).  Thus one can do:
+
+    	if (config("tab")) { ... } else { ... }
+
+    The configuration values that now return 1 or 0 are:
+
+	config("tilde")
+	config("tab")
+	config("leadzero")
+	config("blkverbose")
+	config("verbose_quit")
+	config("windows")
+
+    Now shipping a win32 sub-directory that contains hsrc .h files
+    that have been attempted to be built for windoz.
+
+
+The following are the changes from calc version 2.11.4t1 to 2.11.4t2:
 
     Added missing test8600.cal test file.
 
@@ -5076,7 +5596,7 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1:
 
     A small bug in the library file regress.cal was fixed.
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 2001  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
@@ -5092,8 +5612,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.22 $
+## @(#) $Revision: 29.60 $
-## @(#) $Id: CHANGES,v 29.22 2001/03/18 03:27:28 chongo Exp $
+## @(#) $Id: CHANGES,v 29.60 2003/08/26 04:35:45 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 $
+    # @(#) $Revision: 29.7 $
-    # @(#) $Id: COPYING,v 29.5 2000/12/18 10:22:55 chongo Exp $
+    # @(#) $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
+	Web:	http://www.isthe.com/chongo/tech/comp/calc/email.html
-	EMail:	calc-contrib at asthe dot com
 
-    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,34 +1,130 @@
-Installing calc in 4 easy steps:
+Installing calc from the gziped tarball in 4 easy steps:
 
-    1) Look at the makefile, and adjust it to suit your needs.
+    0)  If your platform supports i686 RPMs, you may want to go to:
 
-       Here are some Makefile hints:
+	    http://www.isthe.com/chongo/src/calc/
 
-	   Select a compiler set by commenting in the appropriate set
+	and use these RPMs:
-	   of cc options.  As shipped the Makefile assumes a gcc-like
-	   environment such as Linux.  If a more appropriate cc set if
-	   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 or may not need RANLIB when building libraries.
+	    * calc*.i686.rpm
-	   As shipped the Makefile assumes RANLIB is needed.
+		- all that is needed if you just want to use calc
-	   Comment the in/out the RANLIB value if ranlib does
-	   not work or does not exist.
 
-	   You may want to change the default pager used by calc.
+	    * calc-devel-*.i686.rpm
-	   As shipped the Makefile assumes 'more'.  On your system
+	        - calc *.h header and *.a lib files for use in other programs
-	   you may find 'less' to be a better pager.
 
-	   Set TOPDIR to be the place under which help files, calc,
+	    * calc.*.src.rpm
-	   include files and calc libs are to be installed.  As shipped
+	        - calc source in RPM package form
-	   the Makefile assumes a TOPDIR of /usr/local/lib.
 
-	   Set BINDIR to the place where calc is installed.  As shipped
+	The following 4 steps apply to calc source tree that comes from either:
-	   the Makefile assumes a BINDIR /usr/local/bin.
+
+		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.
+
+	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
+	    environment such as Linux.  If a more appropriate cc set if
+	    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.
+
+	    DEBUG
+
+	       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.
 
-    2) build calc:
+    2)	build calc:
 
 	make all
 
@@ -36,13 +132,14 @@ Installing calc in 4 easy steps:
 	    you may find.  See the BUGS file if you find any compiler
 	    warning or errors.
 
-    3) test calc:
+    3)	test calc:
 
 	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:
+    4)	install calc:
 
 	make install
 
@@ -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 $
+## @(#) $Revision: 29.7 $
-## @(#) $Id: HOWTO.INSTALL,v 29.2 2000/06/07 14:02:13 chongo Exp $
+## @(#) $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
+When calc is installed, all of libraries are installed into ${LIBDIR}.
-libcalc.a along with the link library itself 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 $
+## @(#) $Revision: 29.5 $
-## @(#) $Id: LIBRARY,v 29.2 2000/06/07 14:02:13 chongo Exp $
+## @(#) $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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: README,v 29.2 2000/06/07 14:02:13 chongo Exp $
+## @(#) $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
@@ -55,10 +107,11 @@ by the make file:
     have_gettime.h have_getprid.h have_urandom.h have_rusage.h
     have_strdup.h
 
-NOTE: In a future release, a tarball of these files will be shipped with
+You will find generated versions of these files located in the win32
-      calc so that you do not have to do much other than inspect them.
+sub-directory.  These files may be appropriate for your Cygwin building
-
+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:
 
@@ -86,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
@@ -102,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.3 $
+## @(#) $Revision: 29.8 $
-## @(#) $Id: README.WINDOWS,v 29.3 2001/03/17 21:31:47 chongo Exp $
+## @(#) $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

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.2 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: alloc.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $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,10 +32,17 @@
 #define __ALLOC_H__
 
 
-#include "have_malloc.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
-#include "have_newstr.h"
+# include "have_malloc.h"
-#include "have_string.h"
+# include "have_newstr.h"
-#include "have_memmv.h"
+# include "have_string.h"
+# include "have_memmv.h"
+#else
+# include <calc/have_malloc.h>
+# include <calc/have_newstr.h>
+# include <calc/have_string.h>
+# include <calc/have_memmv.h>
+#endif
 
 #ifdef HAVE_MALLOC_H
 # include <malloc.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.2 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: blkcpy.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Id: blkcpy.c,v 29.3 2001/04/10 22:06:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/blkcpy.c,v $
  *
  * Under source code control:	1997/04/18 20:41:26
@@ -581,7 +581,7 @@ copyblk2file(BLOCK *sblk, long ssi, long num, FILEID id, long dsi)
 	if (num == 0)
 		return 0;
 
-	fiop = findid(id, 'w');
+	fiop = findid(id, TRUE);
 	if (fiop == NULL)
 		return E_COPYF1;
 	fp = fiop->fp;
@@ -618,7 +618,7 @@ copyfile2blk(FILEID id, long ssi, long num, BLOCK *dblk, long dsi, BOOL noreloc)
 
 	if (id < 3)			/* excludes copying from stdin */
 		return E_COPYF1;
-	fiop = findid(id, 'r');
+	fiop = findid(id, FALSE);
 	if (fiop == NULL)
 		return E_COPYF1;
 
@@ -690,7 +690,7 @@ copystr2file(STRING *str, long ssi, long num, FILEID id, long dsi)
 		return 0;
 	if ((USB32) ssi + num > len)
 		return E_COPY5;		/* Insufficient memory in str */
-	fiop = findid(id, 'w');
+	fiop = findid(id, TRUE);
 	if (fiop == NULL)
 		return E_COPYF1;
 	fp = fiop->fp;

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.2 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: byteswap.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $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,11 @@
 #define __BYTESWAP_H__
 
 
-#include "longbits.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
+# include "longbits.h"
+#else
+# include <calc/longbits.h>
+#endif
 
 
 /*

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.3 $
+# @(#) $Revision: 29.15 $
-# @(#) $Id: Makefile,v 29.3 2000/12/15 14:42:52 chongo Exp $
+# @(#) $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,15 +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
-TOPDIR= /usr/local/lib
-#TOPDIR= /usr/lib
-#TOPDIR= /usr/libdata
 
-LIBDIR= ${TOPDIR}/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
 #
@@ -57,6 +162,7 @@ Q=@
 # standard tools
 #
 CHMOD= chmod
+CMP= cmp
 
 # The calc files to install
 #
@@ -69,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 \
+	randomrun.cal repeat.cal xx_print.cal natnumset.cal qtime.cal \
-	test8500.cal test8600.cal
+	test8400.cal test8500.cal test8600.cal chi.cal intfile.cal
 
 # These files are found (but not built) in the distribution
 #
@@ -102,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:
@@ -116,34 +224,54 @@ calcliblist:
 	    fi; \
 	done
 
+##
+#
+# rpm rules
+#
+##
+
+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
+
+##
+#
+# Utility rules
+#
+##
+
 clean:
 
 clobber:
 	rm -f .all
 
 install: all
-	-${Q}if [ ! -d ${TOPDIR} ]; then \
+	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-		echo mkdir ${TOPDIR}; \
+	    echo mkdir $T${CALC_SHAREDIR}; \
-		mkdir ${TOPDIR}; \
+	    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 ${LIBDIR} ]; then \
+	${Q}for i in ${CALC_FILES} /dev/null; do \
-		echo mkdir ${LIBDIR}; \
+	    if [ "$$i" = "/dev/null" ]; then \
-		mkdir ${LIBDIR}; \
+		continue; \
-	else \
+	    fi; \
-	    true; \
+	    if ${CMP} -s $$i $T${CALC_SHAREDIR}/$$i; then \
-	fi
+		true; \
-	${Q}for i in ${CALC_FILES}; do \
+	    else \
-		echo rm -f ${LIBDIR}/$$i; \
+		rm -f $T${CALC_SHAREDIR}/$$i.new; \
-		rm -f ${LIBDIR}/$$i; \
+		cp -f $$i $T${CALC_SHAREDIR}/$$i.new; \
-		echo cp $$i ${LIBDIR}; \
+		${CHMOD} 0444 $T${CALC_SHAREDIR}/$$i.new; \
-		cp $$i ${LIBDIR}; \
+		mv -f $T${CALC_SHAREDIR}/$$i.new $T${CALC_SHAREDIR}/$$i; \
-		echo ${CHMOD} 0444 ${LIBDIR}/$$i; \
+		echo "installed $T${CALC_SHAREDIR}/$$i"; \
-		${CHMOD} 0444 ${LIBDIR}/$$i; \
+	    fi; \
 	done
-	${Q}echo remove files that are obsolete
-	-rm -f nextprime.cal nextprim.cal
-	-rm -f test1000.cal test2000.cal ${LIBDIR}/test2000.cal
-	-rm -f ${LIBDIR}/nextprime.cal ${LIBDIR}/nextprim.cal
-	-rm -f ${LIBDIR}/test1000.cal ${LIBDIR}/cryrand.cal

cal/README

@@ -64,7 +64,7 @@ Zero value of config("resource_debug") means that no such information
 is displayed.  For other values, the non-zero bits which currently
 have meanings are as follows:
 
-    n	    Meaning of bit n of config("resource_debug")
+    n		Meaning of bit n of config("resource_debug")
 
     0	When a function is defined, redefined or undefined at
 	interactive level, a message saying what has been done
@@ -74,6 +74,12 @@ have meanings are as follows:
 	the reading of a file, a message saying what has been done
 	is displayed.
 
+    2	Show func will display more information about a functions
+	arguments as well as more argument sdummary information.
+
+    3	During execution, allow calc standard resource files
+	to output additional debugging information.
+
 The value for config("resource_debug") in both oldstd and newstd is 3,
 but if calc is invoked with the -d flag, its initial value is zero.
 Thus, if calc is started without the -d flag, until config("resource_debug")
@@ -97,6 +103,14 @@ either of the bottom 2 bits set:
 		print "funcB(size, mass, ...) defined";
 	}
 
+If your the resource file needs to output special debugging informatin,
+we recommend that you check for bit 3 of the config("resource_debug")
+before printing the debug statement:
+
+	if (config("resource_debug") & 8) {
+		print "DEBUG: This a sample debug statement";
+	}
+
 =-=
 
 The following is a brief description of some of the calc resource files
@@ -128,6 +142,24 @@ bigprime.cal
     A prime test, base a, on p*2^x+1 for even x>m.
 
 
+chi.cal
+
+    Z(x[, eps])
+    P(x[, eps])
+    chi_prob(chi_sq, v[, eps])
+
+    Computes the Probability, given the Null Hypothesis, that a given
+    Chi squared values >= chi_sq with v degrees of freedom.
+
+    The chi_prob() function does not work well with odd degrees of freedom.
+    It is reasonable with even degrees of freedom, although one must give
+    a sifficently small error term as the degress gets large (>100).
+
+    The Z(x) and P(x) are internal statistical funcions.
+
+    eps is an optional epsilon() like error term.
+
+
 chrem.cal
 
     chrem(r1,m1 [,r2,m2, ...])
@@ -163,6 +195,33 @@ hello.cal
 	http://www.latech.edu/~acm/helloworld/calc.html
 
 
+intfile.cal
+
+    file2be(filename)
+
+	Read filename and return an integer that is built from the
+	octets in that file in Big Endian order.  The first octets
+	of the file become the most significant bits of the integer.
+
+    file2le(filename)
+
+	Read filename and return an integer that is built from the
+	octets in that file in Little Endian order.  The first octets
+	of the file become the most significant bits of the integer.
+
+    be2file(v, filename)
+
+	Write the absolute value of v into filename in Big Endian order.
+	The v argument must be on integer.  The most significant bits
+	of the integer become the first octets of the file.
+
+    le2file(v, filename)
+
+	Write the absolute value of v into filename in Little Endian order.
+	The v argument must be on integer.  The least significant bits
+	of the integer become the last octets of the file.
+
+
 lucas.cal
 
     lucas(h, n)
@@ -421,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
 
@@ -756,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.4 $
+## @(#) $Revision: 29.9 $
-## @(#) $Id: README,v 29.4 2000/12/17 12:26:04 chongo Exp $
+## @(#) $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/chi.cal

@@ -0,0 +1,251 @@
+/*
+ * chi - chi^2 probabilities with degrees of freedom for null hypothesis
+ *
+ * Copyright (C) 2001  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: chi.cal,v 29.2 2001/04/08 10:21:23 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/chi.cal,v $
+ *
+ * Under source code control:	2001/03/27 14:10:11
+ * File existed as early as:	2001
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+/*
+ * Z(x)
+ *
+ * From Handbook of Mathematical Functions
+ *	10th printing, Dec 1972 with corrections
+ *	National Bureau of Standards
+ *
+ * Section 26.2.1, p931.
+ */
+define Z(x, eps_term)
+{
+    local eps;		/* error term */
+
+    /* obtain the error term */
+    if (isnull(eps_term)) {
+    	eps = epsilon();
+    } else {
+	eps = eps_term;
+    }
+
+    /* compute Z(x) value */
+    return exp(-x*x/2, eps) / sqrt(2*pi(eps), eps);
+}
+
+
+/*
+ * P(x[, eps]) asymtotic P(x) expansion for x>0 to an given epsilon error term
+ *
+ * NOTE: If eps is omitted, the stored epsilon value is used.
+ *
+ * From Handbook of Mathematical Functions
+ *	10th printing, Dec 1972 with corrections
+ *	National Bureau of Standards
+ *
+ * 26.2.11, p932:
+ *
+ *	P(x) = 1/2 + Z(x) * sum(n=0; n < infinity){x^(2*n+1)/(1*3*5*...(2*n+1)};
+ *
+ * We continue the fraction until it is less than epsilon error term.
+ *
+ * Also note 26.2.5:
+ *
+ *	P(x) + Q(x) = 1
+ */
+define P(x, eps_term)
+{
+    local eps;		/* error term */
+    local s;		/* sum */
+    local x2;		/* x^2 */
+    local x_term;	/* x^(2*r+1) */
+    local odd_prod;	/* 1*3*5* ... */
+    local odd_term;	/* next odd value to multiply into odd_prod */
+    local term;		/* the recent term added to the sum */
+
+    /* obtain the error term */
+    if (isnull(eps_term)) {
+    	eps = epsilon();
+    } else {
+	eps = eps_term;
+    }
+
+    /* firewall */
+    if (x <= 0) {
+	if (x == 0) {
+	    return 0;	/* hack */
+	} else {
+	    quit "Q(x[,eps]) 1st argument must be >= 0";
+	}
+    }
+    if (eps <= 0) {
+	quit "Q(x[,eps]) 2nd argument must be > 0";
+    }
+
+    /*
+     * aproximate sum(n=0; n < infinity){x^(2*n+1)/(1*3*5*...(2*n+1)}
+     */
+    x2 = x*x;
+    x_term = x;
+    s = x_term;	/* 1st term */
+    odd_term = 1;
+    odd_prod = 1;
+    do {
+
+	/* compute the term */
+	odd_term += 2;
+	odd_prod *= odd_term;
+	x_term *= x2;
+	term = x_term / odd_prod;
+	s += term;
+
+    } while (term >= eps);
+
+    /* apply term and factor */
+    return 0.5 + Z(x,eps)*s;
+}
+
+
+/*
+ * chi_prob(chi_sq, v[, eps]) -  Prob of >= chi^2 with v degrees of freedom
+ *
+ *    Computes the Probability, given the Null Hypothesis, that a given
+ *    Chi squared values >= chi_sq with v degrees of freedom.
+ *
+ *    The chi_prob() function does not work well with odd degrees of freedom.
+ *    It is reasonable with even degrees of freedom, although one must give
+ *    a sifficently small error term as the degress gets large (>100).
+ *
+ * NOTE: This function does not work well with odd degrees of freedom.
+ *	 Can somebody help / find a bug / provide a better method of
+ *	 this odd degrees of freedom case?
+ *
+ * NOTE: This function works well with even degrees of freedom.  However
+ *	 when the even degrees gets large (say, as you approach 100), you
+ *	 need to increase your error term.
+ *
+ * From Handbook of Mathematical Functions
+ *	10th printing, Dec 1972 with corrections
+ *	National Bureau of Standards
+ *
+ * Section 26.4.4, p941:
+ *
+ *   For odd v:
+ *
+ *	Q(chi_sq, v) = 2*Q(chi) + 2*Z(chi) * (
+ *		     sum(r=1, r<=(r-1)/2) {(chi_sq^r/chi) / (1*3*5*...(2*r-1)});
+ *
+ *	chi = sqrt(chi_sq)
+ *
+ *	NOTE: Q(x) = 1-P(x)
+ *
+ * Section 26.4.5, p941.
+ *
+ *   For even v:
+ *
+ *	Q(chi_sq, v) = sqrt(2*pi()) * Z(chi) * ( 1 +
+ *		       sum(r=1, r=((v-2)/2)) { chi_sq^r / (2*4*...*(2r)) } );
+ *
+ *	chi = sqrt(chi_sq)
+ *
+ * Observe that:
+ *
+ *	Z(x) = exp(-x*x/2) / sqrt(2*pi());	(Section 26.2.1, p931)
+ *
+ * and thus:
+ *
+ *	sqrt(2*pi()) * Z(chi) =
+ *	sqrt(2*pi()) * Z(sqrt(chi_sq)) =
+ *	sqrt(2*pi()) * exp(-sqrt(chi_sq)*sqrt(chi_sq)/2) / sqrt(2*pi()) =
+ *	exp(-sqrt(chi_sq)*sqrt(chi_sq)/2) =
+ *	exp(-sqrt(-chi_sq/2)
+ *
+ * So:
+ *
+ *	Q(chi_sq, v) = exp(-sqrt(-chi_sq/2) * ( 1 + sum(....){...} );
+ */
+define chi_prob(chi_sq, v, eps_term)
+{
+    local eps;		/* error term */
+    local r;		/* index in finite sum */
+    local r_lim;	/* limit value for r */
+    local s;		/* sum */
+    local d;		/* demoninator (2*4*6*... or 1*3*5...) */
+    local chi_term;	/* chi_sq^r */
+    local ret;		/* return value */
+
+    /* obtain the error term */
+    if (isnull(eps_term)) {
+	eps = epsilon();
+    } else {
+	eps = eps_term;
+    }
+
+    /*
+     * odd degrees of freedom
+     */
+    if (isodd(v)) {
+
+	local chi;		/* sqrt(chi_sq) */
+
+	/* setup for sum */
+	s = 1;
+	d = 1;
+	chi = sqrt(abs(chi_sq), eps);
+	chi_term = chi;
+	r_lim = (v-1)/2;
+
+	/* compute sum(r=1, r=((v-1)/2)) {(chi_sq^r/chi) / (1*3*5...*(2r-1))} */
+	for (r=2; r <= r_lim; ++r) {
+	    chi_term *= chi_sq;
+	    d *= (2*r)-1;
+	    s += chi_term/d;
+	}
+
+	/* apply term and factor, Q(x) = 1-P(x) */
+	ret = 2*(1-P(chi)) + 2*Z(chi)*s;
+
+    /*
+     * even degrees of freedom
+     */
+    } else {
+
+	/* setup for sum */
+	s =1;
+	d = 1;
+	chi_term = 1;
+	r_lim = (v-2)/2;
+
+	/* compute sum(r=1, r=((v-2)/2)) { chi_sq^r / (2*4*...*(2r)) } */
+	for (r=1; r <= r_lim; ++r) {
+	    chi_term *= chi_sq;
+	    d *= r*2;
+	    s += chi_term/d;
+	}
+
+	/* apply factor - see observation in the main comment above */
+	ret = exp(-chi_sq/2, eps) * s;
+    }
+
+    return ret;
+}

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 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: deg.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $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.deg = -a.deg;
-	ans.min = -ans.min;
+	ans.min = -a.min;
-	ans.sec = -ans.sec;
+	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/intfile.cal

@@ -0,0 +1,222 @@
+/*
+ * intfile - integer to file and file to integer conversion
+ *
+ * Copyright (C) 2001  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.5 $
+ * @(#) $Id: intfile.cal,v 29.5 2001/04/10 22:09:34 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/intfile.cal,v $
+ *
+ * Under source code control:   2001/03/31 08:13:11
+ * File existed as early as:    2001
+ *
+ * chongo <was here> /\oo/\     http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)        http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+/*
+ * NOTE: Because leading HALF values are trimmed from integer, a file
+ *	 that begins with lots of 0 bits (in the case of big endian)
+ *	 or that ends with lots of 0 bits (in the case of little endian)
+ *	 will be changed when the subsequent integer is written back.
+ */
+
+
+/*
+ * file2be - convert a file into an big endian integer
+ *
+ * given:
+ *	filename	filename to read
+ *
+ * returns:
+ *	integer read from its contents on big endian order
+ */
+define file2be(filename)
+{
+    local fd;	/* open file */
+    local ret;	/* integer to return */
+    local c;	/* character read from the file */
+    local i;
+
+    /*
+     * open the file for reading
+     */
+    fd = fopen(filename, "rb");
+    if (!isfile(fd)) quit "file2be: cannot open file for reading";
+
+    /*
+     * read the contents of the file
+     *
+     * The first octets become the most significant bits of the integer.
+     */
+    ret = 0;
+    while (! isnull(c = fgetc(fd))) {
+	ret <<= 8;
+	ret += ord(c);
+    }
+
+    /*
+     * cleanup and return the integer
+     */
+    fclose(fd);
+    return ret;
+}
+
+
+/*
+ * file2le - convert a file into an little endian integer
+ *
+ * given:
+ *	filename	filename to read
+ *
+ * returns:
+ *	integer read from its contents on little endian order
+ */
+define file2le(filename)
+{
+    local fd;	/* open file */
+    local ret;	/* integer to return */
+    local c;	/* character read from the file */
+    local shft;	/* bit shift for the c value */
+    local i;
+
+    /*
+     * open the file for reading
+     */
+    fd = fopen(filename, "rb");
+    if (!isfile(fd)) quit "file2le: cannot open file for reading";
+
+    /*
+     * read the contents of the file into a string
+     *
+     * The first octets become are the least significant bits of the integer.
+     */
+    ret = 0;
+    shft = 0;
+    while (! isnull(c = fgetc(fd))) {
+	ret |= (ord(c) << shft);
+	shft += 8;
+    }
+
+    /*
+     * cleanup and return the integer
+     */
+    fclose(fd);
+    return ret;
+}
+
+
+/*
+ * be2file - convert a big endian integer into a file
+ *
+ * given:
+ *	v		integer to write to the file
+ *	filename	filename to write
+ *
+ * returns:
+ *	The number of octets written to the file.
+ *
+ * NOTE: The absolute value of the integer is written to the file.
+ */
+define be2file(v, filename)
+{
+    local fd;		/* open file */
+    local octlen;	/* length of v in octets */
+    local i;
+
+    /*
+     * firewall
+     */
+    if (!isint(v)) {
+	quit "be2file: 1st arg not an integer";
+    }
+    v = abs(v);
+
+    /*
+     * open the file for writing
+     */
+    fd = fopen(filename, "wb");
+    if (!isfile(fd)) quit "be2file: cannot open file for writing";
+
+    /*
+     * write the octets to the file
+     *
+     * The most significant bits of the integer become the first file octets.
+     */
+    octlen = int((highbit(v)+8) / 8);
+    for (i=octlen-1; i >= 0; --i) {
+    	fputc(fd, char(v >> (i*8)));
+    }
+
+    /*
+     * cleanup
+     */
+    fclose(fd);
+    return octlen;
+}
+
+
+/*
+ * le2file - convert a little endian integer into a file
+ *
+ * given:
+ *	v		integer to write to the file
+ *	filename	filename to write
+ *
+ * returns:
+ *	The number of octets written to the file.
+ *
+ * NOTE: The absolute value of the integer is written to the file.
+ */
+define le2file(v, filename)
+{
+    local fd;	/* open file */
+    local cnt;	/* octets written */
+
+    /*
+     * firewall
+     */
+    if (!isint(v)) {
+	quit "be2file: 1st arg not an integer";
+    }
+    v = abs(v);
+
+    /*
+     * open the file for writing
+     */
+    fd = fopen(filename, "wb");
+    if (!isfile(fd)) quit "le2file: cannot open file for writing";
+
+    /*
+     * Write the octets to the file.
+     *
+     * The least significant bits of the integer become the first file octets.
+     */
+    cnt = 0;
+    while (v > 0) {
+	fputc(fd, char(v));
+	v >>= 8;
+	++cnt;
+    }
+
+    /*
+     * cleanup
+     */
+    fclose(fd);
+    return cnt;
+}

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.2 $
+ * @(#) $Revision: 29.6 $
- * @(#) $Id: lucas.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $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
@@ -1030,7 +1047,7 @@ gen_v1(h, n)
 define
 ldebug(funct, str)
 {
-	if (config("resource_debug") & 3) {
+	if (config("resource_debug") & 8) {
 		print "DEBUG:", funct:":", str;
 	}
 	return;

cal/lucas_chk.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 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: lucas_chk.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Id: lucas_chk.cal,v 29.3 2001/03/31 13:31:34 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/lucas_chk.cal,v $
  *
  * Under source code control:	1991/01/11 05:41:43
@@ -336,7 +336,7 @@ lucas_chk(high_n, quiet)
 
 		/* skip primes where h>=2^n */
 		if (highbit(h_p[i]) >= n_p[i]) {
-			if (config("resource_debug") & 3) {
+			if (config("resource_debug") & 8) {
 				print "h>=2^n skip:", h_p[i]:"*2^":n_p[i]:"-1";
 			}
 			continue;

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.6 $
+ * @(#) $Revision: 29.17 $
- * @(#) $Id: regress.cal,v 29.6 2000/12/17 12:26:42 chongo Exp $
+ * @(#) $Id: regress.cal,v 29.17 2003/06/10 21:17:55 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")';
+	print				'503: callcfg = config("all","oldstd")';
-	oldcfg = config("all", "newstd");
-	print				'503: oldcfg = config("all","newstd")';
 	vrfy(callcfg == startcfg,	'504: callcfg == startcfg');
-	newcfg = config("all");
+	oldcfg = config("all");
-	print				'505: newcfg = config("all")';
+	print				'505: oldcfg = config("all");';
-	vrfy(config("all") == newcfg,	'506: config("all") == newcfg');
+	vrfy(config("all") == oldcfg,	'506: config("all") == oldcfg');
-	vrfy(config("all", oldcfg) == newcfg,
+	vrfy(oldcfg==config("all","newstd"),
-					'507: config("all", oldcfg) == newcfg');
+					'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,
@@ -411,10 +412,10 @@ define test_config()
 					'516: config("pow2") == 40');
 	vrfy(config("redc2") == 50,
 					'517: config("redc2") == 50');
-	vrfy(config("tilde") == "true",
+	vrfy(config("tilde"),
-					'518: config("tilde") == "true"');
+					'518: config("tilde")');
-	vrfy(config("tab") == "true",
+	vrfy(config("tab"),
-					'519: config("tab") == "true"');
+					'519: config("tab")');
 	vrfy(config("quomod") == 0,
 					'520: config("quomod") == 0');
 	vrfy(config("quo") == 2,
@@ -429,58 +430,59 @@ define test_config()
 					'525: config("cfappr") == 0');
 	vrfy(config("cfsim") == 8,
 					'526: config("cfsim") == 8');
-	vrfy(config("outround") == 2,
+	vrfy(config("outround") == 24,
-					'527: config("outround") == 2');
+					'527: config("outround") == 24');
 	vrfy(config("round") == 24,
 					'528: config("round") == 24');
-	vrfy(config("leadzero") == "false",
+	vrfy(config("leadzero") == 1,
-					'529: config("leadzero") == "false"');
+					'529: config("leadzero") == 1');
-	vrfy(config("fullzero") == "false",
+	vrfy(config("fullzero") == 0,
-					'530: config("fullzero") == "false"');
+					'530: config("fullzero") == 0');
 	vrfy(config("maxscan") == 20,
 					'531: config("maxscan") == 20');
-	vrfy(config("prompt") == "> ",
+	vrfy(config("prompt") == "; ",
-					'532: config("prompt") == "> "');
+					'532: config("prompt") == "; "');
-	vrfy(config("more") == ">> ",
+	vrfy(config("more") == ";; ",
-					'533: config("more") == ">> "');
+					'533: config("more") == ";; "');
 
-	/* convert to "newstd" config by individual changes */
+	/* convert to "oldstd" config by individual changes */
-	vrfy(config("display", 10) == 20,
+	print				'534: test unused';
-					'534: config("display") == 20');
+	vrfy(config("outround", 2) == 24,
-	vrfy(config("epsilon",1e-10)==1e-20,
+					'535: config("outround", 2) == 24');
-					'535: config("epsilon",1e-10)==1e-20');
+	vrfy(config("leadzero","n") == 1,
-	vrfy(config("quo", 0) == 2,	'536: config("quo", 0) == 2');
+					'536: config("leadzero","n") == 1');
-	vrfy(config("outround", 24) == 2,
+	print				'537: test unused';
-					'537: config("outround", 24) == 2');
+	vrfy(config("prompt", "> ") == "; ",
-	vrfy(config("leadzero","y") == "false",
+					'538: config("prompt", "> ") == "; "');
-				'538: config("leadzero","y") == "false"');
+	vrfy(config("more", ">> ") == ";; ",
-	vrfy(config("fullzero", 1) == "false",
+					'539: config("more", ">> ") == ";; "');
-				'539: config("fullzero", 1) == "false"');
+	vrfy(config("all") == oldcfg,	'540: config("all") == oldcfg');
-	vrfy(config("prompt", "; ") == "> ",
-					'540: config("prompt", "; ") == "> "');
-	vrfy(config("more", ";; ") == ">> ",
-					'541: config("more", ";; ") == ">> "');
-	vrfy(config("all") == newcfg,	'542: config("all") == newcfg');
 
-	/* check on the new config("fullzero") effect */
+	/* restore the configation at the start of this function */
-	vrfy(config("all","oldstd") == newcfg,
+	vrfy(config("all",callcfg) == oldcfg,
-					'543: config("all",callcfg) == newcfg');
+					'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("fullzero",1) == "false",
+	vrfy(config("leadzero",0) == 1,
-					'545: config("fullzero",1) == "false"');
+					'543: config("leadzero",0) == 1');
+	vrfy(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');
+					'546: config("display",20) == 2');
-	vrfy(config("fullzero",0) == "true",
+	vrfy(config("leadzero",1) == 0,
-					'548: config("fullzero",0) == "true"');
+					'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,
+	vrfy(config("all",callcfg) == startcfg,
-					'550: config("all",callcfg) == oldcfg');
+		'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,8 +1002,13 @@ 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');
-	vrfy(system("") == 0,		'949: system("") == 0');
+	if (config("windows")) {
-	vrfy(system("true") == 0,	'950: system("true") == 0');
+	    print '949: test skipped for windows systems';
+	    print '950: test skipped for windows systems';
+	} else {
+	    vrfy(system("") == 0,		'949: system("") == 0');
+	    vrfy(system("true") == 0,		'950: system("true") == 0');
+	}
 	print		'951: test disabled due to stdin dependency';
 	print				'952: test removed';
 	print				'953: test removed';
@@ -1029,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) == 1,		'977: digits(0) == 1');
-	vrfy(digits(0.0123) == 0,	'978: digits(0.0123) == 0');
+	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');
@@ -1562,31 +1573,31 @@ define test_rand()
 	/* test the additive 55 shuffle generator */
 	tmp = srand(0);
 	print				  '1505: tmp = srand(0)';
-	vrfy(rand() == 0xc79ef743e2e6849c, \
+	vrfy(rand() == 0x1fe5b46fba7e069d, \
-		  '1506: rand() == 0xc79ef743e2e6849c');
+		  '1506: rand() == 0x1fe5b46fba7e069d');
-	vrfy(rand() == 0x8d2dcb2bed321284, \
+	vrfy(rand() == 0x308d32d9bdf2dc6f, \
-		  '1507: rand() == 0x8d2dcb2bed321284');
+		  '1507: rand() == 0x308d32d9bdf2dc6f');
 	tmp = srand(init);
 	print				  '1508: tmp = srand(init)';
-	vrfy(rand() == 0xc79ef743e2e6849c, \
+	vrfy(rand() == 0x1fe5b46fba7e069d, \
-		  '1509: rand() == 0xc79ef743e2e6849c');
+		  '1509: rand() == 0x1fe5b46fba7e069d');
-	vrfy(rand() == 0x8d2dcb2bed321284, \
+	vrfy(rand() == 0x308d32d9bdf2dc6f, \
-		  '1510: rand() == 0x8d2dcb2bed321284');
+		  '1510: rand() == 0x308d32d9bdf2dc6f');
 
 	/* test range interface */
 	tmp = srand(0);
 	print				  '1511: tmp = srand(0)';
-	vrfy(rand(12345678901234567890) == 0x8d2dcb2bed321284, \
+	vrfy(rand(12345678901234567890) == 0x1fe5b46fba7e069d, \
-		  '1512: rand(12345678901234567890) == 0x8d2dcb2bed321284');
+		  '1512: rand(12345678901234567890) == 0x1fe5b46fba7e069d');
-	vrfy(rand(216091) == 0x13d2b,	  '1513: rand(216091) == 0x13d2b');
+	vrfy(rand(216091) == 0xc234,	  '1513: rand(216091) == 0xc234');
-	vrfy(rand(100) == 0x26,	  '1514: rand(100) == 0x26');
+	vrfy(rand(100) == 0x59,	  '1514: rand(100) == 0x59');
-	vrfy(rand(-46,46) == -0xf,	  '1515: rand(-46,46) == -0xf');
+	vrfy(rand(-46,46) == 0x2d,	  '1515: rand(-46,46) == 0x2d');
 	tmp = srand(0);
 	print				  '1516: tmp = srand(0)';
-	vrfy(rand(2^64) == 0xc79ef743e2e6849c, \
+	vrfy(rand(2^64) == 0x1fe5b46fba7e069d, \
-		  '1517: rand(2^64) == 0xc79ef743e2e6849c');
+		  '1517: rand(2^64) == 0x1fe5b46fba7e069d');
-	vrfy(rand(0,2^64) == 0x8d2dcb2bed321284, \
+	vrfy(rand(0,2^64) == 0x308d32d9bdf2dc6f, \
-		  '1518: rand(0,2^64) == 0x8d2dcb2bed321284');
+		  '1518: rand(0,2^64) == 0x308d32d9bdf2dc6f');
 
 	/* test different forms of seeding the initial state */
 	tmp = srand(0);
@@ -1594,7 +1605,7 @@ define test_rand()
 	vrfy(srand() == init,		  '1520: srand() == init');
 	tmp = srand(0x87e6ec938ff55aa5<<64);
 	print	  '1521: tmp = srand(0x87e6ec938ff55aa5<<64)';
-	vrfy(srand() == init,		  '1522: srand() == init');
+	print	  '1522: test disabled';
 	tmp = srand(state0);
 	print				  '1523: tmp = srand(state0)';
 	vrfy(srand() == init,		  '1524: srand() == init');
@@ -1606,35 +1617,35 @@ define test_rand()
 	/* test the bit length interface */
 	tmp = srand(0);
 	print				  '1528: tmp = srand(0)';
-	vrfy(randbit(64) == 0xc79ef743e2e6849c, \
+	vrfy(randbit(64) == 0x1fe5b46fba7e069d, \
-		  '1529: randbit(64) == 0xc79ef743e2e6849c');
+		  '1529: randbit(64) == 0x1fe5b46fba7e069d');
-	vrfy(randbit(128) == 0x8d2dcb2bed3212844f4ad31f3818af34, \
+	vrfy(randbit(128) == 0x308d32d9bdf2dc6f45d3e3b3361b79e4, \
-		  '1530: randbit(128) == 0x8d2dcb2bed3212844f4ad31f3818af34');
+		  '1530: randbit(128) == 0x308d32d9bdf2dc6f45d3e3b3361b79e4');
-	vrfy(randbit(64) == 0x23a252f60bae4907, \
+	vrfy(randbit(64) == 0xd4ef1e3336022d81, \
-		  '1531: randbit(64) == 0x23a252f60bae4907');
+		  '1531: randbit(64) == 0xd4ef1e3336022d81');
-	vrfy(randbit(128) == 0xa8ed5b6203e2b1da32848cd9b3f1e3fa, \
+	vrfy(randbit(128) == 0x66b086e6c34e42124a1fc5d4e5c6f598, \
-		  '1532: randbit(128) == 0xa8ed5b6203e2b1da32848cd9b3f1e3fa');
+		  '1532: randbit(128) == 0x66b086e6c34e42124a1fc5d4e5c6f598');
 	tmp = srand(0);
 	print				  '1533: tmp = srand(0)';
-	vrfy(randbit(32) == 0xc79ef743,	  '1534: randbit(32) == 0xc79ef743');
+	vrfy(randbit(32) == 0x1fe5b46f,	  '1534: randbit(32) == 0x1fe5b46f');
-	vrfy(randbit(32) == 0xe2e6849c,	  '1535: randbit(32) == 0xe2e6849c');
+	vrfy(randbit(32) == 0xba7e069d,	  '1535: randbit(32) == 0xba7e069d');
-	vrfy(randbit(1) == 0x1,		  '1536: randbit(1) == 0x1');
+	vrfy(randbit(1) == 0x0,		  '1536: randbit(1) == 0x0');
-	vrfy(randbit(5) == 0x3,		  '1537: randbit(5) == 0x3');
+	vrfy(randbit(5) == 0xc,		  '1537: randbit(5) == 0xc');
-	vrfy(randbit(33) == 0x96e595f6,	  '1538: randbit(33) == 0x96e595f6');
+	vrfy(randbit(33) == 0x46996cde,	  '1538: randbit(33) == 0x46996cde');
-	vrfy(randbit(25) == 0x1321284,	  '1539: randbit(25) == 0x1321284');
+	vrfy(randbit(25) == 0x1f2dc6f,	  '1539: randbit(25) == 0x1f2dc6f');
 	vrfy(randbit(2) == 0x1,		  '1540: randbit(2) == 0x1');
-	vrfy(randbit(13) == 0x7a5,	  '1541: randbit(13) == 0x7a5');
+	vrfy(randbit(13) == 0x2e9,	  '1541: randbit(13) == 0x2e9');
-	vrfy(randbit(18) == 0x1a63e,	  '1542: randbit(18) == 0x1a63e');
+	vrfy(randbit(18) == 0x3c766,	  '1542: randbit(18) == 0x3c766');
-	vrfy(randbit(8) == 0x70,	  '1543: randbit(8) == 0x70');
+	vrfy(randbit(8) == 0x6c,	  '1543: randbit(8) == 0x6c');
-	vrfy(randbit(9) == 0x62,	  '1544: randbit(9) == 0x62');
+	vrfy(randbit(9) == 0x6d,	  '1544: randbit(9) == 0x6d');
-	vrfy(randbit(70) == 0x2f3423a252f60bae49, \
+	vrfy(randbit(70) == 0x39e4d4ef1e3336022d, \
-		  '1545: randbit(70) == 0x2f3423a252f60bae49');
+		  '1545: randbit(70) == 0x39e4d4ef1e3336022d');
 	print				  '1546: test unused';
-	vrfy(randbit(8) == 0x7,		  '1547: randbit(8) == 0x7');
+	vrfy(randbit(8) == 0x81,		  '1547: randbit(8) == 0x81');
-	vrfy(randbit(65) == 0x151dab6c407c563b4, \
+	vrfy(randbit(65) == 0xcd610dcd869c8424, \
-		  '1548: randbit(65) == 0x151dab6c407c563b4');
+		  '1548: randbit(65) == 0xcd610dcd869c8424');
-	vrfy(randbit(63) == 0x32848cd9b3f1e3fa, \
+	vrfy(randbit(63) == 0x4a1fc5d4e5c6f598, \
-		  '1549: randbit(63) == 0x32848cd9b3f1e3fa');
+		  '1549: randbit(63) == 0x4a1fc5d4e5c6f598');
 
 	/* check to be sure that the srand(1) bug was fixed */
 	tmp = srand(1);
@@ -1643,36 +1654,36 @@ define test_rand()
 	print				  '1551: n = 1';
 	vrfy(num(n),			  '1552: num(n)');
 	vrfy(den(n),			  '1553: den(n)');
-	vrfy(randbit(64) == 0x4280429f8069cb27, \
+	vrfy(randbit(64) == 0xbf989a4c504a541d, \
-		  '1554: randbit(64) == 0x4280429f8069cb27');
+		  '1554: randbit(64) == 0xbf989a4c504a541d');
-
 	/* test randbit skip interface */
 	tmp = srand(0);
 	print				  '1555: tmp = srand(0)';
-	vrfy(randbit(20) == 817647,	  '1556: randbit(20) == 817647');
+	vrfy(randbit(20) == 0x1fe5b,	  '1556: randbit(20) == 0x1fe5b');
-	vrfy(randbit(20) == 476130,	  '1557: randbit(20) == 476130');
+	vrfy(randbit(20) == 0x46fba,	  '1557: randbit(20) == 0x46fba');
-	vrfy(randbit(20) == 944201,	  '1558: randbit(20) == 944201');
+	vrfy(randbit(20) == 0x7e069,	  '1558: randbit(20) == 0x7e069');
-	vrfy(randbit(20) == 822573,	  '1559: randbit(20) == 822573');
+	vrfy(randbit(20) == 0xd308d,	  '1559: randbit(20) == 0xd308d');
 	tmp = srand(0);
 	print				  '1560: tmp = srand(0)';
 	vrfy(randbit(-20) == 20,	  '1561: randbit(-20) == 20');
-	vrfy(randbit(20) == 476130,	  '1562: randbit(20) == 476130');
+	vrfy(randbit(20) == 290746,	  '1562: randbit(20) == 290746');
 	vrfy(randbit(-20) == 20,	  '1563: randbit(-20) == 20');
-	vrfy(randbit(20) == 822573,	  '1564: randbit(20) == 822573');
+	vrfy(randbit(20) == 864397,	  '1564: randbit(20) == 864397');
 
 	/* test randbit without and arg */
 	tmp = srand(0);
 	print				  '1565: tmp = srand(0)';
-	vrfy(randbit() == 1,		  '1566: randbit() == 1');
+	vrfy(randbit() == 0,		  '1566: randbit() == 0');
-	vrfy(randbit() == 1,		  '1567: randbit() == 1');
+	vrfy(randbit() == 0,		  '1567: randbit() == 0');
 	vrfy(randbit() == 0,		  '1568: randbit() == 0');
+	vrfy(randbit() == 1,		  '1569: randbit() == 1');
 
 	/* test seed() as best as we can */
-	vrfy(seed() >= 0,		  '1569: seed() >= 0');
+	vrfy(seed() >= 0,		  '1570: seed() >= 0');
-	vrfy(seed() < 2^64,		  '1570: seed() < 2^64');
+	vrfy(seed() < 2^64,		  '1571: seed() < 2^64');
-	vrfy(isrand(srand(seed())),	  '1571: isrand(srand(seed()))');
+	vrfy(isrand(srand(seed())),	  '1572: isrand(srand(seed()))');
 
-	print '1572: Ending rand test';
+	print '1573: Ending rand test';
 }
 print '025: parsed test_rand()';
 
@@ -1788,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()';
 
@@ -4542,7 +4569,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()';
 
@@ -5112,10 +5146,17 @@ define test_is()
 	 */
 	a = assoc();
 	print				  '5901: a = assoc()';
-	ofd = fopen("/dev/null", "r");
+	if (config("windows")) {
-	print				  '5902: ofd = fopen("/dev/null", "r")';
+	    ofd = fopen("NUL:", "rb");
-	cfd = fopen("/dev/null", "r");
+	    print			  '5902: ofd = fopen("NUL:", "rb")';
-	print				  '5903: cfd = fopen("/dev/null", "r")';
+	    cfd = fopen("NUL:", "rb");
+	    print			  '5903: cfd = fopen("NUL:", "rb")';
+	} else {
+	    ofd = fopen("/dev/null","rb");
+	    print			  '5902: ofd = fopen("/dev/null","rb")';
+	    cfd = fopen("/dev/null","rb");
+	    print			  '5903: cfd = fopen("/dev/null","rb")';
+	}
 	fclose(cfd);
 	print				  '5904: fclose(cfd)';
 	blk = blk();
@@ -6293,8 +6334,8 @@ define test_blkcpy()
 
 	/* blkcpy the last 5 octets of B1 to a new block C */
 
-	blkcpy(C = blk(), B1, 5, ,100);
+	blkcpy(C = blk(), B1,5,,100);
-	print				  '6821: blkcpy(C = blk(), B1, 5, ,100);';
+	print				  '6821: blkcpy(C = blk(), B1,5,,100);';
 	vrfy(C == A,			  '6822: C == A');
 
 	/* blkcpy to and from a file */
@@ -6310,8 +6351,8 @@ define test_blkcpy()
 	blkcpy(fs, A, ,100);
 	print				  '6828: blkcpy(fs, A, ,100);';
 	vrfy(size(fs) == 105,		  '6829: size(f) == 105');
-	blkcpy(C = blk(), fs, 2, ,100);
+	blkcpy(C = blk(), fs,2,,100);
-	print				  '6830: blkcpy(C = blk(), fs, 2, ,100)';
+	print				  '6830: blkcpy(C = blk(), fs,2,,100)';
 	vrfy(C == (blk() = {1,2}),	  '6831: C == (blk() = {1,2}');
 
 	/* blkcpy string to a block */
@@ -7593,7 +7634,9 @@ vrfy(j8300(10) == 11,		'8307: j8300(10) == 11');
 {static k8300 = 5} define l8300(x) = k8300 + x;
 print	'8308: {static k8300 = 5} define l8300(x) = k8300 + x;';
 vrfy(l8300(10) == 15,		'8309: l8300(10) == 15');
-print	'8310: Ending define tests';
+static a8300 = 1, b8300;
+vrfy(a8300 == 1,		'8310: a8300 == 1');
+print	'8311: Ending define tests';
 
 
 /*

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);
+}

cal/seedrandom.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 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: seedrandom.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Id: seedrandom.cal,v 29.3 2001/03/31 13:31:34 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/seedrandom.cal,v $
  *
  * Under source code control:	1996/01/01 08:21:00
@@ -115,7 +115,7 @@ define seedrandom(seed1, seed2, size, trials)
 			p = 2*fp+1;
 		} while (ptest(p,1,0) == 0);
 	} while(ptest(p, trials) == 0 || ptest(fp, trials) == 0);
-	if (config("resource_debug") & 3) {
+	if (config("resource_debug") & 8) {
 		print "/* 1st Blum prime */ p=", p;
 	}
 
@@ -129,7 +129,7 @@ define seedrandom(seed1, seed2, size, trials)
 			q = 2*fq+1;
 		} while (ptest(q,1,0) == 0);
 	} while(ptest(q, trials) == 0 || ptest(fq, trials) == 0);
-	if (config("resource_debug") & 3) {
+	if (config("resource_debug") & 8) {
 		print "/* 2nd Blum prime */ q=", q;
 	}
 
@@ -139,7 +139,7 @@ define seedrandom(seed1, seed2, size, trials)
 	n = p*q;				/* the Blum modulus */
 	binsize = highbit(n)+1;			/* smallest power of 2 > p*q */
 	r = pmod(rand(1<<ceil(binsize*4/5), 1<<(binsize-2)), 2, n);
-	if (config("resource_debug") & 3) {
+	if (config("resource_debug") & 8) {
 		print "/* seed quadratic residue */ r=", r;
 		print "/* newn", binsize, "bit quadratic residue*/ newn=", n;
 	}

cal/test4600.cal

@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: test4600.cal,v 29.2 2000/06/07 14:02:25 chongo Exp $
+ * @(#) $Id: test4600.cal,v 29.4 2001/04/10 22:09:02 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test4600.cal,v $
  *
  * Under source code control:	1996/07/02 20:04:40
@@ -53,10 +53,10 @@ define stest(str, verbose)
 	/*
 	 * do file operations
 	 */
-	f = fopen("junk4600", "w");
+	f = fopen("junk4600", "wb");
 	if (iserror(f)) {
 		print 'failed';
-		print '**** fopen("junk4600", "w") failed';
+		print '**** fopen("junk4600", "wb") failed';
 		return 1;
 	}
 	if (iserror(fputs(f,
@@ -67,9 +67,9 @@ define stest(str, verbose)
 		print '**** fputs(f, "Fourscore ... failed';
 		return 1;
 	}
-	if (iserror(freopen(f, "r"))) {
+	if (iserror(freopen(f, "rb"))) {
 		print 'failed';
-		print '**** iserror(freopen(f, "r")) failed';
+		print '**** iserror(freopen(f, "rb")) failed';
 		return 1;
 	}
 	if (iserror(rewind(f))) {
@@ -173,7 +173,7 @@ define ttest(str, m, n, verbose)
 		print str:":",:;
 	}
 	i = rm("-f", "junk4600");
-	f = fopen("junk4600", "w");
+	f = fopen("junk4600", "wb");
 
 	if (isnull(n))
 		n = 4;
@@ -198,7 +198,7 @@ define ttest(str, m, n, verbose)
 	fflush(f);
 	if (verbose > 1)
 		printf("File has size %d\n", pos[i]);
-	freopen(f, "r");
+	freopen(f, "rb");
 	if (size(f) != pos[i]) {
 		print 'failed';
 		printf("**** Failure 1 for file size\n");

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.7 $
+ * @(#) $Revision: 29.9 $
- * @(#) $Id: calc.c,v 29.7 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Id: calc.c,v 29.9 2003/08/26 04:36:10 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.c,v $
  *
  * Under source code control:	1990/02/15 01:48:11
@@ -214,7 +214,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 +431,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);
@@ -625,9 +631,18 @@ main(int argc, char **argv)
 			if (!p_flag && i_flag && !stdin_tty) {
 				closeinput();
 				if(!freopen("/dev/tty", "r", stdin)) {
+#if defined (_WIN32)
+					fprintf(stderr,
+						"/dev/tty does not exist on "
+						"this operating system.  "
+						"Change operating systems\n"
+						"or don't use this calc mode "
+						"in the future, sorry!\n");
+#else /* Windoz free systems */
 					fprintf(stderr,
 						"Unable to associate stdin"
 						" with /dev/tty");
+#endif /* Windoz free systems */
 					set_run_state(RUN_EXIT_WITH_ERROR);
 					break;
 				}
@@ -646,9 +661,18 @@ main(int argc, char **argv)
 					!p_flag && (!havecommands||i_flag)) {
 				closeinput();
 				if(!freopen("/dev/tty", "r", stdin)) {
+#if defined (_WIN32)
+					fprintf(stderr,
+						"/dev/tty does not exist on "
+						"this operating system.  "
+						"Change operating systems\n"
+						"or don't use this calc mode "
+						"in the future, sorry!\n");
+#else /* Windoz free systems */
 					fprintf(stderr,
 						"Unable to associate stdin"
 						" with /dev/tty");
+#endif /* Windoz free systems */
 					set_run_state(RUN_EXIT_WITH_ERROR);
 					break;
 				}

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.6 $
+ * @(#) $Revision: 29.11 $
- * @(#) $Id: calc.h,v 29.6 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $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,9 +32,15 @@
 #define __CALC_H__
 
 #include <setjmp.h>
-#include "win32dll.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
-#include "value.h"
+# include "win32dll.h"
-#include "have_const.h"
+# include "value.h"
+# include "have_const.h"
+#else
+# include <calc/win32dll.h>
+# include <calc/value.h>
+# include <calc/have_const.h>
+#endif
 
 
 /*
@@ -54,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 */
 
@@ -222,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 */
@@ -252,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.5 $
+.\" @(#) $Revision: 29.11 $
-.\" @(#) $Id: calc.man,v 29.5 2000/06/07 14:02:13 chongo Exp $
+.\" @(#) $Id: calc.man,v 29.11 2003/08/26 04:36:10 chongo Exp $
 .\" @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.man,v $
 .\"
 .\" Under source code control:	    1991/07/23 05:48:26
@@ -36,24 +36,25 @@ calc \- arbitrary precision calculator
 .RB [ \-c ]
 .RB [ \-C ]
 .RB [ \-d ]
-.RB [ -D\ \&calc_debug[:resource_debug[:user_debug]] ]
 .br
 .in +5n
+.RB [ -D\ \&calc_debug[:resource_debug[:user_debug]] ]
+.br
 .RB [ \-e ]
 .RB [ \-h ]
 .RB [ \-i ]
 .RB [ \-m\ \&mode ]
-.RB [ \-n ]
+.RB [ \-O ]
+.br
 .RB [ \-p ]
 .RB [ \-q ]
 .RB [ \-s ]
 .RB [ \-u ]
 .RB [ \-v ]
-.br
 .RB [ calc_cmd\ \&.\|.\|. ]
 .in -5n
 .sp
-\fI#!${BINDIR}/calc\fP\ \fB\-S\fP\ [other_flags\ \&...]
+\fI#!${BINDIR}/calc\fP\ \fB\-f\fP\ [other_flags\ \&...]
 .SH DESCRIPTION
 \&
 .br
@@ -301,11 +302,22 @@ The reading of key bindings is also disabled
 when the mode disables opening of files for reading.
 
 .TP
-.B \-n
+.B \-O
-Use the new configuration defaults instead of the old
+Use the old classic defaults instead of the
-default classic defaults.
+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
@@ -513,8 +525,8 @@ searches in succession:
 ./myfile.cal
 ${LIBDIR}/myfile
 ${LIBDIR}/myfile.cal
-${CUSTOMLIBDIR}/myfile
+${CUSTOMCALDIR}/myfile
-${CUSTOMLIBDIR}/myfile.cal
+${CUSTOMCALDIR}/myfile.cal
 .fi
 .in -5n
 .sp 1
@@ -571,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\ \fB\-f\fP\ [other_flags\ \&...]
 .fi
 .in -5n
 .sp 1
 the rest of the file will be processed in
 .BR "shell script mode" .
 Note that
-.B \-S
+.B \-f
-(UPPER CASE
-.BR \-S )
 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"
@@ -624,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\-f\fP\ \&\fB\-q\fP
 #
 # mersenne - an example of a calc \fBshell script file\fP
 
@@ -838,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
@@ -850,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
@@ -993,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,
+resource files, and
-.B calc
+shell scripts please join the low volume calc mailing list.
-shell scripts that you would like you see included
+.sp
-in future distributions to:
+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
@@ -1022,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
@@ -1036,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
@@ -1044,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
+
+#****

calcerr.tbl

@@ -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 $
+# @(#) $Revision: 29.4 $
-# @(#) $Id: calcerr.tbl,v 29.3 2000/07/17 15:35:49 chongo Exp $
+# @(#) $Id: calcerr.tbl,v 29.4 2001/04/10 22:06:46 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/calcerr.tbl,v $
 #
 # Under source code control:	1996/05/23 17:38:44
@@ -108,8 +108,8 @@ E_FGETSTR1	Non-file first argument for fgetstr
 E_FGETSTR2	File not open for reading for fgetstr
 E_FGETLINE1	Non-file  argument for fgetline
 E_FGETLINE2	File not open for reading for fgetline
-E_FGETWORD1	Non-file argument for fgetword
+E_FGETFIELD1	Non-file argument for fgetfield
-E_FGETWORD2	File not open for reading for fgetword
+E_FGETFIELD2	File not open for reading for fgetfield
 E_REWIND1	Non-file argument for rewind
 E_FILES		Non-integer argument for files
 E_PRINTF1	Non-string fmt argument for fprint

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.3 $
+ * @(#) $Revision: 29.6 $
- * @(#) $Id: cmath.h,v 29.3 2000/07/17 15:35:49 chongo Exp $
+ * @(#) $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,11 @@
 #define __CMATH_H__
 
 
-#include "qmath.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
+# include "qmath.h"
+#else
+# include <calc/qmath.h>
+#endif
 
 
 /*
@@ -58,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);
@@ -70,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 *c_real(COMPLEX *c);
-extern COMPLEX *cimag(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.4 $
+ * @(#) $Revision: 29.7 $
- * @(#) $Id: codegen.c,v 29.4 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Id: codegen.c,v 29.7 2002/07/10 11:51:51 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
 
@@ -127,6 +127,7 @@ getcommands(BOOL toplevel)
 	if (!toplevel)
 		enterfilescope();
 	for (;;) {
+		int i;
 		(void) tokenmode(TM_NEWLINES);
 		switch (gettoken()) {
 
@@ -144,10 +145,14 @@ getcommands(BOOL toplevel)
 			return;
 
 		case T_HELP:
-			for (;;) {
+			for (i=1;;i++) {
 				switch(getfilename(name, NULL)) {
-				case 1:
+				case -1:
-					strcpy(name, DEFAULTCALCHELP);
+					if(i == 1) {
+						strcpy(name, DEFAULTCALCHELP);
+						givehelp(name);
+					}
+					break;
 				case 0:
 					givehelp(name);
 					continue;
@@ -522,9 +527,10 @@ getsimpledeclaration(int symtype)
 		switch (gettoken()) {
 			case T_SYMBOL:
 				rescantoken();
-				res = getonevariable(symtype);
+				if (getonevariable(symtype)) {
-				if (res)
+					res = 1;
 					addop(OP_POP);
+				}
 				continue;
 			case T_COMMA:
 				continue;

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 $
+ * @(#) $Revision: 29.3 $
- * @(#) $Id: commath.c,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $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.4 $
+ * @(#) $Revision: 29.10 $
- * @(#) $Id: config.c,v 29.4 2000/07/17 15:35:49 chongo Exp $
+ * @(#) $Id: config.c,v 29.10 2003/08/26 04:36:10 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*/
@@ -90,6 +91,7 @@ NAMETYPE configs[] = {
 	    {"ctrl-d",	CONFIG_CTRL_D},		/* alias for ctrl_d */
 	{"program",	CONFIG_PROGRAM},
 	{"basename",	CONFIG_BASENAME},
+	{"windows",	CONFIG_WINDOWS},
 	{"version",	CONFIG_VERSION},
 	{NULL,		0}
 };
@@ -100,6 +102,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 */
@@ -132,17 +135,23 @@ CONFIG oldstd = {	/* backward compatible standard configuration */
 	0,			/* internal calc debug level */
 	3,			/* calc resource file debug level */
 	0,			/* user defined debug level */
-	TRUE,			/* print Quit or abort executed messages */
+	FALSE,			/* print Quit or abort executed messages */
 	CTRL_D_VIRGIN_EOF,	/* ^D only exits on virgin lines */
 	NULL,			/* our name */
 	NULL,			/* basename of our name */
+#if defined(_WIN32)
+	TRUE,			/* running under windows */
+#else
+	FALSE,			/* congrats, you are not using windows */
+#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 */
@@ -152,7 +161,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 */
@@ -161,7 +170,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 */
@@ -172,10 +181,15 @@ CONFIG newstd = {	/* new non-backward compatible configuration */
 	0,			/* internal calc debug level */
 	3,			/* calc resource file debug level */
 	0,			/* user defined debug level */
-	TRUE,			/* print Quit or abort executed messages */
+	FALSE,			/* print Quit or abort executed messages */
 	CTRL_D_VIRGIN_EOF,	/* ^D only exits on virgin lines */
 	NULL,			/* our name */
 	NULL,			/* basename of our name */
+#if defined(_WIN32)
+	TRUE,			/* running under windows */
+#else
+	FALSE,			/* congrats, you are not using windows */
+#endif
 	NULL			/* version */
 };
 CONFIG *conf = NULL;	/* loaded in at startup - current configuration */
@@ -201,6 +215,7 @@ static NAMETYPE modes[] = {
 	{"oct",		MODE_OCTAL},
 	{"binary",	MODE_BINARY},
 	{"bin",		MODE_BINARY},
+	{"off",		MODE2_OFF},
 	{NULL,		0}
 };
 
@@ -456,6 +471,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");
@@ -822,11 +850,15 @@ setconfig(int type, VALUE *vp)
 		/*NOTREACHED*/
 
 	case CONFIG_BASENAME:
-		math_error("The program config parameter is read-only");
+		math_error("The basename config parameter is read-only");
+		/*NOTREACHED*/
+
+	case CONFIG_WINDOWS:
+		math_error("The windows config parameter is read-only");
 		/*NOTREACHED*/
 
 	case CONFIG_VERSION:
-		math_error("The program config parameter is read-only");
+		math_error("The version config parameter is read-only");
 		/*NOTREACHED*/
 
 	default:
@@ -1003,6 +1035,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;
@@ -1028,20 +1070,18 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		break;
 
 	case CONFIG_TILDE:
-		vp->v_type = V_STR;
 		if (cfg->tilde_ok) {
-			vp->v_str = makenewstring(TRUE_STRING);
+			vp->v_num = itoq(1);
 		} else {
-			vp->v_str = makenewstring(FALSE_STRING);
+			vp->v_num = itoq(0);
 		}
 		return;
 
 	case CONFIG_TAB:
-		vp->v_type = V_STR;
 		if (cfg->tab_ok) {
-			vp->v_str = makenewstring(TRUE_STRING);
+			vp->v_num = itoq(1);
 		} else {
-			vp->v_str = makenewstring(FALSE_STRING);
+			vp->v_num = itoq(0);
 		}
 		return;
 
@@ -1082,20 +1122,18 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		break;
 
 	case CONFIG_LEADZERO:
-		vp->v_type = V_STR;
 		if (cfg->leadzero) {
-			vp->v_str = makenewstring(TRUE_STRING);
+			vp->v_num = itoq(1);
 		} else {
-			vp->v_str = makenewstring(FALSE_STRING);
+			vp->v_num = itoq(0);
 		}
 		return;
 
 	case CONFIG_FULLZERO:
-		vp->v_type = V_STR;
 		if (cfg->fullzero) {
-			vp->v_str = makenewstring(TRUE_STRING);
+			vp->v_num = itoq(1);
 		} else {
-			vp->v_str = makenewstring(FALSE_STRING);
+			vp->v_num = itoq(0);
 		}
 		return;
 
@@ -1118,11 +1156,10 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		break;
 
 	case CONFIG_BLKVERBOSE:
-		vp->v_type = V_STR;
 		if (cfg->blkverbose) {
-			vp->v_str = makenewstring(TRUE_STRING);
+			vp->v_num = itoq(1);
 		} else {
-			vp->v_str = makenewstring(FALSE_STRING);
+			vp->v_num = itoq(0);
 		}
 		return;
 
@@ -1159,11 +1196,10 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		break;
 
 	case CONFIG_VERBOSE_QUIT:
-		vp->v_type = V_STR;
 		if (cfg->verbose_quit) {
-			vp->v_str = makenewstring(TRUE_STRING);
+			vp->v_num = itoq(1);
 		} else {
-			vp->v_str = makenewstring(FALSE_STRING);
+			vp->v_num = itoq(0);
 		}
 		return;
 
@@ -1195,6 +1231,14 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		}
 		return;
 
+	case CONFIG_WINDOWS:
+		if (cfg->windows) {
+			vp->v_num = itoq(1);
+		} else {
+			vp->v_num = itoq(0);
+		}
+		return;
+
 	case CONFIG_VERSION:
 		vp->v_type = V_STR;
 		if (cfg->version == NULL) {
@@ -1250,6 +1294,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 ||
@@ -1295,6 +1340,7 @@ config_cmp(CONFIG *cfg1, CONFIG *cfg2)
 
 	       (cfg1->version == NULL && cfg2->version != NULL) ||
 	       (cfg1->version != NULL && cfg2->version == NULL) ||
+	       cfg1->windows != cfg2->windows ||
 	       (cfg1->version != NULL && cfg2->version != NULL &&
 		strcmp(cfg1->version, cfg2->version) != 0);
 }

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.6 $
+ * @(#) $Revision: 29.13 $
- * @(#) $Id: config.h,v 29.6 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Id: config.h,v 29.13 2003/08/26 04:36:10 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/config.h,v $
  *
  * Under source code control:	1995/11/01 22:20:17
@@ -35,9 +35,15 @@
 #define __CONFIG_H__
 
 
-#include "win32dll.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
-#include "nametype.h"
+# include "win32dll.h"
-#include "qmath.h"
+# include "nametype.h"
+# include "qmath.h"
+#else
+# include <calc/win32dll.h>
+# include <calc/nametype.h>
+# include <calc/qmath.h>
+#endif
 
 
 /*
@@ -83,6 +89,8 @@
 #define CONFIG_PROGRAM 35
 #define CONFIG_BASENAME 36
 #define CONFIG_VERSION 37
+#define CONFIG_WINDOWS 38
+#define CONFIG_MODE2	39
 
 
 /*
@@ -91,8 +99,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 */
 
@@ -111,6 +117,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) */
@@ -147,6 +154,7 @@ struct config {
 	int ctrl_d;		/* see CTRL_D_xyz below */
 	char *program;		/* our name */
 	char *base_name;	/* basename of our name */
+	BOOL windows;		/* TRUE => running under MS windows */
 	char *version;		/* calc version string */
 };
 typedef struct config CONFIG;
@@ -158,7 +166,8 @@ typedef struct config CONFIG;
 #define RSCDBG_STDIN_FUNC   (0x00000001)    /* interactive func define debug */
 #define RSCDBG_FILE_FUNC    (0x00000002)    /* file read func define debug */
 #define RSCDBG_FUNC_INFO    (0x00000004)    /* print extra info for show func */
-#define RSCDBG_MASK	    (0x00000007)
+#define RSCDBG_PRINT_DBG    (0x00000008)    /* print debug messages */
+#define RSCDBG_MASK	    (0x0000000f)
 
 
 /*
@@ -170,7 +179,8 @@ typedef struct config CONFIG;
 #define CALCDBG_BLOCK	    (0x00000008)    /* block debug */
 #define CALCDBG_TTY	    (0x00000010)    /* report TTY state changes */
 #define CALCDBG_RUNSTATE    (0x00000020)    /* report run_state changes */
-#define CALCDBG_MASK	    (0x0000003f)
+#define CALCDBG_RAND	    (0x00000040)    /* report rand() activity */
+#define CALCDBG_MASK	    (0x0000007f)
 
 /*
  * ctrl-d meanings
@@ -184,8 +194,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 oldstd;	/* old classic standard configuration */
-extern DLL CONFIG newstd;	/* new non-backward compatible 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") */

cscript/4dsphere.calc

@@ -0,0 +1,320 @@
+#!/usr/local/src/cmd/calc/calc -q -s -f
+/*
+ * 4dsphere - determine if 6 points lie on the surface of a sphere in R^4
+ *
+ * usage:
+ *      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
+ *	...		...
+ *      x5 y5 z5 w5	point 5 in R^4
+ *
+ * Copyright (C) 2001  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: 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
+ * File existed as early as:    2001
+ *
+ * chongo <was here> /\oo/\     http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)        http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * parse args
+ */
+argc = argv();
+if (argc != 25) {
+    fprintf(files(2), "usage: %s x0 y0 z0 w0 x1 y1 z1 w1 ... x5 y5 z5 w5\n",
+	argv(0));
+    exit;
+}
+x0 = eval(argv(1));
+y0 = eval(argv(2));
+z0 = eval(argv(3));
+w0 = eval(argv(4));
+x1 = eval(argv(5));
+y1 = eval(argv(6));
+z1 = eval(argv(7));
+w1 = eval(argv(8));
+x2 = eval(argv(9));
+y2 = eval(argv(10));
+z2 = eval(argv(11));
+w2 = eval(argv(12));
+x3 = eval(argv(13));
+y3 = eval(argv(14));
+z3 = eval(argv(15));
+w3 = eval(argv(16));
+x4 = eval(argv(17));
+y4 = eval(argv(18));
+z4 = eval(argv(19));
+w4 = eval(argv(20));
+x5 = eval(argv(21));
+y5 = eval(argv(22));
+z5 = eval(argv(23));
+w5 = eval(argv(24));
+
+/*
+ * verbose output setup
+ */
+print "(":x0:",":y0:",":z0:",":w0:") ":;
+print "(":x1:",":y1:",":z1:",":w1:") ":;
+print "(":x2:",":y2:",":z2:",":w2:") ":;
+print "(":x3:",":y3:",":z3:",":w3:") ":;
+print "(":x4:",":y4:",":z4:",":w4:") ":;
+print "(":x5:",":y5:",":z5:",":w5:") ":;
+
+/*
+ *
+ * Given the 5 points:
+ *
+ * 	(x0,y1,z1,w1)
+ * 	(x1,y1,z1,w1)
+ * 	(x2,y2,z2,w2)
+ * 	(x3,y3,z3,w3)
+ * 	(x4,y4,z4,w4)
+ * 	(x5,y5,z5,w5)
+ *
+ * we can determine if they lie in the surface of 4D sphere in R^4 if the
+ * following matrix is 0:
+ *
+ * 	| x0^2+y0^2+z0^2+w0^2	x0	y0	z0	w0	1 |
+ * 	| x1^2+y1^2+z1^2+w1^2	x1	y1	z1	w1	1 |
+ * 	| x2^2+y2^2+z2^2+w2^2	x2	y2	z2	w2	1 |	= 0
+ * 	| x3^2+y3^2+z3^2+w3^2	x3	y3	z3	w3	1 |
+ * 	| x4^2+y4^2+z4^2+w4^2	x4	y4	z4	w4	1 |
+ * 	| x5^2+y5^2+z5^2+w5^2	x5	y5	z5	w5	1 |
+ */
+if ((w0*(-x1*(-y2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    +y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +y5*(z4^2+y4^2+x4^2+w4^2) + (y4-y5)*(z3^2+y3^2+x3^2+w3^2))
+    -z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z2^2+y2^2+x2^2+w2^2)*(y4*z5+y3*(z4-z5) -y5*z4- (y4-y5)*z3) -
+    (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4)) +y1*(-x2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    +x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +x5*(z4^2+y4^2+x4^2+w4^2)
+    + (x4-x5)*(z3^2+y3^2+x3^2+w3^2)) -z3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) + (z2^2+y2^2+x2^2+w2^2)*(x4*z5+x3*(z4-z5)
+    -x5*z4- (x4-x5)*z3) - (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4))
+    -x2*(-y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4))
+    +y2*(-x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4)) -z1*(-x2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +y5*(z4^2+y4^2+x4^2+w4^2)
+    + (y4-y5)*(z3^2+y3^2+x3^2+w3^2)) +x3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) +y2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +x5*(z4^2+y4^2+x4^2+w4^2) + (x4-x5)*(z3^2+y3^2+x3^2+w3^2))
+    -y3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) -
+    (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2) + (x4*y5+x3*(y4-y5) -x5*y4-
+    (x4-x5)*y3)*(z2^2+y2^2+x2^2+w2^2)) -z2*(-x3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) +y3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) + (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2))
+    + (z1^2+y1^2+x1^2+w1^2)*(x2*(y4*z5+y3*(z4-z5) -y5*z4-
+    (y4-y5)*z3) -x3*(y4*z5-y5*z4) -y2*(x4*z5+x3*(z4-z5) -x5*z4-
+    (x4-x5)*z3) +y3*(x4*z5-x5*z4) - (x4*y5-x5*y4)*z3+
+    (x4*y5+x3*(y4-y5) -x5*y4- (x4-x5)*y3)*z2) +
+    (z2^2+y2^2+x2^2+w2^2)*(x3*(y4*z5-y5*z4) -y3*(x4*z5-x5*z4) +
+    (x4*y5-x5*y4)*z3)) -x0*(-w1*(-y2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    +y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +y5*(z4^2+y4^2+x4^2+w4^2) + (y4-y5)*(z3^2+y3^2+x3^2+w3^2))
+    -z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z2^2+y2^2+x2^2+w2^2)*(y4*z5+y3*(z4-z5) -y5*z4- (y4-y5)*z3) -
+    (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4)) -y1*(w2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    -w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +w5*(z4^2+y4^2+x4^2+w4^2)
+    + (w4-w5)*(z3^2+y3^2+x3^2+w3^2)) +z3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (z2^2+y2^2+x2^2+w2^2)*(-w4*z5-w3*(z4-z5)
+    +w5*z4+ (w4-w5)*z3) - (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5))
+    -w2*(-y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4))
+    -y2*(w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5)) +z1*(w2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +y5*(z4^2+y4^2+x4^2+w4^2)
+    + (y4-y5)*(z3^2+y3^2+x3^2+w3^2)) -w3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) -y2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +w5*(z4^2+y4^2+x4^2+w4^2) + (w4-w5)*(z3^2+y3^2+x3^2+w3^2))
+    +y3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) -
+    (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2) + (-w4*y5-w3*(y4-y5) +w5*y4+
+    (w4-w5)*y3)*(z2^2+y2^2+x2^2+w2^2)) +z2*(w3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) -y3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2))
+    + (z1^2+y1^2+x1^2+w1^2)*(w2*(y4*z5+y3*(z4-z5) -y5*z4-
+    (y4-y5)*z3) -w3*(y4*z5-y5*z4) +y2*(-w4*z5-w3*(z4-z5)
+    +w5*z4+ (w4-w5)*z3) -y3*(w5*z4-w4*z5) + (w5*y4-w4*y5)*z3-
+    (-w4*y5-w3*(y4-y5) +w5*y4+ (w4-w5)*y3)*z2) +
+    (z2^2+y2^2+x2^2+w2^2)*(w3*(y4*z5-y5*z4) +y3*(w5*z4-w4*z5) -
+    (w5*y4-w4*y5)*z3)) +y0*(-w1*(-x2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    +x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +x5*(z4^2+y4^2+x4^2+w4^2) + (x4-x5)*(z3^2+y3^2+x3^2+w3^2))
+    -z3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z2^2+y2^2+x2^2+w2^2)*(x4*z5+x3*(z4-z5) -x5*z4- (x4-x5)*z3) -
+    (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4)) -x1*(w2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    -w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +w5*(z4^2+y4^2+x4^2+w4^2)
+    + (w4-w5)*(z3^2+y3^2+x3^2+w3^2)) +z3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (z2^2+y2^2+x2^2+w2^2)*(-w4*z5-w3*(z4-z5)
+    +w5*z4+ (w4-w5)*z3) - (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5))
+    -w2*(-x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4))
+    -x2*(w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5)) +z1*(w2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +x5*(z4^2+y4^2+x4^2+w4^2)
+    + (x4-x5)*(z3^2+y3^2+x3^2+w3^2)) -w3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) -x2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +w5*(z4^2+y4^2+x4^2+w4^2) + (w4-w5)*(z3^2+y3^2+x3^2+w3^2))
+    +x3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) -
+    (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2) + (-w4*x5-w3*(x4-x5) +w5*x4+
+    (w4-w5)*x3)*(z2^2+y2^2+x2^2+w2^2)) +z2*(w3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) -x3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2)) +
+    (z1^2+y1^2+x1^2+w1^2)*(w2*(x4*z5+x3*(z4-z5) -x5*z4- (x4-x5)*z3)
+    -w3*(x4*z5-x5*z4) +x2*(-w4*z5-w3*(z4-z5) +w5*z4+ (w4-w5)*z3)
+    -x3*(w5*z4-w4*z5) + (w5*x4-w4*x5)*z3- (-w4*x5-w3*(x4-x5) +w5*x4+
+    (w4-w5)*x3)*z2) + (z2^2+y2^2+x2^2+w2^2)*(w3*(x4*z5-x5*z4)
+    +x3*(w5*z4-w4*z5) - (w5*x4-w4*x5)*z3))
+    -w1*(-x2*(-y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4))
+    +y2*(-x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4)) -z2*(-x3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) +y3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) + (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2))
+    + (z2^2+y2^2+x2^2+w2^2)*(x3*(y4*z5-y5*z4)
+    -y3*(x4*z5-x5*z4) + (x4*y5-x5*y4)*z3))
+    +x1*(-w2*(-y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4))
+    -y2*(w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5)) +z2*(w3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) -y3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2))
+    + (z2^2+y2^2+x2^2+w2^2)*(w3*(y4*z5-y5*z4)
+    +y3*(w5*z4-w4*z5) - (w5*y4-w4*y5)*z3))
+    -y1*(-w2*(-x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4))
+    -x2*(w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5)) +z2*(w3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) -x3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2))
+    + (z2^2+y2^2+x2^2+w2^2)*(w3*(x4*z5-x5*z4) +x3*(w5*z4-w4*z5)
+    - (w5*x4-w4*x5)*z3)) -z0*(-w1*(-x2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +y5*(z4^2+y4^2+x4^2+w4^2)
+    + (y4-y5)*(z3^2+y3^2+x3^2+w3^2)) +x3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) +y2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +x5*(z4^2+y4^2+x4^2+w4^2) + (x4-x5)*(z3^2+y3^2+x3^2+w3^2))
+    -y3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) -
+    (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2) + (x4*y5+x3*(y4-y5) -x5*y4-
+    (x4-x5)*y3)*(z2^2+y2^2+x2^2+w2^2)) -x1*(w2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +y5*(z4^2+y4^2+x4^2+w4^2)
+    + (y4-y5)*(z3^2+y3^2+x3^2+w3^2)) -w3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) -y2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +w5*(z4^2+y4^2+x4^2+w4^2) + (w4-w5)*(z3^2+y3^2+x3^2+w3^2))
+    +y3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) -
+    (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2) + (-w4*y5-w3*(y4-y5) +w5*y4+
+    (w4-w5)*y3)*(z2^2+y2^2+x2^2+w2^2)) -w2*(-x3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) +y3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) + (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2))
+    -x2*(w3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    -y3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2)) +y1*(w2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +x5*(z4^2+y4^2+x4^2+w4^2)
+    + (x4-x5)*(z3^2+y3^2+x3^2+w3^2)) -w3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) -x2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +w5*(z4^2+y4^2+x4^2+w4^2)
+    + (w4-w5)*(z3^2+y3^2+x3^2+w3^2)) +x3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) - (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2)
+    + (-w4*x5-w3*(x4-x5) +w5*x4+ (w4-w5)*x3)*(z2^2+y2^2+x2^2+w2^2))
+    +y2*(w3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2))
+    -x3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2)) + (w3*(x4*y5-x5*y4) +x3*(w5*y4-w4*y5)
+    - (w5*x4-w4*x5)*y3)*(z2^2+y2^2+x2^2+w2^2) + (w2*(x4*y5+x3*(y4-y5)
+    -x5*y4- (x4-x5)*y3) -w3*(x4*y5-x5*y4) +x2*(-w4*y5-w3*(y4-y5)
+    +w5*y4+ (w4-w5)*y3) -x3*(w5*y4-w4*y5) + (w5*x4-w4*x5)*y3-
+    (-w4*x5-w3*(x4-x5) +w5*x4+ (w4-w5)*x3)*y2)*(z1^2+y1^2+x1^2+w1^2))
+    +z1*(-w2*(-x3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    +y3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) +
+    (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2)) -x2*(w3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) -y3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2))
+    +y2*(w3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2))
+    -x3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2)) + (w3*(x4*y5-x5*y4)
+    +x3*(w5*y4-w4*y5) - (w5*x4-w4*x5)*y3)*(z2^2+y2^2+x2^2+w2^2)) +
+    (z0^2+y0^2+x0^2+w0^2)*(-w1*(x2*(y4*z5+y3*(z4-z5) -y5*z4- (y4-y5)*z3)
+    -x3*(y4*z5-y5*z4) -y2*(x4*z5+x3*(z4-z5) -x5*z4- (x4-x5)*z3)
+    +y3*(x4*z5-x5*z4) - (x4*y5-x5*y4)*z3+ (x4*y5+x3*(y4-y5) -x5*y4-
+    (x4-x5)*y3)*z2) +x1*(w2*(y4*z5+y3*(z4-z5) -y5*z4- (y4-y5)*z3)
+    -w3*(y4*z5-y5*z4) +y2*(-w4*z5-w3*(z4-z5) +w5*z4+ (w4-w5)*z3)
+    -y3*(w5*z4-w4*z5) + (w5*y4-w4*y5)*z3- (-w4*y5-w3*(y4-y5) +w5*y4+
+    (w4-w5)*y3)*z2) -w2*(x3*(y4*z5-y5*z4) -y3*(x4*z5-x5*z4) +
+    (x4*y5-x5*y4)*z3) +x2*(w3*(y4*z5-y5*z4) +y3*(w5*z4-w4*z5) -
+    (w5*y4-w4*y5)*z3) -y1*(w2*(x4*z5+x3*(z4-z5) -x5*z4- (x4-x5)*z3)
+    -w3*(x4*z5-x5*z4) +x2*(-w4*z5-w3*(z4-z5) +w5*z4+ (w4-w5)*z3)
+    -x3*(w5*z4-w4*z5) + (w5*x4-w4*x5)*z3- (-w4*x5-w3*(x4-x5) +w5*x4+
+    (w4-w5)*x3)*z2) -y2*(w3*(x4*z5-x5*z4) +x3*(w5*z4-w4*z5) -
+    (w5*x4-w4*x5)*z3) + (w3*(x4*y5-x5*y4) +x3*(w5*y4-w4*y5) -
+    (w5*x4-w4*x5)*y3)*z2+ (w2*(x4*y5+x3*(y4-y5) -x5*y4- (x4-x5)*y3)
+    -w3*(x4*y5-x5*y4) +x2*(-w4*y5-w3*(y4-y5) +w5*y4+ (w4-w5)*y3)
+    -x3*(w5*y4-w4*y5) + (w5*x4-w4*x5)*y3- (-w4*x5-w3*(x4-x5) +w5*x4+
+    (w4-w5)*x3)*y2)*z1) - (z1^2+y1^2+x1^2+w1^2)*(-w2*(x3*(y4*z5-y5*z4)
+    -y3*(x4*z5-x5*z4) + (x4*y5-x5*y4)*z3) +x2*(w3*(y4*z5-y5*z4)
+    +y3*(w5*z4-w4*z5) - (w5*y4-w4*y5)*z3) -y2*(w3*(x4*z5-x5*z4)
+    +x3*(w5*z4-w4*z5) - (w5*x4-w4*x5)*z3) + (w3*(x4*y5-x5*y4)
+    +x3*(w5*y4-w4*y5) - (w5*x4-w4*x5)*y3)*z2)) == 0) {
+    print "are in the surface of a 4D sphere";
+} else {
+    print "are NOT on a 4D sphere surface";
+}

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.6 $
+# @(#) $Revision: 29.23 $
-# @(#) $Id: Makefile,v 29.6 2000/12/15 14:56:14 chongo Exp $
+# @(#) $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
 #
-BINDIR= /usr/local/bin
+# For DJGPP, select:
-#BINDIR= /usr/bin
-#BINDIR= /usr/contrib/bin
 #
+#	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
 #
 # Q=@	do not echo internal makefile actions (quiet mode)
@@ -59,6 +165,7 @@ CHMOD= chmod
 SED= sed
 SORT= sort
 FMT= fmt
+CMP= cmp
 
 # The ${SCRIPT} list is the list of calc shell script files (without the .calc
 # extension) which will be installed.
@@ -76,9 +183,11 @@ FMT= fmt
 #
 #		make detaillist
 #
-SCRIPT= mersenne piforever plus simple square
+SCRIPT= 4dsphere fproduct mersenne piforever plus powerterm \
+	simple square
 
-SCRIPT_SRC= mersenne.calc piforever.calc plus.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
 #
@@ -88,9 +197,17 @@ DISTLIST= ${SCRIPT_SRC} ${MAKE_FILE} README
 #
 CALCLIBLIST=
 
+# complete list of targets
+#
+# NOTE: This list MUST be co-ordinated with the ${CSCRIPT_TARGETS} variable
+#	in the upper level ../Makefile
+#
+CSCRIPT_TARGETS= ${SCRIPT}
+TARGETS= ${CSCRIPT_TARGETS}
+
 # The reason for this Makefile
 #
-all: ${SCRIPT} ${SCRIPT_SRC} .all
+all: ${TARGETS} .all
 
 # used by the upper level Makefile to determine if we have done all
 #
@@ -112,9 +229,11 @@ all: ${SCRIPT} ${SCRIPT_SRC} .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; \
-	done | ${SORT}
+	    fi; \
+	done | LANG=C ${SORT}
 
 distdir:
 	${Q}echo cscript
@@ -125,24 +244,28 @@ 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; \
-	done | ${SORT}) | ${FMT} -70 | \
+	    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; \
-	done | ${SORT}) | ${FMT} -70 | \
+	    fi; \
+	done | LANG=C ${SORT}) | ${FMT} -70 | \
 	    ${SED} -e '1s/xxxxxxxxxxx/SCRIPT_SRC=/' -e '2,$$s/^/	/' \
 		   -e 's/$$/ \\/' -e '$$s/ \\$$//'
 
@@ -170,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 '	@rm -f $$@'; \
-		echo '	$${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!$${BINDIR}/calc:" $$?>$$@'; \
+		echo '	@$${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!$${BINDIR}/calc:" $$?>$$@'; \
-		echo '	$${CHMOD} +x $$@'; \
+		echo '	@$${CHMOD} +x $$@'; \
+	    fi; \
 	done >> makedep.out
 	${Q}echo sample dependency list formed
 	${Q}echo forming new cscript/Makefile
@@ -184,7 +309,7 @@ depend:
 	${Q}echo "" >> Makefile
 	${Q}${SED} -n '3,$$p' makedep.out >> Makefile
 	-${Q}rm -f makedep.out
-	-${Q}if cmp -s Makefile.bak Makefile; then \
+	-${Q}if ${CMP} -s Makefile.bak Makefile; then \
 		echo 'sample Makefile was already up to date'; \
 		mv -f Makefile.bak Makefile; \
 	else \
@@ -199,53 +324,102 @@ depend:
 		fi; \
 	fi
 
+##
+#
+# rpm rules
+#
+##
+
+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
+#
+##
+
 clean:
 	-rm -f makedep.out
 
 clobber:
-	-rm -f ${SCRIPT}
+	-rm -f ${TARGETS}
 
 install: all
-	-${Q}if [ ! -d ${BINDIR} ]; then \
+	-${Q}if [ ! -d $T${BINDIR} ]; then \
-		echo mkdir ${BINDIR}; \
+	    echo mkdir $T${BINDIR}; \
-		mkdir ${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 \
+	-${Q}if [ ! -d $T${SCRIPTDIR} ]; then \
-		echo mkdir ${SCRIPTDIR}; \
+	    echo mkdir $T${SCRIPTDIR}; \
-		mkdir ${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 \
+	${Q}for i in ${SCRIPT} /dev/null; do \
-		echo rm -f ${SCRIPTDIR}/$$i; \
+	    if [ "$$i" = "/dev/null" ]; then \
-		rm -f ${SCRIPTDIR}/$$i; \
+		continue; \
-		echo cp $$i ${SCRIPTDIR}; \
+	    fi; \
-		cp $$i ${SCRIPTDIR}; \
+	    if ${CMP} -s $$i $T${SCRIPTDIR}/$$i; then \
-		echo ${CHMOD} 0555 ${SCRIPTDIR}/$$i; \
+		true; \
-		${CHMOD} 0555 ${SCRIPTDIR}/$$i; \
+	    else \
+		rm -f $T${SCRIPTDIR}/$$i.new; \
+		cp -f $$i $T${SCRIPTDIR}/$$i.new; \
+		${CHMOD} 0555 $T${SCRIPTDIR}/$$i.new; \
+		mv -f $T${SCRIPTDIR}/$$i.new $T${SCRIPTDIR}/$$i; \
+		echo "installed $T${SCRIPTDIR}/$$i"; \
+	    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 $@
+fproduct: fproduct.calc
+	@rm -f $@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${CHMOD} +x $@
 mersenne: mersenne.calc
-	rm -f $@
+	@rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@${CHMOD} +x $@
 piforever: piforever.calc
-	rm -f $@
+	@rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@${CHMOD} +x $@
 plus: plus.calc
-	rm -f $@
+	@rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@${CHMOD} +x $@
+powerterm: powerterm.calc
+	@rm -f $@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${CHMOD} +x $@
 simple: simple.calc
-	rm -f $@
+	@rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@${CHMOD} +x $@
 square: square.calc
-	rm -f $@
+	@rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	@${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
+	@${CHMOD} +x $@

cscript/README

@@ -19,6 +19,23 @@ For more info, see:
 
 =-=
 
+4dsphere
+
+    Determine if 6 points lie on the surface of a 4-dimensional sphere in R^4.
+
+    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
+	...             ...
+	x5 y5 z5 w5     point 5 in R^4
+
+
+fproduct filename term ...
+
+    Write the big Endian product of terms to a file.  Use - for stdout.
+
+
 mersenne exp
 
     Print the value of 2^exp-1.
@@ -34,6 +51,12 @@ plus arg ...
     Print the sum of 1 or more arguments.
 
 
+powerterm [base_limit] value
+
+    Print the value as a sum (or difference) of powers of integers up
+    to and including powers <= base_limit.  By default, base_limit is 10000.
+
+
 simple
 
     A trivial example of a calc shell script.
@@ -54,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.4 $
+## @(#) $Revision: 29.10 $
-## @(#) $Id: README,v 29.4 2000/06/07 14:02:59 chongo Exp $
+## @(#) $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

@@ -0,0 +1,88 @@
+#!/usr/local/src/cmd/calc/calc -q -s -f
+/*
+ * fproduct - write the big Endian product of terms to a file
+ *
+ * usage:
+ *	fproduct filename term [term ...]
+ *
+ *	filename	where to write the product, use - for stdout
+ *	term ...	terms to multiply
+ *
+ * Copyright (C) 2001  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: 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
+ * File existed as early as:    2001
+ *
+ * chongo <was here> /\oo/\     http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)        http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * parse args
+ */
+argc = argv();
+if (argc < 2) {
+    fprintf(files(2), "usage: %s term [term ...]\n", argv(0));
+    exit;
+}
+filename = argv(1);
+
+
+/*
+ * build the product
+ */
+product = 1;
+for (i=2; i < argc; ++i) {
+    product *= eval(argv(i));
+}
+product = abs(product);
+
+
+/*
+ * open the file for writing, "-" is stdout
+ */
+if (filename == "-") {
+    fd = files(1);
+} else {
+    fd = fopen(filename, "w");
+    if (!isfile(fd)) quit "be2file: cannot open file for writing";
+}
+
+
+/*
+ * write the octets to the file
+ *
+ * The most significant bits of the integer become the first file octets.
+ */
+if (product > 0) {
+    octlen = int((highbit(product)+8) / 8);
+    for (i=octlen-1; i >= 0; --i) {
+	fputc(fd, char(product >> (i*8)));
+    }
+}
+
+
+/*
+ * cleanup
+ */
+if (filename != "-") {
+    fclose(fd);
+}

cscript/powerterm.calc

@@ -0,0 +1,185 @@
+#!/usr/local/src/cmd/calc/calc -q -s -f
+/*
+ * powerterm - print the argument as a sum of powers of integers
+ *
+ * usage:
+ *      powerterm [base_limit] value
+ *
+ *	base_limit	largest base we will consider (def: 10000)
+ *      value		value to convert into sums of powers of integers
+ *
+ * Copyright (C) 2001  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the powerterm 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.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
+ * File existed as early as:    2001
+ *
+ * chongo <was here> /\oo/\     http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)        http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+/*
+ * parse args
+ */
+config("verbose_quit", 0),;
+base_lim = 10000;		/* default: highest base we will consider */
+if (argv() < 2 || argv() > 3) {
+    fprintf(files(2), "usage: %s [base_limit] value\n", argv(0));
+    exit;
+}
+if (argv() == 3) {
+    x = eval(argv(2));
+    base_lim = eval(argv(1));
+} else {
+    x = eval(argv(1));
+}
+if (! isint(x)) {
+    fprintf(files(2), "%s: value must be an integer\n");
+    exit;
+}
+if (! isint(base_lim)) {
+    fprintf(files(2), "%s: base limit must be an integer\n");
+    exit;
+}
+if (base_lim <= 1) {
+    fprintf(files(2), "%s: base limit is too small\n");
+    exit;
+}
+++base_lim;
+
+/*
+ * setup loop variables
+ */
+term = 0;			/* number of powerterm found */
+
+/*
+ * log constants
+ */
+if (base_lim <= 2^20+1) {		/* 2^20 requires ~96 Megs of memory */
+    mat lni[base_lim];			/* log of integers */
+    for (i=2; i < base_lim; ++i) {
+	lni[i] = ln(i);
+    }
+    have_lni = 1;			/* have lni[x] array */
+} else {
+    mat lni[1];				/* not used */
+    have_lni = 0;			/* base_lim too large for array */
+}
+
+/*
+ * remove nestest powers
+ */
+while (abs(x) >= base_lim) {
+
+    /*
+     * look for the nearest power
+     */
+    lnx = ln(abs(x));			/* log of the remaining co-factor */
+    closest = 0.5;
+    base = 1;
+    exponent = 0;
+    if (have_lni) {
+
+	/*
+	 * use pre-calculated log array when looking for the nearest power
+	 */
+	for (i = 2; i < base_lim; ++i) {
+
+	    /*
+	     * determine exponent closeness to an integer
+	     */
+	    ex = lnx / lni[i];
+	    power = int(ex + 0.5);
+	    diff = ex - power;
+
+	    /*
+	     * look for a closer power
+	     */
+	    if (abs(diff) < closest) {
+		closest = abs(diff);
+		base = i;
+		exponent = power;
+	    }
+	}
+
+    } else {
+
+	/*
+	 * re-calculate logs when looking for the nearest power
+	 */
+	for (i = 2; i < base_lim; ++i) {
+
+	    /*
+	     * determine exponent closeness to an integer
+	     */
+	    ex = lnx / ln(i);
+	    power = int(ex + 0.5);
+	    diff = ex - power;
+
+	    /*
+	     * look for a closer power
+	     */
+	    if (abs(diff) < closest) {
+		closest = abs(diff);
+		base = i;
+		exponent = power;
+	    }
+	}
+    }
+
+    /*
+     * output current term and then subtract it
+     */
+    if (x != 0) {
+	if (x < 0) {
+	    print "-",;
+	} else if (term > 0) {
+	    print "+",;
+	}
+	if (exponent > 1) {
+	    print base: "^": exponent,;
+	} else {
+	    print base,;
+	}
+    }
+
+    /*
+     * subtract (or add) this near power
+     */
+    if (x < 0) {
+	x = x + base^exponent;
+    } else {
+	x = x - base^exponent;
+    }
+    ++term;
+}
+
+/*
+ * print the final term
+ */
+if (x < 0) {
+    print "-", -x;
+} else if (x > 0) {
+    print "+", x;
+} else {
+    print "";
+}
+exit;

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.5 $
+# @(#) $Revision: 29.20 $
-# @(#) $Id: Makefile,v 29.5 2001/03/17 21:39:24 chongo Exp $
+# @(#) $Id: Makefile,v 29.20 2003/01/14 02:18:45 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile,v $
 #
 # Under source code control:	1997/03/09 02:28:54
@@ -88,26 +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:
 #
-# ${TOPDIR} is the directory under which the calc directory will be placed.
+#	INCDIR= /dev/env/DJDIR/include
-# ${LIBDIR} is where the *.cal, *.h, *.a, bindings and help dir are installed.
-# ${HELPDIR} is where the help directory is installed.
-# ${CUSTOMLIBDIR} is where custom lib files are installed.
-# ${CUSTOMHELPDIR} is where custom help files are installed.
 #
-TOPDIR= /usr/local/lib
+# If in doubt, set:
-#TOPDIR= /usr/lib
-#TOPDIR= /usr/libdata
-#TOPDIR= /usr/contrib/lib
 #
-LIBDIR= ${TOPDIR}/calc
+#	INCDIR= /usr/include
-HELPDIR= ${LIBDIR}/help
+#
-CUSTOMLIBDIR= ${LIBDIR}/custom
+
-CUSTOMHELPDIR= ${HELPDIR}/custhelp
+#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=
 
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
@@ -256,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}
 
@@ -288,9 +382,13 @@ DISTLIST= ${CUSTCALC_SRC} ${CUSTOM_CALC_FILES} ${CUSTOM_HELP} \
 #
 CALCLIBLIST= ${CUSTCALC_SRC} ${INSTALL_H_SRC} ${MAKE_FILE} HOW_TO_ADD
 
+# This is the custom .a link library that is build
+#
+CALC_LIBCUSTOM= libcustcalc.a
+
 # complete list of targets
 #
-TARGETS= libcustcalc.a ${CUSTCALC_OBJ}
+TARGETS= ${CALC_LIBCUSTOM} ${CUSTCALC_OBJ}
 
 # required vars
 #
@@ -303,6 +401,7 @@ SED= sed
 MAKEDEPEND= makedepend
 CHMOD= chmod
 SORT= sort
+CMP= cmp
 
 ##
 #
@@ -313,7 +412,7 @@ SORT= sort
 all: ${TARGETS} ${INSTALL_H_SRC} ${CUSTOM_CALC_FILES} \
 	${CUSTOM_HELP} ${MAKE_FILE} .all
 
-libcustcalc.a: ${CUSTCALC_OBJ} ${MAKE_FILE} ../Makefile
+libcustcalc.a: ${CUSTCALC_OBJ} ${MAKE_FILE} ../${MAKE_FILE}
 	-rm -f libcustcalc.a
 	ar qc libcustcalc.a ${CUSTCALC_OBJ}
 	${RANLIB} libcustcalc.a
@@ -353,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:
@@ -390,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; \
@@ -409,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"; \
@@ -422,9 +528,11 @@ depend:
 	${Q}echo forming custom dependency list
 	${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
 	    skel/custom/makedep.out
-	${Q}cd skel/custom; ${MAKEDEPEND} -w 1 -m -f makedep.out ${C_SRC}
+	${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
@@ -432,9 +540,10 @@ depend:
 	${Q}mv Makefile Makefile.bak
 	${Q}${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile
 	${Q}echo "" >> Makefile
-	${Q}${SED} -n '3,$$p' skel/custom/makedep.out | ${SORT} -u >> Makefile
+	${Q}${SED} -n '3,$$p' skel/custom/makedep.out | \
+		LANG=C ${SORT} -u >> Makefile
 	-${Q}rm -rf skel
-	-${Q}if cmp -s Makefile.bak Makefile; then \
+	-${Q}if ${CMP} -s Makefile.bak Makefile; then \
 		echo 'custom Makefile was already up to date'; \
 		mv -f Makefile.bak Makefile; \
 	else \
@@ -449,6 +558,34 @@ depend:
 		fi; \
 	fi
 
+##
+#
+# rpm rules
+#
+##
+
+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
+	${Q}for i in ${CUSTOM_HELP} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo __file__ ${CUSTOMHELPDIR}/$$i; \
+	    fi; \
+	done
+	${Q}for i in ${CUSTOM_CALC_FILES} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo __file__ ${CUSTOMCALDIR}/$$i; \
+	    fi; \
+	done
+	${Q}for i in ${CALC_LIBCUSTOM} /dev/null; do \
+	    if [ X"$$i" != X"/dev/null" ]; then \
+		echo __file__ ${CUSTOMCALDIR}/$$i; \
+	    fi; \
+	done
+
 ##
 #
 # Utility rules
@@ -463,70 +600,145 @@ clobber:
 	rm -f .all Makefile.tmp Makefile.bak
 
 install: all
-	-${Q}if [ ! -d ${TOPDIR} ]; then \
+	-${Q}if [ ! -d $T${INCDIR} ]; then \
-		echo mkdir ${TOPDIR}; \
+	    echo mkdir $T${INCDIR}; \
-		mkdir ${TOPDIR}; \
+	    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 ${LIBDIR} ]; then \
+	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-		echo mkdir ${LIBDIR}; \
+	    echo mkdir $T${CALC_SHAREDIR}; \
-		mkdir ${LIBDIR}; \
+	    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 ${HELPDIR} ]; then \
+	-${Q}if [ ! -d $T${CALC_INCDIR} ]; then \
-		echo mkdir ${HELPDIR}; \
+	    echo mkdir $T${CALC_INCDIR}; \
-		mkdir ${HELPDIR}; \
+	    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 ${CUSTOMLIBDIR} ]; then \
+	-${Q}if [ ! -d $T${HELPDIR} ]; then \
-		echo mkdir ${CUSTOMLIBDIR}; \
+	    echo mkdir $T${HELPDIR}; \
-		mkdir ${CUSTOMLIBDIR}; \
+	    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 ${CUSTOMHELPDIR} ]; then \
+	-${Q}if [ ! -d $T${CUSTOMCALDIR} ]; then \
-		echo mkdir ${CUSTOMHELPDIR}; \
+	    echo mkdir $T${CUSTOMCALDIR}; \
-		mkdir ${CUSTOMHELPDIR}; \
+	    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}for i in ${INSTALL_H_SRC} /dev/null; do \
+	-${Q}if [ ! -d $T${CUSTOMHELPDIR} ]; then \
-		if [ X$$i = X/dev/null ]; then continue; fi; \
+	    echo mkdir $T${CUSTOMHELPDIR}; \
-		echo rm -f ${CUSTOMLIBDIR}/$$i; \
+	    mkdir $T${CUSTOMHELPDIR}; \
-		rm -f ${CUSTOMLIBDIR}/$$i; \
+	    if [ ! -d "$T${CUSTOMHELPDIR}" ]; then \
-		echo cp $$i ${CUSTOMLIBDIR}; \
+		echo mkdir -p "$T${CUSTOMHELPDIR}"; \
-		cp $$i ${CUSTOMLIBDIR}; \
+		mkdir -p "$T${CUSTOMHELPDIR}"; \
-		echo ${CHMOD} 0444 ${CUSTOMLIBDIR}/$$i; \
+	    fi; \
-		${CHMOD} 0444 ${CUSTOMLIBDIR}/$$i; \
+	    echo ${CHMOD} 0755 $T${CUSTOMHELPDIR}; \
+	    ${CHMOD} 0755 $T${CUSTOMHELPDIR}; \
+	else \
+	    true; \
+	fi
+	-${Q}if [ ! -d $T${CUSTOMINCDIR} ]; then \
+	    echo mkdir $T${CUSTOMINCDIR}; \
+	    mkdir $T${CUSTOMINCDIR}; \
+	    if [ ! -d "$T${CUSTOMINCDIR}" ]; then \
+		echo mkdir -p "$T${CUSTOMINCDIR}"; \
+		mkdir -p "$T${CUSTOMINCDIR}"; \
+	    fi; \
+	    echo ${CHMOD} 0755 $T${CUSTOMINCDIR}; \
+	    ${CHMOD} 0755 $T${CUSTOMINCDIR}; \
+	else \
+	    true; \
+	fi
+	-${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 $T${CUSTOMINCDIR}/$$i.new; \
+		cp -f $$i $T${CUSTOMINCDIR}/$$i.new; \
+		${CHMOD} 0444 $T${CUSTOMINCDIR}/$$i.new; \
+		mv -f $T${CUSTOMINCDIR}/$$i.new $T${CUSTOMINCDIR}/$$i; \
+		echo "installed $T${CUSTOMINCDIR}/$$i"; \
+	    fi; \
 	done
-	${Q}for i in ${CUSTOM_CALC_FILES}; do \
+	-${Q}rm -f tmp
-		echo rm -f ${CUSTOMLIBDIR}/$$i; \
+	-${Q}for i in ${CUSTOM_CALC_FILES} /dev/null; do \
-		rm -f ${CUSTOMLIBDIR}/$$i; \
+	    if [ "$$i" = "/dev/null" ]; then \
-		echo cp $$i ${CUSTOMLIBDIR}; \
+		continue; \
-		cp $$i ${CUSTOMLIBDIR}; \
+	    fi; \
-		echo ${CHMOD} 0444 ${CUSTOMLIBDIR}/$$i; \
+	    if ${CMP} -s $$i $T${CUSTOMCALDIR}/$$i; then \
-		${CHMOD} 0444 ${CUSTOMLIBDIR}/$$i; \
+		true; \
+	    else \
+		rm -f $T${CUSTOMCALDIR}/$$i.new; \
+		cp -f $$i $T${CUSTOMCALDIR}/$$i.new; \
+		${CHMOD} 0444 $T${CUSTOMCALDIR}/$$i.new; \
+		mv -f $T${CUSTOMCALDIR}/$$i.new $T${CUSTOMCALDIR}/$$i; \
+		echo "installed $T${CUSTOMCALDIR}/$$i"; \
+	    fi; \
 	done
-	${Q}for i in ${CUSTOM_HELP}; do \
+	-${Q}for i in ${CUSTOM_HELP} /dev/null; do \
-		echo rm -f ${CUSTOMHELPDIR}/$$i; \
+	    if [ "$$i" = "/dev/null" ]; then \
-		rm -f ${CUSTOMHELPDIR}/$$i; \
+		continue; \
-		echo cp $$i ${CUSTOMHELPDIR}; \
+	    fi; \
-		cp $$i ${CUSTOMHELPDIR}; \
+	    if ${CMP} -s $$i $T${CUSTOMHELPDIR}/$$i; then \
-		echo ${CHMOD} 0444 ${CUSTOMHELPDIR}/$$i; \
+		true; \
-		${CHMOD} 0444 ${CUSTOMHELPDIR}/$$i; \
+	    else \
+		rm -f $T${CUSTOMHELPDIR}/$$i.new; \
+		cp -f $$i $T${CUSTOMHELPDIR}/$$i.new; \
+		${CHMOD} 0444 $T${CUSTOMHELPDIR}/$$i.new; \
+		mv -f $T${CUSTOMHELPDIR}/$$i.new $T${CUSTOMHELPDIR}/$$i; \
+		echo "installed $T${CUSTOMHELPDIR}/$$i"; \
+	    fi; \
 	done
 	-${Q}if [ ! -z ${ALLOW_CUSTOM} ]; then \
-		echo "rm -f ${CUSTOMLIBDIR}/libcustcalc.a"; \
+	    if ${CMP} -s libcustcalc.a $T${CUSTOMCALDIR}/libcustcalc.a; then \
-		rm -f ${CUSTOMLIBDIR}/libcustcalc.a; \
+		true; \
-		echo "cp libcustcalc.a ${CUSTOMLIBDIR}/libcustcalc.a"; \
+	    else \
-		cp libcustcalc.a ${CUSTOMLIBDIR}/libcustcalc.a; \
+		rm -f $T${CUSTOMCALDIR}/libcustcalc.a.new; \
-		echo "${CHMOD} 0644 ${CUSTOMLIBDIR}/libcustcalc.a"; \
+		cp -f libcustcalc.a $T${CUSTOMCALDIR}/libcustcalc.a.new; \
-		${CHMOD} 0644 ${CUSTOMLIBDIR}/libcustcalc.a; \
+		${CHMOD} 0644 $T${CUSTOMCALDIR}/libcustcalc.a.new; \
-		echo "${RANLIB} ${CUSTOMLIBDIR}/libcustcalc.a"; \
+		mv -f $T${CUSTOMCALDIR}/libcustcalc.a.new \
-		${RANLIB} ${CUSTOMLIBDIR}/libcustcalc.a; \
+		      $T${CUSTOMCALDIR}/libcustcalc.a; \
+		${RANLIB} $T${CUSTOMCALDIR}/libcustcalc.a; \
+		echo "installed $T${CUSTOMCALDIR}/libcustcalc.a"; \
+	    fi; \
 	fi
 
 ##
@@ -537,13 +749,11 @@ install: all
 
 # DO NOT DELETE THIS LINE
 
-
 c_argv.o: ../alloc.h
 c_argv.o: ../block.h
 c_argv.o: ../byteswap.h
-c_argv.o: ../calcerr.h
 c_argv.o: ../calc.h
-c_argv.o: c_argv.c
+c_argv.o: ../calcerr.h
 c_argv.o: ../cmath.h
 c_argv.o: ../config.h
 c_argv.o: ../custom.h
@@ -559,17 +769,17 @@ c_argv.o: ../longbits.h
 c_argv.o: ../md5.h
 c_argv.o: ../nametype.h
 c_argv.o: ../qmath.h
-c_argv.o: ../shs1.h
 c_argv.o: ../shs.h
+c_argv.o: ../shs1.h
 c_argv.o: ../string.h
 c_argv.o: ../value.h
 c_argv.o: ../win32dll.h
 c_argv.o: ../zmath.h
+c_argv.o: c_argv.c
 c_devnull.o: ../alloc.h
 c_devnull.o: ../block.h
 c_devnull.o: ../byteswap.h
 c_devnull.o: ../calcerr.h
-c_devnull.o: c_devnull.c
 c_devnull.o: ../cmath.h
 c_devnull.o: ../config.h
 c_devnull.o: ../custom.h
@@ -585,17 +795,17 @@ c_devnull.o: ../longbits.h
 c_devnull.o: ../md5.h
 c_devnull.o: ../nametype.h
 c_devnull.o: ../qmath.h
-c_devnull.o: ../shs1.h
 c_devnull.o: ../shs.h
+c_devnull.o: ../shs1.h
 c_devnull.o: ../string.h
 c_devnull.o: ../value.h
 c_devnull.o: ../win32dll.h
 c_devnull.o: ../zmath.h
+c_devnull.o: c_devnull.c
 c_help.o: ../alloc.h
 c_help.o: ../block.h
 c_help.o: ../byteswap.h
 c_help.o: ../calcerr.h
-c_help.o: c_help.c
 c_help.o: ../cmath.h
 c_help.o: ../config.h
 c_help.o: ../custom.h
@@ -611,19 +821,19 @@ c_help.o: ../longbits.h
 c_help.o: ../md5.h
 c_help.o: ../nametype.h
 c_help.o: ../qmath.h
-c_help.o: ../shs1.h
 c_help.o: ../shs.h
+c_help.o: ../shs1.h
 c_help.o: ../string.h
 c_help.o: ../value.h
 c_help.o: ../win32dll.h
 c_help.o: ../zmath.h
+c_help.o: c_help.c
 c_pzasusb8.o: ../alloc.h
 c_pzasusb8.o: ../block.h
 c_pzasusb8.o: ../byteswap.h
 c_pzasusb8.o: ../calcerr.h
 c_pzasusb8.o: ../cmath.h
 c_pzasusb8.o: ../config.h
-c_pzasusb8.o: c_pzasusb8.c
 c_pzasusb8.o: ../custom.h
 c_pzasusb8.o: ../endian_calc.h
 c_pzasusb8.o: ../hash.h
@@ -637,21 +847,21 @@ c_pzasusb8.o: ../longbits.h
 c_pzasusb8.o: ../md5.h
 c_pzasusb8.o: ../nametype.h
 c_pzasusb8.o: ../qmath.h
-c_pzasusb8.o: ../shs1.h
 c_pzasusb8.o: ../shs.h
+c_pzasusb8.o: ../shs1.h
 c_pzasusb8.o: ../string.h
 c_pzasusb8.o: ../value.h
 c_pzasusb8.o: ../win32dll.h
 c_pzasusb8.o: ../zmath.h
+c_pzasusb8.o: c_pzasusb8.c
 c_sysinfo.o: ../alloc.h
 c_sysinfo.o: ../block.h
 c_sysinfo.o: ../byteswap.h
-c_sysinfo.o: ../calcerr.h
 c_sysinfo.o: ../calc.h
+c_sysinfo.o: ../calcerr.h
 c_sysinfo.o: ../cmath.h
 c_sysinfo.o: ../conf.h
 c_sysinfo.o: ../config.h
-c_sysinfo.o: c_sysinfo.c
 c_sysinfo.o: ../custom.h
 c_sysinfo.o: ../endian_calc.h
 c_sysinfo.o: ../fposval.h
@@ -669,14 +879,15 @@ c_sysinfo.o: ../md5.h
 c_sysinfo.o: ../nametype.h
 c_sysinfo.o: ../prime.h
 c_sysinfo.o: ../qmath.h
-c_sysinfo.o: ../shs1.h
 c_sysinfo.o: ../shs.h
+c_sysinfo.o: ../shs1.h
 c_sysinfo.o: ../string.h
 c_sysinfo.o: ../value.h
 c_sysinfo.o: ../win32dll.h
 c_sysinfo.o: ../zmath.h
 c_sysinfo.o: ../zrand.h
 c_sysinfo.o: ../zrandom.h
+c_sysinfo.o: c_sysinfo.c
 custtbl.o: ../alloc.h
 custtbl.o: ../block.h
 custtbl.o: ../byteswap.h
@@ -684,7 +895,6 @@ custtbl.o: ../calcerr.h
 custtbl.o: ../cmath.h
 custtbl.o: ../config.h
 custtbl.o: ../custom.h
-custtbl.o: custtbl.c
 custtbl.o: ../endian_calc.h
 custtbl.o: ../hash.h
 custtbl.o: ../have_const.h
@@ -697,9 +907,10 @@ custtbl.o: ../longbits.h
 custtbl.o: ../md5.h
 custtbl.o: ../nametype.h
 custtbl.o: ../qmath.h
-custtbl.o: ../shs1.h
 custtbl.o: ../shs.h
+custtbl.o: ../shs1.h
 custtbl.o: ../string.h
 custtbl.o: ../value.h
 custtbl.o: ../win32dll.h
 custtbl.o: ../zmath.h
+custtbl.o: custtbl.c

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.4 $
+ * @(#) $Revision: 29.6 $
- * @(#) $Id: c_sysinfo.c,v 29.4 2000/07/17 15:37:12 chongo Exp $
+ * @(#) $Id: c_sysinfo.c,v 29.6 2003/06/10 21:44:17 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_sysinfo.c,v $
  *
  * Under source code control:	1997/03/09 23:14:40
@@ -64,7 +64,7 @@ struct infoname {
 	FULL nmbr;	/* if str==NULL ==> value fo #define as a FULL */
 };
 static struct infoname sys_info[] = {
-    {"A55", "slots in an additive 55 table", NULL, (FULL)A55},
+    {"S100", "slots in an subtractive 100 table", NULL, (FULL)S100},
     {"BASE", "base for calculations", NULL, (FULL)BASE},
     {"BASE1", "one less than base", NULL, (FULL)BASE},
     {"BASEB", "bits in the calculation base", NULL, (FULL)BASEB},
@@ -128,8 +128,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},

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 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: endian.c,v 29.3 2001/03/18 02:59:42 chongo Exp $
+ * @(#) $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.6 $
+ * @(#) $Revision: 29.7 $
- * @(#) $Id: file.c,v 29.6 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Id: file.c,v 29.7 2001/04/10 22:06:46 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/file.c,v $
  *
  * Under source code control:	1991/07/20 00:21:56
@@ -158,7 +158,7 @@ file_init(void)
 				} else {
 					fp = (FILE *) fdopen(i, "w");
 					if (fp) {
-						strcpy(files[idnum].mode, "w?");
+						strcpy(files[idnum].mode, "w");
 						files[idnum].reading = FALSE;
 					}
 					else
@@ -207,7 +207,7 @@ openid(char *name, char *mode)
 	int i;
 
 	if (idnum >= MAXFILES)
-		return -77;
+		return -E_FOPEN3;
 
 	fiop = &files[3];
 	for (i = 3; i < MAXFILES; fiop++,i++) {
@@ -243,11 +243,32 @@ openid(char *name, char *mode)
 	fiop->reading = TRUE;
 	fiop->writing = TRUE;
 	fiop->action = 0;
-	if (mode[1] == '\0') {
+
-		if (*mode == 'r')
+	/*
+	 * determine file open mode
+	 *
+	 * While a leading 'r' is for reading and a leading 'w' is
+	 * for writing, the presense of a '+' in the string means
+	 * both reading and writing.  A leading 'a' means append
+	 * which is writing.
+	 */
+	if (mode[0] == 'r') {
+		fiop->reading = TRUE;
+		if (strchr(mode, '+') == NULL) {
 			fiop->writing = FALSE;
-		else
+		} else {
+			fiop->writing = TRUE;
+		}
+	} else if (mode[0] == 'w' || mode[0] == 'a') {
+		fiop->writing = TRUE;
+		if (strchr(mode, '+') == NULL) {
 			fiop->reading = FALSE;
+		} else {
+			fiop->reading = TRUE;
+		}
+	} else {
+		fiop->reading = FALSE;
+		fiop->writing = FALSE;
 	}
 	strcpy(fiop->mode, mode);
 	return id;
@@ -346,11 +367,32 @@ reopenid(FILEID id, char *mode, char *name)
 	fiop->reading = TRUE;
 	fiop->writing = TRUE;
 	fiop->action = 0;
-	if (mode[1] == '\0') {
+
-		if (*mode == 'r')
+	/*
+	 * determine file open mode
+	 *
+	 * While a leading 'r' is for reading and a leading 'w' is
+	 * for writing, the presense of a '+' in the string means
+	 * both reading and writing.  A leading 'a' means append
+	 * which is writing.
+	 */
+	if (mode[0] == 'r') {
+		fiop->reading = TRUE;
+		if (strchr(mode, '+') == NULL) {
 			fiop->writing = FALSE;
-		else
+		} else {
+			fiop->writing = TRUE;
+		}
+	} else if (mode[0] == 'w' || mode[0] == 'a') {
+		fiop->writing = TRUE;
+		if (strchr(mode, '+') == NULL) {
 			fiop->reading = FALSE;
+		} else {
+			fiop->reading = TRUE;
+		}
+	} else {
+		fiop->reading = FALSE;
+		fiop->writing = FALSE;
 	}
 	strcpy(fiop->mode, mode);
 	return id;
@@ -358,13 +400,13 @@ reopenid(FILEID id, char *mode, char *name)
 
 
 /*
- * Find the file I/O structure for the specified file id, and verify that
+ * Find the file I/O structure for the specified file id, and verifies that
- * it is opened in the required manner ('r' for reading or 'w' for writing).
+ * it is opened in the required manner (0 for reading or 1 for writing).
- * If mode is 0, then no open checks are made at all, and NULL is then
+ * If writable is -1, then no open checks are made at all and NULL is then
  * returned if the id represents a closed file.
  */
 FILEIO *
-findid(FILEID id, int mode)
+findid(FILEID id, int writable)
 {
 	FILEIO *fiop;		/* file structure */
 	int i;
@@ -383,21 +425,11 @@ findid(FILEID id, int mode)
 	if (i == idnum)
 		return NULL;
 
-	switch (mode) {
+	if (writable >= 0) {
-		case 'r':
+		if ((writable && !fiop->writing) ||
-			if (!fiop->reading)
+		    (!writable && !fiop->reading)) {
-				return NULL;
+			return NULL;
-			break;
+		}
-		case 'w':
-			if (!fiop->writing)
-				return NULL;
-			break;
-		case 0:
-			break;
-		default:
-			/* This should not happen */
-			math_error("Unknown findid mode");
-			/*NOTREACHED*/
 	}
 	return fiop;
 }
@@ -409,7 +441,7 @@ findid(FILEID id, int mode)
 BOOL
 validid(FILEID id)
 {
-	return (findid(id, 0) != NULL);
+	return (findid(id, -1) != NULL);
 }
 
 
@@ -505,7 +537,7 @@ errorid(FILEID id)
 {
 	FILEIO *fiop;		/* file structure */
 
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL)
 		return EOF;
 	return (ferror(fiop->fp) != 0);
@@ -520,7 +552,7 @@ eofid(FILEID id)
 {
 	FILEIO *fiop;		/* file structure */
 
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL)
 		return EOF;
 	return (feof(fiop->fp) != 0);
@@ -535,7 +567,7 @@ flushid(FILEID id)
 {
 	FILEIO *fiop;		/* file structure */
 
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL)
 		return 0;
 	if (!fiop->writing || fiop->action == 'r')
@@ -598,7 +630,7 @@ readid(FILEID id, int flags, char **retptr)
 	totlen = 0;
 	str = NULL;
 
-	fiop = findid(id, 'r');
+	fiop = findid(id, FALSE);
 	if (fiop == NULL)
 		return 1;
 	nlstop = (flags & 1);
@@ -679,7 +711,7 @@ getcharid(FILEID id)
 	FILEIO *fiop;
 	FILEPOS fpos;
 
-	fiop = findid(id, 'r');
+	fiop = findid(id, FALSE);
 	if (fiop == NULL)
 		return -2;
 	if (fiop->action == 'w') {
@@ -710,7 +742,7 @@ printid(FILEID id, int flags)
 	/*
 	 * filewall - file is closed
 	 */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL) {
 		if (flags & PRINT_UNAMBIG)
 			math_fmt("FILE %d closed", id);
@@ -787,7 +819,7 @@ idprintf(FILEID id, char *fmt, int count, VALUE **vals)
 	BOOL printstring;
 	BOOL printchar;
 
-	fiop = findid(id, 'w');
+	fiop = findid(id, TRUE);
 	if (fiop == NULL)
 		return 1;
 	if (fiop->action == 'r') {
@@ -1014,7 +1046,7 @@ idfputc(FILEID id, int ch)
 	FILEPOS fpos;
 
 	/* get the file info pointer */
-	fiop = findid(id, 'w');
+	fiop = findid(id, TRUE);
 	if (fiop == NULL)
 		return 1;
 	if (fiop->action == 'r') {
@@ -1049,7 +1081,7 @@ idungetc(FILEID id, int ch)
 {
 	FILEIO *fiop;
 
-	fiop = findid(id, 'r');
+	fiop = findid(id, FALSE);
 	if (fiop == NULL)
 		return -2;
 	if (fiop->action != 'r')
@@ -1072,7 +1104,7 @@ idfputs(FILEID id, char *str)
 	FILEPOS fpos;
 
 	/* get the file info pointer */
-	fiop = findid(id, 'w');
+	fiop = findid(id, TRUE);
 	if (fiop == NULL)
 		return 1;
 
@@ -1110,7 +1142,7 @@ idfputstr(FILEID id, char *str)
 	FILEPOS fpos;
 
 	/* get the file info pointer */
-	fiop = findid(id, 'w');
+	fiop = findid(id, TRUE);
 	if (fiop == NULL)
 		return 1;
 
@@ -1140,7 +1172,7 @@ int
 rewindid(FILEID id)
 {
 	FILEIO *fiop;
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL)
 		return 1;
 	rewind(fiop->fp);
@@ -1328,7 +1360,7 @@ getloc(FILEID id, ZVALUE *res)
 	/*
 	 * convert id to stream
 	 */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL) {
 		/* file not open */
 		return -1;
@@ -1353,7 +1385,7 @@ ftellid(FILEID id, ZVALUE *res)
 	FILEPOS fpos;		/* current file position */
 
 	/* get FILEIO */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL)
 		return -2;
 
@@ -1376,7 +1408,7 @@ fseekid(FILEID id, ZVALUE offset, int whence)
 	int ret = 0;		/* return code */
 
 	/* setup */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL)
 		return -2;
 
@@ -1501,7 +1533,7 @@ setloc(FILEID id, ZVALUE zpos)
 	/*
 	 * convert id to stream
 	 */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL) {
 		/* file not open */
 		return -1;
@@ -1669,7 +1701,7 @@ getsize(FILEID id, ZVALUE *res)
 	/*
 	 * convert id to stream
 	 */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL) {
 		/* file not open */
 		return 1;
@@ -1705,7 +1737,7 @@ get_device(FILEID id, ZVALUE *dev)
 	/*
 	 * convert id to stream
 	 */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL) {
 		/* file not open */
 		return -1;
@@ -1738,7 +1770,7 @@ get_inode(FILEID id, ZVALUE *inode)
 	/*
 	 * convert id to stream
 	 */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL) {
 		/* file not open */
 		return -1;
@@ -1774,7 +1806,7 @@ zfilesize(FILEID id)
 	ZVALUE ret;		/* file size as a ZVALUE return value */
 
 	/* file FILEIO */
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL) {
 		/* return neg value for non-file error */
 		itoz(-1, &ret);
@@ -2144,7 +2176,7 @@ fscanfid(FILEID id, char *fmt, int count, VALUE **vals)
 	FILE *fp;
 	FILEPOS fpos;
 
-	fiop = findid(id, 'r');
+	fiop = findid(id, FALSE);
 	if (fiop == NULL)
 		return -2;
 
@@ -2408,7 +2440,7 @@ isattyid(FILEID id)
 {
 	FILEIO *fiop;
 
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 	if (fiop == NULL)
 		return -2;
 	return isatty(fileno(fiop->fp));
@@ -2445,7 +2477,7 @@ fsearch(FILEID id, char *str, ZVALUE start, ZVALUE end, ZVALUE *res)
 	long k = 0;
 
 	/* get FILEIO */
-	fiop = findid(id, 'r');
+	fiop = findid(id, FALSE);
 	if (fiop == NULL)
 		return -2;
 
@@ -2564,7 +2596,7 @@ frsearch(FILEID id, char *str, ZVALUE first, ZVALUE last, ZVALUE *res)
 	char *s;		/* str comparison pointer */
 
 	/* get FILEIO */
-	fiop = findid(id, 'r');
+	fiop = findid(id, FALSE);
 	if (fiop == NULL)
 		return -2;
 
@@ -2641,7 +2673,7 @@ findfname(FILEID id)
 {
 	FILEIO *fiop;
 
-	fiop = findid(id, 0);
+	fiop = findid(id, -1);
 
 	if (fiop == NULL)
 		return NULL;

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.2 $
+ * @(#) $Revision: 29.5 $
- * @(#) $Id: file.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $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,11 @@
 #define __FILE_H__
 
 
-#include "have_fpos.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
+# include "have_fpos.h"
+#else
+# include <calc/have_fpos.h>
+#endif
 
 
 /*
@@ -50,7 +54,7 @@ typedef struct {
 	BOOL reading;		/* TRUE if opened for reading */
 	BOOL writing;		/* TRUE if opened for writing */
 	char action;		/* most recent use for 'r', 'w' or 0 */
-	char mode[3];		/* open mode */
+	char mode[sizeof("rb+")];/* open mode */
 } FILEIO;
 
 
@@ -85,7 +89,7 @@ typedef struct {
 /*
  * external functions
  */
-extern FILEIO * findid(FILEID id, int mode);
+extern FILEIO * findid(FILEID id, int writable);
 extern int fgetposid(FILEID id, FILEPOS *ptr);
 extern int fsetposid(FILEID id, FILEPOS *ptr);
 extern int get_open_siz(FILE *fp, ZVALUE *res);

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.7 $
+ * @(#) $Revision: 29.12 $
- * @(#) $Id: func.c,v 29.7 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Id: func.c,v 29.12 2002/12/29 09:20:25 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/func.c,v $
  *
  * Under source code control:	1990/02/15 01:48:15
@@ -107,7 +107,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);
@@ -1225,8 +1225,10 @@ f_primetest(int count, NUMBER **vals)
 {
 	/* parse args */
 	switch (count) {
-	case 1: return itoq((long) qprimetest(vals[0], &_qone_, &_qone_));
+	case 1: return itoq((long) qprimetest(vals[0],
-	case 2: return itoq((long) qprimetest(vals[0], vals[1], &_qone_));
+			    qlink(&_qone_), qlink(&_qone_)));
+	case 2: return itoq((long) qprimetest(vals[0],
+			    vals[1], qlink(&_qone_)));
 	default: return itoq((long) qprimetest(vals[0], vals[1], vals[2]));
 	}
 }
@@ -2013,7 +2015,7 @@ f_ln(int count, VALUE **vals)
 				return result;
 			}
 			ctmp.real = vals[0]->v_num;
-			ctmp.imag = &_qzero_;
+			ctmp.imag = qlink(&_qzero_);
 			ctmp.links = 1;
 			c = cln(&ctmp, err);
 			break;
@@ -3351,7 +3353,7 @@ f_trunc(int count, NUMBER **vals)
 {
 	NUMBER *val;
 
-	val = &_qzero_;
+	val = qlink(&_qzero_);
 	if (count == 2)
 		val = vals[1];
 	return qtrunc(*vals, val);
@@ -3433,7 +3435,7 @@ f_btrunc(int count, NUMBER **vals)
 {
 	NUMBER *val;
 
-	val = &_qzero_;
+	val = qlink(&_qzero_);
 	if (count == 2)
 		val = vals[1];
 	return qbtrunc(*vals, val);
@@ -3538,7 +3540,7 @@ f_ceil(VALUE *val)
 	tmp.v_subtype = V_NOSUBTYPE;
 
 	tmp.v_type = V_NUM;
-	tmp.v_num = &_qone_;
+	tmp.v_num = qlink(&_qone_);
 	apprvalue(val, &tmp, &tmp, &res);
 	return res;
 }
@@ -3555,9 +3557,9 @@ f_floor(VALUE *val)
 	tmp2.v_subtype = V_NOSUBTYPE;
 
 	tmp1.v_type = V_NUM;
-	tmp1.v_num = &_qone_;
+	tmp1.v_num = qlink(&_qone_);
 	tmp2.v_type = V_NUM;
-	tmp2.v_num = &_qzero_;
+	tmp2.v_num = qlink(&_qzero_);
 	apprvalue(val, &tmp1, &tmp2, &res);
 	return res;
 }
@@ -4985,24 +4987,31 @@ f_fopen(VALUE *v1, VALUE *v2)
 	/* initialize VALUE */
 	result.v_subtype = V_NOSUBTYPE;
 
+	/* check for a valid mode [rwa][b+\0][b+\0] */
 	if (v1->v_type != V_STR || v2->v_type != V_STR)
 		return error_value(E_FOPEN1);
 	mode = v2->v_str->s_str;
-
 	if ((*mode != 'r') && (*mode != 'w') && (*mode != 'a'))
 		return error_value(E_FOPEN2);
 	if (mode[1] != '\0') {
-		if (mode[1] != '+')
+		if (mode[1] != '+' && mode[1] != 'b')
-			return error_value(E_FOPEN2);
-		if (mode[2] != '\0')
 			return error_value(E_FOPEN2);
+		if (mode[2] != '\0') {
+			if ((mode[2] != '+' && mode[2] != 'b') ||
+			    mode[1] == mode[2])
+				return error_value(E_FOPEN2);
+			if (mode[3] != '\0')
+				return error_value(E_FOPEN2);
+		}
 	}
+
+	/* try to open */
 	errno = 0;
 	id = openid(v1->v_str->s_str, v2->v_str->s_str);
 	if (id == FILEID_NONE)
 		return error_value(errno);
 	if (id < 0)
-		return error_value(E_FOPEN3);
+		return error_value(-id);
 	result.v_type = V_FILE;
 	result.v_file = id;
 	return result;
@@ -5019,21 +5028,27 @@ f_freopen(int count, VALUE **vals)
 	/* initialize VALUE */
 	result.v_subtype = V_NOSUBTYPE;
 
+	/* check for a valid mode [rwa][b+\0][b+\0] */
 	if (vals[0]->v_type != V_FILE)
 		return error_value(E_FREOPEN1);
 	if (vals[1]->v_type != V_STR)
 		return error_value(E_FREOPEN2);
-
 	mode = vals[1]->v_str->s_str;
-
 	if ((*mode != 'r') && (*mode != 'w') && (*mode != 'a'))
 		return error_value(E_FREOPEN2);
 	if (mode[1] != '\0') {
-		if (mode[1] != '+')
+		if (mode[1] != '+' && mode[1] != 'b')
-			return error_value(E_FREOPEN2);
-		if (mode[2] != '\0')
 			return error_value(E_FREOPEN2);
+		if (mode[2] != '\0') {
+			if ((mode[2] != '+' && mode[2] != 'b') ||
+			    mode[1] == mode[2])
+				return error_value(E_FOPEN2);
+			if (mode[3] != '\0')
+				return error_value(E_FREOPEN2);
+		}
 	}
+
+	/* try to reopen */
 	errno = 0;
 	if (count == 2) {
 		id = reopenid(vals[0]->v_file, mode, NULL);
@@ -6139,10 +6154,10 @@ f_fgetfield(VALUE *vp)
 	result.v_subtype = V_NOSUBTYPE;
 
 	if (vp->v_type != V_FILE)
-		return error_value(E_FGETWORD1);
+		return error_value(E_FGETFIELD1);
 	i = readid(vp->v_file, 14, &str);
 	if (i > 0)
-		return error_value(E_FGETWORD2);
+		return error_value(E_FGETFIELD2);
 	result.v_type = V_NULL;
 	if (i == 0) {
 		result.v_type = V_STR;
@@ -6895,9 +6910,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));
 	}
@@ -6963,15 +6978,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 */
@@ -6999,7 +7014,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);
 }
 
 
@@ -7007,14 +7076,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;
@@ -7041,6 +7110,9 @@ base_value(long mode)
 		case MODE_BINARY:
 			result = itoq(2);
 			break;
+		case MODE2_OFF:
+			result = itoq(0);
+			break;
 		default:
 			result = itoq(0);
 			break;
@@ -7069,6 +7141,9 @@ base_value(long mode)
 	case MODE_BINARY:
 		result = itoq(2);
 		break;
+	case MODE2_OFF:
+		result = itoq(0);
+		break;
 	default:
 		result = itoq(0);
 		break;
@@ -7288,6 +7363,7 @@ f_free(int count, VALUE **vals)
 	return result;
 }
 
+
 static VALUE
 f_freeglobals(void)
 {
@@ -7301,6 +7377,7 @@ f_freeglobals(void)
 	return result;
 }
 
+
 static VALUE
 f_freeredc(void)
 {
@@ -7708,6 +7785,20 @@ f_argv(int count, VALUE **vals)
 }
 
 
+static VALUE
+f_version(void)
+{
+	VALUE result;
+
+	/* return the calc verstion string */
+	result.v_type = V_STR;
+	result.v_subtype = V_NOSUBTYPE;
+	result.v_str = makestring(strdup(version()));
+
+	return result;
+}
+
+
 #endif /* !FUNCLIST */
 
 
@@ -7794,6 +7885,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,
@@ -8310,6 +8403,8 @@ static CONST struct builtin builtins[] = {
 	 "truncate a to b number of decimal places"},
 	{"ungetc", 2, 2, 0, OP_NOP, 0, f_ungetc,
 	 "unget char read from file"},
+	{"version", 0, 0, 0, OP_NOP, 0, f_version,
+	 "calc version string"},
 	{"xor", 1, IN, 0, OP_NOP, 0, f_xor,
 	 "logical xor"},
 

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.2 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: func.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $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,8 +32,13 @@
 #define __FUNC_H__
 
 
-#include "calc.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
-#include "label.h"
+# include "calc.h"
+# include "label.h"
+#else
+# include <calc/calc.h>
+# include <calc/label.h>
+#endif
 
 
 /*

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.3 $
+ * @(#) $Revision: 29.5 $
- * @(#) $Id: hash.c,v 29.3 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $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
@@ -911,6 +911,7 @@ hash_value(int type, void *v, HASH *state)
 			(USB8 *)value->v_rand->buffer, SLEN*FULL_BITS/8);
 		state = hash_int(type, value->v_rand->j, state);
 		state = hash_int(type, value->v_rand->k, state);
+		state = hash_int(type, value->v_rand->need_to_skip, state);
 		(state->update)(state,
 			(USB8 *)value->v_rand->slot, SCNT*FULL_BITS/8);
 		(state->update)(state,
@@ -940,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.2 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: hash.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $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,10 +33,17 @@
 #define __HASH_H__
 
 
-#include "shs.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
-#include "shs1.h"
+# include "shs.h"
-#include "md5.h"
+# include "shs1.h"
-#include "zmath.h"
+# include "md5.h"
+# include "zmath.h"
+#else
+# include <calc/shs.h>
+# include <calc/shs1.h>
+# include <calc/md5.h>
+# include <calc/zmath.h>
+#endif
 
 
 /* MAX_CHUNKSIZE is the largest chunksize of any hash */

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.6 $
+ * @(#) $Revision: 29.8 $
- * @(#) $Id: help.c,v 29.6 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Id: help.c,v 29.8 2001/04/08 08:29:28 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/help.c,v $
  *
  * Under source code control:	1997/09/14 10:58:30
@@ -62,6 +62,7 @@ static struct help_alias {
 	{".", "oldvalue"},
 	{"%", "mod"},
 	{"//", "quo"},
+	{"copy", "blkcpy"},
 	{"copying", "COPYING"},
 	{"copying-lgpl", "COPYING-LGPL"},
 	{"copying_lgpl", "COPYING-LGPL"},
@@ -70,6 +71,13 @@ static struct help_alias {
 	{"COPYRIGHT", "copyright"},
 	{"Copyleft", "copyright"},
 	{"COPYLEFT", "copyright"},
+	{"read", "command"},
+	{"write", "command"},
+	{"quit", "command"},
+	{"exit", "command"},
+	{"abort", "command"},
+	{"cd", "command"},
+	{"show", "command"},
 	{"stdlib", "resource"},
 	{NULL, NULL}
 };

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.5 $
+# @(#) $Revision: 29.23 $
-# @(#) $Id: Makefile,v 29.5 2000/12/14 10:33:06 chongo Exp $
+# @(#) $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,15 +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.
-#
+####
-TOPDIR= /usr/local/lib
-#TOPDIR= /usr/lib
-#TOPDIR= /usr/libdata
 
-LIBDIR= ${TOPDIR}/calc
+# Where the system include (.h) files are kept
-HELPDIR= ${LIBDIR}/help
+#
+# 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
 #
@@ -63,6 +168,7 @@ CHMOD= chmod
 SED= sed
 SORT= sort
 FMT= fmt
+CMP= cmp
 
 # Standard and Builtin help files
 #
@@ -140,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 \
+	appr arg argv arrow asec asech asin asinh assign atan atan2 atanh \
-	base bernoulli bit blk blkcpy blkfree blocks bround btrunc calc_tty \
+	avg base base2 bernoulli bit blk blkcpy blkfree blocks bround btrunc \
-	calclevel catalan ceil cfappr cfsim char cmdbuf cmp comb conj cos \
+	calc_tty calclevel catalan ceil cfappr cfsim char cmdbuf cmp comb \
-	cosh cot coth count cp csc csch ctime delete den dereference det \
+	conj cos cosh cot coth count cp csc csch ctime delete den dereference \
-	digit digits dp epsilon errcount errmax errno error euler eval \
+	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 \
@@ -164,7 +270,7 @@ DETAIL_HELP= abs access acos acosh acot acoth acsc acsch address agd append \
 	runtime saveval scale scan scanf search sec sech seed segment select \
 	sgn sha sha1 sin sinh size sizeof sleep sort sqrt srand srandom \
 	ssq str strcat strerror strlen strpos strprintf strscan strscanf \
-	substr sum swap system tail tan tanh test time trunc xor
+	substr sum swap system tail tan tanh test time trunc version xor
 
 # This list is of files that are clones of DETAIL_HELP files.  They are
 # built from DETAIL_HELP files.
@@ -238,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 ''; \
@@ -389,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 \
-	    echo "rm -f $${i}"; \
+	    if [ X"$$i" != X"/dev/null" ]; then \
-	    rm -f $${i}; \
+		echo "rm -f $${i}"; \
-	    echo "cp $${i}s $${i}"; \
+		rm -f $${i}; \
-	    cp $${i}s $${i}; \
+		echo "cp $${i}s $${i}"; \
+		cp $${i}s $${i}; \
+	    fi; \
 	done
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
@@ -426,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
@@ -453,9 +563,11 @@ 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; \
-	done | ${SORT}
+	    fi; \
+	done | LANG=C ${SORT}
 
 distdir:
 	${Q}echo help
@@ -479,16 +591,39 @@ 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; \
-	done | ${SORT}) | ${FMT} -70 | \
+	    fi; \
+	done | LANG=C ${SORT}) | ${FMT} -70 | \
 	    ${SED} -e '1s/xxxxx/DETAIL_HELP=/' -e '2,$$s/^/	/' \
 		   -e 's/$$/ \\/' -e '$$s/ \\$$//'
 
+##
+#
+# rpm rules
+#
+##
+
+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
+	${Q}echo __file__ ${HELPDIR}/obj
+
+##
+#
+# Utility rules
+#
+##
+
 clean:
 	rm -f obj mkbuiltin funclist.c funclist.o funclist
 	rm -f COPYING COPYING-LGPL
@@ -500,36 +635,51 @@ clobber:
 	rm -f ${SINGULAR_FILES} ${DETAIL_CLONE}
 
 install: all
-	-${Q}if [ ! -d ${TOPDIR} ]; then \
+	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
-		echo mkdir ${TOPDIR}; \
+	    echo mkdir $T${CALC_SHAREDIR}; \
-		mkdir ${TOPDIR}; \
+	    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 ${LIBDIR} ]; then \
+	-${Q}if [ ! -d $T${HELPDIR} ]; then \
-		echo mkdir ${LIBDIR}; \
+	    echo mkdir $T${HELPDIR}; \
-		mkdir ${LIBDIR}; \
+	    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 \
+	-${Q}for i in ${STD_HELP_FILES} ${BLT_HELP_FILES} builtin \
-		echo mkdir ${HELPDIR}; \
+		  full ${DETAIL_HELP} ${SINGULAR_FILES} /dev/null; do \
-		mkdir ${HELPDIR}; \
+	    if [ "$$i" = "/dev/null" ]; then \
-	else \
+		continue; \
-	    true; \
+	    fi; \
-	fi
+	    if ${CMP} -s $$i $T${HELPDIR}/$$i; then \
-	${Q}for i in ${STD_HELP_FILES} ${BLT_HELP_FILES} builtin \
+		true; \
-		  full ${DETAIL_HELP} ${SINGULAR_FILES}; do \
+	    else \
-		echo rm -f ${HELPDIR}/$$i; \
+		rm -f $T${HELPDIR}/$$i.new; \
-		rm -f ${HELPDIR}/$$i; \
+		cp -f $$i $T${HELPDIR}/$$i.new; \
-		echo cp $$i ${HELPDIR}; \
+		${CHMOD} 0444 $T${HELPDIR}/$$i.new; \
-		cp $$i ${HELPDIR}; \
+		mv -f $T${HELPDIR}/$$i.new $T${HELPDIR}/$$i; \
-		echo ${CHMOD} 0444 ${HELPDIR}/$$i; \
+		echo "installed $T${HELPDIR}/$$i"; \
-		${CHMOD} 0444 ${HELPDIR}/$$i; \
+	    fi; \
 	done
-	rm -f ${HELPDIR}/obj
+	-${Q}if ${CMP} -s obj.file $T${HELPDIR}/obj; then \
-	cp obj.file ${HELPDIR}/obj
+	    true; \
-	${CHMOD} 0444 ${HELPDIR}/obj
+	else \
-	${Q}echo remove files that are obsolete
+	    rm -f $T${HELPDIR}/obj.new; \
-	-rm -f rmblk block stdlib
+	    cp -f obj.file $T${HELPDIR}/obj.new; \
-	-rm -f ${HELPDIR}/rmblk ${HELPDIR}/block ${HELPDIR}/stdlib
+	    ${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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: address,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: arrow,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: asin,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $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
+    Assignment of a null value to an element of an association does not
-    to an element of an association does not delete the element, but
+    delete the element, but a later reference to that element will return
-    a later reference to that element will return the null value as if
+    the null value as if the element is undefined.
-    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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: assoc,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: atan,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $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 $
+## @(#) $Revision: 29.5 $
-## @(#) $Id: base,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $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 $
+## @(#) $Revision: 29.5 $
-## @(#) $Id: bernoulli,v 29.4 2000/12/17 12:27:58 chongo Exp $
+## @(#) $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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: blk,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: blocks,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $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.
@@ -47,6 +48,7 @@ Configuration parameters
 	    "ctrl_d"		The interactive meaning of ^D (Control D)
 	    "program"		Read-only calc program or shell script path
 	    "basename"		Read-only basename of the program value
+	    "windows"		Read-only indicator of MS windows
 	    "version"		Read-only calc version
 
     The "all" config value allows one to save/restore the configuration
@@ -183,6 +185,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
@@ -218,7 +221,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".
 
     =-=
 
@@ -509,7 +522,9 @@ Detailed config descriptions
 
 	5	Report on changes to the run state of calc.
 
-    Bits >= 6 are reserved for future use and should not be used at this time.
+	6	Report on rand() subtractive 100 shuffle generator issues.
+
+    Bits >= 7 are reserved for future use and should not be used at this time.
 
     By default, "calc_debug" is 0.  The initial value may be overridden
     by the -D command line option.
@@ -539,6 +554,9 @@ Detailed config descriptions
 	2	Show func will display more information about a functions
 		arguments as well as more argument sdummary information.
 
+	3	During execution, allow calc standard resource files
+		to output additional debugging information.
+
     The value for config("resource_debug") in both oldstd and newstd is 3,
     but if calc is invoked with the -d flag, its initial value is zero.
     Thus, if calc is started without the -d flag, until config("resource_debug")
@@ -574,12 +592,14 @@ Detailed config descriptions
 
     The "verbose_quit" controls the print of the message:
 
-	Quit or abort executed
+	quit or abort executed
 
     when a non-interactive quit or abort without an argument is encountered.
     A quit of abort without an argument does not display a message when
     invoked at the interactive level.
 
+    By deafult, "verbose_quit" is false.
+
     =-=
 
     config("ctrl_d", "ctrl_d_string")
@@ -674,6 +694,13 @@ Detailed config descriptions
 
     =-=
 
+    config("windows")		<== NOTE: This is a read-only config value
+
+    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.
+
+    =-=
+
     config("version")		<== NOTE: This is a read-only config value
 
     The version string of the calc program can be obtained by:
@@ -698,8 +725,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.2 $
+## @(#) $Revision: 29.7 $
-## @(#) $Id: config,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: config,v 29.7 2002/12/29 08:32:04 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 $
+## @(#) $Revision: 29.4 $
-## @(#) $Id: contrib,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $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
+    If omitted, b is assumed to be 10.  If given, b must be an
-    of digits in the standard base-b "decimal" representation of int(abs(x));
+    integer > 1.
-    this is also given by  1 + ilog(x, b).
+
+    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)
+    > print digits(100), digits(23209), digits(2^72)
-    0 0 1 2 2
+    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 $
+## @(#) $Revision: 29.5 $
-## @(#) $Id: digits,v 29.3 2000/12/14 10:32:24 chongo Exp $
+## @(#) $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/fopen

@@ -15,9 +15,39 @@ DESCRIPTION
     opened for either reading, writing, or appending.  The mode
     is controlled by the mode flag as follows:
 
-	"r"	reading
+		 allow	  allow    file is   positioned	  file(*)
-	"w"	writing
+       mode	reading	 writing  truncated      at	  mode
-	"a"	appending
+       ----	-------  -------  ---------  ---------	  ----
+	r	   Y	    N	      N      beginning	  text
+	rb	   Y	    N	      N      beginning	  binary
+	r+	   Y	    N	      N      beginning	  text
+	r+b	   Y	    N	      N      beginning	  binary
+	rb+	   Y	    N	      N      beginning	  binary
+
+	w	   N	    Y	      Y      beginning	  text
+	wb	   N	    Y	      Y      beginning	  binary
+	w+	   Y	    Y	      Y      beginning	  text
+	w+b	   Y	    Y	      Y      beginning	  binary
+	wb+	   Y	    Y	      Y      beginning	  binary
+
+	a	   N	    Y	      Y         end	  text
+	ab	   N	    Y	      Y         end	  binary
+	a+	   Y	    Y	      Y         end	  text
+	a+b	   Y	    Y	      Y         end	  binary
+	ab+	   Y	    Y	      Y         end	  binary
+
+    (*) NOTE on 'b' / binary/text mode:
+
+    	The 'b' or fopen binary mode has no effect on POSIX / Linux
+	/ Un*x-like systems.  On those systems a text file is the
+	same as a binary file (as it should be for any modern-day
+	operating system).  Adding 'b' to an fopen has no effect
+	and is ignored.
+
+	Some non-POSIX systems sucn as MS Windoz treat text files
+	and binary files differently.  In text mode MS Windoz consider
+	"\r\n" and end-of-line character.  On an Apple MAC, the
+	text mode end-of-line character is "\r".
 
     Names of files are subject to ~ expansion just like the C or
     Korn shell.	 For example, the file name:
@@ -90,8 +120,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: fopen,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: fopen,v 29.3 2001/04/10 21:46:45 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/fopen,v $
 ##
 ## Under source code control:	1994/10/27 03:04:17

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
+    The calc hash value is based on the core Fowler/Noll/Vo hash
-    as reviewer comments to the IEEE POSIX P1003.2 committee by:
+    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/)
+    See:
-	 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:
 
 	 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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: hash,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: im,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $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 $
+## @(#) $Revision: 29.5 $
-## @(#) $Id: places,v 29.4 2000/12/17 12:27:58 chongo Exp $
+## @(#) $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/rand

@@ -1,5 +1,5 @@
 NAME
-    rand - additive 55 shuffle pseudo-random number generator
+    rand - subtractive 100 shuffle pseudo-random number generator
 
 SYNOPSIS
     rand([[min, ] max])
@@ -11,7 +11,7 @@ TYPES
     return	integer
 
 DESCRIPTION
-    Generate a pseudo-random number using an additive 55 shuffle generator.
+    Generate a pseudo-random number using an subtractive 100 shuffle generator.
     We return a pseudo-random number over the half closed interval [min,max).
     By default, min is 0 and max is 2^64.
 
@@ -38,36 +38,40 @@ DESCRIPTION
 
     when seeded with the same seed.
 
-    The rand generator has two distinct parts, the additive 55 method
+    The rand generator has two distinct parts, the subtractive 100 method
-    and the shuffle method.  The additive 55 method is described in:
+    and the shuffle method.  The subtractive 100 method is described in:
 
-	"The Art of Computer Programming - Seminumerical Algorithms"
+	"The Art of Computer Programming - Seminumerical Algorithms",
-	by Knuth, Vol 2, 2nd edition (1981), Section 3.2.2, page 27,
+	Vol 2, 3rd edition (1998), Section 3.6, page 186, formula (2).
-	Algorithm A.
 
-    The period and other properties of the additive 55 method
+    The "use only the first 100 our of every 1009" is described in
+    Knuth's "The Art of Computer Programming - Seminumerical Algorithms",
+    Vol 2, 3rd edition (1998), Section 3.6, page 188".
+
+    The period and other properties of the subtractive 100 method
     make it very useful to 'seed' other generators.
 
-    The shuffle method is feed values by the additive 55 method.
+    The shuffle method is feed values by the subtractive 100 method.
     The shuffle method is described in:
 
-	"The Art of Computer Programming - Seminumerical Algorithms"
+	"The Art of Computer Programming - Seminumerical Algorithms",
-	by Knuth, Vol 2, 2nd edition (1981), Section 3.2.2, page 32,
+	Vol 2, 3rd edition (1998), Section 3.2.2, page 34, Algorithm B.
-	Algorithm B.
 
     The rand generator has a good period, and is fast.	It is reasonable as
     generators go, though there are better ones available.  The shuffle
     method has a very good period, and is fast.	 It is fairly good as
     generators go, particularly when it is feed reasonably random
-    numbers.  Because of this, we use feed values from the additive 55
+    numbers.  Because of this, we use feed values from the subtractive 100
     method into the shuffle method.
 
     The rand generator uses two internal tables:
 
-	additive table - 55 entries of 64 bits used by the additive 55 method
+	additive table - 100 entries of 64 bits used by the subtractive
+			 100 method
 
 	shuffle table - 256 entries of 64 bits used by the shuffle method
-			feed by the additive 55 method from the additive table
+			feed by the subtractive 100 method from the
+			subtractive table
 
     The goals of this generator are:
 
@@ -95,21 +99,21 @@ DESCRIPTION
     a standard against which other generators may be measured.
 
     The Rand book of numbers was groups into groups of 20 digits.  The
-    first 55 groups < 2^64 were used to initialize the default additive
+    first 100 groups < 2^64 were used to initialize the default additive
     table.  The size of 20 digits was used because 2^64 is 20 digits
     long.  The restriction of < 2^64 was used to prevent modulus biasing.
 
     The shuffle table size is longer than the 100 entries recommended
     by Knuth.  We use a power of 2 shuffle table length so that the
-    shuffle process can select a table entry from a new additive 55
+    shuffle process can select a table entry from a new subtractive 100
     value by extracting its low order bits.  The value 256 is convenient
     in that it is the size of a byte which allows for easy extraction.
 
-    We use the upper byte of the additive 55 value to select the
+    We use the upper byte of the subtractive 100 value to select the
     shuffle table entry because it allows all of 64 bits to play a part
     in the entry selection.  If we were to select a lower 8 bits in the
     64 bit value, carries that propagate above our 8 bits would not
-    impact the additive 55 generator output.
+    impact the subtractive 100 generator output.
 
     It is 'nice' when a seed of "n" produces a 'significantly different'
     sequence than a seed of "n+1".  Generators, by convention, assign
@@ -161,7 +165,7 @@ DESCRIPTION
     The values 'a' and 'c for randreseed64 are taken from the Rand book
     of numbers.	 Because m=2^64 is 20 decimal digits long, we will
     search the Rand book of numbers 20 at a time.  We will skip any of
-    the 55 values that were used to initialize the additive 55
+    the 100 values that were used to initialize the subtractive 100
     generators.	 The values obtained from the Rand book are:
 
 	a = 6316878969928993981
@@ -190,36 +194,40 @@ DESCRIPTION
 
     The truly paranoid might suggest that my claims in the MAGIC NUMBERS
     section are a lie intended to entrap people.  Well they are not, but
-    you need not take my (Landon Curt Noll) word for it.
+    if you that paranoid why would you use a non-cryprographically strong
+    pseudo-random number generator in the first place?  You would be
+    better off using the random() builtin function.
 
-    The random numbers from the Rand book of random numbers can be
+    The two constants that were picked from the Rand Book of Random Numbers
+    The random numbers from the Rand Book of Random Numbers can be
     verified by anyone who obtains the book.  As these numbers were
-    created before I (Landon Curt Noll) was born (you can look up my
+    created before I (Landon Curt Noll) was born (you can look up
-    birth record if you want), I claim to have no possible influence on
+    my birth record if you want), I claim to have no possible influence
-    their generation.
+    on their generation.
 
     There is a very slight chance that the electronic copy of the
-    Rand book that I was given access to differs from the printed text.
+    Rand Book of Random Numbers that I was given access to differs
-    I am willing to provide access to this electronic copy should
+    from the printed text.  I am willing to provide access to this
-    anyone wants to compare it to the printed text.
+    electronic copy should anyone wants to compare it to the printed text.
 
-    When using the a55 generator, one may select your own 55 additive
+    When using the s100 generator, one may select your own 100 subtractive
     values by calling:
 
-	srand(mat55)
+         srand(mat100)
 
-    and avoid using my magic numbers.  Of course, you must pick good
+    and avoid using my magic numbers.  The randreseed64 process is NOT
-    additive 55 values yourself!
+    applied to the matrix values. Of course, you must pick good subtractive
+    100 values yourself!
 
 EXAMPLE
     > print srand(0), rand(), rand(), rand()
-    RAND state 14384206130809570460 10173010522823332484 5713611208311484212
+    RAND state 2298441576805697181 3498508396312845423 5031615567549397476
 
     > print rand(123), rand(123), rand(123), rand(123), rand(123), rand(123)
-    17 104 74 47 48 46
+    106 59 99 99 25 88
 
     > print rand(2,12), rand(2^50,3^50), rand(0,2), rand(-400000, 120000)
-    11 170570393286648531699560 1 -96605
+    2 658186291252503497642116 1 -324097
 
 LIMITS
     min < max
@@ -248,8 +256,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: rand,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: rand,v 29.3 2001/04/14 22:46:33 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/rand,v $
 ##
 ## Under source code control:	1996/01/01 02:16:09

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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: re,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $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/script

@@ -144,9 +144,9 @@ Calc shell scripts
     For systems that support interpreter files, essentially the
     same thing may be done more efficiently by using calc as an
     interpreter.  Assuming the full path for calc is
-    /usr/bin/calc, one could use the file addall3 with contents
+    /usr/local/bin/calc, one could use the file addall3 with contents
 
-	    #!/usr/bin/calc -q -s -f
+	    #!/usr/local/bin/calc -q -s -f
 	    global i, n, s;
 	    n = argv();
 	    for (i = 1; i <= n; i++)
@@ -166,7 +166,7 @@ Calc shell scripts
 
     or what is essentially an interpreter equivalent sqrts2:
 
-	    #!/usr/bin/calc -q -f
+	    #!/usr/local/bin/calc -q -f
 	    global s;
 	    while (scanf('%s', s) == 1)
 		    print sqrt(eval(s));
@@ -283,8 +283,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.4 $
+## @(#) $Revision: 29.5 $
-## @(#) $Id: script,v 29.4 2000/07/17 15:36:26 chongo Exp $
+## @(#) $Id: script,v 29.5 2001/04/08 07:56:32 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/script,v $
 ##
 ## Under source code control:	1999/11/30 05:29:48

help/seed

@@ -19,9 +19,9 @@ DESCRIPTION
 	is almost certainly non-chaotic.  This function is likely not
 	suitable for applications (such as cryptographic applications)
 	where the unpredictability of seeds is critical.  For such critical
-	applications, lavarand should be used.	See the URL:
+	applications, LavaRnd should be used.	See the URL:
 
-		http://lavarand.sgi.com/index.html
+		http://www.LavaRnd.org/
 
 	for information about seeding a pseudo-random number generator
 	(such as rand() or random()) with the cryptographic hash of the
@@ -67,8 +67,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: seed,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: seed,v 29.3 2001/05/13 13:26:26 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/seed,v $
 ##
 ## Under source code control:	1999/10/03 10:04:29

help/srand

@@ -1,5 +1,5 @@
 NAME
-    srand - seed the additive 55 shuffle pseudo-random number generator
+    srand - seed the subtractive 100 shuffle pseudo-random number generator
 
 SYNOPSIS
     srand([seed])
@@ -10,43 +10,43 @@ TYPES
     return	rand state
 
 DESCRIPTION
-    Seed the pseudo-random number using an additive 55 shuffle generator.
+    Seed the pseudo-random number using an subtractive 100 shuffle generator.
 
     For integer seed != 0:
 
-	Any buffered rand generator bits are flushed.  The additive table
+	Any buffered rand generator bits are flushed.  The subtractive table
-	for the rand generator is loaded with the default additive table.
+	for the rand generator is loaded with the default subtractive table.
 	The low order 64 bits of seed is xor-ed against each table value.
-	The additive table is shuffled according to seed/2^64.
+	The subtractive table is shuffled according to seed/2^64.
 
 	The following calc code produces the same effect on the internal
-	additive table:
+	subtractive table:
 
-	    /* reload default additive table xor-ed with low 64 seed bits */
+	    /* reload default subtractive table xor-ed with low 64 seed bits */
 	    seed_xor = seed & ((1<<64)-1);
-	    for (i=0; i < 55; ++i) {
+	    for (i=0; i < 100; ++i) {
-		additive[i] = xor(default_additive[i], seed_xor);
+		subtractive[i] = xor(default_subtractive[i], seed_xor);
 	    }
 
-	    /* shuffle the additive table */
+	    /* shuffle the subtractive table */
 	    seed >>= 64;
-	    for (i=55; seed > 0 && i > 0; --i) {
+	    for (i=100; seed > 0 && i > 0; --i) {
 		quomod(seed, i+1, seed, j);
-		swap(additive[i], additive[j]);
+		swap(subtractive[i], subtractive[j]);
 	    }
 
 	Seed must be >= 0.  All seed values < 0 are reserved for future use.
 
-	The additive table pointers are reset to additive[23] and additive[54].
+	The subtractive table pointers are reset to subtractive[36]
-	Last the shuffle table is loaded with successive values from the
+	and subtractive[99].  Last the shuffle table is loaded with
-	additive 55 generator.
+	successive values from the subtractive 100 generator.
 
 	There is no limit on the size of a seed.  On the other hand,
 	extremely large seeds require large tables and long seed times.
-	Using a seed in the range of [2^64, 2^64 * 55!) should be
+	Using a seed in the range of [2^64, 2^64 * 100!) should be
 	sufficient for most purposes.  An easy way to stay within this
-	range to to use seeds that are between 21 and 93 digits, or
+	range to to use seeds that are between 21 and 178 digits, or
-	64 to 308 bits long.
+	64 to 588 bits long.
 
 	To help make the generator produced by seed S, significantly
 	different from S+1, seeds are scrambled prior to use.  The
@@ -68,9 +68,9 @@ DESCRIPTION
 	After this call, the rand generator is restored to its initial
 	state after calc started.
 
-	The additive 55 pointers are reset to additive[23] and additive[54].
+	The subtractive 100 pointers are reset to subtractive[36]
-	Last the shuffle table is loaded with successive values from the
+	and subtractive[99].  Last the shuffle table is loaded with
-	additive 55 generator.
+	successive values from the subtractive 100 generator.
 
 	The call:
 
@@ -80,14 +80,14 @@ DESCRIPTION
 
     For matrix arg:
 
-	Any buffered random bits are flushed.  The additive table with the
+	Any buffered random bits are flushed.  The subtractive table with the
-	first 55 entries of the matrix mod 2^64.
+	first 100 entries of the matrix mod 2^64.
 
-	The additive 55 pointers are reset to additive[23] and additive[54].
+	The subtractive 100 pointers are reset to subtractive[36]
-	Last the shuffle table is loaded with successive values from the
+	and subtractive[99].  Last the shuffle table is loaded with
-	additive 55 generator.
+	successive values from the subtractive 100 generator.
 
-	This form allows one to load the internal additive 55 generator
+	This form allows one to load the internal subtractive 100 generator
 	with user supplied values.
 
 	The randreseed64 process is NOT applied to the matrix values.
@@ -114,7 +114,7 @@ DESCRIPTION
 
     For no arg given:
 
-	Return current a55 generator state.  This call does not alter
+	Return current s100 generator state.  This call does not alter
 	the generator state.
 
 	This call allows one to take a snapshot of the current generator state.
@@ -126,25 +126,25 @@ EXAMPLE
 	    RAND state
     > state = srand();
     > print rand(123), rand(123), rand(123), rand(123), rand(123), rand(123);
-    32 60 67 71 1 77
+    80 95 41 78 100 27
     > print rand(123), rand(123), rand(123), rand(123), rand(123), rand(123);
-    52 72 110 15 69 58
+    122 109 12 95 80 32
     > state2 = srand(state);
     > print rand(123), rand(123), rand(123), rand(123), rand(123), rand(123);
-    32 60 67 71 1 77
+    80 95 41 78 100 27
     > print rand(123), rand(123), rand(123), rand(123), rand(123), rand(123);
-    52 72 110 15 69 58
+    122 109 12 95 80 32
     > state3 = srand();
     > print state3 == state2;
     1
     > print rand();
-    641407694185874626
+    10710588361472584495
 
 LIMITS
-    for matrix arg, the matrix must have at least 55 integers
+    for matrix arg, the matrix must have at least 100 integers
 
 LINK LIBRARY
-    RAND *zsrand(ZVALUE *pseed, MATRIX *pmat55)
+    RAND *zsrand(ZVALUE *pseed, MATRIX *pmat100)
     RAND *zsetrand(RAND *state)
 
 SEE ALSO
@@ -166,8 +166,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: srand,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: srand,v 29.3 2001/04/14 22:46:33 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/srand,v $
 ##
 ## Under source code control:	1996/01/01 04:19:07

help/srandom

@@ -220,11 +220,11 @@ DESCRIPTION
 	Blum moduli.
 
 	The pre-defined Blum moduli and quadratic residues were selected
-	by lavarand, a hardware random number generator.  See the URL:
+	by LavaRnd, a hardware random number generator.  See the URL:
 
-	    http://lavarand.sgi.com/index.html
+	    http://www.LavaRnd.org/
 
-	for an explanation of how the lavarand random number generator works.
+	for an explanation of how the LavaRnd random number generator works.
 	For more information, see the comments at the top of the calc
 	source file, zrandom.c.
 
@@ -354,8 +354,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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: srandom,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Id: srandom,v 29.3 2001/05/13 13:26:26 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/srandom,v $
 ##
 ## Under source code control:	1997/02/17 01:18:22

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 $
+## @(#) $Revision: 29.3 $
-## @(#) $Id: str,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $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-2003  Landon Curt Noll
-
-## Copyright (C) 1999  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License
@@ -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 $
+## @(#) $Revision: 29.5 $
-## @(#) $Id: todo,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $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
+	  -O   Use the old classic defaults instead of the default
-	       default classic defaults.  This flag as the same effect
+	       configuration.  This flag as the same effect as executing
-	       as executing config("all", "newcfg") at startup time.
+	       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
+			${CUSTOMCALDIR}/myfile
-			${CUSTOMLIBDIR}/myfile.cal
+			${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 $
+## @(#) $Revision: 29.6 $
-## @(#) $Id: usage,v 29.3 2000/06/07 14:02:33 chongo Exp $
+## @(#) $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

@@ -0,0 +1,59 @@
+NAME
+    version - return the calc version string
+
+SYNOPSIS
+    version()
+
+TYPES
+    return	string
+
+DESCRIPTION
+    Returns the calc version string.
+
+    Calc version strings can be of the form:
+
+    	x.y.z.w
+    	x.y.z
+    	x.y
+
+    where x, y, z, w, v are integers (without leading 0's) and,
+    t is the the liternal character 't'.
+
+EXAMPLE
+    > version()
+    	    "2.11.5.4"
+
+LIMITS
+    none
+
+LINK LIBRARY
+    none
+
+SEE ALSO
+    n/a
+
+## Copyright (C) 2001  Landon Curt Noll
+##
+## Calc is open software; you can redistribute it and/or modify it under
+## the terms of the version 2.1 of the GNU Lesser General Public License
+## as published by the Free Software Foundation.
+##
+## Calc is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+## or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+## Public License for more details.
+##
+## A copy of version 2.1 of the GNU Lesser General Public License is
+## distributed with calc under the filename COPYING-LGPL.  You should have
+## received a copy with calc; if not, write to Free Software Foundation, Inc.
+## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+##
+## @(#) $Revision: 29.3 $
+## @(#) $Id: 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
+## File existed as early as:	2001
+##
+## chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/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 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: hist.h,v 29.3 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $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 $
+ * @(#) $Revision: 29.6 $
- * @(#) $Id: input.c,v 29.5 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $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,11 +839,11 @@ 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,
+		    	       _fullpath(fullpathname,cip->i_name,
-			   _MAX_PATH)) == 0) {
+			       _MAX_PATH)) == 0) {
 			/* found a match */
 			return i;
 		}
@@ -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.2 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: jump.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $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
@@ -65,7 +65,13 @@
 #if !defined(__JUMP_H__)
 #define __JUMP_H__
 
-#include "have_const.h"
+
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
+# include "have_const.h"
+#else
+# include <calc/have_const.h>
+#endif
+
 
 /*
  * trivial prime CONSTants

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.2 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: label.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $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,11 @@
 #define __LABEL_H__
 
 
-#include "zmath.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
+# include "zmath.h"
+#else
+# include <calc/zmath.h>
+#endif
 
 
 #define NULL_LABEL	((LABEL *) 0)

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.6 $
+ * @(#) $Revision: 29.9 $
- * @(#) $Id: lib_calc.c,v 29.6 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $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,10 +106,10 @@ 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 */
+int abortlevel;			/* current level of aborts */
-BOOL inputwait;		/* TRUE if in a terminal input wait */
+BOOL inputwait;			/* TRUE if in a terminal input wait */
-jmp_buf jmpbuf;		/* for errors */
+jmp_buf jmpbuf;			/* for errors */
 char *program = "calc";		/* our name */
 char *base_name = "calc";	/* basename of our name */
 char cmdbuf[MAXCMD+1+1+1];	/* command line expression + "\n\0" + guard */
@@ -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() */
+	newstd.epsilon = &_qonesqbase_; /* magic to fake early str2q() */
-	oldstd.program = strdup(program);
+	newstd.program = strdup(program);
-	oldstd.base_name = strdup(base_name);
+	newstd.base_name = strdup(base_name);
-	oldstd.version = strdup(version());
+	newstd.version = strdup(version());
-	conf = config_copy(&oldstd); /* more magic to fake early str2q() */
+	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) {
+	if (use_old_std) {
-		conf = config_copy(&newstd);
-	} else {
 		conf = config_copy(&oldstd);
+	} else {
+		conf = config_copy(&newstd);
 	}
 
 	/*
@@ -753,10 +758,10 @@ calc_tty(int fd)
 		printf("calc_tty: stty -ECHO -ECHOE -ECHOK -ICANON +ISTRIP "
 		       "VMIN=1 VTIME=0: fd %d\n", fd);
 
-#elif defined (USE_SGTTY)/* assume USE_SGTTY */
+#elif defined (USE_TERMIOS)
 
 	/*
-	 * assume USE_SGTTY tty state method
+	 * USE_TERMIOS tty state method
 	 */
 	if (fd_setup[slot] < 0 && tcgetattr(fd, fd_orig+slot) < 0) {
 		if (conf->calc_debug & CALCDBG_TTY)
@@ -848,7 +853,7 @@ orig_tty(int fd)
 	if (conf->calc_debug & CALCDBG_TTY)
 		printf("orig_tty: TCSETAW restored fd %d\n", fd);
 
-#elif defined (USE_SGTTY)/* assume USE_SGTTY */
+#elif defined (USE_TERMIOS)
 
 	/*
 	 * assume USE_SGTTY tty state method

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.3 $
+ * @(#) $Revision: 29.5 $
- * @(#) $Id: math_error.h,v 29.3 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $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,11 @@
 #define __MATH_ERROR_H__
 
 
-#include "win32dll.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
+# include "win32dll.h"
+#else
+# include <calc/win32dll.h>
+#endif
 
 
 /*

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;
+}

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.3 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: opcodes.c,v 29.3 2000/07/17 15:35:49 chongo Exp $
+ * @(#) $Id: opcodes.c,v 29.4 2001/04/25 07:16:26 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/opcodes.c,v $
  *
  * Under source code control:	1990/02/15 01:48:19
@@ -3234,7 +3234,7 @@ o_quit(FUNC *fp, long index)
 	if (cp)
 		printf("%s\n", cp);
 	else if (conf->verbose_quit)
-		printf("Quit or abort executed\n");
+		printf("quit or abort executed\n");
 	if (!inputisterminal() && !strcmp(fp->f_name, "*"))
 		closeinput();
 	go = FALSE;

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.4 $
+ * @(#) $Revision: 29.6 $
- * @(#) $Id: opcodes.h,v 29.4 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $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,11 @@
 #define __OPCODES_H__
 
 
-#include "win32dll.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
+# include "win32dll.h"
+#else
+# include <calc/win32dll.h>
+#endif
 
 
 /*

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.2 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: prime.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $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,8 +33,13 @@
 #define __PRIME_H__
 
 
-#include "qmath.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
-#include "have_const.h"
+# include "qmath.h"
+# include "have_const.h"
+#else
+# include <calc/math.h>
+# include <calc/have_const.h>
+#endif
 
 
 #define MAX_MAP_PRIME ((FULL)65521)	   /* (2^16-15) larest prime in prmap */

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 $
+ * @(#) $Revision: 29.5 $
- * @(#) $Id: qfunc.c,v 29.4 2000/12/17 13:07:32 chongo Exp $
+ * @(#) $Id: qfunc.c,v 29.5 2003/01/26 19:41:35 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)
+	if (zabsrel(q->num, q->den) < 0)
-		return 0;
+		return 1;
 	if (qisint(q))
 		return 1 + zlog(q->num, base);
 	zquo(q->num, q->den, &temp, 2);

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 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: qio.c,v 29.3 2000/07/17 15:35:49 chongo Exp $
+ * @(#) $Id: qio.c,v 29.4 2002/12/29 09:20:25 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/qio.c,v $
  *
  * Under source code control:	1993/07/30 19:42:46
@@ -180,9 +180,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 +251,12 @@ qprintnum(NUMBER *q, int outmode)
 			math_error("Bad mode for print");
 			/*NOTREACHED*/
 	}
+
+	if (outmode2 != MODE2_OFF) {
+		PUTSTR(" /* ");
+		qprintnum(q, outmode2);
+		PUTSTR(" */");
+	}
 }
 
 

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.3 $
+ * @(#) $Revision: 29.5 $
- * @(#) $Id: qmath.h,v 29.3 2000/07/17 15:35:49 chongo Exp $
+ * @(#) $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,12 @@
 #define __QMATH_H__
 
 
-#include "zmath.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
+# include "zmath.h"
+#else
+# include <calc/zmath.h>
+#endif
+
 
 #define INITCONSTCOUNT 9    /* number of initnumbs[] pre-defined constants */
 

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.3 $
+ * @(#) $Revision: 29.7 $
- * @(#) $Id: quickhash.c,v 29.3 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $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 += V_MAT;
-	val = fnv(m->m_size, val);
+	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);
+		quasi_fnv(m->m_min[i], val);
-		val = fnv(m->m_max[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)
@@ -304,7 +336,7 @@ objhash(OBJECT *op, QCKHASH val)
 
 
 /*
- * randhash - return a trivial hash for an a55 state
+ * randhash - return a trivial hash for an s100 state
  *
  * given:
  *	state - state to hash
@@ -323,9 +355,11 @@ randhash(RAND *r, QCKHASH val)
 		return V_RAND+val;
 	} else {
 		/* hash control values */
-		val = fnv(r->j, V_RAND+val);
+	    	val += V_RAND;
-		val = fnv(r->k, val);
+		quasi_fnv(r->j, val);
-		val = fnv(r->bits, 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);
@@ -355,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);
 	}
@@ -381,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);
@@ -422,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
@@ -470,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;
 }
@@ -498,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;
 }
@@ -522,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;
 }
@@ -550,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;
@@ -559,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
@@ -594,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;
 }
@@ -623,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.4 $
+# @(#) $Revision: 29.17 $
-# @(#) $Id: Makefile,v 29.4 2001/03/17 21:37:54 chongo Exp $
+# @(#) $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,22 +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 to install things
+# For DJGPP, select:
 #
-# ${TOPDIR} is the directory under which the calc directory will be placed.
+#	INCDIR= /dev/env/DJDIR/include
-# ${LIBDIR} is where the *.cal, *.h, *.a, bindings and help dir are installed.
-# ${HELPDIR} is where the help directory is installed.
 #
-TOPDIR= /usr/local/lib
+# If in doubt, set:
-#TOPDIR= /usr/lib
-#TOPDIR= /usr/libdata
-#TOPDIR= /usr/contrib/lib
 #
-LIBDIR= ${TOPDIR}/calc
+#	INCDIR= /usr/include
-HELPDIR= ${LIBDIR}/help
+#
+
+#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=
 
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
@@ -266,12 +364,15 @@ CALCLIBLIST= ${C_SRC} ${H_SRC} ${MAKE_FILE} README_SAMPLE
 
 # complete list of targets
 #
-TARGETS= many_random test_random
+# NOTE: This list MUST be co-ordinated with the ${SAMPLE_TARGETS} variable
+#	in the upper level ../Makefile
+#
+SAMPLE_TARGETS= many_random test_random
+TARGETS= ${SAMPLE_TARGETS}
 
 # required vars
 #
 SHELL= /bin/sh
-MAKE_FILE= Makefile
 
 # standard tools
 #
@@ -279,6 +380,7 @@ SED= sed
 MAKEDEPEND= makedepend
 CHMOD= chmod
 SORT= sort
+CMP= cmp
 
 ##
 #
@@ -287,6 +389,7 @@ SORT= sort
 ##
 
 all: ${TARGETS} .all
+	@true
 
 test_random.o: test_random.c
 	${CC} ${CFLAGS} ${ALLOW_CUSTOM} test_random.c -c
@@ -326,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:
@@ -363,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"; \
@@ -376,27 +484,32 @@ 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
 	${Q}echo forming sample dependency list
 	${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
 	    skel/sample/makedep.out
-	${Q}cd skel/sample; ${MAKEDEPEND} -w 1 -m -f makedep.out -I.. ${C_SRC}
+	${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
@@ -404,9 +517,10 @@ depend:
 	${Q}mv Makefile Makefile.bak
 	${Q}${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile
 	${Q}echo "" >> Makefile
-	${Q}${SED} -n '3,$$p' skel/sample/makedep.out | ${SORT} -u >> Makefile
+	${Q}${SED} -n '3,$$p' skel/sample/makedep.out | \
+		LANG=C ${SORT} -u >> Makefile
 	-${Q}rm -rf skel
-	-${Q}if cmp -s Makefile.bak Makefile; then \
+	-${Q}if ${CMP} -s Makefile.bak Makefile; then \
 		echo 'sample Makefile was already up to date'; \
 		mv -f Makefile.bak Makefile; \
 	else \
@@ -421,6 +535,15 @@ depend:
 		fi; \
 	fi
 
+##
+#
+# rpm rules
+#
+##
+
+echo_inst_files: Makefile
+
+
 ##
 #
 # Utility rules
@@ -436,7 +559,9 @@ clobber:
 	rm -f .all Makefile.tmp sample
 
 # for right now we will not install anything
+#
 install: all
+	@true
 
 ##
 #
@@ -446,12 +571,11 @@ install: all
 
 # DO NOT DELETE THIS LINE
 
-
 many_random.o: ../alloc.h
 many_random.o: ../block.h
 many_random.o: ../byteswap.h
-many_random.o: ../calcerr.h
 many_random.o: ../calc.h
+many_random.o: ../calcerr.h
 many_random.o: ../cmath.h
 many_random.o: ../config.h
 many_random.o: ../endian_calc.h
@@ -464,22 +588,22 @@ many_random.o: ../have_stdlib.h
 many_random.o: ../have_string.h
 many_random.o: ../lib_util.h
 many_random.o: ../longbits.h
-many_random.o: many_random.c
 many_random.o: ../md5.h
 many_random.o: ../nametype.h
 many_random.o: ../qmath.h
-many_random.o: ../shs1.h
 many_random.o: ../shs.h
+many_random.o: ../shs1.h
 many_random.o: ../string.h
 many_random.o: ../value.h
 many_random.o: ../win32dll.h
 many_random.o: ../zmath.h
 many_random.o: ../zrandom.h
+many_random.o: many_random.c
 test_random.o: ../alloc.h
 test_random.o: ../block.h
 test_random.o: ../byteswap.h
-test_random.o: ../calcerr.h
 test_random.o: ../calc.h
+test_random.o: ../calcerr.h
 test_random.o: ../cmath.h
 test_random.o: ../config.h
 test_random.o: ../endian_calc.h
@@ -495,11 +619,11 @@ test_random.o: ../longbits.h
 test_random.o: ../md5.h
 test_random.o: ../nametype.h
 test_random.o: ../qmath.h
-test_random.o: ../shs1.h
 test_random.o: ../shs.h
+test_random.o: ../shs1.h
 test_random.o: ../string.h
-test_random.o: test_random.c
 test_random.o: ../value.h
 test_random.o: ../win32dll.h
 test_random.o: ../zmath.h
 test_random.o: ../zrandom.h
+test_random.o: test_random.c

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.4 $
+ * @(#) $Revision: 29.6 $
- * @(#) $Id: seed.c,v 29.4 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $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
@@ -31,16 +31,21 @@
 /*
  * Generate a quasi-random seed based on system and process information.
  *
- * NOTE: This is not a good source of chaotic data.  The lavarand
+ * NOTE: This is not a good source of chaotic data.  The LavaRnd
  *	 system does a much better job of that.	 See:
  *
- *		http://lavarand.sgi.com/index.html
+ *		http://www.LavaRnd.org/
  */
 
 
 #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>
@@ -270,10 +275,10 @@ hash_buf(char *buf, unsigned len)
  *
  * Generate a quasi-random seed based on system and process information.
  *
- * NOTE: This is not a good source of chaotic data.  The lavarand
+ * NOTE: This is not a good source of chaotic data.  The LavaRnd
  *	 system does a much better job of that.	 See:
  *
- *		http://lavarand.sgi.com/index.html
+ *		http://www.LavaRnd.org/
  *
  * PORTING NOTE:
  *    If when porting this code to your system and something

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.2 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: string.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $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,11 @@
 #define __CALCSTRING_H__
 
 
-#include "zmath.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
+# include "zmath.h"
+#else
+# include <calc/zmath.h>
+#endif
 
 
 struct string {

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.2 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: symbol.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $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,11 @@
 #define __SYMBOL_H__
 
 
-#include "zmath.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
+# include "zmath.h"
+#else
+# include <calc/zmath.h>
+#endif
 
 
 /*

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.2 $
+ * @(#) $Revision: 29.4 $
- * @(#) $Id: token.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $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,11 @@
 #define __TOKEN_H__
 
 
-#include "zmath.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
+# include "zmath.h"
+#else
+# include <calc/zmath.h>
+#endif
 
 
 /*

value.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 $
+ * @(#) $Revision: 29.7 $
- * @(#) $Id: value.h,v 29.5 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Id: value.h,v 29.7 2001/06/08 21:00:58 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/value.h,v $
  *
  * Under source code control:	1993/07/30 19:42:47
@@ -32,15 +32,28 @@
 #define __VALUE_H__
 
 
-#include "win32dll.h"
+#if defined(CALC_SRC)	/* if we are building from the calc source tree */
-#include "cmath.h"
+# include "win32dll.h"
-#include "config.h"
+# include "cmath.h"
-#include "shs.h"
+# include "config.h"
-#include "calcerr.h"
+# include "shs.h"
-#include "hash.h"
+# include "calcerr.h"
-#include "block.h"
+# include "hash.h"
-#include "nametype.h"
+# include "block.h"
-#include "string.h"
+# include "nametype.h"
+# include "string.h"
+#else
+# include <calc/win32dll.h>
+# include <calc/cmath.h>
+# include <calc/config.h>
+# include <calc/shs.h>
+# include <calc/calcerr.h>
+# include <calc/hash.h>
+# include <calc/block.h>
+# include <calc/nametype.h>
+# include <calc/string.h>
+#endif
+
 
 #define MAXDIM		4	/* maximum number of dimensions in matrices */
 #define USUAL_ELEMENTS	4	/* usual number of elements for objects */

version.c

@@ -1,7 +1,7 @@
 /*
  * version - determine the version of calc
  *
- * Copyright (C) 1999  David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999-2003  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.20 $
+ * @(#) $Revision: 29.48 $
- * @(#) $Id: version.c,v 29.20 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Id: version.c,v 29.48 2003/08/26 04:35:32 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $
  *
  * Under source code control:	1990/05/22 11:00:58
@@ -32,6 +32,9 @@
 
 
 #include <stdio.h>
+#include <errno.h>
+#include <string.h>
+
 #if defined(CALC_VER)
 #include <stdlib.h>
 #include <unistd.h>
@@ -42,8 +45,9 @@ static char *program;
 
 #define MAJOR_VER	2	/* major version */
 #define MINOR_VER	11	/* minor version */
-#define MAJOR_PATCH	5	/* patch level or 0 if no patch */
+#define MAJOR_PATCH	8	/* patch level or 0 if no patch */
-#define MINOR_PATCH	"1.0"	/* test number or empty string if no patch */
+#define MINOR_PATCH	1	/* test number or 0 if no minor patch */
+
 
 /*
  * calc version constants
@@ -51,7 +55,7 @@ static char *program;
 int calc_major_ver = MAJOR_VER;
 int calc_minor_ver = MINOR_VER;
 int calc_major_patch = MAJOR_PATCH;
-char *calc_minor_patch = MINOR_PATCH;
+int calc_minor_patch = MINOR_PATCH;
 
 
 /*
@@ -66,7 +70,7 @@ static char *stored_version = NULL;	/* version formed if != NULL */
 char *Copyright = "\n"
   "calc - arbitrary precision calculator\n"
   "\n"
-  "@(#) Copyright (C) 1999  David I. Bell, Landon Curt Noll and Ernest Bowen\n"
+  "@(#) Copyright (C) 2003  David I. Bell, Landon Curt Noll and Ernest Bowen\n"
   "\n"
   "Primary author:  David I. Bell\n"
   "\n"
@@ -89,13 +93,29 @@ char *Copyright = "\n"
   "\n";
 
 
+#if !defined(HAVE_SNPRINTF)
+/* Simulate snprintf with vsprintf, hoping that BUFSIZ is large enough.  */
+#include <stdarg.h>
+int
+snprintf (char *buf, size_t n, const char *fmt, ...)
+{
+  int retval;
+  va_list arg;
+
+  va_start (arg, fmt);
+  retval = vsprintf (buf, fmt, arg);
+  va_end (arg);
+  return retval;
+}
+#endif
+
 /*
  * version - return version string
  *
  * This function returns a malloced version string.  This version
  * string does not contain the title, just:
  *
- *		x.y.ztw
+ *		x.y.z.w
  *		x.y.z
  *		x.y
  */
@@ -114,15 +134,17 @@ version(void)
 	/*
 	 * form the version buffer
 	 */
-	if (sizeof(MINOR_PATCH) > 1) {
+	if (MINOR_PATCH > 0) {
-	    sprintf(verbuf,
+		snprintf(verbuf, BUFSIZ,
-		"%d.%d.%dt%s", calc_major_ver, calc_minor_ver,
+		    "%d.%d.%d.%d", calc_major_ver, calc_minor_ver,
-		 calc_major_patch, calc_minor_patch);
+		     calc_major_patch, calc_minor_patch);
 	} else if (MAJOR_PATCH > 0) {
-	    sprintf(verbuf,
+		snprintf(verbuf, BUFSIZ,
-		"%d.%d.%d", calc_major_ver, calc_minor_ver, calc_major_patch);
+		    "%d.%d.%d", calc_major_ver,
+		    calc_minor_ver, calc_major_patch);
 	} else {
-	    sprintf(verbuf, "%d.%d", calc_major_ver, calc_minor_ver);
+		snprintf(verbuf, BUFSIZ,
+		    "%d.%d", calc_major_ver, calc_minor_ver);
 	}
 
 	/*
@@ -131,7 +153,7 @@ version(void)
 	stored_version = (char *)malloc(strlen(verbuf)+1);
 	if (stored_version == NULL) {
 		fprintf(stderr, "%s: version formation value\n", program);
-		exit(2);
+		exit(1);
 	}
 	strcpy(stored_version, verbuf);
 
@@ -144,6 +166,129 @@ version(void)
 
 #if defined(CALC_VER)
 
+
+/*
+ * print_rpm_version - print just the version string, rpm style
+ *
+ * This function prints a version string, rpm style:
+ *
+ *		x.y.z.w-r
+ *		x.y.z-r
+ *		x.y-r
+ *
+ * where 'r' comes from the content of the release file.
+ */
+void
+print_rpm_version(char *release)
+{
+	FILE *file;		/* open file */
+	char buf[BUFSIZ+1];	/* release file buffer */
+	char *p;
+
+	/*
+	 * obtain the release
+	 */
+	file = fopen(release, "r");
+	if (file == NULL) {
+		fprintf(stderr, "%s: cannot open %s: %s\n",
+		    program, release, strerror(errno));
+		exit(2);
+	}
+	buf[BUFSIZ] = '\0';
+	if (fgets(buf, BUFSIZ, file) == NULL) {
+		fprintf(stderr, "%s: cannot read %s: %s\n",
+		    program, release, strerror(errno));
+		exit(3);
+	}
+	p = strchr(buf, '\n');
+	if (p != NULL) {
+		*p = '\0';
+	}
+
+	/*
+	 * form the version buffer
+	 */
+	if (MINOR_PATCH > 0) {
+		printf("%d.%d.%d.%d-%s\n", calc_major_ver, calc_minor_ver,
+				      calc_major_patch, calc_minor_patch, buf);
+	} else if (MAJOR_PATCH > 0) {
+		printf("%d.%d.%d-%s\n", calc_major_ver, calc_minor_ver,
+				     calc_major_patch, buf);
+	} else {
+		printf("%d.%d-%s\n", calc_major_ver, calc_minor_ver, buf);
+	}
+	return;
+}
+
+
+/*
+ * print_rpm_major - print just the major part version string
+ *
+ * This function prints the major part version string:
+ *
+ *		x.y.z
+ *		x.y
+ */
+void
+print_rpm_major(void)
+{
+	/*
+	 * form the version buffer
+	 */
+	if (MAJOR_PATCH > 0) {
+		printf("%d.%d.%d\n", calc_major_ver, calc_minor_ver,
+				     calc_major_patch);
+	} else {
+		printf("%d.%d\n", calc_major_ver, calc_minor_ver);
+	}
+	return;
+}
+
+
+/*
+ * print_rpm_release - print just the rpm release
+ *
+ * This function prints the rpm release:
+ *
+ *		r
+ *
+ * where 'r' comes from the content of the release file.
+ */
+void
+print_rpm_release(char *release)
+{
+	FILE *file;		/* open file */
+	char buf[BUFSIZ+1];	/* release file buffer */
+	char *p;
+
+	/*
+	 * obtain the release
+	 */
+	file = fopen(release, "r");
+	if (file == NULL) {
+		fprintf(stderr, "%s: cannot open %s: %s\n",
+		    program, release, strerror(errno));
+		exit(2);
+	}
+	buf[BUFSIZ] = '\0';
+	if (fgets(buf, BUFSIZ, file) == NULL) {
+		fprintf(stderr, "%s: cannot read %s: %s\n",
+		    program, release, strerror(errno));
+		exit(3);
+	}
+	p = strchr(buf, '\n');
+	if (p != NULL) {
+		*p = '\0';
+	}
+
+	/*
+	 * form the version buffer
+	 */
+	printf("%s\n", buf);
+	return;
+}
+
+
 /*
  * version - print the calc version
  */
@@ -151,9 +296,26 @@ version(void)
 int
 main(int argc, char *argv[])
 {
-    program = argv[0];
+	program = argv[0];
-    printf("%s\n", version());
+	if (argc == 3 && strcmp(argv[1], "-r") == 0) {
-    return 0;
+		print_rpm_version(argv[2]);
+
+	} else if (argc == 3 && strcmp(argv[1], "-R") == 0) {
+		print_rpm_release(argv[2]);
+
+	} else if (argc == 2 && strcmp(argv[1], "-V") == 0) {
+		print_rpm_major();
+
+	} else if (argc == 1) {
+		printf("%s\n", version());
+
+	} else {
+		fprintf(stderr,
+		    "usage: %s [-V] [-R release_file] [-r release_file]\n",
+		    program);
+		exit(4);
+	}
+	return 0;
 }
 
 #endif /* CALC_VER */

win32.mkdef

@@ -0,0 +1,58 @@
+TERMCONTROL=-DUSE_WIN32
+HAVE_VSPRINTF=-UDONT_HAVE_VSPRINTF
+BYTE_ORDER=-DLITTLE_ENDIAN
+LONG_BITS=32
+LONGLONG_BITS=0
+HAVE_FPOS=-DHAVE_NO_FPOS
+HAVE_FPOS_POS=-DHAVE_NO_FPOS_POS
+FPOS_POS_BITS=-UFPOS_POS_BITS
+FPOS_BITS=-DFPOS_BITS=64
+OFF_T_BITS=-DOFF_T_BITS=32
+DEV_BITS=-DDEV_BITS=32
+INODE_BITS=-DINODE_BITS=16
+HAVE_OFFSCL=-UOFF_T_NON_SCALAR
+HAVE_POSSCL=-UFILEPOS_NON_SCALAR
+HAVE_CONST=-UHAVE_NO_CONST
+HAVE_UID_T=-DHAVE_NO_UID_T
+HAVE_NEWSTR=-UHAVE_NO_NEWSTR
+HAVE_MEMMOVE=-UHAVE_NO_MEMMOVE
+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
+HAVE_GETRUSAGE=-DHAVE_NO_GETRUSAGE
+HAVE_STRDUP=-UHAVE_NO_STRDUP
+ALIGN32=-UMUST_ALIGN32
+HAVE_MALLOC_H=YES
+HAVE_STDLIB_H=YES
+HAVE_STRING_H=YES
+HAVE_TIMES_H=NO
+HAVE_SYS_TIMES_H=NO
+HAVE_TIME_H=YES
+HAVE_SYS_TIME_H=NO
+HAVE_UNISTD_H=NO
+
+LIBDIR=/lib/calc
+HELPDIR=/lib/calc/help
+CALC_INCDIR=/include/calc
+CUSTOMCALDIR=/lib/calc/custom
+CUSTOMHELPDIR=/lib/calc/help/custhelp
+SCRIPTDIR=/lib/calc/cscript
+MANDIR=
+CATDIR=
+MANEXT=
+CATEXT=
+NROFF=
+NROFF_ARG=
+MANMAKE=
+MANMODE=
+CALCPATH=./cal
+CALCRC='/lib/calc/startup:~/.calcrc:./.calcinit'
+USE_READLINE=
+READLINE_LIB=
+READLINE_INCLUDE=
+CALCPAGER=
+
+ECHO=

win32/align32.h

@@ -0,0 +1,15 @@
+/*
+ * DO NOT EDIT -- generated by the Makefile
+ */
+
+
+#if !defined(__MUST_ALIGN32_H__)
+#define __MUST_ALIGN32_H__
+
+
+/* must we always align 32 bit accesses? */
+/* forced to not require 32 bit alignment */
+#undef MUST_ALIGN32
+
+
+#endif /* !__MUST_ALIGN32_H__ */

win32/args.h

@@ -0,0 +1,18 @@
+/*
+ * DO NOT EDIT -- generated by the Makefile
+ */
+
+
+#if !defined(__ARGS_H__)
+#define __ARGS_H__
+
+
+/* what type of variable args do we have? */
+#define STDARG /* use <stdarg.h> */
+#include <stdarg.h>
+
+/* should we use vsprintf()? */
+#define HAVE_VS /* yes */
+
+
+#endif /* !__ARGS_H__ */