Release calc version 2.11.0t9.4.2

BUGS

@@ -24,7 +24,7 @@ To be sure that your version of calc is up to date, check out:
 
 The calc web site is located at:
 
-	http://reality.sgi.com/chongo/tech/comp/calc
+	http://reality.sgi.com/chongo/tech/comp/calc/index.html
 
 =-=
 
@@ -96,27 +96,56 @@ Known bugs:
       the terminal in a 'bad' state, as if stty -icanon -echo -echoe
       had been executed.
 
-    * Dec Alpha Linux compiling with gcc-2.95.1 and -O2 fails the
-      regression test with:
-
-	make -s check
-	000: Beginning regression tests
-	001: Some of these tests may take a while ...
-	002: Within each section, output should be numbered sequentially
-	003: parsed global definitions
-	004: parsed vrfy()
-	005: parsed prob(str)
-	006: parsed getglobalvar()
-	007: parsed test_booleans()
-	008: parsed test_variables()
-	make: *** [check] Segmentation fault (core dumped)
-
-      Other programs have reported problems when compiling -O2 with
-      gcc-2.95.1 on the Alpha and Mips.
-
-      One work-a-round is to not compile with -O2 (perhaps just -O).
-      Another work-a-round is not use gcc-2.95.1.
+    * Use of 'fmt' in the 2nd arg of printf() calls in c_sysinfo.c
+      cause some compilers to issue warnings.
 
     We are sure some more 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.
+
+=-=
+
+Other items of note:
+
+    * There is a bug in gcc-2.95 that causes calc, when compiled with -O2,
+      to fail the regression test.  The work-a-round is to compile with -O
+      or to use gcc-2.96 or later.
+
+    * There is a bug in some versions of the Dec/Compaq cc for the Alpha
+      where the following:
+
+	    #include <stdio.h>
+	    #define SVAL(a,b) (unsigned long)(0x ## a ## b ## ULL)
+	    main(){SVAL(b8a8aeb0,8168eadc);}
+
+      fails because it puts a space inside the concatenated hex.  Calc
+      has code that is affected by this bug.  This bug has been reported
+      to Compaq and may be fixed in the future.  A work-a-round is to
+      compile with cc -std0 or to use a later version of their compiler.
+
+    * On a Digital UNIX V4.0F (Rev. 1229) on a 500 Mhz 21264, make check
+      dies a horrible death starting in test 600 and 622 gives 100s of
+      messages for calc version 2.11.0t9.4 using the Dec's cc with -O2:
+
+	600: Beginning test_bignums
+	601: muldivcheck 1
+	**** abc != acb: 602: muldivcheck 2
+	**** acb != bac: 602: muldivcheck 2
+	...
+	**** t4 != a4: 622: algcheck 1
+	**** t5 != a5: 622: algcheck 1
+	**** t6 != a6: 622: algcheck 1
+	**** t4 != a4: 622: algcheck 1
+	...
+
+	it finally hangs at test 2000.
+
+      The work-a-round is to compile calc without the optimizer.  If this
+      happens to you, try compiling without -O and without -O2.  I.e., in
+      the Makefile, set:
+
+	DEBUG= -g
+
+      or set:
+
+	DEBUG=

CHANGES

@@ -2,14 +2,14 @@ Following is the change from calc version 2.11.0t8.9.1 to date:
 
     The config("verbose_quit") will control the printing of the message:
 
-	Quit or abort executed
+	    Quit or abort executed
 
-    when a non-interactive ABORT, QUIT or EXIT is encounted.  By default,
-    config("verbose_quit") is TRUE and the message is printed.  If one does:
+	when a non-interactive ABORT, QUIT or EXIT is encounted.  By default,
+	config("verbose_quit") is TRUE and the message is printed.  If one does:
 
-	config("verbose_quit", 0)
+	    config("verbose_quit", 0)
 
-    the message is disabled.
+	the message is disabled.
 
     Added 8400 regression test set and test8400.cal to test the new
     quit and config("verbose_quit") functionality.
@@ -28,41 +28,189 @@ Following is the change from calc version 2.11.0t8.9.1 to date:
     The eval(str) builtin will return an error-value rather than cause
     an execution error str has a scan-error.
 
-    Declaration are permitted to end with EOF as well as a newline or ';'.
+    Declarations are permitted to end with EOF as well as a newline or ';'.
 
-    When prompt() occurs in reading a file, it will take inout from
-    the terminal rather than taking it from a file.  For example,
-    this script, when read, now works:
+    When prompt() occurs while reading a file, it will take input from
+    the terminal rather than taking it from a file.  For example:
 
-	/* This demonstrates the use of prompt() and some other things  */
-	config("verbose_quit", 0);
-	define getnumber() {
-	    local x;
-	    for (;;) {
-		x = eval(prompt(">>> "));
-		if (isnum(x))
-		    return x;
-		print "Not a number! Try again";
+	    /* This demonstrates the use of prompt() and some other things  */
+	    config("verbose_quit", 0);
+	    define getnumber() {
+		local x;
+		for (;;) {
+		    x = eval(prompt(">>> "));
+		    if (isnum(x))
+			return x;
+		    print "Not a number! Try again";
+		}
 	    }
-	}
-	print "This will display the sqrt of each number you enter";
-	print "Enter quit to stop";
-	for (;;) {
-	    print sqrt(getnumber());
-	}
-	print "Good bye";
+	    print "This will display the sqrt of each number you enter";
+	    print "Enter quit to stop";
+	    for (;;) {
+		print sqrt(getnumber());
+	    }
+	    print "Good bye";
 
-    Comments entered at inputisterminal level may be spread over several
-    lines.  For example:
+	Comments entered at input terminal level may be spread over several
+	lines.  For example:
 
-	/*
-	 * These commands work given the file: comment.cal
-	 *
-	 *	cat comment.cal | calc
-	 *	calc < comment.cal
-	 */
-	print "Hello";
+	    /*
+	     * Assume that this calc script is called: comment.cal
+	     * Then these commands now work:
+	     *	cat comment.cal | calc
+	     *	calc < comment.cal
+	     */
+	    print "Hello";
 
+    Added:
+
+	-D calc_debug[:lib_debug:[user_debug]]
+
+    to set the initial value of config("calc_debug"), config("lib_debug")
+    and config("user_debug").
+
+    The : separated strings of -D are interpreted as signed 32 bit values.
+    After an optional leading sign a leading zero indicates octal
+    conversion, and a leading ``0x'' or ``0X'' hexadecimal conversion.
+    Otherwise, decimal conversion is assumed.
+
+    Reordered the config structure moving calc_debug ahead of lib_debug.
+
+    Added bits 4 and 5 to config("calc_debug"):
+
+	4	Report on changes to the state of stdin as well as changes
+		to internal variables that control the setting and restoring
+		of stdin.
+
+	5	Report on changes to the run state of calc.
+
+    Fixed portability issue in seed.c relating to /dev/urandom and ustat.
+
+    Added a fix from Martin Buck <mb@netwings.ch> to detect when
+    calc aborts early instead of completing the regression test.
+    Now 'make chk' will require the last line of calc output to
+    end in the string ``Ending regression tests''.
+
+    Added a patch from Martin Buck <mb@netwings.ch> to allow use of
+    GNU-readline.  Note that GNU-readline is not shipped with calc.
+    His patch only provides the hooks to use it.  One must comment out:
+
+	    USE_READLINE=
+	    READLINE_LIB=
+	    READLINE_INCLUDE=
+
+	and comment in:
+
+	    USE_READLINE= -DUSE_READLINE
+	    READLINE_LIB= -lreadline -lhistory
+	    READLINE_INCLUDE= -I/usr/include/readline
+
+	in addition to pre-installing GNU-readline in your system to use
+	this facility.
+
+    Changed the "object already defined" math_error to a scanerror message.
+
+    Removed the limit on the number of object types.
+
+    Calc tarballs are now named calc-version.tar.gz and untar into
+    a sub-directory called calc-version.
+
+    Made a small change to declarations of static variables to reduce
+    the internal opcodes needed to declare them.
+
+    Fixed a permission problem on ranlib-ed *.a files that was reported
+    by Michael Somos <somos@grail.cba.csuohio.edu>.
+
+    Added patch by Klaus Alexander Seistrup <klaus@seistrup.dk> related
+    to GNU-readline:
+
+	+ enable calc specific bindings in ~/.inputrc
+	+ save a copy of your session to disk and reload them next
+	  time you're using calc
+	+ only add a line to the history if it is different from
+	  the previous line
+
+    Added the Makefile symbol HAVE_GETRUSAGE to determine if the
+    system supports the getrusage() system call.
+
+    Fixed the make depend code in the custom and sample Makefiles.
+
+    Fixed how the help/builtin file is formed.  The help/Makefile is
+    now given the name of the native C compiler by the top level Makefile.
+
+    The include files are installed under INCDIRCALC (a new Makefile variable)
+    which by default is ${INCDIR}/calc.  The INCDIR (also a new Makefile var)
+    by default is /usr/local/include.  Include files previously installed
+    directly under ${LIBDIR} will be removed.
+
+    Added the piforever() funcion to lib/pi.cal.  It was written by
+    Klaus Alexander Seistrup <klaus@seistrup.dk> and was inspired by
+    an algorithm conceived by Lambert Meertens.  (See also the ABC
+    Programmer's Handbook, by Geurts, Meertens & Pemberton, published
+    by Prentice-Hall (UK) Ltd., 1990.)  The piforever() funcion prints
+    digits of pi for as long as your memory and system uptime allows.  :-)
+
+    Fixed the URLs found thruout the source and documentation which did
+    not and in /, but should for performance and server load reasons.
+
+    Cleaned up and improved handling of "mat" and "obj".  The comma in:
+
+	    mat A[2], B[3];
+
+	is changed to whatever is appropriate in the context:
+
+	    + comma operator
+	    + separator of arguments in a function call
+	    + separator of arguments in a defintion
+	    etc.
+
+	The expression (mat A[2]), B[3] returns B[3], assuming B already
+	exists as something created by a statement like: global mat B[4].
+
+	What used to be done by the expression:
+
+	    mat A[2], B[3]
+
+	will now require something like:
+
+	    mat A[2], mat B[3]	or 	A = mat[2], B = mat[3]
+
+	For example, if obj point and obj pair are known types, the
+	following is now allowed:
+
+	    L = list(mat[2], mat[3], obj point, obj pair)
+
+	As another example, the following is allowed:
+
+	    define f(a = mat[2] = {3,4}) = 5 * a;
+
+	as well as the following:
+
+	    obj point {x,y}, PP = obj pair {A,B} = {obj point, obj point}
+
+	which creates two object types at compile time and when executed,
+	assigns a pair-object value to a variable PP.
+
+    Fixed a bug whereby a for loop would behave incorrectly.  For example:
+
+	    config("trace", 2),
+	    global x;
+	    define f() {for ( ; x > 0; x--) {print x;}}
+	    x = 5, f()
+
+	will stop after printing 1 instead of looping forever.
+
+    Added values l_format, which when CHECK_L_FORMAT is defined ahead
+    of including longlong.h will help detect when a system can deal with
+    'long long' but not '%lld' in printf.  If a system with 'long long'
+    uses '%ld' to print a 64 bit value, then l_format will be > 0;
+    othewise if "%lld" is required, l_format will be < 0.
+
+    Added HAVE_STRDUP Makefile variable as well as the have_strdup.c
+    program that forms the have_strdup.h file.  The have_strdup.h file
+    will define HAVE_STRDUP is the system has strdup().  If HAVE_STRDUP
+    is not defined, then calc will use calc_strdup() to simulate
+    the real strdup() function.
 
 
 Following is the change from calc version 2.11.0t8 to 2.11.0t8.9:
@@ -364,7 +512,7 @@ Following is the change from calc version 2.11.0t7 to 2.11.0t7.5:
 
     The main calc URL is now:
 
-	http://reality.sgi.com/chongo/tech/comp/calc
+	http://reality.sgi.com/chongo/tech/comp/calc/
 
     Misc calc man page fixes.
 

Makefile

@@ -261,6 +261,30 @@ HAVE_GETPRID=
 HAVE_URANDOM=
 #HAVE_URANDOM= -DHAVE_NO_URANDOM
 
+# Determine if we have getrusage()
+#
+# If HAVE_GETRUSAGE is empty, this makefile will run the have_memmv program
+# to determine if getrusage() is supported.  If HAVE_GETRUSAGE is set to
+# -DHAVE_NO_GETRUSAGE, then calc will use internal functions to simulate
+# the memory move function that does correct overlapping memory modes.
+#
+# If in doubt, leave HAVE_GETRUSAGE empty and this Makefile will figure it out.
+#
+HAVE_GETRUSAGE=
+#HAVE_GETRUSAGE= -DHAVE_NO_GETRUSAGE
+
+# Determine if we have strdup()
+#
+# If HAVE_STRDUP is empty, this makefile will run the have_memmv program
+# to determine if strdup() is supported.  If HAVE_STRDUP is set to
+# -DHAVE_NO_STRDUP, then calc will use internal functions to simulate
+# the memory move function that does correct overlapping memory modes.
+#
+# If in doubt, leave HAVE_STRDUP empty and this Makefile will figure it out.
+#
+HAVE_STRDUP=
+#HAVE_STRDUP= -DHAVE_NO_STRDUP
+
 # Some architectures such as Sparc do not allow one to access 32 bit values
 # that are not alligned on a 32 bit boundary.
 #
@@ -320,7 +344,9 @@ BINDIR= /usr/local/bin
 # where to install the *.cal, *.h and *.a files
 #
 # ${TOPDIR} is the directory under which the calc directory will be placed.
-# ${LIBDIR} is where the *.cal, *.h, *.a, bindings and help dir are installed.
+# ${LIBDIR} is where the *.cal, *.a, bindings and help dir are installed.
+# ${INCDIR} is where the locally installed include files are found.
+# ${INCDIRCALC} is where the calc include files are installed.
 # ${HELPDIR} is where the help directory is installed.
 # ${CUSTOMLIBDIR} is where custom lib files are installed.
 # ${CUSTOMHELPDIR} is where custom help files are installed.
@@ -332,6 +358,8 @@ TOPDIR= /usr/local/lib
 #
 LIBDIR= ${TOPDIR}/calc
 HELPDIR= ${LIBDIR}/help
+INCDIR= /usr/local/include
+INCDIRCALC= ${INCDIR}/calc
 CUSTOMLIBDIR= ${LIBDIR}/custom
 CUSTOMHELPDIR= ${HELPDIR}/custhelp
 
@@ -414,9 +442,41 @@ CALCRC= ${LIBDIR}/startup:~/.calcrc
 #	${LIBDIR}/bindings	uses ^D for editing
 #	${LIBDIR}/altbind	uses ^D for EOF
 #
+# NOTE: This facility is disabled if USE_READLINE is set to -DUSE_READLINE.
+#
 CALCBINDINGS= bindings
 #CALCBINDINGS= altbind
 
+# Determine of the GNU-readline facility will be used instead of the
+# built-in CALCBINDINGS above.
+#
+# USE_READLINE=			    Do not use GNU-readline, use CALCBINDINGS
+# USE_READLINE= -DUSE_READLINE	    Use GNU-readline, do not use CALCBINDINGS
+#
+# NOTE: If you select the 'USE_READLINE= -DUSE_READLINE' mode, you must set:
+#
+#	READLINE_LIB		The flags needed to link in the readline
+#				and history libs
+#	READLINE_INCLUDE	Where the readline include files reside
+#
+# NOTE: The GNU-readline code is not shipped with calc.  You must have
+# 	the appropriate headers and libs installed on your system in
+#	order to use it.
+#
+# If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
+#
+USE_READLINE=
+#USE_READLINE= -DUSE_READLINE
+#
+READLINE_LIB=
+#READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory
+#READLINE_LIB= -lreadline -lhistory
+#READLINE_LIB= -L/usr/local/lib -lreadline -lhistory
+#
+READLINE_INCLUDE=
+#READLINE_INCLUDE= -I/usr/gnu/include
+#READLINE_INCLUDE= -I/usr/local/include
+
 # If $PAGER is not set, use this program to display a help file
 #
 CALCPAGER= more
@@ -714,7 +774,7 @@ CC= ${PURIFY} ${LCC}
 #
 ###
 #
-# RS6000 set
+# AIX RS/6000 set
 #
 #CCWARN=
 #CCOPT= ${DEBUG} ${NO_SHARED}
@@ -810,6 +870,7 @@ SORT= sort
 TEE= tee
 LINT= lint
 CTAGS= ctags
+FMT= fmt
 # assume the X11 makedepend tool for the depend rule
 MAKEDEPEND= makedepend
 # echo command location
@@ -883,7 +944,8 @@ BUILD_H_SRC= align32.h args.h calcerr.h conf.h endian_calc.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_ustat.h have_getsid.h have_getpgid.h \
-	have_gettime.h have_getprid.h have_urandom.h
+	have_gettime.h have_getprid.h have_urandom.h have_rusage.h \
+	have_strdup.h
 
 # we build these .c files during the make
 #
@@ -897,7 +959,7 @@ 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 \
 	have_ustat.c have_getsid.c have_getpgid.c \
-	have_gettime.c have_getprid.c
+	have_gettime.c have_getprid.c have_rusage.c have_strdup.c
 
 # these awk and sed tools are used in the process of building BUILD_H_SRC
 # and BUILD_C_SRC
@@ -913,20 +975,20 @@ 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_ustat.o have_getsid.o have_getpgid.o \
-	have_gettime.o have_getprid.o
+	have_gettime.o have_getprid.o ver_calc.o have_rusage.o have_strdup.o
 
 # 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 memmv_tmp offscl_tmp posscl_tmp newstr_tmp \
-	getsid_tmp gettime_tmp getprid_tmp
+	getsid_tmp gettime_tmp getprid_tmp rusage_tmp strdup_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 \
 	have_ustat have_getsid have_getpgid \
-	have_gettime have_getprid
+	have_gettime have_getprid ver_calc have_strdup
 
 # These files are required by the regress.cal regression test.
 #
@@ -984,7 +1046,7 @@ SAMPLE_PASSDOWN= Q="${Q}" \
     LCFLAGS="${LCFLAGS}" \
     LDFLAGS="${LDFLAGS}" \
     ILDFLAGS="${ILDFLAGS}" \
-    CALC_LIBS="../libcalc.a ../custom/libcustcalc.a" \
+    CALC_LIBS="../libcalc.a ../custom/libcustcalc.a ${READLINE_LIB}" \
     LCC="${LCC}" \
     CC="${CC}" \
     MAKE_FILE=${MAKE_FILE} \
@@ -992,6 +1054,31 @@ SAMPLE_PASSDOWN= Q="${Q}" \
     MAKEDEPEND=${MAKEDEPEND} \
     SORT=${SORT}
 
+# The compelte list of makefile vars passed down to help/Makefile.
+#
+HELP_PASSDOWN= Q="${Q}" \
+    TOPDIR="${TOPDIR}" \
+    LIBDIR="${LIBDIR}" \
+    HELPDIR="${HELPDIR}" \
+    CFLAGS="${CFLAGS} ${ALLOW_CUSTOM}" \
+    ICFLAGS="${ICFLAGS}" \
+    ILDFLAGS="${ILDFLAGS}" \
+    LCC="${LCC}" \
+    MAKE_FILE=${MAKE_FILE} \
+    SED=${SED} \
+    FMT=${FMT}
+
+# The compelte list of makefile vars passed down to lib/Makefile.
+#
+LIB_PASSDOWN= Q="${Q}" \
+    TOPDIR="${TOPDIR}" \
+    LIBDIR="${LIBDIR}" \
+    HELPDIR="${HELPDIR}" \
+    MAKE_FILE=${MAKE_FILE} \
+    SED=${SED} \
+    MAKEDEPEND=${MAKEDEPEND} \
+    SORT=${SORT}
+
 # complete list of .h files found (but not built) in the distribution
 #
 H_SRC= ${LIB_H_SRC}
@@ -1032,12 +1119,13 @@ TARGETS= ${CALC_LIBS} custom/.all calc sample/sample \
 all: .hsrc ${TARGETS}
 
 calc: .hsrc ${CALC_LIBS} ${CALCOBJS}
-	${CC} ${LDFLAGS} ${CALCOBJS} ${CALC_LIBS} ${LD_DEBUG} -o calc
+	${CC} ${LDFLAGS} ${CALCOBJS} ${CALC_LIBS} ${LD_DEBUG} ${READLINE_LIB} -o calc
 
 libcalc.a: ${LIBOBJS} ${MAKE_FILE}
 	-rm -f libcalc.a
 	ar qc libcalc.a ${LIBOBJS}
 	${RANLIB} libcalc.a
+	chmod 0644 libcalc.a
 
 calc.1: calc.man ${MAKE_FILE}
 	-rm -f calc.1
@@ -1053,13 +1141,14 @@ calc.1: calc.man ${MAKE_FILE}
 ##
 
 calc.o: calc.c ${MAKE_FILE}
-	${CC} ${CFLAGS} ${CCOPT} ${ALLOW_CUSTOM} -c calc.c
+	${CC} ${CFLAGS} ${ALLOW_CUSTOM} -c calc.c
 
 custom.o: custom.c ${MAKE_FILE}
 	${CC} ${CFLAGS} ${ALLOW_CUSTOM} -c custom.c
 
 hist.o: hist.c ${MAKE_FILE}
-	${CC} ${CFLAGS} ${TERMCONTROL} -c hist.c
+	${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} \
+	    -c hist.c
 
 func.o: func.c ${MAKE_FILE}
 	${CC} ${CFLAGS} ${ALLOW_CUSTOM} -c func.c
@@ -1460,6 +1549,8 @@ longlong.h: longlong.c have_stdlib.h have_string.h ${MAKE_FILE}
 	else \
 	    echo '#undef HAVE_LONGLONG' >> longlong.h; \
 	    echo '#define LONGLONG_BITS 0  /* no */' >> longlong.h; \
+	    echo '#undef LL_FORMAT' >> longlong.h; \
+	    echo '#undef L_FORMAT' >> longlong.h; \
 	fi
 	${Q}echo '' >> longlong.h
 	${Q}echo '' >> longlong.h
@@ -2060,6 +2151,84 @@ have_urandom.h: ${MAKE_FILE}
 	    true; \
 	fi
 
+have_rusage.h: have_rusage.c ${MAKE_FILE}
+	-${Q}rm -f have_rusage have_rusage.o rusage_tmp have_rusage.h
+	${Q}echo 'forming have_rusage.h'
+	${Q}echo '/*' > have_rusage.h
+	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_rusage.h
+	${Q}echo ' */' >> have_rusage.h
+	${Q}echo '' >> have_rusage.h
+	${Q}echo '' >> have_rusage.h
+	${Q}echo '#if !defined(__HAVE_RUSAGE_H__)' >> have_rusage.h
+	${Q}echo '#define __HAVE_RUSAGE_H__' >> have_rusage.h
+	${Q}echo '' >> have_rusage.h
+	${Q}echo '' >> have_rusage.h
+	${Q}echo '/* do we have or want getrusage()? */' >> have_rusage.h
+	-${Q}rm -f have_rusage.o have_rusage
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_GETRUSAGE} have_rusage.c -c 2>/dev/null; \
+	     true
+	-${Q}${LCC} ${ILDFLAGS} have_rusage.o -o have_rusage 2>/dev/null; true
+	-${Q}${SHELL} -c "./have_rusage > rusage_tmp 2>/dev/null" \
+	    >/dev/null 2>&1; true
+	-${Q}if [ -s rusage_tmp ]; then \
+	    cat rusage_tmp >> have_rusage.h; \
+	else \
+	    echo '#undef HAVE_GETRUSAGE /* no */' >> have_rusage.h; \
+	fi
+	${Q}echo '' >> have_rusage.h
+	${Q}echo '' >> have_rusage.h
+	${Q}echo '#endif /* !__HAVE_RUSAGE_H__ */' >> have_rusage.h
+	-${Q}rm -f have_rusage have_rusage.o rusage_tmp
+	${Q}echo 'have_rusage.h formed'
+	-@if [ -z "${Q}" ]; then \
+	    echo ''; \
+	    echo '=-=-= start of $@ =-=-='; \
+	    cat $@; \
+	    echo '=-=-= end of $@ =-=-='; \
+	    echo ''; \
+	else \
+	    true; \
+	fi
+
+have_strdup.h: have_strdup.c ${MAKE_FILE}
+	-${Q}rm -f have_strdup have_strdup.o strdup_tmp have_strdup.h
+	${Q}echo 'forming have_strdup.h'
+	${Q}echo '/*' > have_strdup.h
+	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_strdup.h
+	${Q}echo ' */' >> have_strdup.h
+	${Q}echo '' >> have_strdup.h
+	${Q}echo '' >> have_strdup.h
+	${Q}echo '#if !defined(__HAVE_RUSAGE_H__)' >> have_strdup.h
+	${Q}echo '#define __HAVE_RUSAGE_H__' >> have_strdup.h
+	${Q}echo '' >> have_strdup.h
+	${Q}echo '' >> have_strdup.h
+	${Q}echo '/* do we have or want getstrdup()? */' >> have_strdup.h
+	-${Q}rm -f have_strdup.o have_strdup
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_STRDUP} have_strdup.c -c 2>/dev/null; \
+	     true
+	-${Q}${LCC} ${ILDFLAGS} have_strdup.o -o have_strdup 2>/dev/null; true
+	-${Q}${SHELL} -c "./have_strdup > strdup_tmp 2>/dev/null" \
+	    >/dev/null 2>&1; true
+	-${Q}if [ -s strdup_tmp ]; then \
+	    cat strdup_tmp >> have_strdup.h; \
+	else \
+	    echo '#undef HAVE_STRDUP /* no */' >> have_strdup.h; \
+	fi
+	${Q}echo '' >> have_strdup.h
+	${Q}echo '' >> have_strdup.h
+	${Q}echo '#endif /* !__HAVE_RUSAGE_H__ */' >> have_strdup.h
+	-${Q}rm -f have_strdup have_strdup.o strdup_tmp
+	${Q}echo 'have_strdup.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'
@@ -2291,27 +2460,21 @@ longbits: longbits.o
 lib/.all:
 	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking all rule for lib =-=-=-=-='
-	cd lib; ${MAKE} -f Makefile \
-	    MAKE_FILE=${MAKE_FILE} TOPDIR=${TOPDIR} LIBDIR=${LIBDIR} \
-	    HELPDIR=${HELPDIR} all
+	cd lib; ${MAKE} -f Makefile ${LIB_PASSDOWN} all
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
 
 help/.all:
 	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking all rule for help =-=-=-=-='
-	cd help; ${MAKE} -f Makefile \
-	    MAKE_FILE=${MAKE_FILE} TOPDIR=${TOPDIR} LIBDIR=${LIBDIR} \
-	    HELPDIR=${HELPDIR} all
+	cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} all
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
 
 help/builtin: func.c help/builtin.top help/builtin.end help/funclist.sed
 	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking builtin rule for help =-=-=-=-='
-	cd help; ${MAKE} -f Makefile \
-	    MAKE_FILE=${MAKE_FILE} TOPDIR=${TOPDIR} LIBDIR=${LIBDIR} \
-	    HELPDIR=${HELPDIR} builtin
+	cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} builtin
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
 
@@ -2411,9 +2574,7 @@ bsdi: ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 		echo chmod 0444 gen_h/$$i; \
 		chmod 0444 gen_h/$$i; \
 	done
-	cd help; ${MAKE} -f Makefile \
-	    MAKE_FILE=${MAKE_FILE} TOPDIR=${TOPDIR} LIBDIR=${LIBDIR} \
-	    HELPDIR=${HELPDIR} bsdi
+	cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} bsdi
 	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
 
 ##
@@ -2505,6 +2666,12 @@ h_list:
 		echo $$i; \
 	done
 
+# print the calc version
+#
+ver_calc: version.c
+	-rm -f $@
+	${LCC} ${ICFLAGS} -DCALC_VER ${ILDFLAGS} version.c -o $@
+
 ##
 #
 # File distribution list generation.  You can ignore this section.
@@ -2516,34 +2683,19 @@ h_list:
 
 distlist: ${DISTLIST}
 	${Q}(for i in ${DISTLIST}; do \
-		echo calc/$$i; \
+		echo $$i; \
 	done; \
-	(cd help; ${MAKE} distlist \
-	    MAKE_FILE=${MAKE_FILE} TOPDIR=${TOPDIR} LIBDIR=${LIBDIR} \
-	    HELPDIR=${HELPDIR} SORT=${SORT}); \
-	(cd lib; ${MAKE} distlist \
-	    MAKE_FILE=${MAKE_FILE} TOPDIR=${TOPDIR} LIBDIR=${LIBDIR} \
-	    HELPDIR=${HELPDIR} SORT=${SORT}) ) | ${SORT}; \
+	(cd help; ${MAKE} ${HELP_PASSDOWN} distlist); \
+	(cd lib; ${MAKE} ${LIB_PASSDOWN} distlist); \
 	(cd custom; ${MAKE} ${CUSTOM_PASSDOWN} distlist); \
-	(cd sample; ${MAKE} ${SAMPLE_PASSDOWN} distlist) | ${SORT}
+	(cd sample; ${MAKE} ${SAMPLE_PASSDOWN} distlist)) | ${SORT}
 
-# The bsdi distribution has generated files as well as distributed files.
-# The the .h files are placed under calc/gen_h.
-#
-bsdilist: ${DISTLIST} ${BUILD_H_SRC} calc.1
-	${Q}(for i in ${DISTLIST}; do \
-		echo calc/$$i; \
-	done; \
-	for i in ${BUILD_H_SRC}; do \
-		echo calc/gen_h/$$i; \
-	done; \
-	echo calc/calc.1; \
-	(cd help; ${MAKE} bsdilist \
-	    MAKE_FILE=${MAKE_FILE} TOPDIR=${TOPDIR} LIBDIR=${LIBDIR} \
-	    HELPDIR=${HELPDIR} SORT=${SORT}); \
-	(cd lib; ${MAKE} bsdilist \
-	    MAKE_FILE=${MAKE_FILE} TOPDIR=${TOPDIR} LIBDIR=${LIBDIR} \
-	    HELPDIR=${HELPDIR} SORT=${SORT}) ) | ${SORT}
+distdir:
+	${Q}(echo .; \
+	(cd help; ${MAKE} ${HELP_PASSDOWN} distdir); \
+	(cd lib; ${MAKE} ${LIB_PASSDOWN} distdir); \
+	(cd custom; ${MAKE} ${CUSTOM_PASSDOWN} distdir); \
+	(cd sample; ${MAKE} ${SAMPLE_PASSDOWN} distdir)) | ${SORT}
 
 ##
 #
@@ -2668,6 +2820,8 @@ env:
 	@echo "REGRESS_CAL=${REGRESS_CAL}"; echo ""
 	@echo "CUSTOM_PASSDOWN=${CUSTOM_PASSDOWN}"; echo ""
 	@echo "SAMPLE_PASSDOWN=${SAMPLE_PASSDOWN}"; echo ""
+	@echo "HELP_PASSDOWN=${HELP_PASSDOWN}"; echo ""
+	@echo "LIB_PASSDOWN=${LIB_PASSDOWN}"; echo ""
 	@echo "H_SRC=${H_SRC}"; echo ""
 	@echo "C_SRC=${C_SRC}"; echo ""
 	@echo "DISTLIST=${DISTLIST}"; echo ""
@@ -2765,14 +2919,10 @@ clean:
 	-rm -f ${UTIL_PROGS}
 	-rm -f .libcustcalc_error
 	${Q}echo '=-=-=-=-= Invoking $@ rule for help =-=-=-=-='
-	-cd help; ${MAKE} -f Makefile \
-	    MAKE_FILE=${MAKE_FILE} TOPDIR=${TOPDIR} LIBDIR=${LIBDIR} \
-	    HELPDIR=${HELPDIR} clean
+	-cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} clean
 	${Q}echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${Q}echo '=-=-=-=-= Invoking $@ rule for lib =-=-=-=-='
-	-cd lib; ${MAKE} -f Makefile \
-	    MAKE_FILE=${MAKE_FILE} TOPDIR=${TOPDIR} LIBDIR=${LIBDIR} \
-	    HELPDIR=${HELPDIR} clean
+	-cd lib; ${MAKE} -f Makefile ${LIB_PASSDOWN} clean
 	${Q}echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
 	cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} clean
@@ -2780,7 +2930,6 @@ clean:
 	${V} echo '=-=-=-=-= Invoking $@ rule for sample =-=-=-=-='
 	cd sample; ${MAKE} -f Makefile ${SAMPLE_PASSDOWN} clean
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
-	-rm -f funclist.o funclist.c
 	${Q}echo remove files that are obsolete
 	-rm -f endian.h stdarg.h libcalcerr.a lib/obj help/obj
 	-rm -f have_vs.c std_arg.h try_stdarg.c fnvhash.c
@@ -2803,14 +2952,10 @@ clobber: lintclean
 	-rm -f calc.pixie calc.rf calc.Counts calc.cord
 	-rm -rf gen_h skel Makefile.bak
 	${V} echo '=-=-=-=-= Invoking $@ rule for help =-=-=-=-='
-	-cd help;${MAKE} -f Makefile \
-	    MAKE_FILE=${MAKE_FILE} TOPDIR=${TOPDIR} LIBDIR=${LIBDIR} \
-	    HELPDIR=${HELPDIR} clobber
+	-cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} clobber
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for lib =-=-=-=-='
-	-cd lib; ${MAKE} -f Makefile \
-	    MAKE_FILE=${MAKE_FILE} TOPDIR=${TOPDIR} LIBDIR=${LIBDIR} \
-	    HELPDIR=${HELPDIR} clobber
+	-cd lib; ${MAKE} -f Makefile ${LIB_PASSDOWN} clobber
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
 	cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} clobber
@@ -2846,6 +2991,20 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	    true; \
 	fi
 	-chmod 0755 ${HELPDIR}
+	-${Q}if [ ! -d ${INCDIR} ]; then \
+		echo mkdir ${INCDIR}; \
+		mkdir ${INCDIR}; \
+	else \
+	    true; \
+	fi
+	-chmod 0755 ${INCDIR}
+	-${Q}if [ ! -d ${INCDIRCALC} ]; then \
+		echo mkdir ${INCDIRCALC}; \
+		mkdir ${INCDIRCALC}; \
+	else \
+	    true; \
+	fi
+	-chmod 0755 ${INCDIRCALC}
 	-${Q}if [ ! -d ${BINDIR} ]; then \
 		echo mkdir ${BINDIR}; \
 		mkdir ${BINDIR}; \
@@ -2857,14 +3016,10 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	cp calc ${BINDIR}
 	-chmod 0555 ${BINDIR}/calc
 	${V} echo '=-=-=-=-= Invoking $@ rule for help =-=-=-=-='
-	cd help; ${MAKE} -f Makefile \
-	    MAKE_FILE=${MAKE_FILE} TOPDIR=${TOPDIR} LIBDIR=${LIBDIR} \
-	    HELPDIR=${HELPDIR} install
+	cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} install
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for lib =-=-=-=-='
-	cd lib; ${MAKE} -f Makefile \
-	    MAKE_FILE=${MAKE_FILE} TOPDIR=${TOPDIR} LIBDIR=${LIBDIR} \
-	    HELPDIR=${HELPDIR} install
+	cd lib; ${MAKE} -f Makefile ${LIB_PASSDOWN} install
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
 	cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} install
@@ -2873,16 +3028,18 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	cd sample; ${MAKE} -f Makefile ${SAMPLE_PASSDOWN} install
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	-rm -f ${LIBDIR}/libcalc.a
-	cp libcalc.a ${LIBDIR}/libcalc.a
-	-chmod 0644 ${LIBDIR}/libcalc.a
+	cp -f libcalc.a ${LIBDIR}/libcalc.a
 	${RANLIB} ${LIBDIR}/libcalc.a
+	-chmod 0644 ${LIBDIR}/libcalc.a
 	-${Q}for i in ${LIB_H_SRC} ${BUILD_H_SRC}; do \
 		echo rm -f ${LIBDIR}/$$i; \
 		rm -f ${LIBDIR}/$$i; \
-		echo cp $$i ${LIBDIR}; \
-		cp $$i ${LIBDIR}; \
-		echo chmod 0444 ${LIBDIR}/$$i; \
-		chmod 0444 ${LIBDIR}/$$i; \
+		echo rm -f ${INCDIRCALC}/$$i; \
+		rm -f ${INCDIRCALC}/$$i; \
+		echo cp $$i ${INCDIRCALC}; \
+		cp $$i ${INCDIRCALC}; \
+		echo chmod 0444 ${INCDIRCALC}/$$i; \
+		chmod 0444 ${INCDIRCALC}/$$i; \
 	done
 	${Q}: If lint was made, install the lint library.
 	-${Q}if [ -f llib-lcalc.ln ]; then \
@@ -2946,6 +3103,7 @@ addop.o: config.h
 addop.o: endian_calc.h
 addop.o: func.h
 addop.o: hash.h
+addop.o: have_const.h
 addop.o: have_malloc.h
 addop.o: have_memmv.h
 addop.o: have_newstr.h
@@ -3002,6 +3160,7 @@ blkcpy.o: config.h
 blkcpy.o: endian_calc.h
 blkcpy.o: file.h
 blkcpy.o: hash.h
+blkcpy.o: have_const.h
 blkcpy.o: have_fpos.h
 blkcpy.o: have_malloc.h
 blkcpy.o: have_memmv.h
@@ -3106,6 +3265,7 @@ codegen.o: config.h
 codegen.o: endian_calc.h
 codegen.o: func.h
 codegen.o: hash.h
+codegen.o: have_const.h
 codegen.o: have_malloc.h
 codegen.o: have_memmv.h
 codegen.o: have_newstr.h
@@ -3190,6 +3350,7 @@ const.o: config.h
 const.o: const.c
 const.o: endian_calc.h
 const.o: hash.h
+const.o: have_const.h
 const.o: have_malloc.h
 const.o: have_memmv.h
 const.o: have_newstr.h
@@ -3244,6 +3405,7 @@ file.o: file.c
 file.o: file.h
 file.o: fposval.h
 file.o: hash.h
+file.o: have_const.h
 file.o: have_fpos.h
 file.o: have_malloc.h
 file.o: have_memmv.h
@@ -3341,9 +3503,11 @@ have_newstr.o: have_newstr.c
 have_offscl.o: have_offscl.c
 have_posscl.o: have_fpos.h
 have_posscl.o: have_posscl.c
+have_rusage.o: have_rusage.c
 have_stdvs.o: have_stdvs.c
 have_stdvs.o: have_string.h
 have_stdvs.o: have_unistd.h
+have_strdup.o: have_strdup.c
 have_uid_t.o: have_uid_t.c
 have_uid_t.o: have_unistd.h
 have_ustat.o: have_ustat.c
@@ -3360,6 +3524,7 @@ help.o: conf.h
 help.o: config.h
 help.o: endian_calc.h
 help.o: hash.h
+help.o: have_const.h
 help.o: have_malloc.h
 help.o: have_memmv.h
 help.o: have_newstr.h
@@ -3385,10 +3550,12 @@ hist.o: cmath.h
 hist.o: config.h
 hist.o: endian_calc.h
 hist.o: hash.h
+hist.o: have_const.h
 hist.o: have_malloc.h
 hist.o: have_memmv.h
 hist.o: have_newstr.h
 hist.o: have_stdlib.h
+hist.o: have_strdup.h
 hist.o: have_string.h
 hist.o: have_unistd.h
 hist.o: hist.c
@@ -3413,11 +3580,13 @@ input.o: conf.h
 input.o: config.h
 input.o: endian_calc.h
 input.o: hash.h
+input.o: have_const.h
 input.o: have_malloc.h
 input.o: have_memmv.h
 input.o: have_newstr.h
 input.o: have_stdlib.h
 input.o: have_string.h
+input.o: have_unistd.h
 input.o: hist.h
 input.o: input.c
 input.o: longbits.h
@@ -3442,6 +3611,7 @@ label.o: config.h
 label.o: endian_calc.h
 label.o: func.h
 label.o: hash.h
+label.o: have_const.h
 label.o: have_malloc.h
 label.o: have_memmv.h
 label.o: have_newstr.h
@@ -3476,6 +3646,7 @@ lib_calc.o: have_malloc.h
 lib_calc.o: have_memmv.h
 lib_calc.o: have_newstr.h
 lib_calc.o: have_stdlib.h
+lib_calc.o: have_strdup.h
 lib_calc.o: have_string.h
 lib_calc.o: have_unistd.h
 lib_calc.o: label.h
@@ -3571,6 +3742,7 @@ math_error.o: cmath.h
 math_error.o: config.h
 math_error.o: endian_calc.h
 math_error.o: hash.h
+math_error.o: have_const.h
 math_error.o: have_malloc.h
 math_error.o: have_memmv.h
 math_error.o: have_newstr.h
@@ -3621,6 +3793,7 @@ obj.o: config.h
 obj.o: endian_calc.h
 obj.o: func.h
 obj.o: hash.h
+obj.o: have_const.h
 obj.o: have_malloc.h
 obj.o: have_memmv.h
 obj.o: have_newstr.h
@@ -3834,6 +4007,7 @@ seed.o: have_gettime.h
 seed.o: have_malloc.h
 seed.o: have_memmv.h
 seed.o: have_newstr.h
+seed.o: have_rusage.h
 seed.o: have_stdlib.h
 seed.o: have_string.h
 seed.o: have_urandom.h
@@ -3925,6 +4099,7 @@ string.o: cmath.h
 string.o: config.h
 string.o: endian_calc.h
 string.o: hash.h
+string.o: have_const.h
 string.o: have_malloc.h
 string.o: have_memmv.h
 string.o: have_newstr.h
@@ -3950,6 +4125,7 @@ symbol.o: config.h
 symbol.o: endian_calc.h
 symbol.o: func.h
 symbol.o: hash.h
+symbol.o: have_const.h
 symbol.o: have_malloc.h
 symbol.o: have_memmv.h
 symbol.o: have_newstr.h
@@ -3979,6 +4155,7 @@ token.o: cmath.h
 token.o: config.h
 token.o: endian_calc.h
 token.o: hash.h
+token.o: have_const.h
 token.o: have_malloc.h
 token.o: have_memmv.h
 token.o: have_newstr.h
@@ -4038,6 +4215,7 @@ version.o: cmath.h
 version.o: config.h
 version.o: endian_calc.h
 version.o: hash.h
+version.o: have_const.h
 version.o: have_malloc.h
 version.o: have_memmv.h
 version.o: have_newstr.h

README

@@ -87,4 +87,4 @@ your full name.
 
 The calc web site is located at:
 
-	http://reality.sgi.com/chongo/tech/comp/calc
+	http://reality.sgi.com/chongo/tech/comp/calc/

align32.c

@@ -4,7 +4,7 @@
  * This file was written by:
  *
  *	Landon Curt Noll
- *	http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  *	chongo <was here> /\../\
  *

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 http://reality.sgi.com/chongo
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo/
  */
 
 #include <stdio.h>

block.c

@@ -28,7 +28,7 @@
  * Happy bit twiddling,
  *
  *	Landon Curt Noll
- *	http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */

block.h

@@ -28,7 +28,7 @@
  * Happy bit twiddling,
  *
  *	Landon Curt Noll
- *	http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */

calc.c

@@ -39,8 +39,6 @@
 /*
  * static definitions and functions
  */
-static char *usage = "usage: %s [-c] [-C] [-d] [-e] [-h] [-i] [-m mode]\n"
-		     "\t[-n] [-p] [-q] [-u] [-v] [[--] calc_cmd ...]\n";
 static void intint(int arg);	/* interrupt routine */
 
 
@@ -55,13 +53,14 @@ main(int argc, char **argv)
 	extern char *optarg;	/* option argument */
 	extern int optind;	/* option index */
 	int c;			/* option */
+	char *p;
 	long i;
 
 	/*
 	 * parse args
 	 */
 	program = argv[0];
-	while ((c = getopt(argc, argv, "Cehim:npquvcd")) != -1) {
+	while ((c = getopt(argc, argv, "Cehim:npquvcdD:")) != -1) {
 		switch (c) {
 		case 'C':
 #if defined(CUSTOM)
@@ -126,12 +125,36 @@ main(int argc, char **argv)
 			 */
 			printf("%s (version %s)\n", CALC_TITLE, version());
 			exit(0);
+		case 'D':
+			/*
+			 * parse the -D optarg
+			 *
+			 * Could be calc_debug
+			 *	 or calc_debug:lib_debug
+			 *	 or calc_debug:lib_debug:user_debug
+			 */
+			calc_debug = optarg;
+			p = strchr(optarg, ':');
+			if (p != NULL) {
+				*p = '\0';
+				lib_debug = p+1;
+				p = strchr(lib_debug, ':');
+				if (p != NULL) {
+					*p = '\0';
+					user_debug = p+1;
+				}
+			}
+			break;
 		default:
 			/*
 			 * we are too early in processing to call
 			 * libcalc_call_me_last() - nothing to cleanup
 			 */
-			fprintf(stderr, usage, program);
+			fprintf(stderr,
+			  "usage: %s [-c] [-C] [-d] [-e] [-h] [-i] [-m mode]\n"
+			  "\t[-D calc_debug[:lib_debug:[user_debug]]]\n"
+			  "\t[-n] [-p] [-q] [-u] [-v] [[--] calc_cmd ...]\n",
+			  program);
 			exit(1);
 		}
 	}
@@ -185,6 +208,8 @@ main(int argc, char **argv)
 	 */
 	libcalc_call_me_first();
 	stdin_tty = isatty(0);		/* assume stdin is on fd 0 */
+	if (conf->calc_debug & CALCDBG_TTY)
+		printf("DEBUG: stdin_tty is %d\n", stdin_tty);
 	if (want_defhelp) {
 		givehelp(DEFAULTCALCHELP);
 		libcalc_call_me_last();
@@ -239,9 +264,17 @@ main(int argc, char **argv)
 	 */
 	if (run_state == RUN_BEGIN) {
 		if (!q_flag && allow_read) {
+			if (conf->calc_debug & CALCDBG_RUNSTATE)
+				printf("DEBUG: run_state from %s to %s\n",
+				    run_state_name(run_state),
+				    run_state_name(RUN_RCFILES));
 			run_state = RUN_RCFILES;
 			runrcfiles();
 		}
+		if (conf->calc_debug & CALCDBG_RUNSTATE)
+			printf("DEBUG: run_state from %s to %s\n",
+			    run_state_name(run_state),
+			    run_state_name(RUN_PRE_CMD_ARGS));
 		run_state = RUN_PRE_CMD_ARGS;
 	}
 
@@ -252,25 +285,46 @@ main(int argc, char **argv)
 			if (inputlevel() == 0) {
 				closeinput();
 				runrcfiles();
+				if (conf->calc_debug & CALCDBG_RUNSTATE)
+				    printf("DEBUG: run_state from %s to %s\n",
+					run_state_name(run_state),
+					run_state_name(RUN_PRE_CMD_ARGS));
 				run_state = RUN_PRE_CMD_ARGS;
 			} else {
 				closeinput();
 			}
 		} else {
-			if ((havecommands && !i_flag) || !stdin_tty)
+			if ((havecommands && !i_flag) || !stdin_tty) {
+				if (conf->calc_debug & CALCDBG_RUNSTATE)
+				    printf("DEBUG: run_state from %s to %s\n",
+					run_state_name(run_state),
+					run_state_name(RUN_EXIT_WITH_ERROR));
 				run_state = RUN_EXIT_WITH_ERROR;
-			else
+			} else {
+				if (conf->calc_debug & CALCDBG_RUNSTATE)
+				    printf("DEBUG: run_state from %s to %s\n",
+					run_state_name(run_state),
+					run_state_name(RUN_PRE_CMD_ARGS));
 				run_state = RUN_PRE_CMD_ARGS;
+			}
 		}
 	}
 
 	if (run_state == RUN_PRE_CMD_ARGS) {
 		if (havecommands) {
+			if (conf->calc_debug & CALCDBG_RUNSTATE)
+				printf("DEBUG: run_state from %s to %s\n",
+				    run_state_name(run_state),
+				    run_state_name(RUN_CMD_ARGS));
 			run_state = RUN_CMD_ARGS;
 			(void) openstring(cmdbuf, (long) strlen(cmdbuf));
 			getcommands(FALSE);
 			closeinput();
 		}
+		if (conf->calc_debug & CALCDBG_RUNSTATE)
+			printf("DEBUG: run_state from %s to %s\n",
+			    run_state_name(run_state),
+			    run_state_name(RUN_PRE_TOP_LEVEL));
 		run_state = RUN_PRE_TOP_LEVEL;
 	}
 
@@ -279,19 +333,36 @@ main(int argc, char **argv)
 		if ((c_flag && !stoponerror) || stoponerror < 0) {
 			getcommands(FALSE);
 			if (inputlevel() == 0)
+				if (conf->calc_debug & CALCDBG_RUNSTATE)
+				    printf("DEBUG: run_state from %s to %s\n",
+					run_state_name(run_state),
+					run_state_name(RUN_PRE_TOP_LEVEL));
 				run_state = RUN_PRE_TOP_LEVEL;
 			closeinput();
 		} else {
 			closeinput();
-			if (!stdin_tty || !i_flag || p_flag)
+			if (!stdin_tty || !i_flag || p_flag) {
+				if (conf->calc_debug & CALCDBG_RUNSTATE)
+				    printf("DEBUG: run_state from %s to %s\n",
+					run_state_name(run_state),
+					run_state_name(RUN_EXIT_WITH_ERROR));
 				run_state = RUN_EXIT_WITH_ERROR;
-			else
+			} else {
+				if (conf->calc_debug & CALCDBG_RUNSTATE)
+				    printf("DEBUG: run_state from %s to %s\n",
+					run_state_name(run_state),
+					run_state_name(RUN_PRE_TOP_LEVEL));
 				run_state = RUN_PRE_TOP_LEVEL;
+			}
 		}
 	}
 
 	if (run_state == RUN_PRE_TOP_LEVEL) {
 		if (stdin_tty && ((havecommands && !i_flag) || p_flag)) {
+			if (conf->calc_debug & CALCDBG_RUNSTATE)
+				printf("DEBUG: run_state from %s to %s\n",
+				    run_state_name(run_state),
+				    run_state_name(RUN_EXIT));
 			run_state = RUN_EXIT;
 		} else {
 			if (stdin_tty) {
@@ -300,6 +371,10 @@ main(int argc, char **argv)
 				resetinput();
 				openterminal();
 			}
+			if (conf->calc_debug & CALCDBG_RUNSTATE)
+				printf("DEBUG: run_state from %s to %s\n",
+				    run_state_name(run_state),
+				    run_state_name(RUN_TOP_LEVEL));
 			run_state = RUN_TOP_LEVEL;
 			getcommands(TRUE);
 		}
@@ -315,6 +390,10 @@ main(int argc, char **argv)
 				reinitialize();
 				getcommands(TRUE);
 			} else {
+				if (conf->calc_debug & CALCDBG_RUNSTATE)
+				    printf("DEBUG: run_state from %s to %s\n",
+					run_state_name(run_state),
+					run_state_name(RUN_EXIT_WITH_ERROR));
 			 	run_state = RUN_EXIT_WITH_ERROR;
 			}
 		}

calc.h

@@ -14,6 +14,8 @@
 
 #include "value.h"
 
+#include "have_const.h"
+
 
 /*
  * Configuration definitions
@@ -38,7 +40,6 @@
 #define	SYMBOLSIZE	256	/* maximum symbol name size */
 #define	MAXINDICES	20	/* maximum number of indices for objects */
 #define	MAXLABELS	100	/* maximum number of user labels in function */
-#define	MAXOBJECTS	128	/* maximum number of object types */
 #define	MAXSTRING	1024	/* maximum size of string constant */
 #define	MAXSTACK	1000	/* maximum depth of evaluation stack */
 #define	MAXFILES	20	/* maximum number of opened files */
@@ -141,6 +142,7 @@ extern void givehelp(char *type);
 extern void libcalc_call_me_first(void);
 extern void libcalc_call_me_last(void);
 extern void showerrors(void);
+extern char *calc_strdup(CONST char *);
 
 /*
  * Initialization
@@ -208,6 +210,7 @@ typedef enum {
     RUN_EXIT_WITH_ERROR = 7	/* exit with error */
 } run;
 extern run run_state;
+extern char *run_state_name(run state);
 
 /*
  * calc version information

calc.man

@@ -15,17 +15,19 @@ calc \- arbitrary precision calculator
 .RB [ \-c ]
 .RB [ \-C ]
 .RB [ \-d ]
+.RB [ -D\ \&calc_debug[:lib_debug:[user_debug]] ]
+.br
+.in +5n
 .RB [ \-e ]
 .RB [ \-h ]
 .RB [ \-i ]
 .RB [ \-m\ \&mode ]
-.br
-.in +5n
 .RB [ \-n ]
 .RB [ \-p ]
 .RB [ \-q ]
 .RB [ \-u ]
 .RB [ \-v ]
+.br
 .RB [ calc_cmd\ \&.\|.\|. ]
 .in -5n
 .SH DESCRIPTION
@@ -122,6 +124,34 @@ It's nearly ten past six.
 This flag disables the reporting of missing calc
 startup scripts ($CALCRC).
 
+.TP
+.BR -D " calc_debug[:lib_debug:[user_debug]]"
+Force the initial value of config("calc_debug"),
+config("lib_debug") and config("user_debug").
+.sp 1
+The : separated strings are interpreted as signed 32 bit values.
+After an optional leading sign a leading zero indicates octal
+conversion, and a leading ``0x'' or ``0X'' hexadecimal
+conversion.  Otherwise, decimal conversion is assumed.
+.sp 1
+By default,
+.I calc_debug
+is 0,
+.I lib_debug
+is 3 and
+.I lib_debug
+is 0.
+.sp 1
+For more information use the following
+.B calc
+command:
+.sp 1
+.in +5n
+.nf
+help config
+.fi
+.in -5n
+
 .TP
 .B \-e
 Ignore any environment variables on startup.
@@ -182,7 +212,8 @@ This flag sets the permission mode of
 It controls the ability for
 .B calc
 to open files and execute programs.
-Mode may be a number from 0 to 7.
+.I Mode
+may be a number from 0 to 7.
 .sp 1
 The mode value is interpreted in a way similar to that
 of the
@@ -205,8 +236,8 @@ octal mode:
 If one wished to run
 .B calc
 from a privileged user, one might want to use
-.B \-m
-0 in an effort to make
+.BR \-m " 0"
+in an effort to make
 .B calc
 somewhat more secure.
 .sp 1
@@ -214,8 +245,8 @@ Mode bits for reading and writing apply only on an
 open.
 Files already open are not effected.
 Thus if one wanted to use the
-.B \-m
-0 in an effort to make
+.BR \-m " 0"
+in an effort to make
 .B calc
 somewhat more secure, but still wanted to read and write a specific
 file, one might want to do in
@@ -528,6 +559,9 @@ by this environment variable.
 .sp
 Default value: ${CALCBINDINGS}
 .sp
+This variable is not used if calc was compiled with GNU-readline support.
+In that case, the standard readline mechanisms (see readline(3)) are used.
+.sp
 .SH CREDIT
 \&
 .br
@@ -584,7 +618,7 @@ Landon Noll maintains the the
 web site is located at:
 .sp
 .in +0.5i
-http://reality.sgi.com/chongo/tech/comp/calc
+http://reality.sgi.com/chongo/tech/comp/calc/
 .in -0.5i
 .sp
 One may join the

check.awk

@@ -11,6 +11,7 @@ BEGIN {
     havebuf2=0;
     buf2=0;
     error = 0;
+    end_seen = 0;
 }
 
 NF == 0 {
@@ -29,6 +30,10 @@ NF == 0 {
     next;
 }
 
+/: Ending regression tests$/ {
+    end_seen = 1;
+}
+
 $1 ~ /^[0-9]+:/ {
     if (error > 0) {
 	if (havebuf2) {
@@ -71,7 +76,7 @@ END {
     if (error > 0 && havebuf0) {
 	print buf0;
     }
-    if (error > 0) {
+    if (error > 0 || !end_seen) {
 	exit(1);
     } else {
 	exit(0);

codegen.c

@@ -32,8 +32,8 @@ static void getfunction(void);
 static void ungetfunction(void);
 static void getbody(LABEL *contlabel, LABEL *breaklabel,
 		    LABEL *nextcaselabel, LABEL *defaultlabel);
-static void getdeclarations(int symtype);
-static void getsimpledeclaration (int symtype);
+static int getdeclarations(int symtype);
+static int getsimpledeclaration (int symtype);
 static int getonevariable (int symtype);
 static void getstatement(LABEL *contlabel, LABEL *breaklabel,
 			 LABEL *nextcaselabel, LABEL *defaultlabel);
@@ -256,9 +256,15 @@ ungetfunction(void)
 			case T_MULT:
 				rmalluserfunc();
 				continue;
-			default:
+			case T_NEWLINE:
+			case T_SEMICOLON:
+			case T_EOF:
 				rescantoken();
 				return;
+			default:
+				scanerror(T_SEMICOLON,
+					 "Non-name arg for undefine");
+				return;
 		}
 	}
 }
@@ -382,7 +388,7 @@ getbody(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *defaul
 			return;
 
 		case T_EOF:
-			scanerror(T_SEMICOLON, "End-of-file in function body");
+			scanerror(T_NULL, "End-of-file in function body");
 			return;
 
 		default:
@@ -398,9 +404,11 @@ getbody(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *defaul
  * declarations = { LOCAL | GLOBAL | STATIC } onedeclaration
  *	[ ',' onedeclaration ] ... ';'.
  */
-static void
+static int
 getdeclarations(int symtype)
 {
+	int res = 0;
+
 	while (TRUE) {
 		switch (gettoken()) {
 			case T_COMMA:
@@ -411,28 +419,31 @@ getdeclarations(int symtype)
 			case T_RIGHTBRACE:
 			case T_EOF:
 				rescantoken();
-				return;
+				return res;
 
 			case T_SYMBOL:
 				addopone(OP_DEBUG, linenumber());
 				rescantoken();
-				getsimpledeclaration(symtype);
+				if (getsimpledeclaration(symtype))
+					res = 1;
 				break;
 
 			case T_MAT:
 				addopone(OP_DEBUG, linenumber());
 				getmatdeclaration(symtype);
+				res = 1;
 				break;
 
 			case T_OBJ:
 				addopone(OP_DEBUG, linenumber());
 				getobjdeclaration(symtype);
 				addop(OP_POP);
+				res = 1;
 				break;
 
 			default:
 				scanerror(T_SEMICOLON, "Bad syntax in declaration statement");
-				return;
+				return res;
 		}
 	}
 }
@@ -444,22 +455,24 @@ getdeclarations(int symtype)
  * Subsequences end with "," or at end of line; spaces indicate
  * repeated assignment, e.g. "c d = 2" has the effect of "c = 2, d = 2".
  */
-static void
+static int
 getsimpledeclaration(int symtype)
 {
+	int res = 0;
 
 	for (;;) {
 		switch (gettoken()) {
 			case T_SYMBOL:
 				rescantoken();
-				if (getonevariable(symtype))
+				res = getonevariable(symtype);
+				if (res)
 					addop(OP_POP);
 				continue;
 			case T_COMMA:
 				continue;
 			default:
 				rescantoken();
-				return;
+				return res;
 		}
 	}
 }
@@ -508,11 +521,9 @@ getonevariable(int symtype)
  *	| BREAK ';'
  *	| RETURN assignment ';'
  *	| GOTO label ';'
- *	| MAT name '[' value [ ':' value ] [',' value [ ':' value ] ] ']' ';'
- *	| OBJ type '{' arg [ ',' arg ] ... '}' ] ';'
- *	| OBJ type name [ ',' name ] ';'
  *	| PRINT assignment [, assignment ] ... ';'
  *	| QUIT [ string ] ';'
+ *	| ABORT [ string ] ';'
  *	| SHOW item ';'
  *	| body
  *	| assignment ';'
@@ -541,18 +552,20 @@ getstatement(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *d
 		return;
 
 	case T_GLOBAL:
-		getdeclarations(SYM_GLOBAL);
+		(void) getdeclarations(SYM_GLOBAL);
 		break;
 
 	case T_STATIC:
 		clearlabel(&label);
 		addoplabel(OP_INITSTATIC, &label);
-		getdeclarations(SYM_STATIC);
-		setlabel(&label);
+		if (getdeclarations(SYM_STATIC))
+			setlabel(&label);
+		else
+			curfunc->f_opcodecount -= 2;
 		break;
 
 	case T_LOCAL:
-		getdeclarations(SYM_LOCAL);
+		(void) getdeclarations(SYM_LOCAL);
 		break;
 
 	case T_RIGHTBRACE:
@@ -692,14 +705,14 @@ getstatement(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *d
 			}
 		}
 		if (gettoken() != T_RIGHTPAREN) {	/* have 'c' part */
-			if (label1.l_offset <= 0)
+			if (label1.l_offset < 0)
 				addoplabel(OP_JUMP, &label3);
 			setlabel(&label2);
 			contlabel = &label2;
 			rescantoken();
 			(void) getexprlist();
 			addop(OP_POP);
-			if (label1.l_offset > 0)
+			if (label1.l_offset >= 0)
 				addoplabel(OP_JUMP, &label1);
 			if (gettoken() != T_RIGHTPAREN) {
 				(void) tokenmode(oldmode);
@@ -719,15 +732,21 @@ getstatement(LABEL *contlabel, LABEL *breaklabel, LABEL *nextcaselabel, LABEL *d
 	case T_WHILE:
 		oldmode = tokenmode(TM_DEFAULT);
 		contlabel = &label1;
-		breaklabel = &label2;
 		clearlabel(contlabel);
-		clearlabel(breaklabel);
 		setlabel(contlabel);
 		getcondition();
-		addoplabel(OP_JUMPZ, breaklabel);
-		getstatement(contlabel, breaklabel, NULL_LABEL, NULL_LABEL);
-		addoplabel(OP_JUMP, contlabel);
-		setlabel(breaklabel);
+		if (gettoken() != T_SEMICOLON) {
+			breaklabel = &label2;
+			clearlabel(breaklabel);
+			addoplabel(OP_JUMPZ, breaklabel);
+			rescantoken();
+			getstatement(contlabel, breaklabel,
+				NULL_LABEL, NULL_LABEL);
+			addoplabel(OP_JUMP, contlabel);
+			setlabel(breaklabel);
+		} else {
+			addoplabel(OP_JUMPNZ, contlabel);
+		}
 		(void) tokenmode(oldmode);
 		return;
 
@@ -995,7 +1014,11 @@ getobjdeclaration(int symtype)
 				/*FALLTHRU*/
 			case T_RIGHTBRACE:
 				(void) tokenmode(oldmode);
-				(void) defineobject(name, indices, count);
+				if (defineobject(name, indices, count)) {
+					scanerror(T_NULL,
+				"Object type \"%s\" is already defined", name);
+					return;
+				}
 				getobjvars(name, symtype);
 				return;
 			case T_NEWLINE:
@@ -1034,18 +1057,14 @@ getoneobj(long index, int symtype)
 }
 
 /*
- * Routine to collect a set of variables for the specified object type
- * and initialize them as being that type of object.
- * Here
- *	objlist = name initlist [ ',' name initlist ] ... ';'.
- * If symtype is SYM_UNDEFINED, then this is an OBJ statement where the
- * values can be any variable expression, and no symbols are to be defined.
- * Otherwise this is part of a declaration, and the variables must be raw
- * symbol names which are defined with the specified symbol type.
+ * Routine to assign a specified object-type value to each of a set of
+ * variables in a "global", "local" or "static" declaration, or, if
+ * symtype is SYM_UNDEFINED, to create one object value of the specified
+ * type.
  *
  * given:
  *	name		object name
- *	symtype		type of symbol to collect for
+ *	symtype		declaration type
  */
 static void
 getobjvars(char *name, int symtype)
@@ -1059,6 +1078,8 @@ getobjvars(char *name, int symtype)
 	}
 	for (;;) {
 		getoneobj(index, symtype);
+		if (symtype == SYM_UNDEFINED)
+			return;
 		if (gettoken() != T_COMMA) {
 			rescantoken();
 			return;
@@ -1350,7 +1371,7 @@ getopassignment(void)
 			return type;
 	}
 	if (isrvalue(type)) {
-		scanerror(T_NULL, "Illegal assignment in getopassignment");
+		scanerror(T_NULL, "Illegal assignment");
 		(void) getopassignment();
 		return (EXPR_RVALUE | EXPR_ASSIGN);
 	}
@@ -1443,7 +1464,7 @@ getassignment (void)
 			return type;
 	}
 	if (isrvalue(type)) {
-		scanerror(T_SEMICOLON, "Illegal assignment in getassignment");
+		scanerror(T_SEMICOLON, "Illegal assignment");
 		(void) getassignment();
 		return (EXPR_RVALUE | EXPR_ASSIGN);
 	}
@@ -1902,11 +1923,6 @@ getterm(void)
 
 		case T_MAT:
 			getonematrix(SYM_UNDEFINED);
-			while (gettoken() == T_COMMA) {
-				addop(OP_POP);
-				getonematrix(SYM_UNDEFINED);
-			}
-			rescantoken();
 			type = EXPR_ASSIGN;
 			break;
 

config.c

@@ -94,8 +94,8 @@ CONFIG oldstd = {	/* backward compatible standard configuration */
 	FALSE,			/* skip duplicate block output lines */
 	BLK_BASE_HEX,		/* block octet print base */
 	BLK_FMT_HD_STYLE,	/* block output format */
-	3,			/* calc library debug level */
 	0,			/* internal calc debug level */
+	3,			/* calc library debug level */
 	0, 			/* user defined debug level */
 	TRUE			/* print Quit or abort executed messages */
 };
@@ -130,8 +130,8 @@ CONFIG newstd = {	/* new non-backward compatible configuration */
 	FALSE,			/* skip duplicate block output lines */
 	BLK_BASE_HEX,		/* block octet print base */
 	BLK_FMT_HD_STYLE,	/* block output format */
-	3,			/* calc library debug level */
 	0,			/* internal calc debug level */
+	3,			/* calc library debug level */
 	0, 			/* user defined debug level */
 	TRUE			/* print Quit or abort executed messages */
 };
@@ -809,20 +809,6 @@ setconfig(int type, VALUE *vp)
 		conf->blkfmt = temp;
 		break;
 
-	case CONFIG_LIB_DEBUG:
-		if (vp->v_type != V_NUM) {
-			math_error("Non numeric for lib_debug");
-			/*NOTREACHED*/
-		}
-		q = vp->v_num;
-		temp = qtoi(q);
-		if (qisfrac(q) || !zistiny(q->num)) {
-			math_error("Illegal lib_debug parameter value");
-			/*NOTREACHED*/
-		}
-		conf->lib_debug = temp;
-		break;
-
 	case CONFIG_CALC_DEBUG:
 		if (vp->v_type != V_NUM) {
 			math_error("Non numeric for calc_debug");
@@ -837,6 +823,20 @@ setconfig(int type, VALUE *vp)
 		conf->calc_debug = temp;
 		break;
 
+	case CONFIG_LIB_DEBUG:
+		if (vp->v_type != V_NUM) {
+			math_error("Non numeric for lib_debug");
+			/*NOTREACHED*/
+		}
+		q = vp->v_num;
+		temp = qtoi(q);
+		if (qisfrac(q) || !zistiny(q->num)) {
+			math_error("Illegal lib_debug parameter value");
+			/*NOTREACHED*/
+		}
+		conf->lib_debug = temp;
+		break;
+
 	case CONFIG_USER_DEBUG:
 		if (vp->v_type != V_NUM) {
 			math_error("Non numeric for user_debug");
@@ -1125,14 +1125,14 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		i = cfg->blkfmt;
 		break;
 
-	case CONFIG_LIB_DEBUG:
-		i = cfg->lib_debug;
-		break;
-
 	case CONFIG_CALC_DEBUG:
 		i = cfg->calc_debug;
 		break;
 
+	case CONFIG_LIB_DEBUG:
+		i = cfg->lib_debug;
+		break;
+
 	case CONFIG_USER_DEBUG:
 		i = cfg->user_debug;
 		break;
@@ -1214,8 +1214,8 @@ config_cmp(CONFIG *cfg1, CONFIG *cfg2)
 	       cfg1->blkverbose != cfg2->blkverbose ||
 	       cfg1->blkbase != cfg2->blkbase ||
 	       cfg1->blkfmt != cfg2->blkfmt ||
-	       cfg1->lib_debug != cfg2->lib_debug ||
 	       cfg1->calc_debug != cfg2->calc_debug ||
+	       cfg1->lib_debug != cfg2->lib_debug ||
 	       cfg1->user_debug != cfg2->user_debug ||
 	       cfg1->verbose_quit != cfg2->verbose_quit;
 }

config.h

@@ -29,7 +29,7 @@
  * Happy bit twiddling,
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */
@@ -135,9 +135,9 @@ struct config {
 	BOOL blkverbose;	/* TRUE => print all lines if a block */
 	int blkbase;		/* block output base */
 	int blkfmt;		/* block output style */
-	int lib_debug;		/* library debug, see LIB_DEBUG_XXX below */
-	int calc_debug;		/* internal debug, see CALC_DEBUG_XXX below */
-	int user_debug;		/* user defined debug value: 0 default */
+	long calc_debug;	/* internal debug, see CALC_DEBUG_XXX below */
+	long lib_debug;		/* library debug, see LIB_DEBUG_XXX below */
+	long user_debug;	/* user defined debug value: 0 default */
 	BOOL verbose_quit;	/* TRUE => print Quit or abort executed msg */
 };
 typedef	struct config CONFIG;
@@ -158,7 +158,9 @@ typedef	struct config CONFIG;
 #define CALCDBG_FUNC_QUIT   (0x00000002)    /* active functions when quit */
 #define CALCDBG_HASH_STATE  (0x00000004)    /* hash state details */
 #define CALCDBG_BLOCK	    (0x00000008)    /* block debug */
-#define CALCDBG_MASK	    (0x0000000f)
+#define CALCDBG_TTY	    (0x00000010)    /* report TTY state changes */
+#define CALCDBG_RUNSTATE    (0x00000020)    /* report run_state changes */
+#define CALCDBG_MASK	    (0x0000003f)
 
 
 /*
@@ -167,6 +169,9 @@ typedef	struct config CONFIG;
 extern CONFIG *conf;		/* current configuration */
 extern CONFIG oldstd;		/* backward compatible standard configuration */
 extern CONFIG newstd;		/* new non-backward compatible configuration */
+extern char *calc_debug;	/* !=NULL => value of config("calc_debug") */
+extern char *lib_debug;		/* !=NULL => value of config("lib_debug") */
+extern char *user_debug;	/* !=NULL => value of config("user_debug") */
 
 
 /*

custom.c

@@ -25,7 +25,7 @@
  * Happy bit twiddling,
  *
  *	Landon Curt Noll
- *	http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */

custom.h

@@ -29,7 +29,7 @@
  * Happy bit twiddling,
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */

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	/\../\		http://reality.sgi.com/chongo
+# 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

@@ -27,7 +27,7 @@
 # Happy bit twiddling,
 #
 #      Landon Curt Noll
-#      http://reality.sgi.com/chongo
+#      http://reality.sgi.com/chongo/
 #
 # chongo <was here> /\../\
 
@@ -310,6 +310,15 @@ libcustcalc.a: ${CUSTCALC_OBJ} ${MAKE_FILE} ../Makefile
 	ar qc libcustcalc.a ${CUSTCALC_OBJ}
 	${RANLIB} libcustcalc.a
 
+##
+#
+# Special .o files
+#
+##
+
+c_sysinfo.o: c_sysinfo.c ${MAKE_FILE}
+	${CC} ${CFLAGS} c_sysinfo.c -c
+
 ##
 #
 # used by the upper level Makefile
@@ -337,15 +346,11 @@ libcustcalc.a: ${CUSTCALC_OBJ} ${MAKE_FILE} ../Makefile
 
 distlist: ${DISTLIST}
 	${Q}for i in ${DISTLIST}; do \
-		echo calc/custom/$$i; \
+		echo custom/$$i; \
 	done
 
-# The bsdi distribution has generated files as well as distributed files.
-#
-bsdilist: ${DISTLIST}
-	${Q}for i in ${DISTLIST}; do \
-		echo calc/custom/$$i; \
-	done
+distdir:
+	${Q}echo custom
 
 ##
 #
@@ -419,12 +424,12 @@ depend:
 	else \
 		rm -f Makefile.tmp; \
 		mv Makefile Makefile.tmp; \
-		if [ -d RCS ]; then; \
+		if [ -d RCS ]; then \
 		    co -l Makefile; \
 		fi ;\
 		mv Makefile.tmp Makefile; \
-		if [ -d RCS ]; then; \
-		echo new custom Makefile formed '--' you need to check it in'; \
+		if [ -d RCS ]; then \
+		echo 'new custom Makefile formed -- you need to check it in'; \
 		fi; \
 	fi
 

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	/\../\		http://reality.sgi.com/chongo
+ * chongo was here	/\../\		http://reality.sgi.com/chongo/
  */
 /*
  * argv - print information about various args

custom/c_argv.c

@@ -16,7 +16,7 @@
  * Happy bit twiddling,
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */

custom/c_devnull.c

@@ -16,7 +16,7 @@
  * Happy bit twiddling,
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */

custom/c_help.c

@@ -16,7 +16,7 @@
  * Happy bit twiddling,
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */

custom/c_sysinfo.c

@@ -16,7 +16,7 @@
  * Happy bit twiddling,
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */
@@ -33,6 +33,7 @@
 #include "../config.h"
 #include "../calc.h"
 #include "../longbits.h"
+#define CHECK_L_FORMAT
 #include "../longlong.h"
 #include "../block.h"
 #include "../calcerr.h"
@@ -108,7 +109,6 @@ static struct infoname sys_info[] = {
     {"MAXLABELS", "max number of user labels in function", NULL, (FULL)MAXLABELS},
     {"MAXLEN", "longest storage size allowed", NULL, (FULL)MAXLEN},
     {"MAXLONG", "largest long val", NULL, (FULL)MAXLONG},
-    {"MAXOBJECTS", "max number of object types", NULL, (FULL)MAXOBJECTS},
     {"MAXPRINT_DEFAULT", "default number of elements printed", NULL, (FULL)MAXPRINT_DEFAULT},
     {"MAXREDC", "number of entries in REDC cache", NULL, (FULL)MAXREDC},
     {"MAXSCANCOUNT", "default max scan errors before an abort", NULL, (FULL)MAXSCANCOUNT},
@@ -307,17 +307,33 @@ static void
 dump_name_value(void)
 {
 	struct infoname *p;	/* current infoname */
+	char *fmt;		/* printf value format */
 
 	/* dump the entire table */
 	for (p = sys_info; p->name != NULL; ++p) {
 		if (p->str == NULL) {
 #if LONG_BITS == FULL_BITS || FULL_BITS == 32 || !defined(HAVE_LONGLONG)
-			printf("%s%-23s\t%-8lu\t(0x%lx)\n",
+			fmt = "%s%-23s\t%-8lu\t(0x%lx)\n";
+			printf(fmt,
 			    (conf->tab_ok ? "\t" : ""), p->name,
 			    (unsigned long)p->nmbr,
 			    (unsigned long)p->nmbr);
 #else
-			printf("%s%-23s\t%-8llu\t(0x%llx)\n",
+			/*
+			 * Determine of %ld can print a 64 bit long long.
+			 *
+			 * Some systems that can make use of %ld to print a
+			 * a 64 bit value do not support the %lld type.
+			 * So we will only try %lld if %ld does not work.
+			 */
+			if (l_format < 0) {
+				/* %ld prints lower 32 bits only, use %lld */
+				fmt = "%s%-23s\t%-8llu\t(0x%llx)\n";
+			} else {
+				/* %ld prints all 64 bits, use %ld */
+				fmt = "%s%-23s\t%-8lu\t(0x%lx)\n";
+			}
+			printf(fmt,
 			    (conf->tab_ok ? "\t" : ""), p->name,
 			    (unsigned long long)p->nmbr,
 			    (unsigned long long)p->nmbr);
@@ -338,17 +354,33 @@ static void
 dump_mening_value(void)
 {
 	struct infoname *p;	/* current infoname */
+	char *fmt;		/* printf value format */
 
 	/* dump the entire table */
 	for (p = sys_info; p->name != NULL; ++p) {
 		if (p->str == NULL) {
 #if LONG_BITS == FULL_BITS || FULL_BITS == 32 || !defined(HAVE_LONGLONG)
-			printf("%s%-36.36s\t%-8lu\t(0x%lx)\n",
+			fmt = "%s%-36.36s\t%-8lu\t(0x%lx)\n";
+			printf(fmt,
 			    (conf->tab_ok ? "\t" : ""), p->meaning,
 			    (unsigned long)p->nmbr,
 			    (unsigned long)p->nmbr);
 #else
-			printf("%s%-36.36s\t%-8llu\t(0x%llx)\n",
+			/*
+			 * Determine of %ld can print a 64 bit long long.
+			 *
+			 * Some systems that can make use of %ld to print a
+			 * a 64 bit value do not support the %lld type.
+			 * So we will only try %lld if %ld does not work.
+			 */
+			if (l_format < 0) {
+				/* %ld prints lower 32 bits only, use %lld */
+				fmt = "%s%-36.36s\t%-8llu\t(0x%llx)\n";
+			} else {
+				/* %ld prints all 64 bits, use %ld */
+				fmt = "%s%-36.36s\t%-8lu\t(0x%lx)\n";
+			}
+			printf(fmt,
 			    (conf->tab_ok ? "\t" : ""), p->meaning,
 			    (unsigned long long)p->nmbr,
 			    (unsigned long long)p->nmbr);

custom/custtbl.c

@@ -25,7 +25,7 @@
  * Happy bit twiddling,
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  * 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	/\../\		http://reality.sgi.com/chongo
+ * chongo was here	/\../\		http://reality.sgi.com/chongo/
  */
 /*
  * halflen - determine the length of numeric value in HALFs

func.c

@@ -7334,12 +7334,33 @@ static CONST struct builtin builtins[] = {
  *
  * When FUNCLIST is defined, we are being compiled by rules from the help
  * sub-directory to form a program that will produce the main part of the
- * buiiltin help file.  These rules will convert the following function
- * name into main and remove the 'sed me out' line.
+ * buiiltin help file.
  *
  * See the builtin rule in the help/Makefile for details.
  */
-void	/* sed me out */
+#if defined(FUNCLIST)
+/*ARGSUSED*/
+int
+main(int argc, char *argv[])
+{
+	CONST struct builtin *bp;	/* current function */
+
+	printf("\nName\tArgs\tDescription\n\n");
+	for (bp = builtins; bp->b_name; bp++) {
+		printf("%-9s ", bp->b_name);
+		if (bp->b_maxargs == IN)
+			printf("%d+    ", bp->b_minargs);
+		else if (bp->b_minargs == bp->b_maxargs)
+			printf("%-6d", bp->b_minargs);
+		else
+			printf("%d-%-4d", bp->b_minargs, bp->b_maxargs);
+		printf("%s\n", bp->b_desc);
+	}
+	printf("\n");
+	return 0;	/* exit(0); */
+}
+#else /* FUNCLIST */
+void
 showbuiltins(void)
 {
 	CONST struct builtin *bp;	/* current function */
@@ -7357,6 +7378,7 @@ showbuiltins(void)
 	}
 	printf("\n");
 }
+#endif /* FUNCLIST */
 
 
 #if !defined(FUNCLIST)

have_rusage.c

@@ -0,0 +1,62 @@
+/*
+ * have_rusage - Determine if we getrusage()
+ *
+ * usage:
+ *	have_rusage
+ *
+ * Not all systems have the getrusage() function, so this may not
+ * compile on your system.
+ *
+ * This prog outputs several defines:
+ *
+ *	HAVE_GETRUSAGE
+ *		defined ==> use getrusage()
+ *		undefined ==> do not call or cannot call getrusage()
+ */
+/*
+ * 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/time.h>
+#include <sys/resource.h>
+
+int
+main(void)
+{
+#if defined(HAVE_NO_GETRUSAGE)
+
+	printf("#undef HAVE_GETRUSAGE /* no */\n");
+
+#else /* HAVE_NO_GETRUSAGE */
+
+	struct rusage rusage;		/* resource utilization */
+
+	(void) getrusage(RUSAGE_SELF, &rusage);
+
+	printf("#define HAVE_GETRUSAGE /* yes */\n");
+
+#endif /* HAVE_NO_GETRUSAGE */
+
+	/* exit(0); */
+	return 0;
+}

have_strdup.c

@@ -0,0 +1,62 @@
+/*
+ * have_strdup - Determine if we strdup()
+ *
+ * usage:
+ *	have_strdup
+ *
+ * Not all systems have the strdup() function, so this may not
+ * compile on your system.
+ *
+ * This prog outputs several defines:
+ *
+ *	HAVE_STRDUP
+ *		defined ==> use strdup()
+ *		undefined ==> do not call or cannot call strdup()
+ */
+/*
+ * 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 <string.h>
+
+int
+main(void)
+{
+#if defined(HAVE_NO_STRDUP)
+
+	printf("#undef HAVE_STRDUP /* no */\n");
+
+#else /* HAVE_NO_STRDUP */
+
+	char *p;
+
+	p = strdup("#define HAVE_STRDUP /* yes */");
+	if (p != NULL) {
+		printf("%s\n", p);
+	}
+
+#endif /* HAVE_NO_STRDUP */
+
+	/* exit(0); */
+	return 0;
+}

help/Makefile

@@ -35,13 +35,12 @@ Q=@
 
 # standard tools
 #
-NATIVE_CC= cc
-NATIVE_CFLAGS=
+LCC= cc
+ICFLAGS=
+ILDFLAGS=
 SED= sed
 SORT= sort
 FMT= fmt
-CMP= cmp
-CAT= cat
 
 # Standard and Builtin help files
 #
@@ -234,7 +233,7 @@ bugs: ../BUGS
 
 errorcodes: ../calcerr.h errorcodes.hdr errorcodes.sed
 	rm -f $@
-	${CAT} errorcodes.hdr > $@
+	cat errorcodes.hdr > $@
 	${SED} -n -f errorcodes.sed < ../calcerr.h >> $@
 	chmod 0444 $@
 	-@if [ -z "${Q}" ]; then \
@@ -359,17 +358,13 @@ ${SINGULAR_FILES}: ${PLURAL_FILES}
 #
 builtin: builtin.top builtin.end ../func.c funclist.sed
 	${Q}echo "forming builtin help file"
-	-${Q}rm -f builtin
-	${Q}cat builtin.top > builtin
 	-${Q}rm -f funclist.c
 	${Q}${SED} -n -f funclist.sed ../func.c > funclist.c
-
-	-${Q}rm -f ../funclist.c ../funclist.o ../funclist funclist
-	${Q}cp funclist.c ..
-	-${Q}(cd ..; \
-	 ${NATIVE_CC} ${NATIVE_CFLAGS} -DFUNCLIST funclist.c -o funclist; \
-	 mv funclist help; \
-	 rm -f funclist.c funclist.o funclist)
+	-${Q}rm -f funclist.o funclist
+	${Q}${LCC} ${ICFLAGS} -DFUNCLIST -I/usr/include -I.. funclist.c -c
+	${Q}${LCC} ${ILDFLAGS} funclist.o -o funclist
+	-${Q}rm -f builtin
+	${Q}cat builtin.top > builtin
 	${Q}./funclist | \
 	    ${SED} -e 's/^/	/' -e 's/[	 ][	 ]*$$//' >> builtin
 	${Q}cat builtin.end >> builtin
@@ -394,15 +389,11 @@ builtin: builtin.top builtin.end ../func.c funclist.sed
 
 distlist: ${DISTLIST}
 	${Q}for i in ${DISTLIST}; do \
-		echo calc/help/$$i; \
+		echo help/$$i; \
 	done | ${SORT}
 
-# The bsdi distribution has generated files as well as distributed files.
-#
-bsdilist: ${DISTLIST} ${BLT_HELP_FILES}
-	${Q}for i in ${DISTLIST} ${BLT_HELP_FILES}; do \
-		echo calc/help/$$i; \
-	done | ${SORT}
+distdir:
+	${Q}echo help
 
 # The BSDI cdrom makefile expects all help files to be pre-built.  This rule
 # creats these fils so that the release can be shipped off to BSDI.  You can

help/archive

@@ -11,6 +11,6 @@ Where to get the the latest versions of calc
     for information on how to obtain up a recent version of calc.
 
 Landon Curt Noll
-http://reality.sgi.com/chongo
+http://reality.sgi.com/chongo/
 
 chongo <was here> /\../\

help/calclevel

@@ -2,7 +2,7 @@ NAME
     calclevel - current calculation level
 
 SYNOPSIS
-    calclevel()   
+    calclevel()
 
 TYPES
     return	nonnegative integer
@@ -11,7 +11,7 @@ DESCRIPTION
     This function returns the calculation level at which it is called.
     When a command is being read from a terminal or from a file,
     calc is at calculation level zero.  The level is increased
-    by 1 each time calculation starts of a user-defined function 
+    by 1 each time calculation starts of a user-defined function
     or of eval(S) for some expression S which evaluates to a string.  It
     decreases to zero if an error occurs or a quit or abort statement
     is executed.  Otherwise, it decreases by 1 when the calculation

help/config

@@ -40,8 +40,8 @@ Configuration parameters
 	    "blkverbose"	TRUE=>print all lines, FALSE=>skip duplicates
 	    "blkbase"		block output base
 	    "blkfmt"		block output format
-	    "lib_debug"		controls library script debug information
 	    "calc_debug"	controls internal calc debug information
+	    "lib_debug"		controls library script debug information
 	    "user_debug"	for user defined debug information
 	    "verbose_quit"	TRUE=>print message on empty quit or abort
 
@@ -317,29 +317,6 @@ Configuration parameters
 
     The default "blkfmt" is "hd".
 
-    The "lib_debug" parameter is intended for controlling the possible
-    display of special information relating to functions, objects, and
-    other structures created by instructions in calc scripts.
-    Zero value of config("lib_debug") means that no such information
-    is displayed.  For other values, the non-zero bits which currently
-    have meanings are as follows:
-
-	n		Meaning of bit n of config("lib_debug")
-
-	0	When a function is defined, redefined or undefined at
-		interactive level, a message saying what has been done
-		is displayed.
-
-	1	When a function is defined, redefined or undefined during
-		the reading of a file, a message saying what has been done
-		is displayed.
-
-    The value for config("lib_debug") in both oldstd and newstd is 3,
-    but if calc is invoked with the -d flag, its initial value is zero.
-    Thus, if calc is started without the -d flag, until config("lib_debug")
-    is changed, a message will be output when a function is defined
-    either interactively or during the reading of a file.
-
     The "calc_debug" is intended for controlling internal calc routines
     that test its operation, or collect or display information that
     might be useful for debug purposes.  Much of the output from these
@@ -364,7 +341,42 @@ Configuration parameters
 		block is not NULL, and that its "length" is not negative.
 		A failure will result in a runtime error.
 
-    Bits >= 4 are reserved for future use and should not be used at this time.
+	4	Report on changes to the state of stdin as well as changes
+		to internal variables that control the setting and restoring
+		of stdin.
+
+	5	Report on changes to the run state of calc.
+
+    Bits >= 6 are reserved for future use and should not be used at this time.
+
+    By default, "calc_debug" is 0.  The initial value may be overridden
+    by the -D command line option.
+
+    The "lib_debug" parameter is intended for controlling the possible
+    display of special information relating to functions, objects, and
+    other structures created by instructions in calc scripts.
+    Zero value of config("lib_debug") means that no such information
+    is displayed.  For other values, the non-zero bits which currently
+    have meanings are as follows:
+
+	n		Meaning of bit n of config("lib_debug")
+
+	0	When a function is defined, redefined or undefined at
+		interactive level, a message saying what has been done
+		is displayed.
+
+	1	When a function is defined, redefined or undefined during
+		the reading of a file, a message saying what has been done
+		is displayed.
+
+    The value for config("lib_debug") in both oldstd and newstd is 3,
+    but if calc is invoked with the -d flag, its initial value is zero.
+    Thus, if calc is started without the -d flag, until config("lib_debug")
+    is changed, a message will be output when a function is defined
+    either interactively or during the reading of a file.
+
+    By default, "lib_debug" is 3.  The -d flag changes this default to 0.
+    The initial value may be overridden by the -D command line option.
 
     The "user_debug" is provided for use by users.  Calc ignores this value
     other than to set it to 0 by default (for both "oldstd" and "newstd").
@@ -376,6 +388,9 @@ Configuration parameters
     slower operation or more memory usage, and a particular value (like
     -1 or 0) corresponding to "no tests".
 
+    By default, "user_debug" is 0.  The initial value may be overridden
+    by the -D command line option.
+
     The "verbose_quit" controls the print of the message:
 
 	Quit or abort executed

help/contrib

@@ -58,6 +58,6 @@ One may join the calc testing group by sending a request to:
     is your full name.
 
 Landon Curt Noll
-http://reality.sgi.com/chongo
+http://reality.sgi.com/chongo/
 
 chongo <was here> /\../\

help/environment

@@ -58,6 +58,10 @@ Environment variables
 	a terminal, then calc will still run, but fancy command line
 	editing is disabled.
 
+	NOTE: If calc was compiled with GNU-readline support, the
+	      CALCBINDINGS facility is ignored and the standard
+	      readline mechanisms (see readline(3)) are used.
+
     HOME
 
 	This value is taken to be the home directory of the

help/funclist.sed

@@ -3,7 +3,5 @@ s/NUMBER[	 ]*\*/int /
 s/NUMBER/int/
 s/STRINGHEAD/int/
 s/\(".*",.*,.*\),.*,.*,.*,.*,/\1, 0, 0, 0, 0,/
-/sed me out/d
-s/showbuiltins/main/
 s/[	 ][	 ]*$//
 p

help/hash

@@ -15,12 +15,12 @@ DESCRIPTION
     The basis of this hash algorithm was taken from an idea sent
     as reviewer comments to the IEEE POSIX P1003.2 committee by:
 
-         Phong Vo (http://www.research.att.com/info/kpv)
+         Phong Vo (http://www.research.att.com/info/kpv/)
          Glenn Fowler (http://www.research.att.com/~gsf/)
 
     In a subsequent ballot round:
 
-         Landon Curt Noll (http://reality.sgi.com/chongo)
+         Landon Curt Noll (http://reality.sgi.com/chongo/)
 
     improved on their algorithm.  Some people tried this hash
     and found that it worked rather well.  In an EMail message

help/inputlevel

@@ -2,7 +2,7 @@ NAME
     inputlevel - current input level
 
 SYNOPSIS
-    inputlevel()   
+    inputlevel()
 
 TYPES
     return	nonnegative integer
@@ -18,10 +18,10 @@ DESCRIPTION
     decreases to zero if an abort statement is encountered at any
     function-level in the file or string.  If a quit or abort
     statement is encountered at top calculation-level at top input-level,
-    calc is exited. 
+    calc is exited.
 
     Zero input level is also called top input level; greater values
-    of inputlevel() indicate reading at greater depths. 
+    of inputlevel() indicate reading at greater depths.
 
 EXAMPLE
     n/a

help/seed

@@ -19,9 +19,9 @@ DESCRIPTION
 	is almost certainly non-chaotic.  This function is likely not
 	suitable for applications (such as cryptographic applications)
 	where the unpredictability of seeds is critical.  For such critical
-	applications, lavarand should be used.  Seed:
+	applications, lavarand should be used.  See the URL:
 
-		http://lavarand.sgi.com
+		http://lavarand.sgi.com/index.html
 
 	for information about seeding a pseudo-random number generator
 	(such as rand() or random()) with the cryptographic hash of the

help/srandom

@@ -222,8 +222,7 @@ DESCRIPTION
 	The pre-defined Blum moduli and quadratic residues were selected
 	by lavarand, a hardware random number generator.  See the URL:
 
-	    http://lavarand.sgi.com
-	    XXX - This URL is not available on 17Feb97 ... but will be soon.
+	    http://lavarand.sgi.com/index.html
 
 	for an explanation of how the lavarand random number generator works.
 	For more information, see the comments at the top of the calc

help/todo

@@ -50,6 +50,8 @@ Very High priority items:
     * Fix any 'Known bugs' as noted in the BUGS file or as
       displayed by 'calc help bugs'.
 
+    * Copyleft calc and place it under a LGPL.
+
 =-=
 
 High priority items:
@@ -79,10 +81,9 @@ High priority items:
       then a $PAGER should be forked and execed after doing things such
       as closing open file descriptors that the $PAGER does not need.
 
-    * 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.
+    * The arg passdown to the lower level Makfiles should be reviewed
+      to determine which items really need to be passed down.  The lower
+      level Makefiles should default to the shipped values.
 
     * Consider using configure to build the calc Makefile.
 

help/usage

@@ -2,8 +2,8 @@ Calc command line
 
     Calc has the following command line:
 
-	calc [-c] [-C] [-d] [-e] [-h] [-i] [-m mode]
-	     [-n] [-p] [-q] [-u] [-v] [calc_cmd ...]
+	calc [-c] [-C] [-d] [-D calc_debug[:lib_debug:[user_debug]]]
+	     [-e] [-h] [-i] [-m mode] [-n] [-p] [-q] [-u] [-v] [calc_cmd ...]
 
 	-c  Continue reading command lines even after an execution
 	    error has caused the abandonment of a line.
@@ -55,6 +55,22 @@ Calc command line
 	    This flag disables the reporting of missing calc
 	    startup scripts ($CALCRC).
 
+	-D calc_debug[:lib_debug:[user_debug]]
+
+	    Force the initial value of config("calc_debug"),
+	    config("lib_debug") and config("user_debug").
+
+	    The : separated strings are interpreted as signed 32 bit values.
+	    After an optional leading sign a leading zero indicates octal
+	    conversion, and a leading ``0x'' or ``0X'' hexadecimal
+	    conversion.  Otherwise, decimal conversion is assumed.
+
+	    By default, calc_debug is 0, lib_debug is 3 and lib_debug is 0.
+
+	    For more information use the following calc command:
+
+		help config
+
 	-e  Ignore any environment variables on startup.  The
 	    getenv() builtin will still return values, however.
 

hist.c

@@ -5,6 +5,8 @@
  *
  * Adapted from code written by Stephen Rothwell.
  *
+ * GNU readline support added by Martin Buck <mbuck@debian.org>
+ *
  * Interactive readline module.  This is called to read lines of input,
  * while using emacs-like editing commands within a command stack.
  * The key bindings for the editing commands are (slightly) configurable.
@@ -29,6 +31,11 @@
 #include "terminal.h"
 #include "have_string.h"
 
+#include "have_strdup.h"
+#if !defined(HAVE_STRDUP)
+# define strdup(x) calc_strdup((CONST char *)(x))
+#endif /* HAVE_STRDUP */
+
 
 #if defined(USE_TERMIOS)
 # include <termios.h>
@@ -48,6 +55,8 @@
 # include <string.h>
 #endif
 
+#if !defined(USE_READLINE)
+
 extern FILE *curstream(void);
 
 #define	STDIN		0
@@ -283,11 +292,16 @@ hist_init(char *filename)
 {
 	TTYSTRUCT	newtty;
 
-	if (inited)
+	if (inited) {
+		if (conf->calc_debug & CALCDBG_TTY)
+			printf("DEBUG: inited already set in hist_init\n");
 		return HIST_INITED;
+	}
 
 	inited = 1;
 	canedit = 0;
+	if (conf->calc_debug & CALCDBG_TTY)
+		printf("DEBUG: Set inited, cleared canedit in hist_init\n");
 
 	/*
 	 * open the bindings file
@@ -309,20 +323,31 @@ hist_init(char *filename)
 	closeinput();
 
 #ifdef	USE_SGTTY
-	if (ioctl(STDIN, TIOCGETP, &oldtty) < 0)
+	if (ioctl(STDIN, TIOCGETP, &oldtty) < 0) {
+		if (conf->calc_debug & CALCDBG_TTY)
+			printf("DEBUG: Cannot TIOCGETP stdin in hist_init\n");
 		return HIST_NOTTY;
+	}
 
 	newtty = oldtty;
 	newtty.sg_flags &= ~ECHO;
 	newtty.sg_flags |= CBREAK;
 
-	if (ioctl(STDIN, TIOCSETP, &newtty) < 0)
+	if (ioctl(STDIN, TIOCSETP, &newtty) < 0) {
+		if (conf->calc_debug & CALCDBG_TTY)
+			printf("DEBUG: Cannot TIOCSETP stdin in hist_init\n");
 		return HIST_NOTTY;
+	}
+	if (conf->calc_debug & CALCDBG_TTY)
+		printf("DEBUG: stty -ECHO +CBREAK in hist_init\n");
 #endif
 
 #ifdef	USE_TERMIO
-	if (ioctl(STDIN, TCGETA, &oldtty) < 0)
+	if (ioctl(STDIN, TCGETA, &oldtty) < 0) {
+		if (conf->calc_debug & CALCDBG_TTY)
+			printf("DEBUG: Cannot TCGETA stdin in hist_init\n");
 		return HIST_NOTTY;
+	}
 
 	newtty = oldtty;
 	newtty.c_lflag &= ~(ECHO | ECHOE | ECHOK);
@@ -331,13 +356,22 @@ hist_init(char *filename)
 	newtty.c_cc[VMIN] = 1;
 	newtty.c_cc[VTIME] = 0;
 
-	if (ioctl(STDIN, TCSETAW, &newtty) < 0)
+	if (ioctl(STDIN, TCSETAW, &newtty) < 0) {
+		if (conf->calc_debug & CALCDBG_TTY)
+			printf("DEBUG: Cannot TCSETAW stdin in hist_init\n");
 		return HIST_NOTTY;
+	}
+	if (conf->calc_debug & CALCDBG_TTY)
+		printf("DEBUG: stty -ECHO -ECHOE -ECHOK -ICANON +ISTRIP "
+		       "VMIN=1 VTIME=0 in hist_init\n");
 #endif
 
 #ifdef	USE_TERMIOS
-	if (tcgetattr(STDIN, &oldtty) < 0)
+	if (tcgetattr(STDIN, &oldtty) < 0) {
+		if (conf->calc_debug & CALCDBG_TTY)
+			printf("DEBUG: Cannot tcgetattr stdin in hist_init\n");
 		return HIST_NOTTY;
+	}
 
 	newtty = oldtty;
 	newtty.c_lflag &= ~(ECHO | ECHOE | ECHOK);
@@ -346,11 +380,19 @@ hist_init(char *filename)
 	newtty.c_cc[VMIN] = 1;
 	newtty.c_cc[VTIME] = 0;
 
-	if (tcsetattr(STDIN, TCSANOW, &newtty) < 0)
+	if (tcsetattr(STDIN, TCSANOW, &newtty) < 0) {
+		if (conf->calc_debug & CALCDBG_TTY)
+			printf("DEBUG: Cannot tcsetattr stdin in hist_init\n");
 		return HIST_NOTTY;
+	}
+	if (conf->calc_debug & CALCDBG_TTY)
+		printf("DEBUG: stty -ECHO -ECHOE -ECHOK -ICANON +ISTRIP "
+		       "VMIN=1 VTIME=0 in hist_init\n");
 #endif
 
 	canedit = 1;
+	if (conf->calc_debug & CALCDBG_TTY)
+		printf("DEBUG: Set canedit in hist_init\n");
 
 	return HIST_SUCCESS;
 }
@@ -363,20 +405,36 @@ void
 hist_term(void)
 {
 	if (!inited || !canedit) {
+		if (conf->calc_debug & CALCDBG_TTY) {
+			if (!inited)
+				printf("DEBUG: inited already cleared "
+				       "in hist_term\n");
+			if (!canedit)
+				printf("DEBUG: canedit already cleared "
+				       "in hist_term\n");
+		}
 		inited = 0;
+		if (conf->calc_debug & CALCDBG_TTY)
+			printf("DEBUG: Cleared inited in hist_term\n");
 		return;
 	}
 
 #ifdef	USE_SGTTY
 	(void) ioctl(STDIN, TIOCSETP, &oldtty);
+	if (conf->calc_debug & CALCDBG_TTY)
+		printf("DEBUG: TIOCSETP restored stdin in hist_term\n");
 #endif
 
 #ifdef	USE_TERMIO
 	(void) ioctl(STDIN, TCSETAW, &oldtty);
+	if (conf->calc_debug & CALCDBG_TTY)
+		printf("DEBUG: TCSETAW restored stdin in hist_term\n");
 #endif
 
 #ifdef	USE_TERMIOS
 	(void) tcsetattr(STDIN, TCSANOW, &oldtty);
+	if (conf->calc_debug & CALCDBG_TTY)
+		printf("DEBUG: TCSANOW restored stdin in hist_term\n");
 #endif
 }
 
@@ -1384,8 +1442,112 @@ quit_calc(void)
 	exit(0);
 }
 
+#else /* USE_READLINE */
 
-#ifdef	HIST_TEST
+
+#define HISTORY_LEN (1024)	/* number of entries to save */
+
+
+#include <readline/readline.h>
+#include <readline/history.h>
+
+
+/*
+ * The readline/history libs do most of the dirty work for us, so we can
+ * replace hist_init() and hist_term() with dummies when using readline.
+ * For hist_getline() we have to add a newline that readline removed but
+ * calc expects. For hist_saveline(), we have to undo this.  hist_getline()
+ * also has to cope with the different memory management schemes of calc and
+ * readline.
+ */
+
+
+/* name of history file */
+char *my_calc_history = NULL;
+
+int
+hist_getline(char *prompt, char *buf, int len)
+{
+	char *line;
+
+	buf[0] = '\0';
+	line = readline(prompt);
+	if (!line)
+		return 0;
+	strncpy(buf, line, len - 1);
+	buf[len - 2] = '\0';
+	len = strlen(buf);
+	buf[len] = '\n';
+	buf[len + 1] = '\0';
+	free(line);
+	return len + 1;
+}
+
+
+void
+hist_term(void)
+{
+}
+
+
+static void
+my_stifle_history (void)
+{
+	/* only save last number of entries */
+	stifle_history(HISTORY_LEN);
+
+	if (my_calc_history)
+		write_history(my_calc_history);
+}
+
+
+int
+hist_init(char *filename)
+{
+	/* used when parsing conditionals in ~/.inputrc */
+	rl_readline_name = "calc";
+
+	/* initialize interactive variables */
+	using_history();
+
+	/* name of history file */
+	my_calc_history = tilde_expand("~/.calc_history");
+
+	/* read previous history */
+	read_history(my_calc_history);
+
+	atexit(my_stifle_history);
+
+	return HIST_SUCCESS;
+}
+
+void
+hist_saveline(char *line, int len)
+{
+	static char *prev = NULL;
+
+	if (!len)
+		return;
+
+	/* ignore if identical with previous line */
+	if (prev != NULL && strcmp(prev, line) == 0)
+		return;
+
+	free (prev);
+
+	/* fail silently */
+	prev = strdup(line);
+
+	line[len - 1] = '\0';
+	add_history(line);
+	line[len - 1] = '\n';
+}
+
+
+#endif /* USE_READLINE */
+
+
+#if defined(HIST_TEST)
 
 /*
  * Main routine to test history.
@@ -1426,6 +1588,5 @@ main(int argc, char **argv)
 	hist_term();
 	exit(0);
 }
-#endif
 
-/* END CODE */
+#endif /* HIST_TEST */

lib/Makefile

@@ -73,15 +73,11 @@ all: ${CALC_FILES} ${MAKE_FILE} .all
 
 distlist: ${DISTLIST}
 	${Q}for i in ${DISTLIST}; do \
-		echo calc/lib/$$i; \
+		echo lib/$$i; \
 	done
 
-# The bsdi distribution has generated files as well as distributed files.
-#
-bsdilist: ${DISTLIST}
-	${Q}for i in ${DISTLIST}; do \
-		echo calc/lib/$$i; \
-	done
+distdir:
+	${Q}echo lib
 
 clean:
 

lib/README

@@ -273,10 +273,18 @@ pell.cal
 pi.cal
 
     qpi(epsilon)
+    piforever()
 
-    Calculate pi within the specified epsilon using the quartic convergence
-    iteration.
+    The qpi() calculate pi within the specified epsilon using the quartic
+    convergence iteration.
 
+    The piforever() prints digits of pi, nicely formatted, for as long
+    as your free memory space and system up time allows.
+
+    The piforever() funcion (written by Klaus Alexander Seistrup
+    <klaus@seistrup.dk>) was inspired by an algorithm conceived by
+    Lambert Meertens.  See also the ABC Programmer's Handbook, by Geurts,
+    Meertens & Pemberton, published by Prentice-Hall (UK) Ltd., 1990.
 
 pix.cal
 

lib/altbind

@@ -1,4 +1,8 @@
 # Alternate key bindings for calc line editing functions
+#
+# NOTE: This facility is ignored if calc was compiled with GNU-readline.
+#	In that case, the standard readline mechanisms (see readline(3))
+#	are used in place of those found below.
 
 map	base-map
 default	insert-char

lib/bindings

@@ -1,4 +1,8 @@
 # Default key bindings for calc line editing functions
+#
+# NOTE: This facility is ignored if calc was compiled with GNU-readline.
+#	In that case, the standard readline mechanisms (see readline(3))
+#	are used in place of those found below.
 
 map	base-map
 default	insert-char

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 http://reality.sgi.com/chongo
+ * 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

@@ -20,7 +20,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  *      chongo <was here> /\../\
  */

lib/lucas_chk.cal

@@ -20,7 +20,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  *      chongo <was here> /\../\
  */

lib/lucas_tbl.cal

@@ -20,7 +20,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  *      chongo <was here> /\../\
  */

lib/mfactor.cal

@@ -20,7 +20,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  *      chongo <was here> /\../\
  */

lib/pi.cal

@@ -47,3 +47,75 @@ define qpi(epsilon)
 	}
 	return (bround(1/an, bits));
 }
+
+
+/*
+ * Print digits of PI forever, neatly formatted, using calc.
+ *
+ * Written by Klaus Alexander Seistrup <klaus@seistrup.dk>
+ * on a dull Friday evening in November 1999.
+ *
+ * Inspired by an algorithm conceived by Lambert Meertens.
+ *
+ * See also the ABC Programmer's Handbook, by Geurts, Meertens & Pemberton,
+ * published by Prentice-Hall (UK) Ltd., 1990.
+ *
+ */
+
+define piforever()
+{
+	local k = 2;
+	local a = 4;
+	local b = 1;
+	local a1 = 12;
+	local b1 = 4;
+	local a2, b2, p, q, d, d1;
+	local stdout = files(1);
+	local first = 1, row = -1, col = 0;
+
+	while (1) {
+		/*
+		* Next approximation
+		*/
+		p = k * k;
+		q = k + k++;
+
+		a2 = a;
+		b2 = b;
+
+		a = a1;
+		a1 = p * a2 + q * a1;
+		b = b1;
+		b1 = p * b2 + q * b1;
+
+		/*
+		* Print common digits
+		*/
+		d = a // b;
+		d1 = a1 // b1;
+
+		while (d == d1) {
+			if (first) {
+				printf("%d.", d);
+				first = 0;
+			} else {
+				if (!(col % 50)) {
+					printf("\n");
+					col = 0;
+					if (!(++row % 20)) {
+						printf("\n");
+						row = 0;
+					}
+				}
+				printf("%d", d);
+				if (!(++col % 10))
+					printf(" ");
+			}
+			a = 10 * (a % b);
+			a1 = 10 * (a1 % b1);
+			d = a // b;
+			d1 = a1 // b1;
+		}
+		fflush(stdout);
+	}
+}

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 <http://reality.sgi.com/chongo>
+ * With minor mods by: Landon Curt Noll <http://reality.sgi.com/chongo/>
  *
  * See:
  *	http://www.magnetic-ink.dk/download/qtime.html

lib/randmprime.cal

@@ -22,7 +22,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  *      chongo <was here> /\../\
  */

lib/regress.cal

@@ -20,18 +20,17 @@ print '002: Within each section, output should be numbered sequentially';
 global prob;				/* libregress.cal problem counter */
 prob = 0;				/* clear problem counter */
 
-global junk;				/* throw away value */
-junk = errcount(0);			/* clear error count */
-junk = errmax(-1);			/* prevent errcount from abouting */
+errcount(0),;				/* clear error count */
+errmax(-1),;				/* prevent errcount from abouting */
 
 global ecnt;				/* expected value of errcount() */
 ecnt = 0;				/* clear expected errcount() value */
 
 initcfg = config("all", "oldstd");	/* set config to startup default */
-initcfg = config("lib_debug", 0);	/* disable lib startup messages */
-initcfg = config("calc_debug", 0);	/* disable internal debugging */
-initcnf = config("verbose_quit", 0);	/* disable quit messages */
-initcfg = config("all");		/* save state for later use */
+config("lib_debug", 0),;		/* disable lib startup messages */
+config("calc_debug", 0),;		/* disable internal debugging */
+config("verbose_quit", 0),;		/* disable quit messages */
+startcfg = config("all");		/* save state for later use */
 
 print '003: parsed global definitions';
 
@@ -292,7 +291,7 @@ define test_arithmetic()
 	vrfy(8/4==2,		'404: 8 / 4 == 2');
 	vrfy(2^3==8,		'405: 2 ^ 3 == 8');
 	vrfy(9-4-2==3,		'406: 9-4-2 == 3');
-	vrfy(9-4+2==7,		'407: 9-4+2 == 6');
+	vrfy(9-4+2==7,		'407: 9-4+2 == 7');
 	vrfy(-5+2==-3,		'408: -5+2 == -3');
 	vrfy(2*3+1==7,		'409: 2*3+1 == 7');
 	vrfy(1+2*3==7,		'410: 1+2*3 == 7');
@@ -359,7 +358,7 @@ define test_config()
 	print 				'502: callcfg = config("all","oldstd")';
 	oldcfg = config("all", "newstd");
 	print 				'503: oldcfg = config("all","newstd")';
-	vrfy(callcfg == initcfg,	'504: callcfg == initcfg');
+	vrfy(callcfg == startcfg,	'504: callcfg == startcfg');
 	newcfg = config("all");
 	print 				'505: newcfg = config("all")';
 	vrfy(config("all") == newcfg,	'506: config("all") == newcfg');
@@ -457,7 +456,7 @@ define test_config()
 	vrfy(config("all",callcfg) == oldcfg,
 					'550: config("all",callcfg) == oldcfg');
 	vrfy(config("all") == callcfg,  '551: config("all") == callcfg');
-	vrfy(config("all") == initcfg,	'552: config("all") == initcfg');
+	vrfy(config("all") == startcfg,	'552: config("all") == startcfg');
 
 	print '553: Ending test_config';
 }
@@ -1695,6 +1694,7 @@ define test_obj()
 {
 	static obj surd a;
 	static obj surd b;
+	local PP;
 
 	print '1800: Beginning object test';
 
@@ -1732,7 +1732,10 @@ define test_obj()
 	vrfy(a <= a,			'1828: a < a');
 	vrfy(isobj(a) == 1,		'1829: isobj(a) == 1');
 
-	print '1830: Ending object test';
+	obj pt {x,y}, PP = obj pair {A,B} = {obj pt, obj pt};
+	print '1830: obj pt {x,y}, PP = obj pair {A,B} = {obj pt, obj pt}';
+
+	print '1831: Ending object test';
 }
 print '028: parsed test_obj()';
 
@@ -4688,8 +4691,8 @@ define test_commaeq()
 	/*
 	 * matrix assignment
 	 */
-	mat A[3] = {1,2,3}, B[2] = {1,2};
-	print		'5625: mat A[3] = {1,2,3}, B[2] = {1,2}';
+	mat A[3] = {1,2,3}, mat B[2] = {1,2};
+	print		'5625: mat A[3] = {1,2,3}, mat B[2] = {1,2}';
 	vrfy(A[0] == 1,			  '5626: A[0] == 1');
 	vrfy(B[1] == 2,			  '5627: B[1] == 2');
 
@@ -4917,8 +4920,8 @@ define test_assign(base, work)
 	print				  base+3: ': X5800 = base+3';
 	Y5800 = base+4;
 	print				  base+4: ': Y5800 = base+4';
-	obj xy5800 A={1,2}, B={3,4};
-	print base+5: ': obj xy5800 A={1,2}, B={3,4}';
+	obj xy5800 A={1,2}, obj xy5800 B={3,4};
+	print base+5: ': obj xy5800 A={1,2}, obj xy5000 B={3,4}';
 
 	/*
 	 * test assignment
@@ -7373,7 +7376,7 @@ vrfy(X5800 == (obj xy5800 = {3,9}),
 				  '5859: X5800 == (obj xy5800 = {3,9})');
 vrfy(errno() > 0,		  '5860: errno() > 0');
 vrfy(strerror() == "Incompatible types for =",
-			'5861: strerror() == "Incompatible types for ="');
+		'5861: strerror() == "Incompatible types for ="');
 X5800 = 2;
 print				  '5862: X5800 = 2';
 vrfy(X5800 == (obj xy5800 = {2,0}),
@@ -7382,7 +7385,10 @@ X5800 = obj xy5800 = {1,2};
 print				  '5864: X5800 = obj xy5800 = {1,2}';
 vrfy(X5800 == (obj xy5800 = {1,2}),
 				  '5865: X5800 == (obj xy5800 = {1,2})');
-print '5866: End of 5800 sequence';
+define f5800(a8500 = mat[2] = {3,4}) = 5 * a8500;
+print		'5866: define f5800(a8500 = mat[2] = {3,4}) = 5 * a8500;'
+vrfy(f5800() == (mat[] = {15,20}),'5867: f5800() == (mat[] = {15,20})');
+print '5868: End of 5800 sequence';
 
 print;
 return test_is();

lib/seedrandom.cal

@@ -20,7 +20,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  *      chongo <was here> /\../\
  */

lib/test1700.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By:  Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  *      chongo <was here> /\../\
  *

lib/test2300.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By:  Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  *      chongo <was here> /\../\
  *

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 http://reality.sgi.com/chongo
+ *     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 http://reality.sgi.com/chongo
+ *     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 http://reality.sgi.com/chongo
+ *     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 http://reality.sgi.com/chongo
+ *     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 http://reality.sgi.com/chongo
+ *     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 http://reality.sgi.com/chongo
+ *     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 http://reality.sgi.com/chongo
+ *     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 http://reality.sgi.com/chongo
+ *     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 http://reality.sgi.com/chongo
+ *     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 http://reality.sgi.com/chongo
+ *     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 http://reality.sgi.com/chongo
+ *     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/test8400.cal

@@ -4,7 +4,7 @@
  * provided that this copyright notice remains intact.
  *
  * By:  Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  *      chongo <was here> /\../\
  *

lib_calc.c

@@ -34,6 +34,11 @@
 #include "symbol.h"
 #include "func.h"
 
+#include "have_strdup.h"
+#if !defined(HAVE_STRDUP)
+# define strdup(x) calc_strdup((CONST char *)(x))
+#endif /* HAVE_STRDUP */
+
 #include "have_unistd.h"
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
@@ -63,9 +68,9 @@ int new_std = FALSE;	/* TRUE (-n) => use newstd configuration */
 int abortlevel;		/* current level of aborts */
 BOOL inputwait;		/* TRUE if in a terminal input wait */
 jmp_buf jmpbuf;		/* for errors */
-run run_state = RUN_UNKNOWN;	/* calc startup and run state */
 char *program = "calc";		/* our name */
 char cmdbuf[MAXCMD+1+1+1];	/* command line expression + "\n\0" + guard */
+run run_state = RUN_UNKNOWN;	/* calc startup and run state */
 
 
 /*
@@ -86,6 +91,7 @@ int d_flag = FALSE;	/* TRUE => disable heading, lib_debug == 0 */
 int c_flag = FALSE;	/* TRUE => continue on error if permitted */
 int i_flag = FALSE;	/* TRUE => go interactive if permitted */
 
+
 /*
  * global values
  */
@@ -106,6 +112,10 @@ int errmax = ERRMAX;		/* if >= 0,  maximum value for errcount */
 
 NUMBER *epsilon_default;	/* default allowed error for float calcs */
 
+char *calc_debug = NULL;	/* !=NULL => value of config("calc_debug") */
+char *lib_debug = NULL;		/* !=NULL => value of config("lib_debug") */
+char *user_debug = NULL;	/* !=NULL => value of config("user_debug") */
+
 
 /*
  * initialization functions
@@ -173,6 +183,19 @@ libcalc_call_me_first(void)
 		conf->tab_ok = 0;
 	}
 
+	/*
+	 * -D flags can change calc_debug, lib_debug of user_debug
+	 */
+	if (calc_debug) {
+		conf->calc_debug = strtol(calc_debug, NULL, 0);
+	}
+	if (lib_debug) {
+		conf->lib_debug = strtol(lib_debug, NULL, 0);
+	}
+	if (user_debug) {
+		conf->user_debug = strtol(user_debug, NULL, 0);
+	}
+
 	/*
 	 * initialize
 	 */
@@ -181,6 +204,11 @@ libcalc_call_me_first(void)
 	/*
 	 * ready to rock & roll ..
 	 */
+	if (conf->calc_debug & CALCDBG_RUNSTATE) {
+		printf("DEBUG: run_state from %s to %s\n",
+		    run_state_name(run_state),
+		    run_state_name(RUN_BEGIN));
+	}
 	run_state = RUN_BEGIN;
 	init_done = 1;
 	return;
@@ -287,14 +315,17 @@ static void
 initenv(void)
 {
 	struct passwd *ent;		/* our password entry */
+	char *c;
 
 	/* determine the $CALCPATH value */
-	calcpath = (no_env ? NULL : getenv(CALCPATH));
+	c = getenv(CALCPATH);
+	calcpath = ((no_env || c == NULL) ? NULL : strdup(c));
 	if (calcpath == NULL)
 		calcpath = DEFAULTCALCPATH;
 
 	/* determine the $CALCRC value */
-	calcrc = (no_env ? NULL : getenv(CALCRC));
+	c = getenv(CALCRC);
+	calcrc = ((no_env || c == NULL) ? NULL : strdup(c));
 	if (calcrc == NULL) {
 		calcrc = DEFAULTCALCRC;
 	}
@@ -305,13 +336,15 @@ initenv(void)
 	}
 
 	/* determine the $CALCBINDINGS value */
-	calcbindings = (no_env ? NULL : getenv(CALCBINDINGS));
+	c = getenv(CALCBINDINGS);
+	calcbindings = ((no_env || c == NULL) ? NULL : strdup(c));
 	if (calcbindings == NULL) {
 		calcbindings = DEFAULTCALCBINDINGS;
 	}
 
 	/* determine the $HOME value */
-	home = (no_env ? NULL : getenv(HOME));
+	c = getenv(HOME);
+	home = ((no_env || c == NULL) ? NULL : strdup(c));
 	if (home == NULL || home[0] == '\0') {
 		ent = (struct passwd *)getpwuid(geteuid());
 		if (ent == NULL) {
@@ -323,13 +356,15 @@ initenv(void)
 	}
 
 	/* determine the $PAGER value */
-	pager = (no_env ? NULL : getenv(PAGER));
+	c = getenv(PAGER);
+	pager = ((no_env || c == NULL) ? NULL : strdup(c));
 	if (pager == NULL || *pager == '\0') {
 		pager = DEFAULTCALCPAGER;
 	}
 
 	/* determine the $SHELL value */
-	shell = (no_env ? NULL : getenv(SHELL));
+	c = getenv(SHELL);
+	shell = ((no_env || c == NULL) ? NULL : strdup(c));
 	if (shell == NULL)
 		shell = DEFAULTSHELL;
 }
@@ -371,3 +406,75 @@ libcalc_call_me_last(void)
 	init_done = 0;
 	return;
 }
+
+
+/*
+ * run_state_name - return a constant string given a run_state
+ */
+char *
+run_state_name(run state)
+{
+	switch (state) {
+	case RUN_UNKNOWN:
+		return "RUN_UNKNOWN";
+	case RUN_BEGIN:
+		return "RUN_BEGIN";
+	case RUN_RCFILES:
+		return "RUN_RCFILES";
+	case RUN_PRE_CMD_ARGS:
+		return "RUN_PRE_CMD_ARGS";
+	case RUN_CMD_ARGS:
+		return "RUN_CMD_ARGS";
+	case RUN_PRE_TOP_LEVEL:
+		return "RUN_PRE_TOP_LEVEL";
+	case RUN_TOP_LEVEL:
+		return "RUN_TOP_LEVEL";
+	case RUN_EXIT:
+		return "RUN_EXIT";
+	case RUN_EXIT_WITH_ERROR:
+		return "RUN_EXIT_WITH_ERROR";
+	}
+	return "RUN_invalid";
+}
+
+
+/*
+ * calc_strdup - calc interface to provide or simulate strdup()
+ */
+char *
+calc_strdup(CONST char *s1)
+{
+#if defined(HAVE_STRDUP)
+
+	return strdup(s1);
+
+#else /* HAVE_STRDUP */
+
+	char *ret;	/* return string */
+
+	/*
+	 * firewall
+	 */
+	if (s1 == NULL) {
+		return NULL;
+	}
+
+	/*
+	 * allocate duplicate storage
+	 */
+	ret = (char *)malloc(sizeof(char) * (strlen(s1)+1));
+
+	/*
+	 * if we have storage, duplicate the string
+	 */
+	if (ret != NULL) {
+		strcpy(ret, s1);
+	}
+
+	/*
+	 * return the new string, or NULL if malloc failed
+	 */
+	return ret;
+
+#endif /* HAVE_STRDUP */
+}

longlong.c

@@ -62,8 +62,8 @@
 /*
  * have the compiler try its hand with unsigned and signed long longs
  */
-unsigned long long val = 4294967297ULL;
-long long val2 = -4294967297LL;
+unsigned long long val = 0x1234567890123456ULL;
+long long val2 = -1311768467284833366LL;	/* -0x1234567890123456 */
 
 
 int
@@ -90,14 +90,20 @@ main(int argc, char **argv)
 	if (longlong_bits > 0) {
 
 		/*
-		 * if size is longer than an unsigned long, use it
+		 * if size is longer than an unsigned long,
+		 * and the negative 'long long' works, then use long long's
 		 */
-		if (longlong_bits > sizeof(unsigned long)*8) {
+		if (longlong_bits > sizeof(unsigned long)*8 && val2 < 0) {
 
 			/* use long long length */
 			printf("#define HAVE_LONGLONG\n");
 			printf("#define LONGLONG_BITS %d  /* yes */\n",
 			    longlong_bits);
+
+			printf("\n/* does %%lld work or does %%ld? */\n");
+			printf("#if defined(CHECK_L_FORMAT)\n");
+			printf("long long l_format = %ld;\n", val);
+			printf("#endif /* CHECK_L_FORMAT */\n");
 		}
 	}
 	/* exit(0); */

math_error.h

@@ -28,7 +28,7 @@
  * Happy bit twiddling,
  *
  *	Landon Curt Noll
- *	http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */

nametype.h

@@ -29,7 +29,7 @@
  * Happy bit twiddling,
  *
  *	Landon Curt Noll
- *	http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */

obj.c

@@ -96,8 +96,10 @@ static struct objectinfo {
 
 static STRINGHEAD objectnames;	/* names of objects */
 static STRINGHEAD elements;	/* element names for parts of objects */
-static OBJECTACTIONS *objects[MAXOBJECTS]; /* table of actions for objects */
+static OBJECTACTIONS **objects; /* table of actions for objects */
 
+#define OBJALLOC 16
+static long maxobjcount = 0;
 
 static VALUE objpowi(VALUE *vp, NUMBER *q);
 static BOOL objtest(OBJECT *op);
@@ -456,11 +458,12 @@ objpowi(VALUE *vp, NUMBER *q)
  *	indices		table of indices for elements
  *	count		number of elements defined for the object
  */
-void
+int
 defineobject(char *name, int indices[], int count)
 {
 	OBJECTACTIONS *oap;	/* object definition structure */
 	STRINGHEAD *hp;
+	OBJECTACTIONS **newobjects;
 	int index;
 
 	hp = &objectnames;
@@ -476,21 +479,32 @@ defineobject(char *name, int indices[], int count)
 		if (oap->count == count) {
 			for (index = 0; ; index++) {
 				if (index >= count)
-					return;
+					return 0;
 				if (oap->elements[index] != indices[index])
 					break;
 			}
 		}
-		math_error("Object type \"%s\" is already defined", name);
-		/*NOTREACHED*/
+		return 1;
 	}
 
-	if (hp->h_count >= MAXOBJECTS) {
-		math_error("Too many object types in use");
-		/*NOTREACHED*/
+	if (hp->h_count >= maxobjcount) {
+		if (maxobjcount == 0) {
+			newobjects = (OBJECTACTIONS **) malloc(
+			 	OBJALLOC * sizeof(OBJECTACTIONS *));
+			maxobjcount = OBJALLOC;
+		} else {
+			maxobjcount += OBJALLOC;
+			newobjects = (OBJECTACTIONS **) realloc(objects,
+				maxobjcount * sizeof(OBJECTACTIONS *));
+		}
+		if (newobjects == NULL) {
+			math_error("Allocation failure for new object type");
+			/*NOTREACHED*/
+		}
+		objects = newobjects;
 	}
+
 	oap = (OBJECTACTIONS *) malloc(objectactionsize(count));
-	if (oap)
 		name = addstr(hp, name);
 	if ((oap == NULL) || (name == NULL)) {
 		math_error("Cannot allocate object type");
@@ -504,7 +518,7 @@ defineobject(char *name, int indices[], int count)
 		oap->elements[index] = indices[index];
 	index = findstr(hp, name);
 	objects[index] = oap;
-	return;
+	return 0;
 }
 
 
@@ -565,6 +579,16 @@ findelement(char *name)
 }
 
 
+/*
+ * Returns the name of object type with specified index
+ */
+char *
+objtypename(unsigned long index)
+{
+	return namestr(&objectnames, (long)index);
+}
+
+
 /*
  * Return the value table offset to be used for an object element name.
  * This converts the element index from the element table into an offset
@@ -596,7 +620,7 @@ objalloc(long index)
 	VALUE *vp;
 	int i;
 
-	if ((unsigned) index >= MAXOBJECTS) {
+	if (index < 0 || index > maxobjcount) {
 		math_error("Allocating bad object index");
 		/*NOTREACHED*/
 	}

opcodes.c

@@ -3773,11 +3773,14 @@ dumpop(unsigned long *pc)
 			return 3;
 		case OP_PRINT: case OP_JUMPZ: case OP_JUMPNZ: case OP_JUMP:
 		case OP_CONDORJUMP: case OP_CONDANDJUMP: case OP_CASEJUMP:
-		case OP_INITSTATIC: case OP_MATCREATE: case OP_OBJCREATE:
+		case OP_INITSTATIC: case OP_MATCREATE:
 		case OP_SHOW: case OP_ELEMINIT: case OP_ELEMADDR:
 		case OP_ELEMVALUE: case OP_JUMPNN:
 			printf(" %ld\n", *pc);
 			return 2;
+		case OP_OBJCREATE:
+			printf(" %s\n", objtypename(*pc));
+			return 2;
 		case OP_NUMBER: case OP_IMAGINARY:
 			qprintf(" %r", constvalue(*pc));
 			printf("\n");

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 http://reality.sgi.com/chongo
+ *     ernie@neumann.une.edu.au and http://reality.sgi.com/chongo/
  */
 
 #include "value.h"

quickhash.c

@@ -20,7 +20,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  *      chongo <was here> /\../\
  */
@@ -80,12 +80,12 @@ static QCKHASH blk_hash(BLOCK *blk, QCKHASH val);
  * The basis of this hash algorithm was taken from an idea sent
  * as reviewer comments to the IEEE POSIX P1003.2 committee by:
  *
- *      Phong Vo (http://www.research.att.com/info/kpv)
+ *      Phong Vo (http://www.research.att.com/info/kpv/)
  *      Glenn Fowler (http://www.research.att.com/~gsf/)
  *
  * In a subsequent ballot round:
  *
- *      Landon Curt Noll (http://reality.sgi.com/chongo)
+ *      Landon Curt Noll (http://reality.sgi.com/chongo/)
  *
  * improved on their algorithm.  Some people tried this hash
  * and found that it worked rather well.  In an EMail message
@@ -404,8 +404,8 @@ config_hash(CONFIG *cfg, QCKHASH val)
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->blkverbose);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->blkbase);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->blkfmt);
-	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->lib_debug);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->calc_debug);
+	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->lib_debug);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->user_debug);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->verbose_quit);
 

sample/Makefile

@@ -27,7 +27,7 @@
 # Happy bit twiddling,
 #
 #      Landon Curt Noll
-#      http://reality.sgi.com/chongo
+#      http://reality.sgi.com/chongo/
 #
 # chongo <was here> /\../\
 
@@ -321,15 +321,11 @@ many_random: many_random.o ../libcalc.a
 
 distlist: ${DISTLIST}
 	${Q}for i in ${DISTLIST}; do \
-		echo calc/sample/$$i; \
+		echo sample/$$i; \
 	done
 
-# The bsdi distribution has generated files as well as distributed files.
-#
-bsdilist: ${DISTLIST}
-	${Q}for i in ${DISTLIST}; do \
-		echo calc/sample/$$i; \
-	done
+distdir:
+	${Q}echo sample
 
 ##
 #
@@ -402,11 +398,11 @@ depend:
 	else \
 		rm -f Makefile.tmp; \
 		mv Makefile Makefile.tmp; \
-		if [ -d RCS ]; then; \
+		if [ -d RCS ]; then \
 		    co -l Makefile; \
 		fi; \
 		mv Makefile.tmp Makefile; \
-		if [ -d RCS ]; then; \
+		if [ -d RCS ]; then \
 		    echo new sample Makefile formed, you need to check it in; \
 		fi; \
 	fi

seed.c

@@ -6,7 +6,7 @@
  * NOTE: This is not a good source of chaotic data.  The lavarand
  *	 system does a much better job of that.  See:
  *
- *		http://lavarand.sgi.com
+ *		http://lavarand.sgi.com/index.html
  *
  * Copyright (c) 1999 by Landon Curt Noll.  All Rights Reserved.
  *
@@ -29,7 +29,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  *      chongo <was here> /\../\
  *
@@ -53,16 +53,11 @@
  */
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.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"
-# define DEV_URANDOM_POOL 128
-#endif /* __linux */
 #include "qmath.h"
 #include "longbits.h"
 #include "have_ustat.h"
@@ -71,6 +66,15 @@
 #include "have_gettime.h"
 #include "have_getprid.h"
 #include "have_urandom.h"
+#include "have_rusage.h"
+#if defined(HAVE_USTAT)
+# include <ustat.h>
+#endif /* HAVE_USTAT */
+#if defined(HAVE_URANDOM)
+# include <fcntl.h>
+# define DEV_URANDOM "/dev/urandom"
+# define DEV_URANDOM_POOL 16
+#endif /* HAVE_URANDOM */
 
 
 /*
@@ -157,12 +161,12 @@ hash_buf(char *buf, unsigned len)
          * The basis of this hash algorithm was taken from an idea sent
          * as reviewer comments to the IEEE POSIX P1003.2 committee by:
          *
-         *      Phong Vo (http://www.research.att.com/info/kpv)
+         *      Phong Vo (http://www.research.att.com/info/kpv/)
          *      Glenn Fowler (http://www.research.att.com/~gsf/)
          *
          * In a subsequent ballot round:
          *
-         *      Landon Curt Noll (http://reality.sgi.com/chongo)
+         *      Landon Curt Noll (http://reality.sgi.com/chongo/)
          *
          * improved on their algorithm.  Some people tried this hash
          * and found that it worked rather well.  In an EMail message
@@ -248,7 +252,7 @@ hash_buf(char *buf, unsigned len)
  * NOTE: This is not a good source of chaotic data.  The lavarand
  *	 system does a much better job of that.  See:
  *
- *		http://lavarand.sgi.com
+ *		http://lavarand.sgi.com/index.html
  *
  * PORTING NOTE:
  *    If when porting this code to your system and something
@@ -308,9 +312,13 @@ pseudo_seed(void)
 #if defined(HAVE_GETPGID)
 	pid_t getpgid;                  /* process group ID */
 #endif /* HAVE_GETPGID */
+#if defined(HAVE_GETRUSAGE)
 	struct rusage rusage;           /* resource utilization */
 	struct rusage rusage_chld;      /* resource utilization of children */
+#endif /* HAVE_GETRUSAGE */
 	struct timeval tp2;             /* time of day again */
+	struct tms times;		/* process times */
+	time_t time;			/* local time */
 	size_t size;			/* size of this data structure */
 	jmp_buf env;			/* setjmp() context */
 	char *sdata_p;                  /* address of this structure */
@@ -377,9 +385,13 @@ pseudo_seed(void)
 #if defined(HAVE_GETPGID)
     sdata.getpgid = getpgid((pid_t)0);
 #endif /* HAVE_GETPGID */
+#if defined(HAVE_GETRUSAGE)
     (void) getrusage(RUSAGE_SELF, &sdata.rusage);
     (void) getrusage(RUSAGE_CHILDREN, &sdata.rusage_chld);
+#endif /* HAVE_GETRUSAGE */
     (void) gettimeofday(&sdata.tp2, NULL);
+    (void) times(&sdata.times);
+    sdata.time = time(NULL);
     sdata.size = sizeof(sdata);
     (void) setjmp(sdata.env);
     sdata.sdata_p = (char *)&sdata;

shs.c

@@ -12,7 +12,7 @@
  * This file was Modified/Re-written by:
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  *      chongo <was here> /\../\
  *
@@ -29,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
- * (http://reality.sgi.com/chongo) shs hash program.
+ * (http://reality.sgi.com/chongo/) shs hash program.
  *
  ****
  *

shs.h

@@ -12,7 +12,7 @@
  * This file was Modified by:
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  *      chongo <was here> /\../\
  *

shs1.c

@@ -6,7 +6,7 @@
  * This file was Modified/Re-written by:
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  *      chongo <was here> /\../\
  *

shs1.h

@@ -6,7 +6,7 @@
  * This file was Modified by:
  *
  *      Landon Curt Noll
- *      http://reality.sgi.com/chongo
+ *      http://reality.sgi.com/chongo/
  *
  *      chongo <was here> /\../\
  *

symbol.c

@@ -175,7 +175,10 @@ showglobals(void)
 			printf("\n");
 		}
 	}
-	printf(count ? "\n" : "No real-valued global variables\n");
+	if (count == 0) {
+		printf("No real-valued global variables\n");
+	}
+	putchar('\n');
 }
 
 

value.h

@@ -446,11 +446,12 @@ extern VALUE objcall(int action, VALUE *v1, VALUE *v2, VALUE *v3);
 extern void objfree(OBJECT *op);
 extern void objuncache(void);
 extern int addelement(char *name);
-extern void defineobject(char *name, int indices[], int count);
+extern int defineobject(char *name, int indices[], int count);
 extern int checkobject(char *name);
 extern void showobjfuncs(void);
 extern void showobjtypes(void);
 extern int findelement(char *name);
+extern char *objtypename(unsigned long index);
 extern int objoffset(OBJECT *op, long index);
 
 

version.c

@@ -7,12 +7,18 @@
  */
 
 #include <stdio.h>
-#include "calc.h"
+#if defined(CALC_VER)
+#include <stdlib.h>
+#include <unistd.h>
+static char *program;
+#else
+# include "calc.h"
+#endif
 
 #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	"9.1.1"	/* test number or empty string if no patch */
+#define MINOR_PATCH	"9.4.2"	/* test number or empty string if no patch */
 
 /*
  * calc version constants
@@ -80,3 +86,20 @@ version(void)
 	 */
 	return stored_version;
 }
+
+
+#if defined(CALC_VER)
+
+/*
+ * version - print the calc version
+ */
+/*ARGSUSED*/
+int
+main(int argc, char *argv[])
+{
+    program = argv[0];
+    printf("%s\n", version());
+    return 0;
+}
+
+#endif /* CALC_VER */

zrand.c

@@ -29,7 +29,7 @@
  * Happy bit twiddling,
  *
  *	Landon Curt Noll
- *	http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */

zrand.h

@@ -29,7 +29,7 @@
  * Happy bit twiddling,
  *
  *	Landon Curt Noll
- *	http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */

zrandom.c

@@ -29,7 +29,7 @@
  * Happy bit twiddling,
  *
  *	Landon Curt Noll
- *	http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */
@@ -365,8 +365,7 @@
  *	were selected by lavarand, a hardware random number generator.
  *	See the URL:
  *
- *	    http://lavarand.sgi.com
- *	    XXX - This URL is not available on 17Feb97 ... but will be soon.
+ *	    http://lavarand.sgi.com/index.html
  *
  *	for an explination of how the lavarand random number generator works.
  *

zrandom.h

@@ -29,7 +29,7 @@
  * Happy bit twiddling,
  *
  *	Landon Curt Noll
- *	http://reality.sgi.com/chongo
+ *	http://reality.sgi.com/chongo/
  *
  * chongo <was here> /\../\
  */