Release calc version 2.11.0t8.3

BUGS

@@ -20,11 +20,11 @@ configuration, try backing them out and see if things get better.
 
 To be sure that your version of calc is up to date, check out:
 
-	http://reality.sgi.com/chongo/calc/calc-download.html
+	http://reality.sgi.com/chongo/tech/comp/calc/calc-download.html
 
 The calc web site is located at:
 
-	http://reality.sgi.com/chongo/calc
+	http://reality.sgi.com/chongo/tech/comp/calc
 
 =-=
 
@@ -46,7 +46,7 @@ When you send your report, please include the following information:
 
     * the type of compiler you were using
 
-    * any compiler warnings or erros that you saw
+    * any compiler warnings or errors that you saw
 
     * cd to the calc source directory, and type:
 
@@ -66,14 +66,42 @@ importantly, fixes (in the form of a context diff patch) to:
 
 =-=
 
-Known problems or mis-features:
+Known bugs:
 
-    * Many of and SEE ALSO sections of help files
-      for builtins are either inconsistent or missing information.
+    None reported.  We are sure some bugs exist.  When you find them,
+    please let us know!  See the above for details on how to report and
+    were to EMail your bug reports and hopefully patches to fix them.
 
-    * Many of the LIBRARY sections are incorrect now that libcalc.a
-      contains most of the calc system.
+=-=
 
-    * There is some places in the source with obscure variable names
-      and not much in the way of comments.  We need some major cleanup
-      and documentation.
+Calc Mis-features:
+
+    * The following shell command (written in sh,ksh,bash-like form) works:
+
+	    calc '/*
+		   * comment
+		   */
+		  print 2+3;'
+
+      However this (also written in sh,ksh,bash-like form) does not work:
+
+	    echo '/*
+		   * comment
+		   */
+		  print 2+3;' | calc
+
+      The 2nd example will result in an 'Unterminated comment' error.
+
+    * Calc does not support the #! exec method.  For example of the
+      following is placed in an executable file (assume the path to
+      calc is correct) called /tmp/xyzzy:
+
+	    #!/usr/local/bin/calc
+	    /*
+	     * comment
+	     */
+	    print 2+3;
+
+      Will result in '"tmp" is undefined' and '"xyzzy" is undefined'
+      error messages because calc considers $0 as an expression to
+      evaluate.

CHANGES

@@ -1,4 +1,57 @@
-Following is the change from calc version 2.11.0t7 to date:
+Following is the change from calc version 2.11.0t8 to date:
+
+    Moved 'wishlist' enhancements from the help/todo file to a new
+    help/wishlist file.  Ordered, by priority, help/todo items into
+    Very High, High and Medium priority items.
+
+    The BUGS file now has a 'bugs' section as well as a 'mis-features'
+    section.
+
+    Improved how calc internally dealt with reading EOF or '\0' characters.
+
+    Calc now allows multiple defines to occur on the same line:
+    (Thanks goes to Ernest Bowen <ernie@turing.une.edu.au>)
+
+	define f8300(x) = x^2; define g8300(x) = 1 - x;
+
+    Improved calc's ability to deal with and recover from errors.
+
+    Added inputlevel() builtin to return the input processing level.
+    In an interact mode, inputlevel() returns 0.  When directly reading
+    a calc script, inputlevel() returns 1.  When reading a script which
+    in turn reads another script, inputlevel() returns 2.  etc...
+
+    If $CALCRC has more than one file as in file1:file2 and an error
+    occurs in file1, then calc -c will not read file2.
+
+    Fixed some of the old EMail addresses found in calc documentation.
+
+    Added HAVE_USTAT, HAVE_GETSID, HAVE_GETPGID, HAVE_GETTIME, HAVE_GETPRID
+    and HAVE_URANDOM symbols to the Makefile.  These symbols, along with
+    have_ustat.c, have_getsid.c, have_getpgid.c, have_gettime.c and
+    have_getprid.c form: have_ustat.h, have_getsid.h, have_getpgid.h,
+    have_gettime.h, have_getprid.h and have_urandom.h which in turn
+    are used by pseudo_seed() in seed.c to determine what types of
+    system services can be used to form a pseudo-random seed.
+
+    Fixed the way calc -c will continue processing $CALCRC when errors
+    are encountered.  Unless -d is also given, calc -c will report
+    when calc is unable to open a $CALCRC file.
+
+    Fixed the lower level make depend rules.
+
+    Misc cleanup on the have_*.c support source files.
+
+    Misc source file cleanup for things such as } else { style consistency.
+
+    Fixed the basis for FNV-1 hashes.  Piror to this fix, the hash()
+    builtin produced FNV hash values that did not match the FNV-1
+    algorithm as specified in:
+
+	http://reality.sgi.com/chongo/tech/comp/fnv/index.html
+
+
+Following is the change from calc version 2.11.0t7 to 2.11.0t7.5:
 
     Calc has some new command line flags / command line meaning:
     (Thanks goes to Ernest Bowen <ernie@turing.une.edu.au>)
@@ -110,15 +163,40 @@ Following is the change from calc version 2.11.0t7 to date:
 
 	calc -p 2+17 | whey
 
-     will write '19' instead of '\t17' to the whey command.
+    will write '19' instead of '\t19' to the whey command.
 
-     Updated calc man page and help/usage file to reflect recent
-     command line changes.
+    Updated calc man page and help/usage file to reflect recent
+    command line changes.
 
-     Converted start_done into a general calc run state enum called
-     run_state within the calc source.
+    Converted start_done into a general calc run state enum called
+    run_state within the calc source.
 
-     Misc calc man page fixes.
+    Removed README.OLD.
+
+    Added the Makefile variable ${LCC} to invoke the local c compiler.
+    By default, ${CC} also run the ${LCC} compiler.  The distinction is
+    useful when using something such as purify.  In the case of ${LCC},
+    only the local C compiler is invoked.  In the case of ${CC} a purify
+    compile is invoked.  Only the source that must be compiled and run
+    on the local machine use ${LCC}; everything else uses ${CC}.
+
+    Fixed memory buffer ovreread problem in eatstring() in token.c.
+
+    Fixed memory leaks related to putenv().
+
+    Fixed memory leaks realted to srandom().
+
+    Fixed compilation warnings and problems on BSDI.
+
+    Removed ${CCMAIN} as a variable from the Makefile.  Now files
+    use either ${CFLAGS} for general C source and ${ICFLAGS} for
+    intermediate C source (e.g., special code for building hsrc files).
+
+    The main calc URL is now:
+
+	http://reality.sgi.com/chongo/tech/comp/calc
+
+    Misc calc man page fixes.
 
 
 Following is the change from calc version 2.11.0t1 to 2.11.0t6.3:
@@ -3694,9 +3772,6 @@ Following is the change from calc version 2.9.3t8 to 2.9.3t9.2:
 
 Following is the change from calc version 2.9.3t7 to 2.9.3t7:
 
-    WARNING: This patch is an beta test patch by chongo@toad.com
-	     (Landon Curt Noll).
-
     The 'show' command by itself will issue an error message
     that will remind one of the possible show arguments.
     (thanks to Ha S. Lam <hl@kuhep4.phsx.ukans.edu>)
@@ -3744,9 +3819,6 @@ Following is the change from calc version 2.9.3t7 to 2.9.3t7:
 
 Following is the change from calc version 2.9.2 to 2.9.3t7:
 
-    WARNING: This patch is an beta test patch by chongo@toad.com
-	     (Landon Curt Noll).
-
     Calc can now compile on OSF/1, SGI and IBM RS6000 systems.
 
     A number of systems that have both <varargs.h> and <stdarg.h> do

Makefile

@@ -106,7 +106,7 @@ LONGLONG_BITS=
 # to determine if there is are fgetpos and fsetpos functions.  If HAVE_FPOS
 # is set to -DHAVE_NO_FPOS, then calc will use ftell() and fseek().
 #
-# If in doubt, leave HAVE_FPOS empty.
+# If in doubt, leave HAVE_FPOS empty and this Makefile will figure it out.
 #
 HAVE_FPOS=
 #HAVE_FPOS= -DHAVE_NO_FPOS
@@ -120,7 +120,7 @@ HAVE_FPOS=
 # -DOFF_T_NON_SCALAR when calc will assume that off_t some sort of
 # union or struct which.
 #
-# If in doubt, leave HAVE_OFFSCL empty.
+# If in doubt, leave HAVE_OFFSCL empty and this Makefile will figure it out.
 #
 HAVE_OFFSCL=
 #HAVE_OFFSCL= -DOFF_T_NON_SCALAR
@@ -136,7 +136,7 @@ HAVE_OFFSCL=
 # -DFILEPOS_NON_SCALAR when calc will assume that fpos_t exists and is
 # some sort of union or struct which.
 #
-# If in doubt, leave HAVE_POSSCL empty.
+# If in doubt, leave HAVE_POSSCL empty and this Makefile will figure it out.
 #
 HAVE_POSSCL=
 #HAVE_POSSCL= -DFILEPOS_NON_SCALAR
@@ -147,7 +147,7 @@ HAVE_POSSCL=
 # to determine if const is supported.  If HAVE_CONST is set to -DHAVE_NO_CONST,
 # then calc will not use const.
 #
-# If in doubt, leave HAVE_CONST empty.
+# If in doubt, leave HAVE_CONST empty and this Makefile will figure it out.
 #
 HAVE_CONST=
 #HAVE_CONST= -DHAVE_NO_CONST
@@ -159,7 +159,7 @@ HAVE_CONST=
 # then calc will treat uid_t as an unsigned short.  This only matters if
 # $HOME is not set and calc must look up the home directory in /etc/passwd.
 #
-# If in doubt, leave HAVE_UID_T empty.
+# If in doubt, leave HAVE_UID_T empty and this Makefile will figure it out.
 #
 HAVE_UID_T=
 #HAVE_UID_T= -DHAVE_NO_UID_T
@@ -172,7 +172,7 @@ HAVE_UID_T=
 # of memcpy(), use bfill() instead of memset(), and use index() instead of
 # strchr().
 #
-# If in doubt, leave HAVE_NEWSTR empty.
+# If in doubt, leave HAVE_NEWSTR empty and this Makefile will figure it out.
 #
 HAVE_NEWSTR=
 #HAVE_NEWSTR= -DHAVE_NO_NEWSTR
@@ -184,11 +184,83 @@ HAVE_NEWSTR=
 # -DHAVE_NO_MEMMOVE, then calc will use internal functions to simulate
 # the memory move function that does correct overlapping memory modes.
 #
-# If in doubt, leave HAVE_MEMMOVE empty.
+# If in doubt, leave HAVE_MEMMOVE empty and this Makefile will figure it out.
 #
 HAVE_MEMMOVE=
 #HAVE_MEMMOVE= -DHAVE_NO_MEMMOVE
 
+# Determine if we have ustat()
+#
+# If HAVE_USTAT is empty, this makefile will run the have_memmv program
+# to determine if ustat() is supported.  If HAVE_USTAT is set to
+# -DHAVE_NO_USTAT, then calc will use internal functions to simulate
+# the memory move function that does correct overlapping memory modes.
+#
+# If in doubt, leave HAVE_USTAT empty and this Makefile will figure it out.
+#
+HAVE_USTAT=
+#HAVE_USTAT= -DHAVE_NO_USTAT
+
+# Determine if we have getsid()
+#
+# If HAVE_GETSID is empty, this makefile will run the have_memmv program
+# to determine if getsid() is supported.  If HAVE_GETSID is set to
+# -DHAVE_NO_GETSID, then calc will use internal functions to simulate
+# the memory move function that does correct overlapping memory modes.
+#
+# If in doubt, leave HAVE_GETSID empty and this Makefile will figure it out.
+#
+HAVE_GETSID=
+#HAVE_GETSID= -DHAVE_NO_GETSID
+
+# Determine if we have getpgid()
+#
+# If HAVE_GETPGID is empty, this makefile will run the have_memmv program
+# to determine if getpgid() is supported.  If HAVE_GETPGID is set to
+# -DHAVE_NO_GETPGID, then calc will use internal functions to simulate
+# the memory move function that does correct overlapping memory modes.
+#
+# If in doubt, leave HAVE_GETPGID empty and this Makefile will figure it out.
+#
+HAVE_GETPGID=
+#HAVE_GETPGID= -DHAVE_NO_GETPGID
+
+# Determine if we have clock_gettime()
+#
+# If HAVE_GETTIME is empty, this makefile will run the have_memmv program
+# to determine if clock_gettime() is supported.  If HAVE_GETTIME is set to
+# -DHAVE_NO_GETTIME, then calc will use internal functions to simulate
+# the memory move function that does correct overlapping memory modes.
+#
+# If in doubt, leave HAVE_GETTIME empty and this Makefile will figure it out.
+#
+HAVE_GETTIME=
+#HAVE_GETTIME= -DHAVE_NO_GETTIME
+
+# Determine if we have getprid()
+#
+# If HAVE_GETPRID is empty, this makefile will run the have_memmv program
+# to determine if getprid() is supported.  If HAVE_GETPRID is set to
+# -DHAVE_NO_GETPRID, then calc will use internal functions to simulate
+# the memory move function that does correct overlapping memory modes.
+#
+# If in doubt, leave HAVE_GETPRID empty and this Makefile will figure it out.
+#
+HAVE_GETPRID=
+#HAVE_GETPRID= -DHAVE_NO_GETPRID
+
+# Determine if we have /dev/urandom
+#
+# If HAVE_URANDOM is empty, this makefile will run the have_memmv program
+# to determine if /dev/urandom is supported.  If HAVE_URANDOM is set to
+# -DHAVE_NO_URANDOM, then calc will use internal functions to simulate
+# the memory move function that does correct overlapping memory modes.
+#
+# If in doubt, leave HAVE_URANDOM empty and this Makefile will figure it out.
+#
+HAVE_URANDOM=
+#HAVE_URANDOM= -DHAVE_NO_URANDOM
+
 # Some architectures such as Sparc do not allow one to access 32 bit values
 # that are not alligned on a 32 bit boundary.
 #
@@ -352,7 +424,7 @@ CALCPAGER= more
 #CALCPAGER= cat
 #CALCPAGER= less
 
-# Debug/Optimize options for ${CC}
+# Debug/Optimize options for ${CC} and ${LCC}
 #
 #DEBUG= -O
 #DEBUG= -O -g
@@ -393,7 +465,7 @@ NO_SHARED=
 #NO_SHARED= -non_shared
 
 # On some systems where you are disabling dynamic shared libs, you may
-# need to pass a special flag to ${CC} during linking stage.
+# need to pass a special flag to ${CC} and ${LCC} during linking stage.
 #
 #    System type    			    NO_SHARED recommendation
 #
@@ -516,13 +588,12 @@ ALLOW_CUSTOM= -DCUSTOM
 # CFLAGS are all flags given to ${CC} [[often includes CCOPT, CCWARN, CCMISC]]
 # ICFLAGS are given to ${CC} for intermediate progs
 #
-# CCMAIN are flags for ${CC} when files with main() instead of CFLAGS
-#
 # LCFLAGS are CC-style flags for ${LINT}
 # LDFLAGS are flags given to ${CC} for linking .o files
 # ILDFLAGS are flags given to ${CC} for linking .o files for intermediate progs
 #
-# CC is how the the C compiler is invoked
+# LCC how the the C compiler is invoked on locally executed intermediate progs
+# CC is how the the C compiler is invoked (with an optional Purify)
 #
 ###
 #
@@ -540,13 +611,12 @@ CCMISC=
 CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 ICFLAGS= ${CCWARN} ${CCMISC}
 #
-CCMAIN= ${ICFLAGS}
-#
 LCFLAGS=
 LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 ILDFLAGS=
 #
-CC= ${PURIFY} gcc
+LCC= gcc
+CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -562,14 +632,13 @@ CC= ${PURIFY} gcc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS}
-#
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} gcc
-#CC= ${PURIFY} gcc2
+#LCC= gcc
+#LCC= gcc2
+#CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -582,13 +651,12 @@ CC= ${PURIFY} gcc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS}
-#
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} cc
+#LCC= cc
+#CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -613,13 +681,12 @@ CC= ${PURIFY} gcc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS}
-#
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} cc -n32 -xansi
+#LCC= cc -n32 -xansi
+#CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -638,13 +705,12 @@ CC= ${PURIFY} gcc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS}
-#
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} cc
+#LCC= cc
+#CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -657,13 +723,12 @@ CC= ${PURIFY} gcc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS}
-#
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} cc
+#LCC= cc
+#CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -682,13 +747,12 @@ CC= ${PURIFY} gcc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS}
-#
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} cc
+#LCC= cc
+#CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -702,15 +766,14 @@ CC= ${PURIFY} gcc
 #CCMISC=
 #
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= ${CCWARN} ${CCMISC}
-#
-#CCMAIN= ${ICFLAGS}
+#ICFLAGS= ${CCWARN} ${CCMISC} -Wno-unused
 #
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} gcc
+#LCC= gcc
+#CC= ${PURIFY} ${LCC}
 #
 ###
 #
@@ -724,15 +787,14 @@ CC= ${PURIFY} gcc
 #CCMISC=
 #
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= ${CCWARN} ${CCMISC}
-#
-#CCMAIN= ${ICFLAGS}
+#ICFLAGS= ${CCWARN} ${CCMISC} -Wno-unused
 #
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} cc
+#LCC= cc
+#CC= ${PURIFY} ${LCC}
 
 ##############################################################################
 #-=-=-=-=-=-=-=-=- Be careful if you change something below -=-=-=-=-=-=-=-=-#
@@ -819,7 +881,9 @@ BUILD_H_SRC= align32.h args.h calcerr.h conf.h endian_calc.h \
 	fposval.h have_const.h have_fpos.h have_malloc.h \
 	have_memmv.h have_newstr.h have_offscl.h have_posscl.h \
 	have_stdlib.h have_string.h have_times.h have_uid_t.h \
-	have_unistd.h longbits.h longlong.h terminal.h calc_errno.h
+	have_unistd.h longbits.h longlong.h terminal.h calc_errno.h \
+	have_ustat.h have_getsid.h have_getpgid.h \
+	have_gettime.h have_getprid.h have_urandom.h
 
 # we build these .c files during the make
 #
@@ -831,7 +895,9 @@ BUILD_C_SRC= calcerr.c
 #
 UTIL_C_SRC= align32.c endian.c longbits.c have_newstr.c have_uid_t.c \
 	have_const.c have_stdvs.c have_varvs.c fposval.c have_fpos.c \
-	longlong.c have_offscl.c have_posscl.c have_memmv.c calc_errno.c
+	longlong.c have_offscl.c have_posscl.c have_memmv.c calc_errno.c \
+	have_ustat.c have_getsid.c have_getpgid.c \
+	have_gettime.c have_getprid.c
 
 # these awk and sed tools are used in the process of building BUILD_H_SRC
 # and BUILD_C_SRC
@@ -845,17 +911,22 @@ UTIL_MISC_SRC= calcerr_h.sed calcerr_h.awk calcerr_c.sed calcerr_c.awk \
 #
 UTIL_OBJS= endian.o longbits.o have_newstr.o have_uid_t.o \
 	have_const.o fposval.o have_fpos.o longlong.o try_strarg.o \
-	have_stdvs.o have_varvs.o have_posscl.o have_memmv.o calc_errno.o
+	have_stdvs.o have_varvs.o have_posscl.o have_memmv.o calc_errno.o \
+	have_ustat.o have_getsid.o have_getpgid.o \
+	have_gettime.o have_getprid.o
 
-# these temp files may be created  (and removed) during the build of BUILD_C_SRC
+# these temp files may be created (and removed) during the build of BUILD_C_SRC
 #
 UTIL_TMP= ll_tmp fpos_tmp fposv_tmp const_tmp uid_tmp newstr_tmp vs_tmp \
-	calc_errno_tmp
+	calc_errno_tmp memmv_tmp offscl_tmp posscl_tmp newstr_tmp \
+	getsid_tmp gettime_tmp getprid_tmp
 
 # these utility progs may be used in the process of building BUILD_H_SRC
 #
 UTIL_PROGS= align32 fposval have_uid_t longlong have_const \
-	endian longbits have_newstr have_stdvs have_varvs calc_errno
+	endian longbits have_newstr have_stdvs have_varvs calc_errno \
+	have_ustat have_getsid have_getpgid \
+	have_gettime have_getprid
 
 # These files are required by the regress.cal regression test.
 #
@@ -887,6 +958,7 @@ CUSTOM_PASSDOWN= Q="${Q}" \
     LCFLAGS="${LCFLAGS}" \
     LDFLAGS="${LDFLAGS}" \
     ILDFLAGS="${ILDFLAGS}" \
+    LCC="${LCC}" \
     CC="${CC}" \
     MAKE_FILE=${MAKE_FILE} \
     SED=${SED} \
@@ -909,11 +981,11 @@ SAMPLE_PASSDOWN= Q="${Q}" \
     CCMISC="${CCMISC}" \
     CFLAGS="${CFLAGS} ${ALLOW_CUSTOM}" \
     ICFLAGS="${ICFLAGS}" \
-    CCMAIN="${CCMAIN}" \
     LCFLAGS="${LCFLAGS}" \
     LDFLAGS="${LDFLAGS}" \
     ILDFLAGS="${ILDFLAGS}" \
     CALC_LIBS="../libcalc.a ../custom/libcustcalc.a" \
+    LCC="${LCC}" \
     CC="${CC}" \
     MAKE_FILE=${MAKE_FILE} \
     SED=${SED} \
@@ -931,7 +1003,7 @@ C_SRC= ${LIBSRC} ${CALCSRC} ${UTIL_C_SRC}
 # These files are found (but not built) in the distribution
 #
 DISTLIST= ${C_SRC} ${H_SRC} ${MAKE_FILE} BUGS CHANGES LIBRARY README \
-	calc.man lint.sed README.OLD HOWTO.INSTALL ${UTIL_MISC_SRC}
+	calc.man lint.sed HOWTO.INSTALL ${UTIL_MISC_SRC}
 
 # complete list of .o files
 #
@@ -981,7 +1053,7 @@ calc.1: calc.man ${MAKE_FILE}
 ##
 
 calc.o: calc.c ${MAKE_FILE}
-	${CC} ${CCMAIN} ${CCOPT} ${ALLOW_CUSTOM} -c calc.c
+	${CC} ${CFLAGS} ${CCOPT} ${ALLOW_CUSTOM} -c calc.c
 
 custom.o: custom.c ${MAKE_FILE}
 	${CC} ${CFLAGS} ${ALLOW_CUSTOM} -c custom.c
@@ -1379,8 +1451,8 @@ longlong.h: longlong.c have_stdlib.h have_string.h ${MAKE_FILE}
 	${Q}echo '' >> longlong.h
 	${Q}echo '/* do we have/want to use a long long type? */' >> longlong.h
 	-${Q}rm -f longlong.o longlong
-	-${Q}${CC} ${CCMAIN} longlong.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} longlong.o -o longlong 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} longlong.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} longlong.o -o longlong 2>/dev/null; true
 	-${Q}${SHELL} -c "./longlong ${LONGLONG_BITS} > ll_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	-${Q}if [ -s ll_tmp ]; then \
@@ -1418,8 +1490,8 @@ have_fpos.h: have_fpos.c ${MAKE_FILE}
 	${Q}echo '' >> have_fpos.h
 	${Q}echo '/* do we have fgetpos & fsetpos functions? */' >> have_fpos.h
 	-${Q}rm -f have_fpos.o have_fpos
-	-${Q}${CC} ${HAVE_FPOS} ${CCMAIN} have_fpos.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_fpos.o -o have_fpos 2>/dev/null; true
+	-${Q}${LCC} ${HAVE_FPOS} ${ICFLAGS} have_fpos.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_fpos.o -o have_fpos 2>/dev/null; true
 	-${Q}${SHELL} -c "./have_fpos > fpos_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	-${Q}if [ -s fpos_tmp ]; then \
@@ -1459,8 +1531,8 @@ fposval.h: fposval.c have_fpos.h have_offscl.h have_posscl.h \
 	${Q}echo '' >> fposval.h
 	${Q}echo '/* what are our file position & size types? */' >> fposval.h
 	-${Q}rm -f fposval.o fposval
-	-${Q}${CC} ${CCMAIN} fposval.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} fposval.o -o fposval 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} fposval.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} fposval.o -o fposval 2>/dev/null; true
 	${Q}${SHELL} -c "./fposval fposv_tmp >> fposval.h 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	${Q}echo '' >> fposval.h
@@ -1492,8 +1564,8 @@ have_const.h: have_const.c ${MAKE_FILE}
 	${Q}echo '' >> have_const.h
 	${Q}echo '/* do we have or want const? */' >> have_const.h
 	-${Q}rm -f have_const.o have_const
-	-${Q}${CC} ${CCMAIN} ${HAVE_CONST} have_const.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_const.o -o have_const 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_CONST} have_const.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_const.o -o have_const 2>/dev/null; true
 	-${Q}${SHELL} -c "./have_const > const_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	-${Q}if [ -s const_tmp ]; then \
@@ -1531,8 +1603,8 @@ have_offscl.h: have_offscl.c ${MAKE_FILE}
 	${Q}echo '' >> have_offscl.h
 	${Q}echo '' >> have_offscl.h
 	-${Q}rm -f have_offscl.o have_offscl
-	-${Q}${CC} ${CCMAIN} ${HAVE_OFFSCL} have_offscl.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_offscl.o -o have_offscl 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_OFFSCL} have_offscl.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_offscl.o -o have_offscl 2>/dev/null; true
 	-${Q}${SHELL} -c "./have_offscl > offscl_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	-${Q}if [ -s offscl_tmp ]; then \
@@ -1569,8 +1641,8 @@ have_posscl.h: have_posscl.c have_fpos.h ${MAKE_FILE}
 	${Q}echo '' >> have_posscl.h
 	${Q}echo '' >> have_posscl.h
 	-${Q}rm -f have_posscl.o have_posscl
-	-${Q}${CC} ${CCMAIN} ${HAVE_POSSCL} have_posscl.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_posscl.o -o have_posscl 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_POSSCL} have_posscl.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_posscl.o -o have_posscl 2>/dev/null; true
 	-${Q}${SHELL} -c "./have_posscl > posscl_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	-${Q}if [ -s posscl_tmp ]; then \
@@ -1621,8 +1693,8 @@ align32.h: align32.c longbits.h have_unistd.h ${MAKE_FILE}
 	fi
 	-${Q}if [ X = X${ALIGN32} ]; then \
 	    rm -f align32.o align32; \
-	    ${CC} ${CCMAIN} ${ALIGN32} align32.c -c 2>/dev/null; \
-	    ${CC} ${ILDFLAGS} align32.o -o align32 2>/dev/null; \
+	    ${LCC} ${ICFLAGS} ${ALIGN32} align32.c -c 2>/dev/null; \
+	    ${LCC} ${ILDFLAGS} align32.o -o align32 2>/dev/null; \
 	    ${SHELL} -c "./align32 >align32_tmp 2>/dev/null" >/dev/null 2>&1; \
 	    if [ -s align32_tmp ]; then \
 		cat align32_tmp >> align32.h; \
@@ -1662,8 +1734,8 @@ have_uid_t.h: have_uid_t.c have_unistd.h ${MAKE_FILE}
 	${Q}echo '' >> have_uid_t.h
 	${Q}echo '/* do we have or want uid_t? */' >> have_uid_t.h
 	-${Q}rm -f have_uid_t.o have_uid_t
-	-${Q}${CC} ${CCMAIN} ${HAVE_UID_T} have_uid_t.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_uid_t.o -o have_uid_t 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_UID_T} have_uid_t.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_uid_t.o -o have_uid_t 2>/dev/null; true
 	-${Q}${SHELL} -c "./have_uid_t > uid_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	-${Q}if [ -s uid_tmp ]; then \
@@ -1701,8 +1773,8 @@ have_newstr.h: have_newstr.c ${MAKE_FILE}
 	${Q}echo '/* do we have or want memcpy(), memset() & strchr()? */' \
 							>> have_newstr.h
 	-${Q}rm -f have_newstr.o have_newstr
-	-${Q}${CC} ${CCMAIN} ${HAVE_NEWSTR} have_newstr.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_newstr.o -o have_newstr 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_NEWSTR} have_newstr.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_newstr.o -o have_newstr 2>/dev/null; true
 	-${Q}${SHELL} -c "./have_newstr > newstr_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
 	-${Q}if [ -s newstr_tmp ]; then \
@@ -1726,7 +1798,7 @@ have_newstr.h: have_newstr.c ${MAKE_FILE}
 	fi
 
 have_memmv.h: have_memmv.c ${MAKE_FILE}
-	-${Q}rm -f have_memmv have_memmv.o newstr_tmp have_memmv.h
+	-${Q}rm -f have_memmv have_memmv.o memmv_tmp have_memmv.h
 	${Q}echo 'forming have_memmv.h'
 	${Q}echo '/*' > have_memmv.h
 	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_memmv.h
@@ -1739,19 +1811,19 @@ have_memmv.h: have_memmv.c ${MAKE_FILE}
 	${Q}echo '' >> have_memmv.h
 	${Q}echo '/* do we have or want memmove()? */' >> have_memmv.h
 	-${Q}rm -f have_memmv.o have_memmv
-	-${Q}${CC} ${CCMAIN} ${HAVE_MEMMOVE} have_memmv.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_memmv.o -o have_memmv 2>/dev/null; true
-	-${Q}${SHELL} -c "./have_memmv > newstr_tmp 2>/dev/null" \
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_MEMMOVE} have_memmv.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_memmv.o -o have_memmv 2>/dev/null; true
+	-${Q}${SHELL} -c "./have_memmv > memmv_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s newstr_tmp ]; then \
-	    cat newstr_tmp >> have_memmv.h; \
+	-${Q}if [ -s memmv_tmp ]; then \
+	    cat memmv_tmp >> have_memmv.h; \
 	else \
 	    echo '#undef HAVE_MEMMOVE /* no */' >> have_memmv.h; \
 	fi
 	${Q}echo '' >> have_memmv.h
 	${Q}echo '' >> have_memmv.h
 	${Q}echo '#endif /* !__HAVE_MEMMV_H__ */' >> have_memmv.h
-	-${Q}rm -f have_memmv have_memmv.o newstr_tmp
+	-${Q}rm -f have_memmv have_memmv.o memmv_tmp
 	${Q}echo 'have_memmv.h formed'
 	-@if [ -z "${Q}" ]; then \
 	    echo ''; \
@@ -1763,6 +1835,231 @@ have_memmv.h: have_memmv.c ${MAKE_FILE}
 	    true; \
 	fi
 
+have_ustat.h: have_ustat.c ${MAKE_FILE}
+	-${Q}rm -f have_ustat have_ustat.o ustat_tmp have_ustat.h
+	${Q}echo 'forming have_ustat.h'
+	${Q}echo '/*' > have_ustat.h
+	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_ustat.h
+	${Q}echo ' */' >> have_ustat.h
+	${Q}echo '' >> have_ustat.h
+	${Q}echo '' >> have_ustat.h
+	${Q}echo '#if !defined(__HAVE_USTAT_H__)' >> have_ustat.h
+	${Q}echo '#define __HAVE_USTAT_H__' >> have_ustat.h
+	${Q}echo '' >> have_ustat.h
+	${Q}echo '' >> have_ustat.h
+	${Q}echo '/* do we have or want ustat()? */' >> have_ustat.h
+	-${Q}rm -f have_ustat.o have_ustat
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_USTAT} have_ustat.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_ustat.o -o have_ustat 2>/dev/null; true
+	-${Q}${SHELL} -c "./have_ustat > ustat_tmp 2>/dev/null" \
+	    >/dev/null 2>&1; true
+	-${Q}if [ -s ustat_tmp ]; then \
+	    cat ustat_tmp >> have_ustat.h; \
+	else \
+	    echo '#undef HAVE_USTAT /* no */' >> have_ustat.h; \
+	fi
+	${Q}echo '' >> have_ustat.h
+	${Q}echo '' >> have_ustat.h
+	${Q}echo '#endif /* !__HAVE_USTAT_H__ */' >> have_ustat.h
+	-${Q}rm -f have_ustat have_ustat.o ustat_tmp
+	${Q}echo 'have_ustat.h formed'
+	-@if [ -z "${Q}" ]; then \
+	    echo ''; \
+	    echo '=-=-= start of $@ =-=-='; \
+	    cat $@; \
+	    echo '=-=-= end of $@ =-=-='; \
+	    echo ''; \
+	else \
+	    true; \
+	fi
+
+have_getsid.h: have_getsid.c ${MAKE_FILE}
+	-${Q}rm -f have_getsid have_getsid.o getsid_tmp have_getsid.h
+	${Q}echo 'forming have_getsid.h'
+	${Q}echo '/*' > have_getsid.h
+	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_getsid.h
+	${Q}echo ' */' >> have_getsid.h
+	${Q}echo '' >> have_getsid.h
+	${Q}echo '' >> have_getsid.h
+	${Q}echo '#if !defined(__HAVE_GETSID_H__)' >> have_getsid.h
+	${Q}echo '#define __HAVE_GETSID_H__' >> have_getsid.h
+	${Q}echo '' >> have_getsid.h
+	${Q}echo '' >> have_getsid.h
+	${Q}echo '/* do we have or want getsid()? */' >> have_getsid.h
+	-${Q}rm -f have_getsid.o have_getsid
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_GETSID} have_getsid.c -c 2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_getsid.o -o have_getsid 2>/dev/null; true
+	-${Q}${SHELL} -c "./have_getsid > getsid_tmp 2>/dev/null" \
+	    >/dev/null 2>&1; true
+	-${Q}if [ -s getsid_tmp ]; then \
+	    cat getsid_tmp >> have_getsid.h; \
+	else \
+	    echo '#undef HAVE_GETSID /* no */' >> have_getsid.h; \
+	fi
+	${Q}echo '' >> have_getsid.h
+	${Q}echo '' >> have_getsid.h
+	${Q}echo '#endif /* !__HAVE_GETSID_H__ */' >> have_getsid.h
+	-${Q}rm -f have_getsid have_getsid.o getsid_tmp
+	${Q}echo 'have_getsid.h formed'
+	-@if [ -z "${Q}" ]; then \
+	    echo ''; \
+	    echo '=-=-= start of $@ =-=-='; \
+	    cat $@; \
+	    echo '=-=-= end of $@ =-=-='; \
+	    echo ''; \
+	else \
+	    true; \
+	fi
+
+have_getpgid.h: have_getpgid.c ${MAKE_FILE}
+	-${Q}rm -f have_getpgid have_getpgid.o getpgid_tmp have_getpgid.h
+	${Q}echo 'forming have_getpgid.h'
+	${Q}echo '/*' > have_getpgid.h
+	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_getpgid.h
+	${Q}echo ' */' >> have_getpgid.h
+	${Q}echo '' >> have_getpgid.h
+	${Q}echo '' >> have_getpgid.h
+	${Q}echo '#if !defined(__HAVE_GETPGID_H__)' >> have_getpgid.h
+	${Q}echo '#define __HAVE_GETPGID_H__' >> have_getpgid.h
+	${Q}echo '' >> have_getpgid.h
+	${Q}echo '' >> have_getpgid.h
+	${Q}echo '/* do we have or want getpgid()? */' >> have_getpgid.h
+	-${Q}rm -f have_getpgid.o have_getpgid
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_GETPGID} have_getpgid.c -c 2>/dev/null; \
+	     true
+	-${Q}${LCC} ${ILDFLAGS} have_getpgid.o -o have_getpgid 2>/dev/null; true
+	-${Q}${SHELL} -c "./have_getpgid > getpgid_tmp 2>/dev/null" \
+	    >/dev/null 2>&1; true
+	-${Q}if [ -s getpgid_tmp ]; then \
+	    cat getpgid_tmp >> have_getpgid.h; \
+	else \
+	    echo '#undef HAVE_GETPGID /* no */' >> have_getpgid.h; \
+	fi
+	${Q}echo '' >> have_getpgid.h
+	${Q}echo '' >> have_getpgid.h
+	${Q}echo '#endif /* !__HAVE_GETPGID_H__ */' >> have_getpgid.h
+	-${Q}rm -f have_getpgid have_getpgid.o getpgid_tmp
+	${Q}echo 'have_getpgid.h formed'
+	-@if [ -z "${Q}" ]; then \
+	    echo ''; \
+	    echo '=-=-= start of $@ =-=-='; \
+	    cat $@; \
+	    echo '=-=-= end of $@ =-=-='; \
+	    echo ''; \
+	else \
+	    true; \
+	fi
+
+have_gettime.h: have_gettime.c ${MAKE_FILE}
+	-${Q}rm -f have_gettime have_gettime.o gettime_tmp have_gettime.h
+	${Q}echo 'forming have_gettime.h'
+	${Q}echo '/*' > have_gettime.h
+	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_gettime.h
+	${Q}echo ' */' >> have_gettime.h
+	${Q}echo '' >> have_gettime.h
+	${Q}echo '' >> have_gettime.h
+	${Q}echo '#if !defined(__HAVE_GETTIME_H__)' >> have_gettime.h
+	${Q}echo '#define __HAVE_GETTIME_H__' >> have_gettime.h
+	${Q}echo '' >> have_gettime.h
+	${Q}echo '' >> have_gettime.h
+	${Q}echo '/* do we have or want clock_gettime()? */' >> have_gettime.h
+	-${Q}rm -f have_gettime.o have_gettime
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_GETTIME} have_gettime.c -c 2>/dev/null; \
+	     true
+	-${Q}${LCC} ${ILDFLAGS} have_gettime.o -o have_gettime 2>/dev/null; true
+	-${Q}${SHELL} -c "./have_gettime > gettime_tmp 2>/dev/null" \
+	    >/dev/null 2>&1; true
+	-${Q}if [ -s gettime_tmp ]; then \
+	    cat gettime_tmp >> have_gettime.h; \
+	else \
+	    echo '#undef HAVE_GETTIME /* no */' >> have_gettime.h; \
+	fi
+	${Q}echo '' >> have_gettime.h
+	${Q}echo '' >> have_gettime.h
+	${Q}echo '#endif /* !__HAVE_GETTIME_H__ */' >> have_gettime.h
+	-${Q}rm -f have_gettime have_gettime.o gettime_tmp
+	${Q}echo 'have_gettime.h formed'
+	-@if [ -z "${Q}" ]; then \
+	    echo ''; \
+	    echo '=-=-= start of $@ =-=-='; \
+	    cat $@; \
+	    echo '=-=-= end of $@ =-=-='; \
+	    echo ''; \
+	else \
+	    true; \
+	fi
+
+have_getprid.h: have_getprid.c ${MAKE_FILE}
+	-${Q}rm -f have_getprid have_getprid.o getprid_tmp have_getprid.h
+	${Q}echo 'forming have_getprid.h'
+	${Q}echo '/*' > have_getprid.h
+	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_getprid.h
+	${Q}echo ' */' >> have_getprid.h
+	${Q}echo '' >> have_getprid.h
+	${Q}echo '' >> have_getprid.h
+	${Q}echo '#if !defined(__HAVE_GETPRID_H__)' >> have_getprid.h
+	${Q}echo '#define __HAVE_GETPRID_H__' >> have_getprid.h
+	${Q}echo '' >> have_getprid.h
+	${Q}echo '' >> have_getprid.h
+	${Q}echo '/* do we have or want getprid()? */' >> have_getprid.h
+	-${Q}rm -f have_getprid.o have_getprid
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_GETPRID} have_getprid.c -c 2>/dev/null; \
+	     true
+	-${Q}${LCC} ${ILDFLAGS} have_getprid.o -o have_getprid 2>/dev/null; true
+	-${Q}${SHELL} -c "./have_getprid > getprid_tmp 2>/dev/null" \
+	    >/dev/null 2>&1; true
+	-${Q}if [ -s getprid_tmp ]; then \
+	    cat getprid_tmp >> have_getprid.h; \
+	else \
+	    echo '#undef HAVE_GETPRID /* no */' >> have_getprid.h; \
+	fi
+	${Q}echo '' >> have_getprid.h
+	${Q}echo '' >> have_getprid.h
+	${Q}echo '#endif /* !__HAVE_GETPRID_H__ */' >> have_getprid.h
+	-${Q}rm -f have_getprid have_getprid.o getprid_tmp
+	${Q}echo 'have_getprid.h formed'
+	-@if [ -z "${Q}" ]; then \
+	    echo ''; \
+	    echo '=-=-= start of $@ =-=-='; \
+	    cat $@; \
+	    echo '=-=-= end of $@ =-=-='; \
+	    echo ''; \
+	else \
+	    true; \
+	fi
+
+have_urandom.h: ${MAKE_FILE}
+	-${Q}rm -f have_urandom.h
+	${Q}echo 'forming have_urandom.h'
+	${Q}echo '/*' > have_urandom.h
+	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_urandom.h
+	${Q}echo ' */' >> have_urandom.h
+	${Q}echo '' >> have_urandom.h
+	${Q}echo '' >> have_urandom.h
+	${Q}echo '#if !defined(__HAVE_URANDOM_H__)' >> have_urandom.h
+	${Q}echo '#define __HAVE_URANDOM_H__' >> have_urandom.h
+	${Q}echo '' >> have_urandom.h
+	${Q}echo '' >> have_urandom.h
+	${Q}echo '/* do we have /dev/urandom? */' >> have_urandom.h
+	-${Q}if [ -c /dev/urandom ]; then \
+	    echo '#define HAVE_URANDOM_H  /* yes */' >> have_urandom.h; \
+	else \
+	    echo '#undef HAVE_URANDOM_H  /* no */' >> have_urandom.h; \
+	fi
+	${Q}echo '' >> have_urandom.h
+	${Q}echo '' >> have_urandom.h
+	${Q}echo '#endif /* !__HAVE_URANDOM_H__ */' >> have_urandom.h
+	${Q}echo 'have_urandom.h formed'
+	-@if [ -z "${Q}" ]; then \
+	    echo ''; \
+	    echo '=-=-= start of $@ =-=-='; \
+	    cat $@; \
+	    echo '=-=-= end of $@ =-=-='; \
+	    echo ''; \
+	else \
+	    true; \
+	fi
+
 args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h have_string.h
 	-${Q}rm -f args.h have_args
 	${Q}echo 'forming args.h'
@@ -1776,8 +2073,9 @@ args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h have_string.h
 	${Q}echo '' >> args.h
 	${Q}echo '' >> args.h
 	-${Q}rm -f have_stdvs.o have_stdvs
-	-${Q}${CC} ${CCMAIN} ${HAVE_VSPRINTF} have_stdvs.c -c 2>/dev/null; true
-	-${Q}${CC} ${ILDFLAGS} have_stdvs.o -o have_stdvs 2>/dev/null; true
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_VSPRINTF} have_stdvs.c -c \
+		2>/dev/null; true
+	-${Q}${LCC} ${ILDFLAGS} have_stdvs.o -o have_stdvs 2>/dev/null; true
 	-${Q}if ./have_stdvs >>args.h 2>/dev/null; then \
 	    touch have_args; \
 	else \
@@ -1785,8 +2083,9 @@ args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h have_string.h
 	fi
 	-${Q}if [ ! -f have_args ] && [ X"${HAVE_VSPRINTF}" = X ]; then \
 	    rm -f have_stdvs.o have_stdvs have_varvs.o have_varvs; \
-	    ${CC} ${CCMAIN} -DDONT_HAVE_VSPRINTF have_varvs.c -c 2>/dev/null; \
-	    ${CC} ${ILDFLAGS} have_varvs.o -o have_varvs 2>/dev/null; \
+	    ${LCC} ${ICFLAGS} -DDONT_HAVE_VSPRINTF have_varvs.c -c \
+		    2>/dev/null; \
+	    ${LCC} ${ILDFLAGS} have_varvs.o -o have_varvs 2>/dev/null; \
 	    if ./have_varvs >>args.h 2>/dev/null; then \
 		touch have_args; \
 	    else \
@@ -1865,17 +2164,17 @@ calc_errno.h: calc_errno.c ${MAKE_FILE}
 	    echo 'extern int sys_nerr;		' \
 		 '/* number of system errors */' >> calc_errno.h; \
 	else \
-	    ${CC} ${CCMAIN} -DTRY_ERRNO_NO_DECL \
+	    ${LCC} ${ICFLAGS} -DTRY_ERRNO_NO_DECL \
 		  calc_errno.c -o calc_errno 2>calc_errno_tmp; \
 	    if [ -x ./calc_errno ]; then \
 		./calc_errno >> calc_errno.h; \
 	    else \
-		${CC} ${CCMAIN} -DTRY_ERRNO_STD_DECL \
+		${LCC} ${ICFLAGS} -DTRY_ERRNO_STD_DECL \
 		      calc_errno.c -o calc_errno 2>calc_errno_tmp; \
 		if [ -x ./calc_errno ]; then \
 		    ./calc_errno >> calc_errno.h; \
 		else \
-		    ${CC} ${CCMAIN} -DTRY_ERRNO_OLD_DECL \
+		    ${LCC} ${ICFLAGS} -DTRY_ERRNO_OLD_DECL \
 			  calc_errno.c -o calc_errno 2>calc_errno_tmp; \
 		    if [ -x ./calc_errno ]; then \
 			./calc_errno >> calc_errno.h; \
@@ -1971,16 +2270,16 @@ calcerr.c: calcerr.tbl calcerr_c.sed calcerr_c.awk ${MAKE_FILE}
 ##
 
 endian.o: endian.c have_unistd.h
-	${CC} ${CCMAIN} endian.c -c
+	${LCC} ${ICFLAGS} endian.c -c
 
 endian: endian.o
-	${CC} ${ILDFLAGS} endian.o -o endian
+	${LCC} ${ICFLAGS} endian.o -o endian
 
 longbits.o: longbits.c longlong.h have_unistd.h
-	${CC} ${CCMAIN} longbits.c -c
+	${LCC} ${ICFLAGS} longbits.c -c
 
 longbits: longbits.o
-	${CC} ${ILDFLAGS} longbits.o -o longbits
+	${LCC} ${ICFLAGS} longbits.o -o longbits
 
 ##
 #
@@ -2297,6 +2596,12 @@ env:
 	@echo "HAVE_CONST=${HAVE_CONST}"; echo ""
 	@echo "HAVE_UID_T=${HAVE_UID_T}"; echo ""
 	@echo "HAVE_NEWSTR=${HAVE_NEWSTR}"; echo ""
+	@echo "HAVE_USTAT=${HAVE_USTAT}"; echo ""
+	@echo "HAVE_GETSID=${HAVE_GETSID}"; echo ""
+	@echo "HAVE_GETPGID=${HAVE_GETPGID}"; echo ""
+	@echo "HAVE_GETTIME=${HAVE_GETTIME}"; echo ""
+	@echo "HAVE_GETPRID=${HAVE_GETPRID}"; echo ""
+	@echo "HAVE_URANDOM=${HAVE_URANDOM}"; echo ""
 	@echo "ALIGN32=${ALIGN32}"; echo ""
 	@echo "ERRNO_DECL=${ERRNO_DECL}"; echo ""
 	@echo "BINDIR=${BINDIR}"; echo ""
@@ -2332,10 +2637,10 @@ env:
 	@echo "CCMISC=${CCMISC}"; echo ""
 	@echo "CFLAGS=${CFLAGS}"; echo ""
 	@echo "ICFLAGS=${ICFLAGS}"; echo ""
-	@echo "CCMAIN=${CCMAIN}"; echo ""
 	@echo "LCFLAGS=${LCFLAGS}"; echo ""
 	@echo "LDFLAGS=${LDFLAGS}"; echo ""
 	@echo "ILDFLAGS=${ILDFLAGS}"; echo ""
+	@echo "LCC=${LCC}"; echo ""
 	@echo "CC=${CC}"; echo ""
 	@echo "SHELL=${SHELL}"; echo ""
 	@echo "MAKE=${MAKE}"; echo ""
@@ -3027,6 +3332,10 @@ hash.o: zrand.h
 hash.o: zrandom.h
 have_const.o: have_const.c
 have_fpos.o: have_fpos.c
+have_getpgid.o: have_getpgid.c
+have_getprid.o: have_getprid.c
+have_getsid.o: have_getsid.c
+have_gettime.o: have_gettime.c
 have_memmv.o: have_memmv.c
 have_newstr.o: have_newstr.c
 have_offscl.o: have_offscl.c
@@ -3037,6 +3346,7 @@ have_stdvs.o: have_string.h
 have_stdvs.o: have_unistd.h
 have_uid_t.o: have_uid_t.c
 have_uid_t.o: have_unistd.h
+have_ustat.o: have_ustat.c
 have_varvs.o: have_string.h
 have_varvs.o: have_unistd.h
 have_varvs.o: have_varvs.c
@@ -3517,11 +3827,17 @@ quickhash.o: zrandom.h
 seed.o: alloc.h
 seed.o: byteswap.h
 seed.o: endian_calc.h
+seed.o: have_getpgid.h
+seed.o: have_getprid.h
+seed.o: have_getsid.h
+seed.o: have_gettime.h
 seed.o: have_malloc.h
 seed.o: have_memmv.h
 seed.o: have_newstr.h
 seed.o: have_stdlib.h
 seed.o: have_string.h
+seed.o: have_urandom.h
+seed.o: have_ustat.h
 seed.o: longbits.h
 seed.o: qmath.h
 seed.o: seed.c

README

@@ -4,7 +4,7 @@ See the HOWTO.INSTALL file for information on how to build and install calc.
 
 To be sure that your version of calc is up to date, check out:
 
-	http://reality.sgi.com/chongo/calc/calc-download.html
+	http://reality.sgi.com/chongo/tech/comp/calc/calc-download.html
 
 We are interested in any/all feedback on recent versions of calc.
 In particular we would like to hear about:
@@ -60,10 +60,12 @@ Calc is shipped with a library of calc scripts.  For a list see:
 See the file:
 
     help/todo
+    help/wishlist
 
 or run:
 
-    calc 'help todo'
+    calc help todo
+    calc help wishlist
 
 for a wish/todo list.  Code contributions are welcome.
 
@@ -84,4 +86,4 @@ your full name.
 
 The calc web site is located at:
 
-	http://reality.sgi.com/chongo/calc
+	http://reality.sgi.com/chongo/tech/comp/calc

README.OLD

@@ -1,73 +0,0 @@
-# Copyright (c) 1997 David I. Bell
-# Permission is granted to use, distribute, or modify this source,
-# provided that this copyright notice remains intact.
-#
-# Arbitrary precision calculator.
-
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    NOTE: This is an old historic README.  We recommend that
-	  you read README and HOWTO.INSTALL for more info.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-I am allowing this calculator to be freely distributed for your enjoyment.
-Like all multi-precision programs, you should not depend absolutely on
-its results, since bugs in such programs can be insidious and only rarely
-show up.
-
--dbell-
-
-p.s. By Landon Curt Noll:
-
-Building calc in 3 easy steps:
-
-    1) Look at the makefile, and adjust it to suit your needs.
-
-       Here are some Makefile hints:
-
-	   In the past, some people have had to adjust the VARARG or
-	   TERMCONTROL because the Makefile cannot always guess
-	   correctly for certain systems.  You may need to play with
-	   these values if you experience problems.
-
-	   The default compiler used is 'cc'.  The default compiler flag
-	   is '-O'.  If you have gcc, or gcc v2 (or better) you should use
-	   that instead.   Some compilers allow for optimization beyond
-	   just -O (gcc v2 has -O2, mips cc has -O3).  You should select
-	   the best flag for speed optimization.  Calc can be cpu intensive
-	   so selecting a quality compiler and good optimization level can
-	   really pay off.
-
-    2) build calc:
-
-	make all
-
-    3) test calc:
-
-	make check
-
- ==>>>If you run into problems, follow the instructions in the BUGS file<<<==
-
-=-=
-
-For further reading:
-
-    LIBRARY
-    	explains how programs can use libcalc.a to take advantage
-	of the calc multi-precision routines.
-
-    help/todo
-	current wish list for calc
-
-    CHANGES
-	recent changes to calc
-
-    BUGS
-	known bugs, mis-features and how to report problems
-
-    help/full
-	full set of calc documentation
-
-=-=
-
-David I. Bell    dbell@auug.org.au
-chongo <Landon Curt Noll> /\../\

align32.c

@@ -3,7 +3,10 @@
  *
  * This file was written by:
  *
- *	 Landon Curt Noll  (chongo@toad.com)	chongo <was here> /\../\
+ *	Landon Curt Noll
+ *	http://reality.sgi.com/chongo
+ *
+ *	chongo <was here> /\../\
  *
  * This code has been placed in the public domain.  Please do not
  * copyright this code.

assocfunc.c

@@ -57,7 +57,7 @@ associndex(ASSOC *ap, BOOL create, long dim, VALUE *indices)
 	 * so that we can first select the correct hash chain, and
 	 * also so we can quickly compare each element for a match.
 	 */
-	hash = (QCKHASH)0;
+	hash = FNV1_32_BASIS;
 	for (i = 0; i < dim; i++)
 		hash = hashvalue(&indices[i], hash);
 

blkcpy.c

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  */
 
 #include <stdio.h>

block.c

@@ -27,12 +27,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *	Landon Curt Noll
+ *	http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 

block.h

@@ -27,12 +27,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *	Landon Curt Noll
+ *	http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 

calc.c

@@ -237,73 +237,94 @@ main(int argc, char **argv)
 	/*
 	 * execute calc code based on the run state
 	 */
-	if (run_state == RUN_PRE_BEGIN) {
+	if (run_state == RUN_BEGIN) {
 		if (!q_flag && allow_read) {
-			run_state = RUN_PRE_RCFILES;
+			run_state = RUN_RCFILES;
 			runrcfiles();
 		}
-		run_state = RUN_POST_RCFILES;
-	}
-	if (run_state == RUN_PRE_RCFILES) {
-		fprintf(stderr, "Execution error in rcfiles\n");
-		if ((c_flag && !stoponerror) || stoponerror < 0) {
-			getcommands(FALSE);
-			run_state = RUN_POST_RCFILES;
-		} else {
-			if ((havecommands && !i_flag) || !stdin_tty)
-				run_state = RUN_STOP_ON_ERROR;
-			else if (havecommands)
-				run_state = RUN_POST_CMD_ARGS;
-			else
-				run_state = RUN_POST_RCFILES;
-		}
-	}
-	if (run_state == RUN_POST_RCFILES) {
-		if (havecommands) {
-			run_state = RUN_PRE_CMD_ARGS;
-			(void) openstring(cmdbuf);
-			getcommands(FALSE);
-		}
-		run_state = RUN_POST_CMD_ARGS;
-	}
-	if (run_state == RUN_PRE_CMD_ARGS) {
-		fprintf(stderr, "Execution error in commands\n");
-		if ((c_flag && !stoponerror) || stoponerror < 0) {
-			getcommands(FALSE);
-			run_state = RUN_POST_CMD_ARGS;
-		} else {
-			closeinput();
-			if (!stdin_tty || !i_flag)
-				run_state = RUN_STOP_ON_ERROR;
-			else
-				run_state = RUN_POST_CMD_ARGS;
-		}
-	}
-	if (run_state == RUN_POST_CMD_ARGS) {
-		if (stdin_tty && ((havecommands && !i_flag) || p_flag))
-			run_state = RUN_NOT_TOP_LEVEL;
-		else
-			openterminal();
-	} else if (run_state == RUN_TOP_LEVEL) {
-		if (!stdin_tty && (!c_flag || stoponerror) &&
-		    stoponerror >= 0) {
-			run_state = RUN_STOP_ON_ERROR;
-		} else if ((c_flag && !stoponerror) || stoponerror < 0)
-			getcommands(FALSE);
-		else
-			reinitialize();
+		run_state = RUN_PRE_CMD_ARGS;
 	}
 
-	if (run_state < RUN_NOT_TOP_LEVEL) {
-		run_state = RUN_TOP_LEVEL;
-		getcommands(TRUE);
+	while (run_state == RUN_RCFILES) {
+		fprintf(stderr, "Error in rcfiles\n");
+		if ((c_flag && !stoponerror) || stoponerror < 0) {
+			getcommands(FALSE);
+			if (inputlevel() == 0) {
+				closeinput();
+				runrcfiles();
+				run_state = RUN_PRE_CMD_ARGS;
+			} else {
+				closeinput();
+			}
+		} else {
+			if ((havecommands && !i_flag) || !stdin_tty)
+				run_state = RUN_EXIT_WITH_ERROR;
+			else
+				run_state = RUN_PRE_CMD_ARGS;
+		}
+	}
+
+	if (run_state == RUN_PRE_CMD_ARGS) {
+		if (havecommands) {
+			run_state = RUN_CMD_ARGS;
+			(void) openstring(cmdbuf, (long) strlen(cmdbuf));
+			getcommands(FALSE);
+			closeinput();
+		}
+		run_state = RUN_PRE_TOP_LEVEL;
+	}
+
+	while (run_state == RUN_CMD_ARGS) {
+		fprintf(stderr, "Error in commands\n");
+		if ((c_flag && !stoponerror) || stoponerror < 0) {
+			getcommands(FALSE);
+			if (inputlevel() == 0)
+				run_state = RUN_PRE_TOP_LEVEL;
+			closeinput();
+		} else {
+			closeinput();
+			if (!stdin_tty || !i_flag || p_flag)
+				run_state = RUN_EXIT_WITH_ERROR;
+			else
+				run_state = RUN_PRE_TOP_LEVEL;
+		}
+	}
+
+	if (run_state == RUN_PRE_TOP_LEVEL) {
+		if (stdin_tty && ((havecommands && !i_flag) || p_flag)) {
+			run_state = RUN_EXIT;
+		} else {
+			if (stdin_tty) {
+				reinitialize();
+			} else {
+				resetinput();
+				openterminal();
+			}
+			run_state = RUN_TOP_LEVEL;
+			getcommands(TRUE);
+		}
+	}
+
+	while (run_state == RUN_TOP_LEVEL) {
+		if ((c_flag && !stoponerror) || stoponerror < 0) {
+			getcommands(TRUE);
+			if (!inputisterminal())
+				closeinput();
+		} else {
+			if (stdin_tty) {
+				reinitialize();
+				getcommands(TRUE);
+			} else {
+			 	run_state = RUN_EXIT_WITH_ERROR;
+			}
+		}
 	}
 
 	/*
 	 * all done
 	 */
 	libcalc_call_me_last();
-	return (run_state == RUN_STOP_ON_ERROR ||
+	return (run_state == RUN_EXIT_WITH_ERROR ||
 		run_state == RUN_UNKNOWN) ? 1 : 0;
 }
 

calc.h

@@ -113,7 +113,7 @@ extern void trimconstants(void);
 /*
  * Input routines.
  */
-extern int openstring(char *str);
+extern int openstring(char *str, long num);
 extern int openterminal(void);
 extern int opensearchfile(char *name, char *pathlist, char *exten, int reopen_ok);
 extern char *nextline(void);
@@ -122,12 +122,12 @@ extern void reread(void);
 extern void resetinput(void);
 extern void setprompt(char *);
 extern BOOL inputisterminal(void);
+extern int inputlevel(void);
 extern char *inputname(void);
 extern long linenumber(void);
 extern void runrcfiles(void);
 extern void closeinput(void);
 
-
 /*
  * Other routines.
  */
@@ -141,7 +141,6 @@ extern void libcalc_call_me_first(void);
 extern void libcalc_call_me_last(void);
 extern void showerrors(void);
 
-
 /*
  * Initialization
  */
@@ -192,22 +191,21 @@ extern int allow_read;	/* FALSE => may not open any files for reading */
 extern int allow_write;	/* FALSE => may not open any files for writing */
 extern int allow_exec;	/* FALSE => may not execute any commands */
 
-/* 
- * calc startup and run state 
+/*
+ * calc startup and run state
  */
 typedef enum {
     RUN_UNKNOWN = -1,		/* unknown or unset start state */
-    RUN_PRE_BEGIN = 0,		/* pre-startup state, calc execution started */
-    RUN_PRE_RCFILES = 1,	/* rc files about to or are being evaluated */
-    RUN_POST_RCFILES = 2,	/* rc files have been evaluated */
-    RUN_PRE_CMD_ARGS = 3,	/* cmd_args about to or are being evaluated */
-    RUN_POST_CMD_ARGS = 4,	/* cmd_args have been evaluated */
-    RUN_TOP_LEVEL = 5,		/* running at the top interactive level */
-    RUN_NOT_TOP_LEVEL = 6,	/* running not at the top interactive level */
-    RUN_STOP_ON_ERROR = 7	/* we need to stop due to errors */
+    RUN_BEGIN = 0,		/* calc execution starts */
+    RUN_RCFILES = 1,		/* rc files being evaluated */
+    RUN_PRE_CMD_ARGS = 2,	/* prepare to evaluate cmd args */
+    RUN_CMD_ARGS = 3,		/* cmd args being evaluated */
+    RUN_PRE_TOP_LEVEL = 4,	/* prepare to start top level activity */
+    RUN_TOP_LEVEL = 5,		/* running at top level */
+    RUN_EXIT = 6,		/* normal exit from calc */
+    RUN_EXIT_WITH_ERROR = 7	/* exit with error */
 } run;
-extern run run_state;	
-
+extern run run_state;
 
 /*
  * calc version information

calc.man

@@ -567,7 +567,7 @@ scripts that you would like you see included
 in future distributions to:
 .sp
 .in +0.5i
-calc-tester-request@postofc.corp.sgi.com
+calc-tester@postofc.corp.sgi.com
 .in -0.5i
 .sp
 Landon Noll maintains the the
@@ -575,7 +575,7 @@ Landon Noll maintains the the
 web site is located at:
 .sp
 .in +0.5i
-http://reality.sgi.com/chongo/calc
+http://reality.sgi.com/chongo/tech/comp/calc
 .in -0.5i
 .sp
 One may join the

codegen.c

@@ -125,6 +125,7 @@ getcommands(BOOL toplevel)
 			switch (opensearchfile(name,calcpath,CALCEXT,rdonce)) {
 			case 0:
 				getcommands(FALSE);
+				closeinput();
 				break;
 			case 1:
 				/* previously read and -once was given */
@@ -354,10 +355,6 @@ getsimplebody(void)
 	(void) tokenmode(TM_NEWLINES);
 	(void) getexprlist();
 	addop(OP_RETURN);
-	if (gettoken() != T_SEMICOLON)
-		rescantoken();
-	if (gettoken() != T_NEWLINE)
-		scanerror(T_NULL, "Illegal function definition");
 }
 
 
@@ -1004,8 +1001,7 @@ getoneobj(long index, int symtype)
 		if (symtype == SYM_UNDEFINED) {
 			rescantoken();
 			(void) getidexpr(TRUE, TRUE);
-		}
-		else {
+		} else {
 			symname = tokensymbol();
 			definesymbol(symname, symtype);
 			usesymbol(symname, FALSE);
@@ -1089,8 +1085,7 @@ getonematrix(int symtype)
 		if (symtype == SYM_UNDEFINED) {
 			rescantoken();
 			(void) getidexpr(FALSE, TRUE);
-		}
-		else {
+		} else {
 			name = tokensymbol();
 			definesymbol(name, symtype);
 			usesymbol(name, FALSE);
@@ -1175,9 +1170,9 @@ creatematrix(void)
 		switch (gettoken()) {
 			case T_RIGHTBRACKET:
 				addopone(OP_MATCREATE, dim);
-				if (gettoken() == T_LEFTBRACKET)
+				if (gettoken() == T_LEFTBRACKET) {
 					creatematrix();
-				else {
+				} else {
 					rescantoken();
 					addop(OP_ZERO);
 				}
@@ -1353,8 +1348,7 @@ getopassignment(void)
 			while (gettoken() == T_ASSIGN)
 				getinitlist();
 			rescantoken();
-		}
-		else {
+		} else {
 			rescantoken();
 			(void) getassignment();
 		}

comfunc.c

@@ -231,8 +231,7 @@ csqrt(COMPLEX *c, NUMBER *epsilon, long R)
 				return r;
 			}
 			s3 = zquo(tmp3, d, &tmp1, s2 < 0);
-		}
-		else {
+		} else {
 			s2 = zquo(tmp1, d, &tmp3, s1 ? (s1 < 0) : 16);
 			zfree(tmp1);
 			s3 = zsqrt(tmp3,&tmp1,(s1||s2) ? (s1<0 || s2<0) : 16);
@@ -288,8 +287,7 @@ csqrt(COMPLEX *c, NUMBER *epsilon, long R)
 				return r;
 			}
 			s3 = zquo(tmp3, d, &mul1, 0);
-		}
-		else {
+		} else {
 			s2 = zquo(tmp1, d, &tmp3, 0);
 			zfree(tmp1);
 			s3 = zsqrt(tmp3, &mul1, 0);

config.h

@@ -28,12 +28,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 

custom.c

@@ -24,12 +24,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *	Landon Curt Noll
+ *	http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 /* these include files are needed regardless of CUSTOM */

custom.h

@@ -28,15 +28,12 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
-
 /*
  * Be careful what you put in this file, upper .c files include
  * this file even when CUSTOM is not defined (ALLOW_CUSTOM is empty).

custom/CUSTOM_CAL

@@ -19,7 +19,7 @@
 # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# chongo was here	/\../\		chongo@toad.com
+# chongo was here	/\../\		http://reality.sgi.com/chongo
 
 The following custom calc library files are provided because they serve
 as examples of how use the custom interface.  The custom interface

custom/Makefile

@@ -26,12 +26,10 @@
 #
 # Happy bit twiddling,
 #
-#			Landon Curt Noll
+#      Landon Curt Noll
+#      http://reality.sgi.com/chongo
 #
-#			chongo@toad.com
-#			...!{pyramid,sun,uunet}!hoptoad!chongo
-#
-# chongo was here	/\../\
+# chongo <was here> /\../\
 
 ##############################################################################
 #-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
@@ -421,9 +419,13 @@ depend:
 	else \
 		rm -f Makefile.tmp; \
 		mv Makefile Makefile.tmp; \
-		sccs edit Makefile; \
+		if [ -d RCS ]; then; \
+		    co -l Makefile; \
+		fi ;\
 		mv Makefile.tmp Makefile; \
-		echo new 'custom Makefile formed -- you need to check it in'; \
+		if [ -d RCS ]; then; \
+		echo new custom Makefile formed '--' you need to check it in'; \
+		fi; \
 	fi
 
 ##
@@ -590,8 +592,28 @@ c_help.o: ../string.h
 c_help.o: ../value.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: ../custom.h
+c_pzasusb8.o: ../endian_calc.h
+c_pzasusb8.o: ../hash.h
 c_pzasusb8.o: ../have_const.h
+c_pzasusb8.o: ../have_malloc.h
+c_pzasusb8.o: ../have_memmv.h
+c_pzasusb8.o: ../have_newstr.h
+c_pzasusb8.o: ../have_stdlib.h
+c_pzasusb8.o: ../have_string.h
+c_pzasusb8.o: ../longbits.h
+c_pzasusb8.o: ../md5.h
+c_pzasusb8.o: ../nametype.h
+c_pzasusb8.o: ../qmath.h
+c_pzasusb8.o: ../shs.h
+c_pzasusb8.o: ../shs1.h
+c_pzasusb8.o: ../string.h
 c_pzasusb8.o: ../value.h
 c_pzasusb8.o: ../zmath.h
 c_pzasusb8.o: c_pzasusb8.c

custom/argv.cal

@@ -10,7 +10,7 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ * chongo was here	/\../\		http://reality.sgi.com/chongo
  */
 /*
  * argv - print information about various args

custom/c_argv.c

@@ -15,12 +15,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 #if defined(CUSTOM)

custom/c_devnull.c

@@ -15,12 +15,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 #if defined(CUSTOM)

custom/c_help.c

@@ -15,12 +15,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 #if defined(CUSTOM)

custom/c_sysinfo.c

@@ -15,12 +15,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 #if defined(CUSTOM)

custom/custtbl.c

@@ -24,12 +24,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 

custom/halflen.cal

@@ -10,7 +10,7 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ * chongo was here	/\../\		http://reality.sgi.com/chongo
  */
 /*
  * halflen - determine the length of numeric value in HALFs

file.c

@@ -115,15 +115,14 @@ file_init(void)
 		 */
 		if (fstat(i, &sbuf) >= 0) {
 			fp = (FILE *) fdopen(i,"r+");	/*guess mode*/
-			if (fp)
+			if (fp) {
 				strcpy(files[idnum].mode, "r+");
-			else {
+			} else {
 				fp = (FILE *) fdopen(i, "r");
 				if (fp) {
 					strcpy(files[idnum].mode, "r");
 					files[idnum].writing = FALSE;
-				}
-				else {
+				} else {
 					fp = (FILE *) fdopen(i, "w");
 					if (fp) {
 						strcpy(files[idnum].mode, "w?");
@@ -885,13 +884,14 @@ idprintf(FILEID id, char *fmt, int count, VALUE **vals)
 							math_str((char *)
 								 vp->v_nblock
 								 ->blk->data);
-					 } else if (printchar) {
+					} else if (printchar) {
 						if (vp->v_nblock->blk->data !=
 						    NULL)
 							math_chr(*vp->v_nblock->
 								 blk->data);
-					} else
+					} else {
 						printvalue(vp, PRINT_NORMAL);
+					}
 					break;
 				default:
 					printvalue(vp, PRINT_NORMAL);
@@ -1770,8 +1770,7 @@ showfiles(void)
 		if (fstat(fileno(fp), &sbuf) < 0) {
 			printf("Bad fstat for file %d\n", (int) fiop->id);
 			sizes[i] = -1;
-		}
-		else {
+		} else {
 			inodes[i] = sbuf.st_ino;
 			sizes[i] = (long) sbuf.st_size;
 		}
@@ -2471,9 +2470,9 @@ fsearch(FILEID id, char *str, ZVALUE start, ZVALUE end, ZVALUE *res)
 			}
 			(void) f_seek_set(fiop->fp, &cur);
 		}
-		if (*tmp.v)
+		if (*tmp.v) {
 			(*tmp.v)--;
-		else {
+		} else {
 			if (tmp.len == 1)
 				break;
 			k = 0;

func.c

@@ -72,6 +72,7 @@ static int strscan(char *s, int count, VALUE **vals);
 static int filescan(FILEID id, int count, VALUE **vals);
 static VALUE f_eval(VALUE *vp);
 static VALUE f_fsize(VALUE *vp);
+static int malloced_putenv(char *str);
 
 
 
@@ -87,6 +88,19 @@ extern int idungetc(FILEID id, int ch);
 extern int stoponerror;
 
 
+/*
+ * malloced environment storage
+ */
+#define ENV_POOL_CHUNK 10	/* env_pool elements to allocate at a time */
+struct env_pool {
+    char *getenv;	/* what getenv() would return, NULL => unused */
+    char *putenv;	/* pointer given to putenv() */
+};
+static int env_pool_cnt = 0;	/* number of env_pool elements in use */
+static int env_pool_max = 0;	/* number of env_pool elements allocated */
+static struct env_pool *e_pool = NULL;	/* env_pool elements */
+
+
 /*
  * if HZ & CLK_TCK are not defined, pick typical values, hope for the best
  */
@@ -139,12 +153,14 @@ f_eval(VALUE *vp)
 	FUNC	*oldfunc;
 	FUNC	*newfunc;
 	VALUE	result;
-	char	*cp;
+	char	*str;
+	long	num;
 
 	if (vp->v_type != V_STR)
 		return error_value(E_EVAL2);
-	cp = vp->v_str->s_str;
-	switch (openstring(cp)) {
+	str = vp->v_str->s_str;
+	num = vp->v_str->s_len;
+	switch (openstring(str, num)) {
 		case -2:
 			return error_value(E_EVAL3);
 		case -1:
@@ -153,6 +169,7 @@ f_eval(VALUE *vp)
 	oldfunc = curfunc;
 	enterfilescope();
 	if (evaluate(TRUE)) {
+		closeinput();
 		exitfilescope();
 		freevalue(stack--);
 		newfunc = curfunc;
@@ -164,6 +181,7 @@ f_eval(VALUE *vp)
 			free(newfunc);
 		return result;
 	}
+	closeinput();
 	exitfilescope();
 	newfunc = curfunc;
 	curfunc = oldfunc;
@@ -1509,7 +1527,7 @@ f_hash(int count, VALUE **vals)
 	long lhash;
 	VALUE result;
 
-	hash = (QCKHASH)0;
+	hash = FNV1_32_BASIS;
 	while (count-- > 0)
 		hash = hashvalue(*vals++, hash);
 	lhash = (long) hash;
@@ -1622,8 +1640,7 @@ f_avg(int count, VALUE **vals)
 		if ((*vals)->v_type == V_LIST) {
 			addlistitems((*vals)->v_list, &sum);
 			n += countlistitems((*vals++)->v_list);
-		}
-		else {
+		} else {
 			addvalue(&sum, *vals++, &tmp);
 			freevalue(&sum);
 			sum = tmp;
@@ -1672,8 +1689,7 @@ f_hmean(int count, VALUE **vals)
 		if ((*vals)->v_type == V_LIST) {
 			addlistinv((*vals)->v_list, &sum);
 			n += countlistitems((*vals++)->v_list);
-		}
-		else {
+		} else {
 			invertvalue(*vals++, &tmp1);
 			addvalue(&sum, &tmp1, &tmp2);
 			freevalue(&tmp1);
@@ -3824,9 +3840,9 @@ f_search(int count, VALUE **vals)
 			start = qlink(start);
 	}
 	if (end) {
-		if (!qispos(end))
+		if (!qispos(end)) {
 			end = qqadd(size, end);
-		else {
+		} else {
 			if (qrel(end, size) > 0)
 				end = qlink(size);
 			else
@@ -3848,8 +3864,7 @@ f_search(int count, VALUE **vals)
 			if (count == 2 || (count == 4 && end != NULL)) {
 				start = qalloc();
 				start->num = pos;
-			}
-			else {
+			} else {
 				end = qalloc();
 				end->num = pos;
 			}
@@ -3987,9 +4002,9 @@ f_rsearch(int count, VALUE **vals)
 			start = qlink(start);
 	}
 	if (end) {
-		if (!qispos(end))
+		if (!qispos(end)) {
 			end = qqadd(size, end);
-		else {
+		} else {
 			if (qrel(end, size) > 0)
 				end = qlink(size);
 			else
@@ -4011,8 +4026,7 @@ f_rsearch(int count, VALUE **vals)
 			if (count == 2 || (count == 4 && end != NULL)) {
 				start = qalloc();
 				start->num = pos;
-			}
-			else {
+			} else {
 				end = qalloc();
 				end->num = pos;
 			}
@@ -4024,8 +4038,7 @@ f_rsearch(int count, VALUE **vals)
 		if (count < 4) {
 			end = start;
 			start = NULL;
-		}
-		else {
+		} else {
 			qtmp = qsub(end, qlen);
 			qfree(end);
 			end = qtmp;
@@ -4616,9 +4629,9 @@ f_strerror(int count, VALUE **vals)
 
 	if (count > 0) {
 		vp = vals[0];
-		if (vp->v_type < 0)
+		if (vp->v_type < 0) {
 			i = (long) -vp->v_type;
-		else {
+		} else {
 			if (vp->v_type != V_NUM || qisfrac(vp->v_num))
 				return error_value(E_STRERROR1);
 			i = qtoi(vp->v_num);
@@ -4729,12 +4742,12 @@ f_error(int count, VALUE **vals)
 	if (count > 0) {
 		vp = vals[0];
 
-		if (vp->v_type <= 0)
+		if (vp->v_type <= 0) {
 			r = (long) -vp->v_type;
-		else {
-			if (vp->v_type != V_NUM || qisfrac(vp->v_num))
+		} else {
+			if (vp->v_type != V_NUM || qisfrac(vp->v_num)) {
 				r = E_ERROR1;
-			else {
+			} else {
 				r = qtoi(vp->v_num);
 				if (r < 0 || r >= 32768)
 					r = E_ERROR2;
@@ -5524,28 +5537,26 @@ f_tail(VALUE *v1, VALUE *v2)
 	res.v_type = v1->v_type;
 	switch (v1->v_type) {
 		case V_LIST:
-			if (n == 0)
+			if (n == 0) {
 				res.v_list = listalloc();
-			else if (n > 0) {
+			} else if (n > 0) {
 				res.v_list = listsegment(v1->v_list,
 					v1->v_list->l_count - n,
 					v1->v_list->l_count - 1);
-			}
-			else {
+			} else {
 				res.v_list = listsegment(v1->v_list,
 					v1->v_list->l_count - 1,
 					v1->v_list->l_count + n);
 			}
 			return res;
 		case V_STR:
-			if (n == 0)
+			if (n == 0) {
 				res.v_str = slink(&_nullstring_);
-			else if (n > 0) {
+			} else if (n > 0) {
 				res.v_str = stringsegment(v1->v_str,
 					v1->v_str->s_len - n,
 					v1->v_str->s_len - 1);
-			}
-			else {
+			} else {
 				res.v_str = stringsegment(v1->v_str,
 					v1->v_str->s_len - 1,
 					v1->v_str->s_len + n);
@@ -5875,6 +5886,17 @@ f_isatty(VALUE *vp)
 }
 
 
+static VALUE
+f_inputlevel (void)
+{
+	VALUE result;
+
+	result.v_type = V_NUM;
+	result.v_num = itoq((long) inputlevel());
+	return result;
+}
+
+
 static VALUE
 f_access(int count, VALUE **vals)
 {
@@ -5977,8 +5999,7 @@ f_putenv(int count, VALUE **vals)
 
 	/* return putenv result */
 	result.v_type = V_NUM;
-	result.v_num = itoq((long) putenv(putenv_str));
-	free(putenv_str);
+	result.v_num = itoq((long) malloced_putenv(putenv_str));
 	return result;
 }
 
@@ -6960,6 +6981,8 @@ static CONST struct builtin builtins[] = {
 	 "integral log of a number base 2"},
 	{"im", 1, 1, 0, OP_IM, 0, 0,
 	 "imaginary part of complex number"},
+	{"inputlevel", 0, 0, 0, OP_NOP, 0, f_inputlevel,
+	 "current input depth"},
 	{"insert", 2, IN, FA, OP_NOP, 0, f_listinsert,
 	 "insert values c ... into list a at position b"},
 	{"int", 1, 1, 0, OP_INT, qint, 0,
@@ -7522,4 +7545,145 @@ showerrors(void)
 }
 
 
+/*
+ * malloced_putenv - Keep track of malloced environment variable storage
+ *
+ * given:
+ *	str	a malloced string which will be given to putenv
+ *
+ * returns:
+ *	putenv() return value
+ *
+ * NOTE: The caller MUST pass a string that the caller has previously malloced.
+ */
+static int
+malloced_putenv(char *str)
+{
+	char *value;	/* location of the value part of the str argument */
+	char *old_val;	/* previously stored (or inherited) env value */
+	int found_cnt;	/* number of active env_pool entries found */
+	struct env_pool *new;	/* new e_pool */
+	int i;
+
+	/*
+	 * firewall
+	 */
+	if (str == NULL) {
+		math_error("malloced_putenv given a NULL pointer!!");
+		/*NOTREACHED*/
+	}
+	if (str[0] == '=') {
+		math_error("malloced_putenv = is first character in string!!");
+		/*NOTREACHED*/
+	}
+
+	/*
+	 * determine the place where getenv would return
+	 */
+	value = strchr(str, '=');
+	if (value == NULL) {
+		math_error("malloced_putenv = not found in string!!");
+		/*NOTREACHED*/
+	}
+	++value;
+
+	/*
+	 * lookup for an existing environment value
+	 */
+	*(value-1) = '\0';
+	old_val = getenv(str);
+	*(value-1) = '=';
+
+	/*
+	 * If we have the value in our environment, look for a
+	 * previously malloced string and free it
+	 */
+	if (old_val != NULL && env_pool_cnt > 0) {
+		for (i=0, found_cnt=0;
+		     i < env_pool_max && found_cnt < env_pool_cnt;
+		     ++i) {
+
+			/* skip an unused entry */
+			if (e_pool[i].getenv == NULL) {
+			    continue;
+			}
+			++found_cnt;
+
+			/* look for the 1st match */
+			if (e_pool[i].getenv == value) {
+
+				/* found match, free the storage */
+				if (e_pool[i].putenv != NULL) {
+					free(e_pool[i].putenv);
+				}
+				e_pool[i].getenv = NULL;
+				--env_pool_cnt;
+				break;
+			}
+		}
+	}
+
+	/*
+	 * ensure that we have room in the e_pool
+	 */
+	if (env_pool_max == 0) {
+
+		/* allocate an initial pool (with one extra guard value) */
+		new = (struct env_pool *)malloc((ENV_POOL_CHUNK+1) *
+						sizeof(struct env_pool));
+		if (new == NULL) {
+			math_error("malloced_putenv malloc failed");
+			/*NOTREACHED*/
+		}
+		e_pool = new;
+		env_pool_max = ENV_POOL_CHUNK;
+		for (i=0; i <= ENV_POOL_CHUNK; ++i) {
+			e_pool[i].getenv = NULL;
+		}
+
+	} else if (env_pool_cnt >= env_pool_max) {
+
+		/* expand the current pool (with one extra guard value) */
+		new = (struct env_pool *)realloc(e_pool,
+					     (env_pool_max+ENV_POOL_CHUNK+1) *
+					     sizeof(struct env_pool));
+		if (new == NULL) {
+			math_error("malloced_putenv realloc failed");
+			/*NOTREACHED*/
+		}
+		e_pool = new;
+		for (i=env_pool_max; i <= env_pool_max + ENV_POOL_CHUNK; ++i) {
+			e_pool[i].getenv = NULL;
+		}
+		env_pool_max += ENV_POOL_CHUNK;
+	}
+
+	/*
+	 * store our data into the first e_pool entry
+	 */
+	for (i=0; i < env_pool_max; ++i) {
+
+		/* skip used entries */
+		if (e_pool[i].getenv != NULL) {
+			continue;
+		}
+
+		/* store in this free entry and stop looping */
+		e_pool[i].getenv = value;
+		e_pool[i].putenv = str;
+		++env_pool_cnt;
+		break;
+	}
+	if (i >= env_pool_max) {
+		math_error("malloced_putenv missed unused entry!!");
+		/*NOTREACHED*/
+	}
+
+	/*
+	 * finally, do the putenv action
+	 */
+	return putenv(str);
+}
+
+
 #endif /* FUNCLIST */

have_const.c

@@ -46,16 +46,21 @@ int
 main(void)
 {
 #if defined(HAVE_NO_CONST)
+
 	printf("#undef HAVE_CONST /* no */\n");
 	printf("#undef CONST\n");
 	printf("#define CONST /* no */\n");
+
 #else /* HAVE_NO_CONST */
+
 	const char * const str = "const";
 
 	printf("#define HAVE_CONST /* yes */\n");
 	printf("#undef CONST\n");
 	printf("#define CONST %s /* yes */\n", str);
+
 #endif /* HAVE_NO_CONST */
+
 	/* exit(0); */
 	return 0;
 }

have_getpgid.c

@@ -0,0 +1,60 @@
+/*
+ * have_getpgid - Determine if we getpgid()
+ *
+ * usage:
+ *	have_getpgid
+ *
+ * Not all systems have the getpgid() function, so this may not
+ * compile on your system.
+ *
+ * This prog outputs several defines:
+ *
+ *	HAVE_GETPGID
+ *		defined ==> use getpgid()
+ *		undefined ==> do not or cannot call getpgid()
+ */
+/*
+ * Copyright (c) 1999 by Landon Curt Noll.  All Rights Reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright, this permission notice and text
+ * this comment, and the disclaimer below appear in all of the following:
+ *
+ *	supporting documentation
+ *	source copies
+ *	source works derived from this source
+ *	binaries derived from this source or from derived source
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * chongo was here	/\../\
+ */
+
+#include <sys/types.h>
+#include <unistd.h>
+
+int
+main(void)
+{
+#if defined(HAVE_NO_GETPGID)
+
+	printf("#undef HAVE_GETPGID /* no */\n");
+
+#else /* HAVE_NO_GETPGID */
+
+	(void) getpgid((pid_t)0);
+
+	printf("#define HAVE_GETPGID /* yes */\n");
+
+#endif /* HAVE_NO_GETPGID */
+
+	/* exit(0); */
+	return 0;
+}

have_getprid.c

@@ -0,0 +1,59 @@
+/*
+ * have_getprid - Determine if we getprid()
+ *
+ * usage:
+ *	have_getprid
+ *
+ * Not all systems have the getprid() function, so this may not
+ * compile on your system.
+ *
+ * This prog outputs several defines:
+ *
+ *	HAVE_GETPRID
+ *		defined ==> use getprid()
+ *		undefined ==> do not or cannot call getprid()
+ */
+/*
+ * Copyright (c) 1999 by Landon Curt Noll.  All Rights Reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright, this permission notice and text
+ * this comment, and the disclaimer below appear in all of the following:
+ *
+ *	supporting documentation
+ *	source copies
+ *	source works derived from this source
+ *	binaries derived from this source or from derived source
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * chongo was here	/\../\
+ */
+
+#include <sys/types.h>
+#include <unistd.h>
+
+int
+main(void)
+{
+#if defined(HAVE_NO_GETPRID)
+
+	printf("#undef HAVE_GETPRID /* no */\n");
+
+#else /* HAVE_NO_GETPRID */
+
+	(void) getprid();
+	printf("#define HAVE_GETPRID /* yes */\n");
+
+#endif /* HAVE_NO_GETPRID */
+
+	/* exit(0); */
+	return 0;
+}

have_getsid.c

@@ -0,0 +1,59 @@
+/*
+ * have_getsid - Determine if we getsid()
+ *
+ * usage:
+ *	have_getsid
+ *
+ * Not all systems have the getsid() function, so this may not
+ * compile on your system.
+ *
+ * This prog outputs several defines:
+ *
+ *	HAVE_GETSID
+ *		defined ==> use getsid()
+ *		undefined ==> do not call or cannot call getsid()
+ */
+/*
+ * Copyright (c) 1999 by Landon Curt Noll.  All Rights Reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright, this permission notice and text
+ * this comment, and the disclaimer below appear in all of the following:
+ *
+ *	supporting documentation
+ *	source copies
+ *	source works derived from this source
+ *	binaries derived from this source or from derived source
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * chongo was here	/\../\
+ */
+
+#include <sys/types.h>
+
+int
+main(void)
+{
+#if defined(HAVE_NO_GETSID)
+
+	printf("#undef HAVE_GETSID /* no */\n");
+
+#else /* HAVE_NO_GETSID */
+
+	(void) getsid((pid_t)0);
+
+	printf("#define HAVE_GETSID /* yes */\n");
+
+#endif /* HAVE_NO_GETSID */
+
+	/* exit(0); */
+	return 0;
+}

have_gettime.c

@@ -0,0 +1,74 @@
+/*
+ * have_gettime - Determine if we clock_gettime()
+ *
+ * usage:
+ *	have_gettime
+ *
+ * Not all systems have the clock_gettime() function, so this may not
+ * compile on your system.
+ *
+ * This prog outputs several defines:
+ *
+ *	HAVE_GETTIME
+ *		defined ==> use clock_gettime() for either CLOCK_SGI_CYCLE
+ *			    and/or CLOCK_REALTIME
+ *		undefined ==> clock_gettime() is not available for both
+ *			      CLOCK_SGI_CYCLE and CLOCK_REALTIME
+ */
+/*
+ * Copyright (c) 1999 by Landon Curt Noll.  All Rights Reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright, this permission notice and text
+ * this comment, and the disclaimer below appear in all of the following:
+ *
+ *	supporting documentation
+ *	source copies
+ *	source works derived from this source
+ *	binaries derived from this source or from derived source
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * chongo was here	/\../\
+ */
+
+#include <time.h>
+
+int
+main(void)
+{
+#if defined(HAVE_NO_GETTIME)
+
+	printf("#undef HAVE_GETTIME /* no */\n");
+
+#else /* HAVE_NO_GETTIME */
+
+# if defined(CLOCK_SGI_CYCLE)
+
+	struct timespec sgi_cycle;	/* SGI hardware clock */
+	(void) clock_gettime(CLOCK_SGI_CYCLE, &sgi_cycle);
+	printf("#define HAVE_GETTIME /* yes - w/CLOCK_SGI_CYCLE */\n");
+
+# elif defined(CLOCK_REALTIME)
+
+	struct timespec realtime;	/* POSIX realtime clock */
+	(void) clock_gettime(CLOCK_REALTIME, &realtime);
+	printf("#define HAVE_GETTIME /* yes - CLOCK_REALTIME only */\n");
+
+# else
+
+	printf("#undef HAVE_GETTIME /* no - no SGI_CYCLE and no REALTIME */\n");
+
+# endif /* CLOCK_REALTIME */
+
+#endif /* HAVE_NO_GETTIME */
+	/* exit(0); */
+	return 0;
+}

have_memmv.c

@@ -2,7 +2,7 @@
  * have_memmv - Determine if we memmove()
  *
  * usage:
- *	have_newstr
+ *	have_memmv
  *
  * Not all systems with memcpy() have memmove() functions, so this may not
  * compile on your system.
@@ -48,12 +48,17 @@ int
 main(void)
 {
 #if defined(HAVE_NO_MEMMOVE)
+
 	printf("#undef HAVE_MEMMOVE /* no */\n");
+
 #else /* HAVE_NO_MEMMOVE */
+
 	(void) memmove(dest, src, MOVELEN);
 
 	printf("#define HAVE_MEMMOVE /* yes */\n");
+
 #endif /* HAVE_NO_MEMMOVE */
+
 	/* exit(0); */
 	return 0;
 }

have_newstr.c

@@ -50,14 +50,19 @@ int
 main(void)
 {
 #if defined(HAVE_NO_NEWSTR)
+
 	printf("#undef HAVE_NEWSTR /* no */\n");
+
 #else /* HAVE_NO_NEWSTR */
+
 	(void) memcpy(dest, src, MOVELEN);
 	(void) memset(dest, 0, MOVELEN);
 	(void) strchr(src, 'e');
 
 	printf("#define HAVE_NEWSTR /* yes */\n");
+
 #endif /* HAVE_NO_NEWSTR */
+
 	/* exit(0); */
 	return 0;
 }

have_uid_t.c

@@ -51,15 +51,20 @@ int
 main(void)
 {
 #if defined(HAVE_NO_UID_T)
+
 	printf("#undef HAVE_UID_T /* no */\n");
+
 #else /* HAVE_NO_UID_T */
+
 	uid_t curds;
 	extern uid_t geteuid();
 
 	curds = geteuid();
 
 	printf("#define HAVE_UID_T /* yes */\n");
+
 #endif /* HAVE_NO_UID_T */
+
 	/* exit(0); */
 	return 0;
 }

have_ustat.c

@@ -0,0 +1,65 @@
+/*
+ * have_ustat - Determine if we ustat()
+ *
+ * usage:
+ *	have_ustat
+ *
+ * Not all systems have the ustat() function, so this may not
+ * compile on your system.
+ *
+ * This prog outputs several defines:
+ *
+ *	HAVE_USTAT
+ *		defined ==> use ustat()
+ *		undefined ==> do not call or cannot call ustat()
+ */
+/*
+ * Copyright (c) 1999 by Landon Curt Noll.  All Rights Reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright, this permission notice and text
+ * this comment, and the disclaimer below appear in all of the following:
+ *
+ *	supporting documentation
+ *	source copies
+ *	source works derived from this source
+ *	binaries derived from this source or from derived source
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * chongo was here	/\../\
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <ustat.h>
+
+int
+main(void)
+{
+#if defined(HAVE_NO_USTAT)
+
+	printf("#undef HAVE_USTAT /* no */\n");
+
+#else /* HAVE_NO_USTAT */
+
+	struct stat stat_dot;           /* stat of "." */
+	struct ustat ustat_dot;         /* usage stat of "." */
+
+	(void) stat(".", &stat_dot);
+	(void) ustat(stat_dot.st_dev, &ustat_dot);
+
+	printf("#define HAVE_USTAT /* yes */\n");
+
+#endif /* HAVE_NO_USTAT */
+
+	/* exit(0); */
+	return 0;
+}

have_varvs.c

@@ -57,11 +57,13 @@ try_this(char *fmt, ...)
     va_list ap;
 
     va_start(ap);
+
 #if !defined(DONT_HAVE_VSPRINTF)
     vsprintf(buf, fmt, ap);
 #else
     sprintf(buf, fmt, ap);
 #endif
+
     va_end(ap);
 }
 

help/Makefile

@@ -74,7 +74,7 @@ STD_HELP_FILES_12= archive
 
 BLT_HELP_FILES_13= bugs changes
 
-STD_HELP_FILES_14= contrib credit todo
+STD_HELP_FILES_14= contrib credit wishlist todo
 
 # These files are used in the following order to construct full
 #

help/archive

@@ -7,7 +7,7 @@ Where to get the the latest versions of calc
     Alpha test versions, complete with bugs, untested code and
     experimental features may be fetched (if you are brave) under:
 
-	http://reality.sgi.com/chongo/calc/
+	http://reality.sgi.com/chongo/tech/comp/calc/
 
     One may join the calc testing group by sending a request to:
 
@@ -22,10 +22,7 @@ Where to get the the latest versions of calc
     where "address" is your EMail address and "your_full_name"
     is your full name.
 
-    See:
+Landon Curt Noll
+http://reality.sgi.com/chongo
 
-	http://prime.corp.sgi.com/csp/ioccc/noll/noll.html#calc
-
-    for details.
-
-Landon Curt Noll <chongo@toad.com> /\oo/\
+chongo <was here> /\../\

help/contrib

@@ -8,7 +8,7 @@ We welcome and encourage you to send us:
 Prior to doing so, you should consider trying your changes on the most
 recent alpha test code.  To obtain the most recent code, look under
 
-	http://reality.sgi.com/chongo/calc/
+	http://reality.sgi.com/chongo/tech/comp/calc/
 
 You should also consider joining the calc testing group by sending a
 request to:
@@ -45,4 +45,7 @@ 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!
 
-Landon Curt Noll <chongo@toad.com> /\oo/\
+Landon Curt Noll
+http://reality.sgi.com/chongo
+
+chongo <was here> /\../\

help/credit

@@ -34,17 +34,17 @@ Credits
     interesting calc scripts that you would like you see included in
     future distributions to:
 
-	    dbell@auug.org.au
-	    chongo@toad.com
+	calc-tester@postofc.corp.sgi.com
 
-    Landon Noll maintains the official calc ftp archive at:
+    Landon Noll maintains the official calc http/ftp archive at:
 
-	ftp://ftp.uu.net/pub/calc
+	ftp://reality.sgi.com/users/chongo/src/calc
+	http://reality.sgi.com/chongo/src/calc/
 
     Alpha test versions, complete with bugs, untested code and
     experimental features may be fetched (if you are brave) under:
 
-	http://reality.sgi.com/chongo/calc/
+	http://reality.sgi.com/chongo/tech/comp/calc/
 
     One may join the calc testing group by sending a request to:
 

help/hash

@@ -12,10 +12,23 @@ TYPES
 DESCRIPTION
     Returns a hash value for one or more values of arbitrary types.
 
+    This function implements the Fowler/Noll/Vo hash-1 (FNV-1 hash).
+    The basis of the hash algorithm was taken from an idea sent
+    by Email to the IEEE POSIX P1003.2 mailing list from Phong Vo
+    (kpv@research.att.com) and Glenn Fowler (gsf@research.att.com).
+    Landon Curt Noll (http://reality.sgi.com/chongo) later improved on
+    their algorithm to come up with Fowler/Noll/Vo hash.
+
+    See:
+
+	http://reality.sgi.com/chongo/tech/comp/fnv/index.html
+
+    for more information in this hash.
+
 EXAMPLE
     > a = isqrt(2e1000); s = "xyz";
     > hash(a,s)
-	    870000771
+	    1916476840
 
 LIMITS
     The number of arguments is not to exceed 100.

help/help

@@ -42,7 +42,8 @@ following topics:
     changes		recent changes to calc
     contrib		how to contribute scripts, code or custom functions
     credit		who wrote calc and who helped
-    todo		needed enhancements and wish list
+    todo		list of priority action items for calc
+    wishlist		wish list of future enhancements of calc
 
     full		all of the above (in the above order)
 

help/todo

@@ -1,183 +1,71 @@
-Needed enhancements
+Calc Todo Items:
 
-    Send calc comments, suggestions, bug fixes, enhancements and
-    interesting calc scripts that you would like you see included in
-    future distributions to:
+    The following items should be addressed sometime in the short to
+    medium term future, if not before the next release.
 
-	    dbell@auug.org.au
-	    chongo@toad.com
+    Code contributions are welcome.  Send patches to:
 
-    The following items are in the calc wish list.  Programs like this
-    can be extended and improved forever.
+	    calc-tester@postofc.corp.sgi.com
 
-    *  In general use faster algorithms for large numbers when they
-       become known.  In particular, look at better algorithms for
-       very large numbers -- multiply, square and mod in particular.
+    See also the 'wishlist' help files for the calc enhancement wish list.
 
-    *  Implement an autoload feature.  Associate a calc library filename
-       with a function or global variable.  On the first reference of
-       such item, perform an automatic load of that file.
+=-=
 
-    *  Add error handling statements, so that QUITs, errors from the
-       'eval' function, division by zeroes, and so on can be caught.
-       This should be done using syntax similar to:
+Very High priority items:
 
-		ONERROR statement DO statement;
+    * Write the help file for the inputlevel() builtin function.
 
-       Something like signal isn't versatile enough.
+    * Write the help file for the display() builtin function.
 
-    *  Add a debugging capability so that functions can be single stepped,
-       breakpoints inserted, variables displayed, and so on.
+    * Write the help file for the stoponerror() builtin function.
 
-    *  Figure out how to write all variables out to a file, including
-       deeply nested arrays, lists, and objects.
+    * Update the errmax about the meaning of errmax(-1).
 
-       Add the ability to read and write a value in some binary form.
-       Clearly this is easy for non-neg integers.  The question of
-       everything else is worth pondering.
+    * Document the new meanings for bit values and the sign of
+      of config("lib_debug") in the appropriate help file(s).
 
-    *  Eliminate the need for the define keyword by doing smarter parsing.
+    * Fix any 'Known bugs' as noted in the BUGS file or as
+      displayed by 'calc help bugs'.
 
-    *  Allow results of a command (or all commands) to be re-directed to a
-       file or piped into a command.
+=-=
 
-    *  Add some kind of #include and #define facility.  Perhaps use
-       the C pre-processor itself?
+High priority items:
 
-    *  Support a more general input and output base mode other than
-       just dec, hex or octal.
+    * Verify, complete or fix the 'SEE ALSO' help file sections.
 
-    *  Implement a form of symbolic algebra.  Work on this has already
-       begun.  This will use backquotes to define expressions, and new
-       functions will be able to act on expressions.  For example:
+    * Verify, complete or fix the 'LIBRARY' help file sections.
 
-	    x = `hello * strlen(mom)`;
-	    x = sub(x, `hello`, `hello + 1`);
-	    x = sub(x, `hello`, 10, `mom`, "curds");
-	    eval(x);
+    * Verify, complete or fix the 'LIMITS' help file sections.
 
-       prints 55.
+    * Verify, complete or fix the 'SYNOPSIS' and 'TYPES' help file sections.
 
-    *  Place the results of previous commands into a parallel history list.
-       Add a binding that returns the saved result of the command so
-       that one does not need to re-execute a previous command simply
-       to obtain its value.
+    * Where reasonable, be sure that regress.cal tests builtin functions.
 
-       If you have a command that takes a very long time to execute,
-       it would be nice if you could get at its result without having
-       to spend the time to reexecute it.
+    * Perform a code coverage analysis of the 'make check' action
+      and improve the coverage (within reason) of the regress.cal suite.
 
-    *  Add a binding to delete a value from the history list.
+    * Create a Linux rpm (Red Hat Package Manager) package for calc.
 
-       One may need to remove a large value from the history list if
-       it is very large.  Deleting the value would replace the history
-       entry with a null value.
+    * Address, if possible and reasonable, any Calc Mis-features
+      as noted in the BUGS file or as displayed by 'calc help bugs'.
 
-    *  Add a binding to delete a command from the history list.
+    * The shell script that is currently constructed to display a help
+      file (in help.c) is a gross hack.  That code should be replaced
+      with code that looks for the help file in the pre-defined help
+      directories.  When the specific help file is found and opened,
+      then a $PAGER should be forked and execed after doing things such
+      as closing open file descriptors that the $PAGER does not need.
 
-       Since you can delete values, you might as well be able to
-       delete commands.
+    * Inspect changes made since the last major calc release (the
+      initial x.y.z version ... prior to any t sub-version) to help
+      ensure that they have not introduced new or re-introduced old bugs
+      into calc.
 
-    *  All one to alter the size of the history list thru config().
+=-=
 
-       In some cases, 256 values is too small, in others it is too large.
+Medium priority items:
 
-    *  Add a builtin that returns a value from the history list.
-       As an example:
-
-	    histval(-10)
-
-       returns the 10th value on the history value list, if such
-       a value is in the history list (null otherwise).  And:
-
-	    histval(23)
-
-       return the value of the 23rd command given to calc, if
-       such a value is in the history list (null otherwise).
-
-       It would be very helpful to use the history values in
-       subsequent equations.
-
-    *  Add a builtin that returns command as a string from the
-       history list.  As an example:
-
-	    history(-10)
-
-       returns a string containing the 10th command on the
-       history list, if a such a value is in the history list
-       (empty string otherwise).  And:
-
-	    history(23)
-
-       return the string containing the 23rd command given to calc, if
-       such a value is in the history list (empty string otherwise).
-
-       One could use the eval() function to re-evaluate the command.
-
-    *  Allow one to optionally restore the command number to calc
-       prompts.  When going back in the history list, indicate the
-       command number that is being examined.
-
-       The command number was a useful item.  When one is scanning the
-       history list, knowing where you are is hard without it.  It can
-       get confusing when the history list wraps or when you use
-       search bindings.  Command numbers would be useful in
-       conjunction with positive args for the history() and histval()
-       functions as suggested above.
-
-    *  Add a builtin that returns the current command number.
-       For example:
-
-	    cmdnum()
-
-       returns the current command number.
-
-       This would allow one to tag a value in the history list.  One
-       could save the result of cmdnum() in a variable and later use
-       it as an arg to the histval() or history() functions.
-
-    *  Add a factoring builtin functions.  Provide functions that perform
-       multiple polynomial quadratic sieves, elliptic curve, difference
-       of two squares, N-1 factoring as so on.  Provide a easy general
-       factoring builtin (say factor(foo)) that would attempt to apply
-       whatever process was needed based on the value.
-
-       Factoring builtins would return a matrix of factors.
-
-       It would be handy to configure, via config(), the maximum time
-       that one should try to factor a number.  By default the time
-       should be infinite.  If one set the time limit to a finite
-       value and the time limit was exceeded, the factoring builtin
-       would return whatever if had found thus far, even if no new
-       factors had been found.
-
-       Another factoring configuration interface, via config(), that
-       is needed would be to direct the factoring builtins to return
-       as soon as a factor was found.
-
-    *  Allow one to config calc break up long output lines.
-
-       The command:  calc '2^100000'  will produce one very long
-       line.  Many times this is reasonable.  Long output lines
-       are a problem for some utilities.  It would be nice if one
-       could configure, via config(), calc to fold long lines.
-
-       By default, calc should continue to produce long lines.
-
-       One option to config should be to specify the length to
-       fold output.  Another option should be to append a trailing
-       \ on folded lines (as some symbolic packages use).
-
-    *  Allow one to use the READ and WRITE commands inside a function.
-
-    *  Remove or increase limits on factor(), lfactor(), isprime(),
-       nextprime(), and prevprime().  Currently these functions cannot
-       search for factors > 2^32.
-
-    *  Add read -once -try "filename" which would do nothing
-       if "filename" was not a readable file.
-
-    *  Complete the use of CONST where appropirate:
+    * Complete the use of CONST where appropriate:
 
 	CONST is beginning to be used with read-only tables and some
 	function arguments.  This allows certain compilers to better
@@ -196,48 +84,10 @@ Needed enhancements
 	at by 'fizbin' and the HALF array pointer at by 'data' should be
 	treated as read-only.
 
-    * Blocks should have the following features:
-
-        + read/write to/from files (ala fread/fwrite)
-
-	+ misc memory functions (ala memcpy, memcmp, memset,
-	  memchr, etc.)
-
-	+ scatter and gather functions (to send every n-th octet
-	  to another block and to copy from n blocks, the 1st
-	  then 2nd then 3rd ... octets)
-
-    * Printing of blocks should be under the control of the
-      config() interface.  This should allow one to select
-      from any of the following formats:
-
-	+ as one long string
-
-	+ as a series of lines (< 80 chars wide)
-
-	+ in od command style (offset: value value value ...)
-
-	+ in hex dump style (offset: val val val val ...  3hf.Uas.c)
-
-    * In addition one should be able to control the following
-      aspects of printing blocks via the config() interface:
-
-	+ base (hex, octal, char, base 2)
-
-	+ amount of data (the first n octets or the entire block)
-
-	+ skipping printing of duplicate print lines (ala od)
-
-	+ have the ability to print the block as raw data
-
     * It is overkill to have nearly everything wind up in libcalc.a.
 
-      One should make available a the fundimental math operations
+      One should make available a the fundamental math operations
       on ZVALUE, NUMBER and perhaps COMPLEX (without all of the
       other stuff) in a separate library.
 
-    * improve the coverage in the 'SEE ALSO' help file lists
-
-    * where reasonable, be sure that regress.cal tests builtin functions
-
-    * clean the source code and document it better
+    * Clean the source code and document it better.

help/wishlist

@@ -0,0 +1,215 @@
+Calc Enhancement Wish List:
+
+    Send calc comments, suggestions, bug fixes, enhancements and
+    interesting calc scripts that you would like you see included in
+    future distributions to:
+
+		calc-tester@postofc.corp.sgi.com
+
+    The following items are in the calc wish list.  Programs like this
+    can be extended and improved forever.
+
+    See the 'todo' help file for higher priority todo items.
+
+=-=
+
+    *  In general use faster algorithms for large numbers when they
+       become known.  In particular, look at better algorithms for
+       very large numbers -- multiply, square and mod in particular.
+
+    *  Implement an autoload feature.  Associate a calc library filename
+       with a function or global variable.  On the first reference of
+       such item, perform an automatic load of that file.
+
+    *  Add error handling statements, so that QUITs, errors from the
+       'eval' function, division by zeroes, and so on can be caught.
+       This should be done using syntax similar to:
+
+		ONERROR statement DO statement;
+
+       Something like signal isn't versatile enough.
+
+    *  Add a debugging capability so that functions can be single stepped,
+       breakpoints inserted, variables displayed, and so on.
+
+    *  Figure out how to write all variables out to a file, including
+       deeply nested arrays, lists, and objects.
+
+       Add the ability to read and write a value in some binary form.
+       Clearly this is easy for non-neg integers.  The question of
+       everything else is worth pondering.
+
+    *  Eliminate the need for the define keyword by doing smarter parsing.
+
+    *  Allow results of a command (or all commands) to be re-directed to a
+       file or piped into a command.
+
+    *  Add some kind of #include and #define facility.  Perhaps use
+       the C pre-processor itself?
+
+    *  Support a more general input and output base mode other than
+       just dec, hex or octal.
+
+    *  Implement a form of symbolic algebra.  Work on this has already
+       begun.  This will use backquotes to define expressions, and new
+       functions will be able to act on expressions.  For example:
+
+	    x = `hello * strlen(mom)`;
+	    x = sub(x, `hello`, `hello + 1`);
+	    x = sub(x, `hello`, 10, `mom`, "curds");
+	    eval(x);
+
+       prints 55.
+
+    *  Place the results of previous commands into a parallel history list.
+       Add a binding that returns the saved result of the command so
+       that one does not need to re-execute a previous command simply
+       to obtain its value.
+
+       If you have a command that takes a very long time to execute,
+       it would be nice if you could get at its result without having
+       to spend the time to reexecute it.
+
+    *  Add a binding to delete a value from the history list.
+
+       One may need to remove a large value from the history list if
+       it is very large.  Deleting the value would replace the history
+       entry with a null value.
+
+    *  Add a binding to delete a command from the history list.
+
+       Since you can delete values, you might as well be able to
+       delete commands.
+
+    *  All one to alter the size of the history list thru config().
+
+       In some cases, 256 values is too small, in others it is too large.
+
+    *  Add a builtin that returns a value from the history list.
+       As an example:
+
+	    histval(-10)
+
+       returns the 10th value on the history value list, if such
+       a value is in the history list (null otherwise).  And:
+
+	    histval(23)
+
+       return the value of the 23rd command given to calc, if
+       such a value is in the history list (null otherwise).
+
+       It would be very helpful to use the history values in
+       subsequent equations.
+
+    *  Add a builtin that returns command as a string from the
+       history list.  As an example:
+
+	    history(-10)
+
+       returns a string containing the 10th command on the
+       history list, if a such a value is in the history list
+       (empty string otherwise).  And:
+
+	    history(23)
+
+       return the string containing the 23rd command given to calc, if
+       such a value is in the history list (empty string otherwise).
+
+       One could use the eval() function to re-evaluate the command.
+
+    *  Allow one to optionally restore the command number to calc
+       prompts.  When going back in the history list, indicate the
+       command number that is being examined.
+
+       The command number was a useful item.  When one is scanning the
+       history list, knowing where you are is hard without it.  It can
+       get confusing when the history list wraps or when you use
+       search bindings.  Command numbers would be useful in
+       conjunction with positive args for the history() and histval()
+       functions as suggested above.
+
+    *  Add a builtin that returns the current command number.
+       For example:
+
+	    cmdnum()
+
+       returns the current command number.
+
+       This would allow one to tag a value in the history list.  One
+       could save the result of cmdnum() in a variable and later use
+       it as an arg to the histval() or history() functions.
+
+    *  Add a factoring builtin functions.  Provide functions that perform
+       multiple polynomial quadratic sieves, elliptic curve, difference
+       of two squares, N-1 factoring as so on.  Provide a easy general
+       factoring builtin (say factor(foo)) that would attempt to apply
+       whatever process was needed based on the value.
+
+       Factoring builtins would return a matrix of factors.
+
+       It would be handy to configure, via config(), the maximum time
+       that one should try to factor a number.  By default the time
+       should be infinite.  If one set the time limit to a finite
+       value and the time limit was exceeded, the factoring builtin
+       would return whatever if had found thus far, even if no new
+       factors had been found.
+
+       Another factoring configuration interface, via config(), that
+       is needed would be to direct the factoring builtins to return
+       as soon as a factor was found.
+
+    *  Allow one to config calc break up long output lines.
+
+       The command:  calc '2^100000'  will produce one very long
+       line.  Many times this is reasonable.  Long output lines
+       are a problem for some utilities.  It would be nice if one
+       could configure, via config(), calc to fold long lines.
+
+       By default, calc should continue to produce long lines.
+
+       One option to config should be to specify the length to
+       fold output.  Another option should be to append a trailing
+       \ on folded lines (as some symbolic packages use).
+
+    *  Allow one to use the READ and WRITE commands inside a function.
+
+    *  Remove or increase limits on factor(), lfactor(), isprime(),
+       nextprime(), and prevprime().  Currently these functions cannot
+       search for factors > 2^32.
+
+    *  Add read -once -try "filename" which would do nothing
+       if "filename" was not a readable file.
+
+    * Blocks should have the following features:
+
+        + read/write to/from files (ala fread/fwrite)
+
+	+ misc memory functions (ala memcpy, memcmp, memset,
+	  memchr, etc.)
+
+	+ scatter and gather functions (to send every n-th octet
+	  to another block and to copy from n blocks, the 1st
+	  then 2nd then 3rd ... octets)
+
+    * Printing of blocks should be under the control of the
+      config() interface.  This should allow one to select
+      from any of the following formats:
+
+	+ as one long string
+
+	+ as a series of lines (< 80 chars wide)
+
+	+ in od command style (offset: value value value ...)
+
+	+ in hex dump style (offset: val val val val ...  3hf.Uas.c)
+
+    * In addition one should be able to control the following
+      aspects of printing blocks via the config() interface:
+
+	+ base (hex, octal, char, base 2)
+
+	+ amount of data (the first n octets or the entire block)
+
+	+ skipping printing of duplicate print lines (ala od)
+
+	+ have the ability to print the block as raw data

hist.c

@@ -455,8 +455,9 @@ do_bind_line(KEY_MAP *map, char *line)
 		if (*cp == '?') {
 			key = 0177;
 			cp++;
-		} else
+		} else {
 			key = CONTROL(*cp++);
+		}
 	}
 	else if (key == '\\')
 		key = *cp++;

input.c

@@ -33,8 +33,9 @@ typedef struct {
 	int i_state;		/* state (read, reread) */
 	int i_char;		/* currently read char */
 	long i_line;		/* line number */
-	char *i_str;		/* current string for input (if not NULL) */
-	char *i_origstr;	/* original string so it can be freed */
+	char *i_cp;		/* pointer to string character to be read */
+	char *i_str;		/* start of string copy to be read, or NULL */
+	long i_num;		/* number of string characters remaining */
 	char *i_ttystr;		/* current character of tty line (or NULL) */
 	FILE *i_fp;		/* current file for input (if not NULL) */
 	char *i_name;		/* file name if known */
@@ -311,7 +312,7 @@ f_open(char *name, char *mode)
 	 */
 	if (!allow_read && !allow_write) {
 		/* no reads and no writes means no opens! */
-		if (run_state > RUN_PRE_BEGIN) {
+		if (run_state > RUN_BEGIN) {
 			fprintf(stderr,
 				"open of %s mode %s - %s\n", name, mode,
 				"open for read or write disallowed by -m\n");
@@ -319,7 +320,7 @@ f_open(char *name, char *mode)
 		return NULL;
 	} else if (!allow_read && strchr(mode, 'r') != NULL) {
 		/* reading new files disallowed */
-		if (run_state > RUN_PRE_BEGIN) {
+		if (run_state > RUN_BEGIN) {
 			fprintf(stderr,
 				"open of %s mode %s - %s\n", name, mode,
 				"open for read disallowed by -m\n");
@@ -330,7 +331,7 @@ f_open(char *name, char *mode)
 		    strchr(mode, 'a') != NULL ||
 		    strchr(mode, '+') != NULL)) {
 		/* writing new files disallowed */
-		if (run_state > RUN_PRE_BEGIN) {
+		if (run_state > RUN_BEGIN) {
 			fprintf(stderr,
 				"open of %s mode %s - %s\n", name, mode,
 				"open for write disallowed by -m\n");
@@ -375,7 +376,6 @@ openfile(char *name)
 	cip->i_state = IS_READ;
 	cip->i_char = '\0';
 	cip->i_str = NULL;
-	cip->i_origstr = NULL;
 	cip->i_ttystr = NULL;
 	cip->i_fp = fp;
 	cip->i_line = 1;
@@ -401,7 +401,7 @@ curstream(void)
 
 
 /*
- * Open a string for scanning. String is ended by a null character.
+ * Open a string for scanning, num characters to be read.
  * String is copied into local memory so it can be trashed afterwards.
  * Returns -1 if cannot open string.
  *
@@ -409,21 +409,22 @@ curstream(void)
  *	str		string to be opened
  */
 int
-openstring(char *str)
+openstring(char *str, long num)
 {
 	char *cp;		/* copied string */
 
 	if ((depth >= MAXDEPTH) || (str == NULL))
 		 return -2;
-	cp = (char *)malloc(strlen(str) + 1);
+	cp = (char *) malloc(num + 1);
 	if (cp == NULL)
 		 return -1;
 	strcpy(cp, str);
 	cip = inputs + depth++;
 	cip->i_state = IS_READ;
 	cip->i_char = '\0';
+	cip->i_cp = cp;
 	cip->i_str = cp;
-	cip->i_origstr = cp;
+	cip->i_num = num;
 	cip->i_fp = NULL;
 	cip->i_name = NULL;
 	cip->i_ttystr = NULL;
@@ -445,7 +446,6 @@ openterminal(void)
 	cip->i_state = IS_READ;
 	cip->i_char = '\0';
 	cip->i_str = NULL;
-	cip->i_origstr = NULL;
 	cip->i_ttystr = NULL;
 	cip->i_fp = NULL;
 	cip->i_name = NULL;
@@ -462,8 +462,8 @@ closeinput(void)
 {
 	if (depth <= 0)
 		return;
-	if (cip->i_origstr)
-		free(cip->i_origstr);
+	if (cip->i_str)
+		free(cip->i_str);
 	if (cip->i_fp)
 		fclose(cip->i_fp);
 	if (cip->i_name)
@@ -515,8 +515,11 @@ nextchar(void)
 		 return ch;
 	}
 	if (cip->i_str) {		/* from string */
-		ch = chartoint(*cip->i_str++);
-		if (ch == '\0')
+		if (cip->i_num) {
+			ch = chartoint(*cip->i_cp++);
+			cip->i_num--;
+		}
+		else
 			ch = EOF;
 	} else if (cip->i_fp) {		/* from file */
 		ch = fgetc(cip->i_fp);
@@ -525,10 +528,6 @@ nextchar(void)
 	} else {			/* from terminal */
 		ch = ttychar();
 	}
-	if (ch == EOF) {		/* fix up end of file */
-		closeinput();
-		ch = EOF;
-	}
 	if (depth > 0)
 		cip->i_char = ch;	/* save for rereads */
 	if (ch == '\n')
@@ -663,6 +662,16 @@ inputisterminal(void)
 }
 
 
+/*
+ * Return depth of current input source
+ */
+int
+inputlevel(void)
+{
+	return depth - 1;
+}
+
+
 /*
  * Return the name of the current input file.
  * Returns NULL for terminal or strings.
@@ -710,35 +719,37 @@ runrcfiles(void)
 {
 	char path[MAX_CALCRC+1+1];	/* name being searched for */
 	char *cp;
-	char *newcp;
 	char *p;
-	int i;
 
 	/* execute each file in the list */
-	for (cp=calcrc, newcp=(char *)strchr(calcrc, LISTCHAR);
-	     cp != NULL && *cp;
-	     cp = newcp,
-		 newcp=(newcp) ? (char *)strchr(newcp+1, LISTCHAR) : NULL) {
+	while (calcrc != NULL && *calcrc) {
+		cp = calcrc;
+		calcrc = (char *) strchr(calcrc + 1, LISTCHAR);
 
 		/* load file name into the path */
-		if (newcp == NULL) {
+		if (calcrc == NULL) {
 			strcpy(path, cp);
 		} else {
-			strncpy(path, cp, newcp-cp);
-			path[newcp-cp] = '\0';
+			strncpy(path, cp, calcrc - cp);
+			path[calcrc - cp] = '\0';
 		}
 
 		/* find the start of the path */
-		p = (path[0] == ':') ? path+1 : path;
+		p = (path[0] == ':') ? path + 1 : path;
 		if (p[0] == '\0') {
 			continue;
 		}
 
 		/* process the current file in the list */
-		i = openfile(p);
-		if (i < 0)
+		if (openfile(p) < 0) {
+			/* Unable to open rcfile */
+			if (c_flag && !d_flag)
+				 fprintf(stderr,
+					"Unable to open rcfile \"%s\"\n", p);
 			continue;
+		}
 		getcommands(FALSE);
+		closeinput();
 	}
 }
 

lib/chrem.cal

@@ -86,7 +86,7 @@
  *	i.e., any value that is 301 mod 420.
  *
  * Written by: Ernest W Bowen <ernie@neumann.une.edu.au>
- * Interface by: Landon Curt Noll <chongo@toad.com>
+ * Interface by: Landon Curt Noll http://reality.sgi.com/chongo
  */
 
 static defaultmlist = list(2,3,5,7,11,13,17,19); /* The first eight primes */

lib/lucas.cal

@@ -19,7 +19,10 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  */
 /*
  * lucas - perform a Lucas primality test on h*2^n-1

lib/lucas_chk.cal

@@ -19,7 +19,10 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  */
 /*
  * primes of the form h*2^n-1 for 1<=h<200 and 1<=n<1000

lib/lucas_tbl.cal

@@ -19,7 +19,10 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  */
 /*
  * Lucasian criteria for primality

lib/mfactor.cal

@@ -19,7 +19,10 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  */
 
 

lib/qtime.cal

@@ -7,7 +7,7 @@
  *	utc_hr_offset	Offset from UTC in hours.
  *
  * Written by: Klaus Alexander Seistrup <kseis@magnetic-ink.dk>
- * With minor mods by: Landon Curt Noll <chongo@toad.com>
+ * With minor mods by: Landon Curt Noll <http://reality.sgi.com/chongo>
  *
  * See:
  *	http://www.magnetic-ink.dk/download/qtime.html

lib/randmprime.cal

@@ -21,7 +21,10 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  */
 
 /* obtain our required libs */

lib/regress.cal

@@ -4223,7 +4223,7 @@ define test_random()
 
 	/* test range interface some more */
 	tmp = srandom(state1);
-	print				  '5369: tmp = srandom(0)';
+	print				  '5369: tmp = srandom(state1)';
 	vrfy(random(-46,46) == -0x7,	  '5370: random(-46,46) == -0x7');
 	vrfy(random(21701,23209) == 23061,
 		'5371: random(21701,23209) == 23061');
@@ -7115,6 +7115,8 @@ print '188: parsed test_natnumset()';
  */
 define test_somenew()
 {
+	local a, s;
+
 	print	'8200: Starting test_somenew';
 
 	vrfy(char(-1) == char(255),	'8201: char(-1) == char(255)');
@@ -7139,7 +7141,11 @@ define test_somenew()
 	vrfy(1/(1/0) == 0,		'8215: 1/(1/0) == 0');
 	vrfy(inverse(1/0) == 0,		'8216: inverse(1/0) == 0');
 
-	print '8217: Ending test_somenew';
+	a = isqrt(2e1000); s = "xyz";
+	print				'8217: a = isqrt(2e1000); s = "xyz";';
+	vrfy(hash(a,s) == 1916476840,	'8218: hash(a,s) == 1916476840');
+
+	print '8219: Ending test_somenew';
 }
 print '189: parsed test_somenew()';
 
@@ -7393,6 +7399,23 @@ print;
 return test_somenew();
 
 
+/*
+ * misc define tests
+ */
+print;
+print	'8300: Starting define tests';
+define f8300(x) = x^2; define g8300(x) = 1 - x;
+print	'8301: define f8300(x) = x^2; define g8300(x) = 1 - x;';
+vrfy(f8300(10) == 100,		'8302: f8300(10) == 100');
+vrfy(g8300(10) == -9,		'8303: g8300(10) == -9');
+define h8300(x)=x^3;define i8300(x)=x-1;define j8300(x)=x+1;
+print	'8304: define h8300(x)=x^3;define i8300(x)=x-1;define j8300(x)=x+1;';
+vrfy(h8300(10) == 1000,		'8305: h8300(10) == 1000');
+vrfy(i8300(10) == 9,		'8306: i8300(10) == 9');
+vrfy(j8300(10) == 11,		'8307: j8300(10) == 11');
+print	'8308: Ending define tests';
+
+
 /*
  * read various calc libs
  *

lib/seedrandom.cal

@@ -19,7 +19,10 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\		chongo@toad.com
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  */
 
 /*

lib/test1700.cal

@@ -3,8 +3,10 @@
  * Permission is granted to use, distribute, or modify this source,
  * provided that this copyright notice remains intact.
  *
- * By: Landon Curt Noll
- *     chongo@toad.com  -or-  ...!{pyramid,sun,uunet}!hoptoad!chongo
+ * By:  Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  *
  * This library is used by the 1700 series of the regress.cal test suite.
  */

lib/test2300.cal

@@ -3,8 +3,10 @@
  * Permission is granted to use, distribute, or modify this source,
  * provided that this copyright notice remains intact.
  *
- * By: Landon Curt Noll
- *     chongo@toad.com  -or-  ...!{pyramid,sun,uunet}!hoptoad!chongo
+ * By:  Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  *
  * This library is used by the 2300 series of the regress.cal test suite.
  */

lib/test2600.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 2600 series of the regress.cal test suite.
  */

lib/test2700.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 2700 series of the regress.cal test suite.
  */

lib/test3100.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 3100 series of the regress.cal test suite.
  */

lib/test3300.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 3300 series of the regress.cal test suite.
  */

lib/test3400.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 3400 series of the regress.cal test suite.
  */

lib/test3500.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 3500 series of the regress.cal test suite.
  */

lib/test4000.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 4000 series of the regress.cal test suite.
  */

lib/test4100.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 4100 series of the regress.cal test suite.
  */

lib/test4600.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 4600 series of the regress.cal test suite.
  */

lib/test5100.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 5100 series of the regress.cal test suite.
  */

lib/test5200.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  *
  * This library is used by the 5200 series of the regress.cal test suite.
  */

lib_calc.c

@@ -180,7 +180,7 @@ libcalc_call_me_first(void)
 	/*
 	 * ready to rock & roll ..
 	 */
-	run_state = RUN_PRE_BEGIN;
+	run_state = RUN_BEGIN;
 	init_done = 1;
 	return;
 }
@@ -247,6 +247,7 @@ reinitialize(void)
 	math_setfp(stdout);
 	resetscopes();
 	resetinput();
+	inittokens();
 	(void) openterminal();
 }
 

matfunc.c

@@ -1213,8 +1213,9 @@ matcopy(MATRIX *m)
 		if (v1->v_type == V_NUM) {
 			v2->v_type = V_NUM;
 			v2->v_num = qlink(v1->v_num);
-		} else
+		} else {
 			copyvalue(v1, v2);
+		}
 		v1++;
 		v2++;
 	}

math_error.h

@@ -27,12 +27,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *	Landon Curt Noll
+ *	http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 

nametype.h

@@ -28,12 +28,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *	Landon Curt Noll
+ *	http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 

obj.c

@@ -640,8 +640,9 @@ objfree(OBJECT *op)
 	for (i = op->o_actions->count; i-- > 0; vp++) {
 		if (vp->v_type == V_NUM) {
 			qfree(vp->v_num);
-		} else
+		} else {
 			freevalue(vp);
+		}
 	}
 	if (op->o_actions->count <= USUAL_ELEMENTS)
 		free(op);
@@ -678,8 +679,9 @@ objcopy(OBJECT *op)
 		if (v1->v_type == V_NUM) {
 			v2->v_num = qlink(v1->v_num);
 			v2->v_type = V_NUM;
-		} else
+		} else {
 			copyvalue(v1, v2);
+		}
 		v2->v_subtype = V_NOSUBTYPE;
 	}
 	return np;

opcodes.c

@@ -2065,9 +2065,9 @@ o_isdefined(void)
 	}
 	r = 0;
  	index = getbuiltinfunc(vp->v_str->s_str);
- 	if (index >= 0)
+ 	if (index >= 0) {
  		r = 1;
- 	else {
+ 	} else {
  		index = getuserfunc(vp->v_str->s_str);
  		if (index >= 0)
  			r = 2;

poly.c

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By: Ernest Bowen and Landon Curt Noll
- *     ernie@neumann.une.edu.au and chongo@toad.com
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo
  */
 
 #include "value.h"
@@ -31,20 +31,17 @@ evp(LISTELEM *cp, LISTELEM *x, VALUE *vres)
 					freevalue(&tmp1);
 					freevalue(vres);
 					*vres = tmp2;
-				}
-				else {
+				} else {
 					s = TRUE;
 					*vres = tmp1;
 				}
 			}
-		}
-		else {
+		} else {
 			if (s) {
 				addvalue(&v, vres, &tmp1);
 				freevalue(vres);
 				*vres = tmp1;
-			}
-			else {
+			} else {
 				s = TRUE;
 				copyvalue(&v, vres);
 			}
@@ -126,9 +123,9 @@ addlistinv(LIST *lp, VALUE *vres)
 	VALUE tmp1, tmp2;
 
 	for (ep = lp->l_first; ep; ep = ep->e_next) {
-		if (ep->e_value.v_type == V_LIST)
+		if (ep->e_value.v_type == V_LIST) {
 			addlistinv(ep->e_value.v_list, vres);
-		else {
+		} else {
 			invertvalue(&ep->e_value, &tmp1);
 			addvalue(vres, &tmp1, &tmp2);
 			freevalue(&tmp1);

qfunc.c

@@ -1156,9 +1156,9 @@ qcfappr(NUMBER *q, NUMBER *epsilon, long rnd)
 		s = -s;
 	}
 	if (bnddencase) {
-		if (s > 0)
+		if (s > 0) {
 			useold = TRUE;
-		else {
+		} else {
 			zsub(zden, denbnd, &tmp1);
 			zquo(tmp1, oldden, &k, 1);
 			zfree(tmp1);

qio.c

@@ -413,8 +413,9 @@ qprintfd(NUMBER *q, long width)
 		zquo(q->num, q->den, &z, conf->outround);
 		zprintval(z, 0L, width);
 		zfree(z);
-	} else
+	} else {
 		zprintval(q->num, 0L, width);
+	}
 }
 
 

qmod.c

@@ -116,15 +116,13 @@ qquomod(NUMBER *q1, NUMBER *q2, NUMBER **retqdiv, NUMBER **retqmod)
 			zfree(tmp2);
 			qq = qlink(&_qzero_);
 			qm = qlink(q1);
-		}
-		else {
+		} else {
 			qq = qalloc();
 			qq->num = tmp1;
 			if (ziszero(tmp2)) {
 				zfree(tmp2);
 				qm = qlink(&_qzero_);
-			}
-			else {
+			} else {
 				qm = qalloc();
 				qm->num = tmp2;
 			}
@@ -141,15 +139,13 @@ qquomod(NUMBER *q1, NUMBER *q2, NUMBER **retqdiv, NUMBER **retqmod)
 			zfree(tmp4);
 			qq = qlink(&_qzero_);
 			qm = qlink(q1);
-		}
-		else {
+		} else {
 			qq = qalloc();
 			qq->num = tmp3;
 			if (ziszero(tmp4)) {
 				zfree(tmp4);
 				qm = qlink(&_qzero_);
-			}
-			else {
+			} else {
 				qm = qalloc();
 				zmul(q1->den, q2->den, &tmp1);
 				zreduce(tmp4, tmp1, &qm->num, &qm->den);

qtrans.c

@@ -1022,8 +1022,7 @@ qpower(NUMBER *q1, NUMBER *q2, NUMBER *epsilon)
 			tmp1 = itoq(m);
 			tmp2 = qmul(tmp1, q2tmp);
 			m = qtoi(tmp2);
-		}
-		else {
+		} else {
 			tmp1 = qdec(q1tmp);
 			tmp2 = qqdiv(tmp1, q1tmp);
 			qfree(tmp1);
@@ -1038,8 +1037,7 @@ qpower(NUMBER *q1, NUMBER *q2, NUMBER *epsilon)
 			tmp1 = itoq(m + 1);
 			tmp2 = qmul(tmp1, q2tmp);
 			m = qtoi(tmp2);
-		}
-		else {
+		} else {
 			tmp1 = qdec(q1tmp);
 			tmp2 = qmul(tmp1, q2tmp);
 			qfree(tmp1);

quickhash.c

@@ -19,7 +19,10 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here	/\../\
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  */
 
 /*
@@ -81,7 +84,7 @@ static QCKHASH blk_hash(BLOCK *blk, QCKHASH val);
  * The basis of the hash algorithm was taken from an idea
  * sent by Email to the IEEE Posix P1003.2 mailing list from
  * Phong Vo (kpv@research.att.com) and Glenn Fowler (gsf@research.att.com).
- * Landon Curt Noll (chongo@toad.com) later improved on there
+ * Landon Curt Noll (http://reality.sgi.com/chongo) later improved on there
  * algorithm to come up with Fowler/Noll/Vo hash.
  *
  * The magic lies in the constant 16777619, which for 32 bit hashing

sample/Makefile

@@ -26,12 +26,10 @@
 #
 # Happy bit twiddling,
 #
-#			Landon Curt Noll
+#      Landon Curt Noll
+#      http://reality.sgi.com/chongo
 #
-#			chongo@toad.com
-#			...!{pyramid,sun,uunet}!hoptoad!chongo
-#
-# chongo was here	/\../\
+# chongo <was here> /\../\
 
 ##############################################################################
 #-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
@@ -208,11 +206,6 @@ CALC_LIBS= ../libcalc.a ../custom/libcustcalc.a
 
 ###
 #
-# Normally, the upper level makefile will set these values.  We provide
-# a default here just in case you want to build from this directory.
-#
-# Select your compiler type by commenting out one of the cc sets below:
-#
 # CCOPT are flags given to ${CC} for optimization
 # CCWARN are flags given to ${CC} for warning message control
 # CCMISC are misc flags given to ${CC}
@@ -220,32 +213,36 @@ CALC_LIBS= ../libcalc.a ../custom/libcustcalc.a
 # CFLAGS are all flags given to ${CC} [[often includes CCOPT, CCWARN, CCMISC]]
 # ICFLAGS are given to ${CC} for intermediate progs
 #
-# CCMAIN are flags for ${CC} when files with main() instead of CFLAGS
-#
 # LCFLAGS are CC-style flags for ${LINT}
 # LDFLAGS are flags given to ${CC} for linking .o files
 # ILDFLAGS are flags given to ${CC} for linking .o files for intermediate progs
 #
-# CC is how the the C compiler is invoked
+# LCC how the the C compiler is invoked on locally executed intermediate progs
+# CC is how the the C compiler is invoked (with an optional Purify)
 #
 ###
 #
-# common cc set
+# default set
 #
-CCWARN=
+# Normally these values are passed in from the upper level Makefile.
+# Change these as needed if you intend to build directly in this directory.
+#
+# for better performance, set the following above:
+#     DEBUG= -O2
+#
+CCWARN= -Wall -Wno-implicit -Wno-comment
 CCOPT= ${DEBUG} ${NO_SHARED}
 CCMISC=
 #
-CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} ${ALLOW_CUSTOM}
+CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 ICFLAGS= ${CCWARN} ${CCMISC}
 #
-CCMAIN= ${ICFLAGS}
-#
 LCFLAGS=
 LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 ILDFLAGS=
 #
-CC= ${PURIFY} cc
+LCC= gcc
+CC= ${PURIFY} ${LCC}
 
 ##############################################################################
 #-=-=-=-=-=-=-=-=- Be careful if you change something below -=-=-=-=-=-=-=-=-#
@@ -286,13 +283,13 @@ SORT= sort
 all: ${TARGETS} .all
 
 test_random.o: test_random.c
-	${CC} ${CCMAIN} ${CCOPT} ${ALLOW_CUSTOM} test_random.c -c
+	${CC} ${CFLAGS} ${ALLOW_CUSTOM} test_random.c -c
 
 test_random: test_random.o ../libcalc.a
 	${CC} ${LDFLAGS} test_random.o ${CALC_LIBS} ${LD_DEBUG} -o test_random
 
 many_random.o: many_random.c
-	${CC} ${CCMAIN} ${CCOPT} ${ALLOW_CUSTOM} many_random.c -c
+	${CC} ${CFLAGS} ${ALLOW_CUSTOM} many_random.c -c
 
 many_random: many_random.o ../libcalc.a
 	${CC} ${LDFLAGS} many_random.o ${CALC_LIBS} ${LD_DEBUG} -o many_random
@@ -405,9 +402,13 @@ depend:
 	else \
 		rm -f Makefile.tmp; \
 		mv Makefile Makefile.tmp; \
-		sccs edit Makefile; \
+		if [ -d RCS ]; then; \
+		    co -l Makefile; \
+		fi; \
 		mv Makefile.tmp Makefile; \
-		echo new 'sample Makefile formed -- you need to check it in'; \
+		if [ -d RCS ]; then; \
+		    echo new sample Makefile formed, you need to check it in; \
+		fi; \
 	fi
 
 ##

seed.c

@@ -28,7 +28,10 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * chongo was here      /\../\		{chongo,noll}@{toad,sgi}.com
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  *
  * Share and enjoy! :-)
  */
@@ -52,7 +55,9 @@
 #include <sys/stat.h>
 #include <sys/resource.h>
 #include <setjmp.h>
+#if !defined(__bsdi)
 #include <ustat.h>
+#endif /* __bsdi */
 #if defined(__linux)
 # include <fcntl.h>
 # define DEV_URANDOM "/dev/urandom"
@@ -60,6 +65,12 @@
 #endif /* __linux */
 #include "qmath.h"
 #include "longbits.h"
+#include "have_ustat.h"
+#include "have_getsid.h"
+#include "have_getpgid.h"
+#include "have_gettime.h"
+#include "have_getprid.h"
+#include "have_urandom.h"
 
 
 /*
@@ -75,6 +86,50 @@ typedef struct s_hash64 hash64;
 #endif
 
 
+/*
+ * FNV-1 basis
+ *
+ * We start the hash at a non-zero value at the beginning so that
+ * hashing blocks of data with all 0 bits do not map onto the same
+ * 0 hash value.  The virgin value that we use below is the hash value
+ * that we would get from following 32 ASCII characters:
+ *
+ *              chongo <Landon Curt Noll> /\../\
+ *
+ * Note that the \'s above are not back-slashing escape characters.
+ * They are literal ASCII  backslash 0x5c characters.
+ *
+ * The effect of this virgin initial value is the same as starting
+ * with 0 and pre-pending those 32 characters onto the data being
+ * hashed.
+ *
+ * Yes, even with this non-zero virgin value there is a set of data
+ * that will result in a zero hash value.  Worse, appending any
+ * about of zero bytes will continue to produce a zero hash value.
+ * But that would happen with any initial value so long as the
+ * hash of the initial was the `inverse' of the virgin prefix string.
+ *
+ * But then again for any hash function, there exists sets of data
+ * which that the hash of every member is the same value.  That is
+ * life with many to few mapping functions.  All we do here is to
+ * prevent sets whose members consist of 0 or more bytes of 0's from
+ * being such an awkward set.
+ *
+ * And yes, someone can figure out what the magic 'inverse' of the
+ * 32 ASCII character are ... but this hash function is NOT intended
+ * to be a cryptographic hash function, just a fast and reasonably
+ * good hash function.
+ */
+#if defined(HAVE_B64)
+# define FNV1_64_BASIS ((hash64)(0xcbf29ce484222325ULL))
+#else
+# define FNV1_64_BASIS_0 ((USB32)0x2325)
+# define FNV1_64_BASIS_1 ((USB32)0x8422)
+# define FNV1_64_BASIS_2 ((USB32)0x9ce4)
+# define FNV1_64_BASIS_3 ((USB32)0xcbf2)
+#endif
+
+
 /*
  * hash_buf - perform a 64 bit Fowler/Noll/Vo hash on a buffer
  *
@@ -105,24 +160,16 @@ hash_buf(char *buf, unsigned len)
 	 * (gsf@research.att.com).
 	 *
 	 * See:
-	 *	http://reality.sgi.com/chongo/src/fnv/fnv_hash.tar.gz
-	 *	http://reality.sgi.com/chongo/src/fnv/h32.c
-	 *	http://reality.sgi.com/chongo/src/fnv/h64.c
+	 *	http://reality.sgi.com/chongo/tech/comp/fnv/index.html
 	 *
 	 * for information on 32bit and 64bit Fowler/Noll/Vo hashes.
 	 *
-	 * Landon Curt Noll (chongo@toad.com) later improved on their
-	 * algorithm to come up with Fowler/Noll/Vo hash.
-	 *
-	 * The 32 hash was able to process 234936 words from the web2 dictionary
-	 * without any 32 bit collisions using a constant of
-	 * 16777619 = 0x1000193.
-	 *
-	 * The 64 bit hash uses 1099511628211 = 0x100000001b3 instead.
+	 * Landon Curt Noll (http://reality.sgi.com/chongo) later improved
+	 * on their algorithm to come up with Fowler/Noll/Vo hash.
 	 */
 #if defined(HAVE_B64)
 	/* hash each octet of the buffer */
-	for (hval = (hash64)0ULL; buf < buf_end; ++buf) {
+	for (hval = FNV1_64_BASIS; buf < buf_end; ++buf) {
 
 	    /* multiply by 1099511628211ULL mod 2^64 using 64 bit longs */
 	    hval *= (hash64)1099511628211ULL;
@@ -134,7 +181,11 @@ hash_buf(char *buf, unsigned len)
 #else /* HAVE_B64 */
 
 	/* hash each octet of the buffer */
-	for (val[0]=val[1]=val[2]=val[3]=0; buf < buf_end; ++buf) {
+	val[0] = FNV1_64_BASIS_0;
+	val[1] = FNV1_64_BASIS_1;
+	val[2] = FNV1_64_BASIS_2;
+	val[3] = FNV1_64_BASIS_3;
+	for (; buf < buf_end; ++buf) {
 
 	    /*
 	     * multiply by 1099511628211 mod 2^64 using 32 bit longs
@@ -156,7 +207,7 @@ hash_buf(char *buf, unsigned len)
 	    val[0] = tmp[0] & 0xffff;
 	    tmp[2] += (tmp[1] >> 16);
 	    val[1] = tmp[1] & 0xffff;
-	    val[3] += (tmp[2] >> 16);
+	    val[3] = tmp[3] + (tmp[2] >> 16);
 	    val[2] = tmp[2] & 0xffff;
 	    /*
 	     * Doing a val[3] &= 0xffff; is not really needed since it simply
@@ -203,19 +254,23 @@ NUMBER *
 pseudo_seed(void)
 {
     struct {			/* data used for quasi-random seed */
-#if defined(__sgi)
+#if defined(HAVE_GETTIME)
+# if defined(CLOCK_SGI_CYCLE)
 	struct timespec sgi_cycle;      /* SGI hardware clock */
-	prid_t getprid;                 /* project ID */
+# endif /* CLOCK_SGI_CYCLE */
+# if defined(CLOCK_REALTIME)
 	struct timespec realtime;	/* POSIX realtime clock */
-#endif /* __sgi */
-#if defined(__linux)
+# endif /* CLOCK_REALTIME */
+#endif /* HAVE_GETTIME */
+#if defined(HAVE_GETPRID)
+	prid_t getprid;                 /* project ID */
+#endif /* HAVE_GETPRID */
+#if defined(HAVE_URANDOM)
 	int urandom_fd;			/* open scriptor for /dev/urandom */
 	int urandom_ret;		/* read() of /dev/random */
 	char urandom_pool[DEV_URANDOM_POOL];	/* /dev/urandom data pool */
-#endif /* __linux */
+#endif /* HAVE_URANDOM */
 	struct timeval tp;              /* time of day */
-	pid_t getsid;                   /* session ID */
-	pid_t getpgid;                  /* process group ID */
 	pid_t getpid;                   /* process ID */
 	pid_t getppid;                  /* parent process ID */
 	uid_t getuid;                   /* real user ID */
@@ -229,6 +284,7 @@ pseudo_seed(void)
 	struct stat fstat_stdin;        /* stat of stdin */
 	struct stat fstat_stdout;       /* stat of stdout */
 	struct stat fstat_stderr;       /* stat of stderr */
+#if defined(HAVE_USTAT)
 	struct ustat ustat_dot;         /* usage stat of "." */
 	struct ustat ustat_dotdot;      /* usage stat of ".." */
 	struct ustat ustat_tmp;         /* usage stat of "/tmp" */
@@ -236,6 +292,13 @@ pseudo_seed(void)
 	struct ustat ustat_stdin;       /* usage stat of stdin */
 	struct ustat ustat_stdout;      /* usage stat of stdout */
 	struct ustat ustat_stderr;      /* usage stat of stderr */
+#endif /* HAVE_USTAT */
+#if defined(HAVE_GETSID)
+	pid_t getsid;                   /* session ID */
+#endif /* HAVE_GETSID */
+#if defined(HAVE_GETPGID)
+	pid_t getpgid;                  /* process group ID */
+#endif /* HAVE_GETPGID */
 	struct rusage rusage;           /* resource utilization */
 	struct rusage rusage_chld;      /* resource utilization of children */
 	struct timeval tp2;             /* time of day again */
@@ -254,12 +317,18 @@ pseudo_seed(void)
      *    We do care (that much) if these calls fail.  We do not
      *	  need to process any data in the 'sdata' structure.
      */
-#if defined(__sgi)
+#if defined(HAVE_GETTIME)
+# if defined(CLOCK_SGI_CYCLE)
     (void) clock_gettime(CLOCK_SGI_CYCLE, &sdata.sgi_cycle);
-    sdata.getprid = getprid();
+# endif /* CLOCK_SGI_CYCLE */
+# if defined(CLOCK_REALTIME)
     (void) clock_gettime(CLOCK_REALTIME, &sdata.realtime);
-#endif /* __sgi */
-#if defined(__linux)
+# endif /* CLOCK_REALTIME */
+#endif /* HAVE_GETTIME */
+#if defined(HAVE_GETPRID)
+    sdata.getprid = getprid();
+#endif /* HAVE_GETPRID */
+#if defined(HAVE_URANDOM)
     sdata.urandom_fd = open(DEV_URANDOM, O_NONBLOCK|O_RDONLY);
     if (sdata.urandom_fd >= 0) {
 	sdata.urandom_ret = read(sdata.urandom_fd,
@@ -269,10 +338,8 @@ pseudo_seed(void)
 	memset(&sdata.urandom_pool, EOF, DEV_URANDOM_POOL);
 	sdata.urandom_ret = EOF;
     }
-#endif /* __linux */
+#endif /* HAVE_URANDOM */
     (void) gettimeofday(&sdata.tp, NULL);
-    sdata.getsid = getsid((pid_t)0);
-    sdata.getpgid = getpgid((pid_t)0);
     sdata.getpid = getpid();
     sdata.getppid = getppid();
     sdata.getuid = getuid();
@@ -286,6 +353,7 @@ pseudo_seed(void)
     (void) fstat(0, &sdata.fstat_stdin);
     (void) fstat(1, &sdata.fstat_stdout);
     (void) fstat(2, &sdata.fstat_stderr);
+#if defined(HAVE_USTAT)
     (void) ustat(sdata.stat_dotdot.st_dev, &sdata.ustat_dotdot);
     (void) ustat(sdata.stat_dot.st_dev, &sdata.ustat_dot);
     (void) ustat(sdata.stat_tmp.st_dev, &sdata.ustat_tmp);
@@ -293,6 +361,13 @@ pseudo_seed(void)
     (void) ustat(sdata.fstat_stdin.st_dev, &sdata.ustat_stdin);
     (void) ustat(sdata.fstat_stdout.st_dev, &sdata.ustat_stdout);
     (void) ustat(sdata.fstat_stderr.st_dev, &sdata.ustat_stderr);
+#endif /* HAVE_USTAT */
+#if defined(HAVE_GETSID)
+    sdata.getsid = getsid((pid_t)0);
+#endif /* HAVE_GETSID */
+#if defined(HAVE_GETPGID)
+    sdata.getpgid = getpgid((pid_t)0);
+#endif /* HAVE_GETPGID */
     (void) getrusage(RUSAGE_SELF, &sdata.rusage);
     (void) getrusage(RUSAGE_CHILDREN, &sdata.rusage_chld);
     (void) gettimeofday(&sdata.tp2, NULL);

shs.c

@@ -11,7 +11,10 @@
  *
  * This file was Modified/Re-written by:
  *
- *	 Landon Curt Noll  (chongo@toad.com)	chongo <was here> /\../\
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  *
  * This code has been placed in the public domain.  Please do not
  * copyright this code.
@@ -26,7 +29,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Based on Version 2.11 (09 Mar 1995) from Landon Curt Noll's
- * (chongo@toad.com) shs hash program.
+ * (http://reality.sgi.com/chongo) shs hash program.
  *
  ****
  *

shs.h

@@ -11,7 +11,10 @@
  *
  * This file was Modified by:
  *
- *	 Landon Curt Noll  (chongo@toad.com)	chongo <was here> /\../\
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  *
  * This code has been placed in the public domain.  Please do not
  * copyright this code.

shs1.c

@@ -5,7 +5,10 @@
  *
  * This file was Modified/Re-written by:
  *
- *	 Landon Curt Noll  (chongo@toad.com)	chongo <was here> /\../\
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  *
  * This code has been placed in the public domain.  Please do not
  * copyright this code.

shs1.h

@@ -5,7 +5,10 @@
  *
  * This file was Modified by:
  *
- *	 Landon Curt Noll  (chongo@toad.com)	chongo <was here> /\../\
+ *      Landon Curt Noll
+ *      http://reality.sgi.com/chongo
+ *
+ *      chongo <was here> /\../\
  *
  * This code has been placed in the public domain.  Please do not
  * copyright this code.

string.c

@@ -1142,7 +1142,7 @@ initstrings(void)
 
 /*
  * addstring is called only from token.c
- * When called, len is length if string including '\0'
+ * When called, len is length of string including '\0'
  */
 long
 addstring(char *str, long len)
@@ -1157,8 +1157,7 @@ addstring(char *str, long len)
 	if (stringconstavail <= 0) {
 		if (stringconsttable == NULL) {
 			initstrings();
-		}
-		else {
+		} else {
 			sp = (STRING **) realloc((char *) stringconsttable,
 			sizeof(STRING *) * (stringconstcount + STRCONSTALLOC));
 			if (sp == NULL) {

token.c

@@ -458,6 +458,7 @@ eatstring(int quotechar)
 		}
 		memcpy(str + totlen, buf, len);
 		totlen += len;
+		len = 0;
 	    }
 	}
   	curtoken.t_strindex = addstring(str, totlen + len);

value.c

@@ -894,15 +894,17 @@ xorvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 			if (v1->v_str->s_len) {
 				vres->v_str = stringcopy(v1->v_str);
 				*vres->v_str->s_str ^= *v2->v_octet;
-			} else
+			} else {
 				vres->v_str = charstring(*v2->v_octet);
+			}
 			return;
 		case (TWOVAL(V_OCTET, V_STR)):
 			if (v2->v_str->s_len) {
 				vres->v_str = stringcopy(v2->v_str);
 				*vres->v_str->s_str ^= *v1->v_octet;
-			} else
+			} else {
 				vres->v_str = charstring(*v1->v_octet);
+			}
 			return;
 		case (TWOVAL(V_OCTET, V_OCTET)):
 			vres->v_type = V_STR;

version.c

@@ -12,7 +12,7 @@
 #define MAJOR_VER	2	/* major version */
 #define MINOR_VER	11	/* minor version */
 #define MAJOR_PATCH	0	/* patch level or 0 if no patch */
-#define MINOR_PATCH	"7.2"	/* test number or empty string if no patch */
+#define MINOR_PATCH	"8.3"	/* test number or empty string if no patch */
 
 /*
  * calc version constants

zfunc.c

@@ -269,8 +269,9 @@ zfib(ZVALUE z, ZVALUE *res)
 			fnm1 = fn;
 			fn = fnp1;
 			zadd(fnm1, fn, &fnp1);
-		} else
+		} else {
 			zsub(fnp1, fn, &fnm1);
+		}
 		i >>= (FULL)1;
 	}
 	zfree(fnm1);
@@ -889,8 +890,7 @@ zgcd(ZVALUE z1, ZVALUE z2, ZVALUE *res)
 					*a = ~*a;
 				}
 			}
-		}
-		else {				/* abs(a - b) case */
+		} else {				/* abs(a - b) case */
 			while (i && *a++ == *b++) i--;
 			q = n - i;
 			if (m == n) {		/* a and b same length */
@@ -914,8 +914,7 @@ zgcd(ZVALUE z1, ZVALUE z2, ZVALUE *res)
 						f = -f & BASE1;
 					}
 				}
-			}
-			else {			/* a has more digits than b */
+			} else {		/* a has more digits than b */
 				a = a0 + q;
 				b = b0 + q;
 				i = n - q;
@@ -1117,8 +1116,9 @@ zlog(ZVALUE z1, ZVALUE z2)
 				zfree(val);
 				val = temp;
 				power += worth;
-			} else
+			} else {
 				zfree(temp);
+			}
 		}
 		if (zp != squares)
 			zfree(*zp);
@@ -1170,8 +1170,9 @@ zlog10(ZVALUE z)
 				zfree(val);
 				val = temp;
 				power += worth;
-			} else
+			} else {
 				zfree(temp);
+			}
 		}
 	}
 	zfree(val);
@@ -1574,8 +1575,7 @@ zsqrt(ZVALUE z, ZVALUE *dest, long rnd)
 				x = ~x + !u;
 				if (!(x & TOPHALF))
 					a[1] -= 1;
-			}
-			else {
+			} else {
 				f = *a - x * x;
 				*a++ = (HALF)f;
 				u = -(HALF)(f >> BASEB);
@@ -1623,9 +1623,9 @@ done:	if (s == 0) {
 	}
 	if (rnd & 16) {
 		if (s == 0) {
-			if (m != n)
+			if (m != n) {
 				up = (m > n);
-			else {
+			} else {
 				i = n;
 				b = a0 + n;
 				a = A + n;
@@ -1633,13 +1633,12 @@ done:	if (s == 0) {
 					i--;
 				up = (i > 0 && *a > *b);
 			}
-		}
-		else {
+		} else {
 			while (m > 1 && A[m - 1] == BASE1)
 				m--;
-			if (m != n)
+			if (m != n) {
 				up = (m < n);
-			else {
+			} else {
 				i = n;
 				b = a0 + n;
 				a = A + n;
@@ -1660,9 +1659,9 @@ done:	if (s == 0) {
 		a = a0;
 		while (i-- && *a == BASE1)
 			*a++ = 0;
-		if (i >= 0)
+		if (i >= 0) {
 			(*a)++;
-		else {
+		} else {
 			n++;
 			*a = 1;
 		}

zmath.c

@@ -687,8 +687,7 @@ zdiv(ZVALUE z1, ZVALUE z2, ZVALUE *quo, ZVALUE *rem, long rnd)
 				}
 				s = *a + u;
 				A[m] = (HALF) (~x + !s);
-			}
-			else {
+			} else {
 				while (i--) {
 					f = (FULL) *a - u - x * *b++;
 					*a++ = (HALF) f;
@@ -708,9 +707,9 @@ done:	while (m > 0 && A[m - 1] == 0)
 		val = 0;
 		if (a1[len - 1] == 0)
 			len--;
-		if (len == 0)
+		if (len == 0) {
 			*quo = _zero_;
-		else {
+		} else {
 			quo->len = len;
 			quo->v = alloc(len);
 			memcpy(quo->v, a1, len * sizeof(HALF));
@@ -746,8 +745,7 @@ done:	while (m > 0 && A[m - 1] == 0)
 			}
 			else if (g >= BASE)
 				t = 1;
-		}
-		else {
+		} else {
 			while (--i > 0) {
 				g = (FULL) *--a - (*--b >> 1 | f);
 				if (g != 0)
@@ -973,9 +971,9 @@ zequo(ZVALUE z1, ZVALUE z2, ZVALUE *res)
 			*a0++ = x;
 			p--;
 		}
-		if (k == 0)
+		if (k == 0) {
 			*a0 = w * *a0;
-		else {
+		} else {
 			u = (HALF)(w * *a0) >> k;
 			x = (HALF)(((FULL) z1.v[z1.len - 1] << BASEB
 				| z1.v[z1.len - 2])
@@ -1890,8 +1888,9 @@ zshiftl(ZVALUE z, long n)
 			if (i > BASE1) {
 				mask = i >> BASEB;
 				i &= BASE1;
-			} else
+			} else {
 				mask = 0;
+			}
 			*h = (HALF) i;
 			++h;
 		}

zmath.h

@@ -144,6 +144,43 @@ typedef SB32 LEN;			/* unit of length storage */
 #endif /* LONG_BITS == 64 */
 
 
+/*
+ * FNV-1 basis
+ *
+ * We start the hash at a non-zero value at the beginning so that
+ * hashing blocks of data with all 0 bits do not map onto the same
+ * 0 hash value.  The virgin value that we use below is the hash value
+ * that we would get from following 32 ASCII characters:
+ *
+ *              chongo <Landon Curt Noll> /\../\
+ *
+ * Note that the \'s above are not back-slashing escape characters.
+ * They are literal ASCII  backslash 0x5c characters.
+ *
+ * The effect of this virgin initial value is the same as starting
+ * with 0 and pre-pending those 32 characters onto the data being
+ * hashed.
+ *
+ * Yes, even with this non-zero virgin value there is a set of data
+ * that will result in a zero hash value.  Worse, appending any
+ * about of zero bytes will continue to produce a zero hash value.
+ * But that would happen with any initial value so long as the
+ * hash of the initial was the `inverse' of the virgin prefix string.
+ *
+ * But then again for any hash function, there exists sets of data
+ * which that the hash of every member is the same value.  That is
+ * life with many to few mapping functions.  All we do here is to
+ * prevent sets whose members consist of 0 or more bytes of 0's from
+ * being such an awkward set.
+ *
+ * And yes, someone can figure out what the magic 'inverse' of the
+ * 32 ASCII character are ... but this hash function is NOT intended
+ * to be a cryptographic hash function, just a fast and reasonably
+ * good hash function.
+ */
+#define FNV1_32_BASIS ((QCKHASH)(0x811c9dc5))
+
+
 /*
  * The largest power of 10 we will compute for our decimal conversion
  * internal constants is: 10^(2^TEN_MAX).

zmod.c

@@ -1746,8 +1746,7 @@ zredcsquare(REDC *rp, ZVALUE z1, ZVALUE *res)
 			carry.ivalue = (FULL) sival1.sihigh
 				+ (FULL) sival2.sihigh;
 			hd++;
-		}
-		else {
+		} else {
 			muln = (HALF) (*hd * Ninv);
 			f = (muln * ((FULL) *h3++) + (FULL) *hd++) >> BASEB;
 			j = i;

zrand.c

@@ -28,12 +28,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *	Landon Curt Noll
+ *	http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 /*

zrand.h

@@ -28,12 +28,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *	Landon Curt Noll
+ *	http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 /*
  * random number generator - see zrand.c for details

zrandom.c

@@ -28,12 +28,10 @@
  *
  * Happy bit twiddling,
  *
- *			Landon Curt Noll
+ *	Landon Curt Noll
+ *	http://reality.sgi.com/chongo
  *
- *			chongo@toad.com
- *			...!{pyramid,sun,uunet}!hoptoad!chongo
- *
- * chongo was here	/\../\
+ * chongo <was here> /\../\
  */
 
 /*
@@ -1571,6 +1569,12 @@ static RANDOM random_pregen[BLUM_PREGEN] = {
 };
 
 
+/*
+ * forward static declarations
+ */
+static void zfree_random(ZVALUE z);
+
+
 /*
  * zsrandom1 - seed the Blum generator 1 arg style
  *
@@ -1647,7 +1651,7 @@ zsrandom1(CONST ZVALUE seed, BOOL need_ret)
 		do {
 			/* free temp storage */
 			if (last_r.v != NULL) {
-				zfree(last_r);
+				zfree_random(last_r);
 			}
 
 			/*
@@ -1657,10 +1661,10 @@ zsrandom1(CONST ZVALUE seed, BOOL need_ret)
 			last_r = r;
 			zsquaremod(last_r, blum.n, &r);
 		} while (zrel(r, last_r) > 0);
-		zfree(blum.r);
+		zfree_random(blum.r);
 		blum.r = r;
 		/* free temp storage */
-		zfree(last_r);
+		zfree_random(last_r);
 
 	/*
 	 * reserved seed
@@ -1741,7 +1745,7 @@ zsrandom2(CONST ZVALUE seed, CONST ZVALUE newn)
 			math_error("srandom small newn must be [1,20]");
 			/*NOTREACHED*/
 		}
-		zfree(blum.n);
+		zfree_random(blum.n);
 		zcopy(random_pregen[set-1].n, &blum.n);
 		blum.loglogn = random_pregen[set-1].loglogn;
 		blum.mask = random_pregen[set-1].mask;
@@ -1750,7 +1754,7 @@ zsrandom2(CONST ZVALUE seed, CONST ZVALUE newn)
 		 * reset initial seed as well if seed is 0
 		 */
 		if (ziszero(seed)) {
-			zfree(blum.r);
+			zfree_random(blum.r);
 			zcopy(random_pregen[set-1].r, &blum.r);
 
 		/*
@@ -1785,7 +1789,7 @@ zsrandom2(CONST ZVALUE seed, CONST ZVALUE newn)
 		 * of two primes.
 		 */
 		/* load modulus */
-		zfree(blum.n);
+		zfree_random(blum.n);
 		zcopy(newn, &blum.n);
 
 		/*
@@ -1894,11 +1898,11 @@ zsrandom4(CONST ZVALUE seed, CONST ZVALUE ip, CONST ZVALUE iq, long trials)
 	/*
 	 * form the Blum modulus
 	 */
-	zfree(blum.n);
+	zfree_random(blum.n);
 	zmul(p, q, &blum.n);
 	/* free temp storage */
-	zfree(p);
-	zfree(q);
+	zfree_random(p);
+	zfree_random(q);
 
 	/*
 	 * form the loglogn and mask
@@ -2045,7 +2049,7 @@ zrandomskip(long cnt)
 
 		/* turn the Blum-Blum-Shub crank */
 		zsquaremod(blum.r, blum.n, &new_r);
-		zfree(blum.r);
+		zfree_random(blum.r);
 		blum.r = new_r;
 		cnt -= blum.loglogn;
 	}
@@ -2057,7 +2061,7 @@ zrandomskip(long cnt)
 
 		/* turn the Blum-Blum-Shub crank */
 		zsquaremod(blum.r, blum.n, &new_r);
-		zfree(blum.r);
+		zfree_random(blum.r);
 		blum.r = new_r;
 
 		/* fill the buffer with the unused bits */
@@ -2197,7 +2201,7 @@ zrandom(long cnt, ZVALUE *res)
 		 * turn the Blum-Blum-Shub crank
 		 */
 		zsquaremod(blum.r, blum.n, &new_r);
-		zfree(blum.r);
+		zfree_random(blum.r);
 		blum.r = new_r;
 		/* peal off the bottom loglogn bits */
 		blum.buffer = (blum.r.v[0] & mask);
@@ -2228,7 +2232,7 @@ zrandom(long cnt, ZVALUE *res)
 	 */
 	/* turn the Blum-Blum-Shub crank */
 	zsquaremod(blum.r, blum.n, &new_r);
-	zfree(blum.r);
+	zfree_random(blum.r);
 	blum.r = new_r;
 	/* peal off the bottom loglogn bits */
 	blum.buffer = (blum.r.v[0] & mask);
@@ -2282,13 +2286,13 @@ zrandomrange(CONST ZVALUE low, CONST ZVALUE high, ZVALUE *res)
 	 */
 	zsub(high, low, &range);
 	if (zisone(range)) {
-		zfree(range);
+		zfree_random(range);
 		*res = low;
 		return;
 	}
 	zsub(range, _one_, &rangem1);
 	bitlen = 1+zhighbit(rangem1);
-	zfree(rangem1);
+	zfree_random(rangem1);
 
 	/*
 	 * generate a random value between [0, diff)
@@ -2302,7 +2306,7 @@ zrandomrange(CONST ZVALUE low, CONST ZVALUE high, ZVALUE *res)
 	rval.v = NULL;
 	do {
 		if (rval.v != NULL) {
-			zfree(rval);
+			zfree_random(rval);
 		}
 		zrandom(bitlen, &rval);
 	} while (zrel(rval, range) >= 0);
@@ -2312,8 +2316,8 @@ zrandomrange(CONST ZVALUE low, CONST ZVALUE high, ZVALUE *res)
 	 * which is the range [low, high)
 	 */
 	zadd(rval, low, res);
-	zfree(rval);
-	zfree(range);
+	zfree_random(rval);
+	zfree_random(range);
 }
 
 
@@ -2341,8 +2345,8 @@ irandom(long s)
 	itoz(s, &z1);
 	zrandomrange(_zero_, z1, &z2);
 	res = ztoi(z2);
-	zfree(z1);
-	zfree(z2);
+	zfree_random(z1);
+	zfree_random(z2);
 	return res;
 }
 
@@ -2377,12 +2381,20 @@ randomcopy(CONST RANDOM *state)
 	if (state->r.v == NULL) {
 		ret->r.v = NULL;
 	} else {
-		zcopy(state->r, &ret->r);
+		if (state->r.v == h_rdefvec) {
+			ret->r.v = state->r.v;
+		} else {
+			zcopy(state->r, &ret->r);
+		}
 	}
 	if (state->n.v == NULL) {
 		ret->n.v = NULL;
 	} else {
-		zcopy(state->n, &ret->n);
+		if (state->n.v == h_ndefvec) {
+			ret->n.v = state->n.v;
+		} else {
+			zcopy(state->n, &ret->n);
+		}
 	}
 
 	/*
@@ -2414,12 +2426,8 @@ randomfree(RANDOM *state)
 	}
 
 	/* free the values */
-	if (state->n.v != h_ndefvec) {
-		zfree(state->n);
-	}
-	if (state->r.v != h_rdefvec) {
-		zfree(state->r);
-	}
+	zfree_random(state->n);
+	zfree_random(state->r);
 
 	/* free it if it is not pre-defined */
 	state->seeded = 0;
@@ -2505,9 +2513,43 @@ randomprint(CONST RANDOM *state, int flags)
 void
 random_libcalc_cleanup(void)
 {
-	/* free if we are seeded now */
-	if (blum.seeded) {
-		randomfree(&blum);
+	/* free our state - let zfree_random protect the default state */
+	randomfree(&blum);
+	return;
+}
+
+
+/*
+ * zfree_random - perform a zfree if we are not trying to free static data
+ *
+ * given:
+ *	z	the ZVALUE to zfree(z) if not pointing to static data
+ */
+static void
+zfree_random(ZVALUE z)
+{
+	if (z.v != h_ndefvec && z.v != h_rdefvec && z.v != h_rdefvec_2 &&
+	    z.v != h_nvec01 && z.v != h_rvec01 &&
+	    z.v != h_nvec02 && z.v != h_rvec02 &&
+	    z.v != h_nvec03 && z.v != h_rvec03 &&
+	    z.v != h_nvec04 && z.v != h_rvec04 &&
+	    z.v != h_nvec05 && z.v != h_rvec05 &&
+	    z.v != h_nvec06 && z.v != h_rvec06 &&
+	    z.v != h_nvec07 && z.v != h_rvec07 &&
+	    z.v != h_nvec08 && z.v != h_rvec08 &&
+	    z.v != h_nvec09 && z.v != h_rvec09 &&
+	    z.v != h_nvec10 && z.v != h_rvec10 &&
+	    z.v != h_nvec11 && z.v != h_rvec11 &&
+	    z.v != h_nvec12 && z.v != h_rvec12 &&
+	    z.v != h_nvec13 && z.v != h_rvec13 &&
+	    z.v != h_nvec14 && z.v != h_rvec14 &&
+	    z.v != h_nvec15 && z.v != h_rvec15 &&
+	    z.v != h_nvec16 && z.v != h_rvec16 &&
+	    z.v != h_nvec17 && z.v != h_rvec17 &&
+	    z.v != h_nvec18 && z.v != h_rvec18 &&
+	    z.v != h_nvec19 && z.v != h_rvec19 &&
+	    z.v != h_nvec20 && z.v != h_rvec20) {
+		zfree(z);
 	}
 	return;
 }