Release calc version 2.11.0t3

BUGS

@@ -1,8 +1,8 @@
 If you notice something wrong, strange or broken, try rereading:
 
    README.FIRST
-   README
-   BUGS (in particular the bottom problems or mis-features section)
+   HOWTO.INSTALL
+   BUGS (this file)
 
 If that does not help, cd to the calc source directory and try:
 
@@ -18,13 +18,13 @@ If it does not, then something is really broken!
 If you made and modifications to calc beyond the simple Makefile
 configuration, try backing them out and see if things get better.
 
-Check to see if the version of calc you are using is current.  Calc
-distributions may be obtained from the official calc repository:
+To be sure that your version of calc is up to date, check out:
 
-    ftp://ftp.uu.net/pub/calc
+	http://reality.sgi.com/chongo/calc/calc-download.html
 
-If you are an alpha or beta tester, you may have a special pre-released
-version that is more advanced than what is in the ftp archive.
+The calc web site is located at:
+
+	http://reality.sgi.com/chongo/calc
 
 =-=
 
@@ -46,6 +46,8 @@ When you send your report, please include the following information:
 
     * the type of compiler you were using
 
+    * any compiler warnings or erros that you saw
+
     * cd to the calc source directory, and type:
 
 	make debug > debug.out 2>&1		(sh, ksh, bash users)
@@ -57,22 +59,8 @@ Stack traces from core dumps are useful to send as well.
 
 =-=
 
-The official calc repository is located in:
-
-    ftp://ftp.uu.net/pub/calc
-
-If you don't have ftp access to that site, or if your version is more
-recent than what has been released to the ftp archive, you may, as a
-last resort, send EMail to:
-
-    chongo@toad.com
-
-Indicate the version you have and that you would like a more up to date version.
-
-=-=
-
-Send any comments, suggestions and most importantly, fixes (in the form
-of a context diff patch) to:
+Send any comments, compiler warning messages, suggestions and most
+importantly, fixes (in the form of a context diff patch) to:
 
     calc-tester@postofc.corp.sgi.com
 
@@ -89,3 +77,74 @@ Known problems or mis-features:
     * There is some places in the source with obscure variable names
       and not much in the way of comments.  We need some major cleanup
       and documentation.
+
+    * On a Dec Alpha, make check for version 2.11.0t1 core dumps:
+
+	From vandermj@molbio.sbphrd.com  Fri Sep 24 06:15:28 1999
+	Subject: Re: calc version 2.11.0t1
+	Date: Fri, 24 Sep 1999 09:15:02 -0400
+
+	It dies as follows:
+
+	...
+	1802: a = surd(2,3)
+	1803: a == surd(2,3)
+	1804: surd_value(a) == 2+3i
+	Segmentation fault
+
+	dbx shows:
+	signal Segmentation fault at   [objcall:155 +0xc,0x1200507b4]   index = oap->actions[action];
+	(dbx) where
+	>  0 objcall(action = 14, v1 = 0x1400203d0, v2 = 0x1400203e0, v3 = (nil)) ["obj.c":155, 0x1200507b4]
+	   1 comparevalue(v1 = 0x1400203d0, v2 = 0x1400203e0) ["value.c":2329, 0x12007f250]
+	   2 o_eq() ["opcodes.c":2659, 0x12003728c]
+	   3 calculate(fp = 0x14007fce0) ["opcodes.c":3614, 0x12003942c]
+	   4 o_usercall(fp = 0x14007fce0, index = 39, argcount = 0) ["opcodes.c":2602, 0x120037080]
+	   5 calculate(fp = 0x14003bfa0) ["opcodes.c":3622, 0x120039488]
+	   6 evaluate(nestflag = 14) ["codegen.c":210, 0x120028768]
+	   7 getcommands(toplevel = 536864560) ["codegen.c":158, 0x1200285bc]
+	   8 getcommands(toplevel = 536864560) ["codegen.c":122, 0x1200284dc]
+	   9 main() ["calc.c":279, 0x12001f61c]
+
+      Michel van der List reports that he was using the Dec compiler.
+
+      However On 25-Sep-99  9:18, Ernest Bowen wrote:
+
+	Last night I downloaded 2.11.0t1 and without changing Makefile
+	or anything else did a make and make check.  Absolutely no
+	reported errors or warnings and the check "passed all tests".
+	The machine I'm using is a Dec 20 alpha running Digitial
+	UNIX V4.0B (Rev 564).
+
+      Ernest Bowen was using gcc.
+
+      We definitely want to hunt down this Dec's cc compiler issue.  It
+      could very well be that gcc is letting something slide where as
+      Dec's cc compiler is compiling it faithfully into core dumping code.
+      The fault could very well be the calc code and not the compiler.
+
+      Any more information on calc core dumps compiled with Dec's cc compiler
+      would be most appreciated!
+
+    * To compile calc using the Solaris cc, the -Xc flag is required.
+      Unfortunately this change results in the loss of 'long long' and
+      the resulting code runs slower.
+
+      Dr.D.J.Picton <dave@aps5.ph.bham.ac.uk> reports that -Xc is
+      required for at compiling zrand.c.
+
+   * Calc compiled with Solaris cc -Xc results in some test failures:
+
+	CALCPATH=./lib ./calc -i -q read regress 2>&1 | nawk -f check.awk
+	**** Non-true result (0): 7120: sha(sha(isqrt(2e1000)==0x6db8d9cf0b018b8f9cbbf5aa1edb8066d19e1bb0
+	**** Non-true result (0): 7122: sha(sha("this is", 7^19-8, ..., "hash")) == 0x21e4...
+	**** Non-true result (0): 7124: sha(z) == 0x36dcca3e51865c30a2cf738023cda446f1368340
+	**** Non-true result (0): 7209: sha1(sha1("this is",7^19-8,"a composit",3i+4.5,"hash")) == ...
+	**** Non-true result (0): 7211: sha1(z) == 0xc19e7317675dbf71e293b4c41e117169e9da5b6f
+	**** Non-true result (0): 7227: sha1(sha1(isqrt(2e1000)))==0x6852a1365c51050c3d039e3c5d9cf29c12283ef4
+	**** Non-true result (0): 7310: md5(md5("this is", 7^19-8, "a composit", 3i+4.5, "hash")) == ...
+	**** Non-true result (0): 7312: md5(z) == 0x63d2b2fccae2de265227c30b05abb6b5
+	**** Non-true result (0): 7328: md5(md5(isqrt(2e1000))) == 0xe56ac4b8cad869e738a04fedc97058f3
+
+	**** 9 error(s) found  \/++\/
+	9999: Ending regression tests

CHANGES

@@ -1,4 +1,53 @@
-Following is the change from calc version 2.10.3t5.38 to date:
+Following is the change from calc version 2.11.0t1 to date:
+
+    Removed the makefile symbol MAIN.  Now forcing all funcions to correctly
+    be reclared main.  To passify some old broken compilers, a return 0;
+    (instead of an exit(0);) is used at the end of main().
+
+    A few of files that were added to calc used 4 character indentation
+    whereas most of calc uses 8 character indentation.  These imported
+    sources have been changed to conform better with the calc style.
+
+    Added the program calc_errno.c and the Makefile symbol ERRNO_DECL.
+    If ERRNO_DECL is empty, calc_errno.c will try various ways to
+    declare errno, sys_errlist and sys_nerr.  On success or when
+    it gives up, calc_errno will output the middle of the calc_errno.h
+    header file.  If ERRNO_DECL is  -DERRNO_NO_DECL, or -DERRNO_STD_DECL
+    or -DERRNO_OLD_DECL then the Makefile will build the middle
+    of the calc_errno.h header file without calc_errno.c's help.
+
+    The func.c file now includes the constructed header file calc_errno.h
+    to ensure that errno, sys_errlist and sys_nerr are declared correctly.
+
+    Changed check.awk to be more 'old awk' friendly.
+
+    Made some of the source a little more ++ friendly.  We are NOT
+    porting calc to C++!  We will NOT support C++ compilation of calc.
+    Calc will written ANSI C.  We just compiled with a suggestion from 
+    Love-Jensen, John <jlove-jensen@globalmt.com> to make calc's version 
+    of C a little more to C++ compilers.  Avoiding symbols such as new
+    or try for example.
+
+    Thanks to the efforts of Ernest Bowen <ernie@neumann.une.edu.au> and
+    Dr.D.J.Picton <dave@aps5.ph.bham.ac.uk>, a nasty endian-ness bug
+    in the sha and sha1 hash functions that showed up on machines such
+    as the Sparc was fixed.
+
+    Updated README.FIRST and BUGS to reflect new URLs and addresses.
+
+    Added a HOWTO.INSTALL file.
+
+    Reordered cc Makefile variable sets in the main Makefile.
+
+    Fixed misc compile warnings and notices.
+
+
+Following is the change from calc version 2.10.3t5.38 to 2.11.0t0:
+
+    Fixed a few compile problems found under Red Hat 6.0 Linux.
+
+
+Following is the change from calc version 2.10.3t5.38 to 2.11.3t5.46:
 
     Fixed a bug discovered by Ernest Bowen related to matrix-to-matrix copies.
 

HOWTO.INSTALL

@@ -0,0 +1,53 @@
+Installing calc in 4 easy steps:
+
+    1) Look at the makefile, and adjust it to suit your needs.
+
+       Here are some Makefile hints:
+
+	   Select a compiler set by commenting in the appropriate
+	   set of cc options.  As shipped the Makefile assumes
+	   a gcc-like environment such as Linux.  
+	   
+	   If a more appropriate cc set if found below, comment 
+	   out the Linux set and comment in that set or edit
+	   the gcc set or the common cc set as needed.
+
+	   You may or may not need RANLIB when building libraries.
+	   As shipped the Makefile assumes RANLIB is needed.
+	   Comment the in/out the RANLIB value if ranlib does
+	   not work or does not exist.
+
+	   You may want to change the default pager used by calc.
+	   As shipped the Makefile assumes 'more'.  On your system
+	   you may find 'less' to be a better pager.
+
+	   The CALCBINDINGS is matter of personal taste.  As shipped
+	   the Makefile assumes a default quasi-emacs-like command
+	   line editor.  Changing CALCBINDINGS= altbind will cause ^D
+	   to end calc in a fashion similar to that of the bc(1) command.
+
+	   Set TOPDIR to be the place under which help files, calc,
+	   include files and calc libs are to be installed.  As shipped
+	   the Makefile assumes a TOPDIR of /usr/local/lib.
+
+	   Set BINDIR to the place where calc is installed.  As shipped
+	   the Makefile assumes a BINDIR /usr/local/bin.
+
+	   Adjust other Makefile variables as needed.
+
+    2) build calc:
+
+	make all
+
+	==> We are interested in any compiler warnings (and errors) that
+	    you may find.  See the BUGS file if you find any.
+
+    3) test calc:
+
+	make check
+
+	==> If you run into problems, follow the instructions in the BUGS file
+
+    4) install calc:
+
+	make install

Makefile

@@ -206,17 +206,38 @@ HAVE_MEMMOVE=
 ALIGN32= -DMUST_ALIGN32
 #ALIGN32= -UMUST_ALIGN32
 
-# The return value type of main() differs from platform to platform.
-# In some cases, a compiler warning is issued because main() does
-# or does not return a value.
+# On most machines: errno sys_errlist and sys_nerr are declared
+# by either <stdio.h> and/or <errno.h>.  But some systems declare
+# them somewhere else or do not declare them at all!
 #
-# MAIN= -DMAIN=void	main() is of type void
-# MAIN= -DMAIN=int	main() is of type int
+# If the system were doing a proper job in headers, this should declare them:
 #
-# When in doubt, try MAIN= -DMAIN=void.  If you get a warning try the other.
+#	#include <stdio.h>
+#	#include <errno.h>
 #
-MAIN= -DMAIN=void
-#MAIN= -DMAIN=int
+# But one some systems one must explicitly declare them as:
+#
+#	extern int errno;
+#	extern const char *const sys_errlist[];
+#	extern int sys_nerr;
+#
+# and on some old systems they must be explicitly and incorrectly declared as:
+#
+#	extern int errno;
+#	extern char *sys_errlist[];
+#	extern int sys_nerr;
+#
+# ERRNO_DECL=			let calc_errno.c determine how to declare them
+# ERRNO_DECL= -DERRNO_NO_DECL	headers declare them correctly
+# ERRNO_DECL= -DERRNO_STD_DECL	one must explicitly declare then
+# ERRNO_DECL= -DERRNO_OLD_DECL	one must explicitly & incorrectly declare them
+#
+# When in doubt, be safe leave ERRNO_DECL empty.
+#
+ERRNO_DECL=
+#ERRNO_DECL= -DERRNO_NO_DECL
+#ERRNO_DECL= -DERRNO_STD_DECL
+#ERRNO_DECL= -DERRNO_OLD_DECL
 
 # where to install binary files
 #
@@ -293,7 +314,8 @@ CATEXT= 1
 #     The cat page is not built or installed
 #
 # If in doubt and you don't want to fool with man pages, set MANDIR
-# and CATDIR to empty and ignore the lines below.
+# and CATDIR to empty and ignore the NROFF, NROFF_ARG and MANMAKE
+# lines below.
 #
 NROFF= nroff
 #NROFF=
@@ -332,7 +354,7 @@ CALCPAGER= more
 
 # Debug/Optimize options for ${CC}
 #
-DEBUG= -O
+#DEBUG= -O
 #DEBUG= -O -g
 #DEBUG= -O -g3
 #DEBUG= -O1
@@ -340,7 +362,7 @@ DEBUG= -O
 #DEBUG= -O1 -g3
 #DEBUG= -O2
 #DEBUG= -O2 -g
-#DEBUG= -O2 -g3
+DEBUG= -O2 -g3
 #DEBUG= -O2 -ipa
 #DEBUG= -O2 -g3 -ipa
 #DEBUG= -O3
@@ -388,8 +410,8 @@ LD_NO_SHARED=
 # a *.a library.  Set RANLIB to the utility that performs this action.
 # Set RANLIB to : if your system does not need such a utility.
 #
-#RANLIB=ranlib
-RANLIB=:
+RANLIB=ranlib
+#RANLIB=:
 
 # Some systems are able to form lint libs.  How it is formed depends
 # on your system.  If you do not care about lint, use : as the
@@ -505,47 +527,65 @@ ALLOW_CUSTOM= -DCUSTOM
 #
 ###
 #
-# common cc set
+# Linux set
 #
-CCWARN=
+# Tested on Red Hat 6.0 Linux but should run on almost any Linux release.
+#
+# for better performance, set the following above:
+#     DEBUG= -O2
+#
+CCWARN= -Wall -Wno-implicit -Wno-comment
 CCOPT= ${DEBUG} ${NO_SHARED}
 CCMISC=
 #
 CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 ICFLAGS= ${CCWARN} ${CCMISC}
 #
-CCMAIN= ${ICFLAGS} ${MAIN}
+CCMAIN= ${ICFLAGS}
 CCSHS= ${CFLAGS}
 #
 LCFLAGS=
 LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 ILDFLAGS=
 #
-CC= ${PURIFY} cc
+CC= ${PURIFY} gcc
 #
 ###
 #
-# SGI IRIX5.3 (or earlier) -o32 C Compiler
-#
-# You must set above:
-#	RANLIB=:
-#	LONGLONG_BITS= 0
+# gcc set	(some call it gcc2, some call it gcc)
 #
 # for better performance, set the following above:
-#	DEBUG= -O2 -g3
+#     DEBUG= -O2
 #
-# If you have the directory /usr/lib/nonshared, then set the following above:
-#	NO_SHARED= -non_shared
-#	LD_NO_SHARED= -Wl,-rdata_shared
-#
-#CCWARN= -fullwarn -woff 835
+#CCWARN= -Wall -Wno-implicit -Wno-comment
 #CCOPT= ${DEBUG} ${NO_SHARED}
-#CCMISC= -use_readonly_const
+#CCMISC=
 #
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS} ${MAIN}
+#CCMAIN= ${ICFLAGS}
+#CCSHS= ${CFLAGS}
+#
+#LCFLAGS=
+#LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
+#ILDFLAGS=
+#
+#CC= ${PURIFY} gcc
+#CC= ${PURIFY} gcc2
+#
+###
+#
+# common cc set
+#
+#CCWARN=
+#CCOPT= ${DEBUG} ${NO_SHARED}
+#CCMISC=
+#
+#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= ${CCWARN} ${CCMISC}
+#
+#CCMAIN= ${ICFLAGS}
 #CCSHS= ${CFLAGS}
 #
 #LCFLAGS=
@@ -577,7 +617,7 @@ CC= ${PURIFY} cc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS} ${MAIN}
+#CCMAIN= ${ICFLAGS}
 #CCSHS=
 #
 #LCFLAGS=
@@ -603,7 +643,7 @@ CC= ${PURIFY} cc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS} ${MAIN}
+#CCMAIN= ${ICFLAGS}
 #CCSHS= ${CFLAGS}
 #
 #LCFLAGS=
@@ -623,7 +663,7 @@ CC= ${PURIFY} cc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS} ${MAIN}
+#CCMAIN= ${ICFLAGS}
 #CCSHS= ${CFLAGS}
 #
 #LCFLAGS=
@@ -634,29 +674,6 @@ CC= ${PURIFY} cc
 #
 ###
 #
-# BSDI's BSD/OS 2.0 (or later) set
-#
-# for better performance, set the following above:
-#     DEBUG= -O2
-#
-#CCWARN= -Wall -Wno-implicit -Wno-comment
-#CCOPT= ${DEBUG} ${NO_SHARED}
-#CCMISC= -ansi
-#
-#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= ${CCWARN} ${CCMISC}
-#
-#CCMAIN= ${ICFLAGS} ${MAIN}
-#CCSHS= ${CFLAGS}
-#
-#LCFLAGS=
-#LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
-#ILDFLAGS=
-#
-#CC= ${PURIFY} shlicc2
-#
-###
-#
 # Solaris 2.x Sun cc compiler
 #
 # for better performance, set the following above:
@@ -669,7 +686,7 @@ CC= ${PURIFY} cc
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS} ${MAIN}
+#CCMAIN= ${ICFLAGS}
 #CCSHS= ${CFLAGS}
 #
 #LCFLAGS=
@@ -680,73 +697,25 @@ CC= ${PURIFY} cc
 #
 ###
 #
-# gcc set
-#
-# for better performance, set the following above:
-#     DEBUG= -O
-#
-#CCWARN= -Wall
-#CCOPT= ${DEBUG} ${NO_SHARED}
-#CCMISC= -ansi
-#
-#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= ${CCWARN} ${CCMISC}
-#
-#CCMAIN= ${ICFLAGS} ${MAIN}
-#CCSHS= ${CFLAGS}
-#
-#LCFLAGS=
-#LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
-#ILDFLAGS=
-#
-#CC= ${PURIFY} gcc
-#
-###
-#
-# gcc1 set	(some call it gcc1, some call it gcc)
-#
-# for better performance, set the following above:
-#     DEBUG= -O
-#
-#CCWARN= -Wall
-#CCOPT= ${DEBUG} ${NO_SHARED}
-#CCMISC= -ansi
-#
-#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= ${CCWARN} ${CCMISC}
-#
-#CCMAIN= ${ICFLAGS} ${MAIN}
-#CCSHS= ${CFLAGS}
-#
-#LCFLAGS=
-#LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
-#ILDFLAGS=
-#
-#CC= ${PURIFY} gcc1
-#CC= ${PURIFY} gcc
-#
-###
-#
-# gcc2 set	(some call it gcc2, some call it gcc)
+# BSDI's BSD/OS 4.0 (or later) set
 #
 # for better performance, set the following above:
 #     DEBUG= -O2
 #
 #CCWARN= -Wall -Wno-implicit -Wno-comment
 #CCOPT= ${DEBUG} ${NO_SHARED}
-#CCMISC= -ansi
+#CCMISC=
 #
 #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
 #ICFLAGS= ${CCWARN} ${CCMISC}
 #
-#CCMAIN= ${ICFLAGS} ${MAIN}
+#CCMAIN= ${ICFLAGS}
 #CCSHS= ${CFLAGS}
 #
 #LCFLAGS=
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
 #
-#CC= ${PURIFY} gcc2
 #CC= ${PURIFY} gcc
 
 ##############################################################################
@@ -834,7 +803,7 @@ BUILD_H_SRC= align32.h args.h calcerr.h conf.h endian_calc.h \
 	fposval.h have_const.h have_fpos.h have_malloc.h \
 	have_memmv.h have_newstr.h have_offscl.h have_posscl.h \
 	have_stdlib.h have_string.h have_times.h have_uid_t.h \
-	have_unistd.h longbits.h longlong.h terminal.h
+	have_unistd.h longbits.h longlong.h terminal.h calc_errno.h
 
 # we build these .c files during the make
 #
@@ -846,7 +815,7 @@ BUILD_C_SRC= calcerr.c
 #
 UTIL_C_SRC= align32.c endian.c longbits.c have_newstr.c have_uid_t.c \
 	have_const.c have_stdvs.c have_varvs.c fposval.c have_fpos.c \
-	longlong.c have_offscl.c have_posscl.c have_memmv.c
+	longlong.c have_offscl.c have_posscl.c have_memmv.c calc_errno.c
 
 # these awk and sed tools are used in the process of building BUILD_H_SRC
 # and BUILD_C_SRC
@@ -860,16 +829,17 @@ UTIL_MISC_SRC= calcerr_h.sed calcerr_h.awk calcerr_c.sed calcerr_c.awk \
 #
 UTIL_OBJS= endian.o longbits.o have_newstr.o have_uid_t.o \
 	have_const.o fposval.o have_fpos.o longlong.o try_strarg.o \
-	have_stdvs.o have_varvs.o have_posscl.o have_memmv.o
+	have_stdvs.o have_varvs.o have_posscl.o have_memmv.o calc_errno.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
+UTIL_TMP= ll_tmp fpos_tmp fposv_tmp const_tmp uid_tmp newstr_tmp vs_tmp \
+	calc_errno_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
+	endian longbits have_newstr have_stdvs have_varvs calc_errno
 
 # These files are required by the regress.cal regression test.
 #
@@ -913,7 +883,6 @@ SAMPLE_PASSDOWN= Q="${Q}" \
     TOPDIR="${TOPDIR}" \
     LIBDIR="${LIBDIR}" \
     HELPDIR="${HELPDIR}" \
-    MAIN="${MAIN}" \
     DEBUG="${DEBUG}" \
     NO_SHARED="${NO_SHARED}" \
     RANLIB="${RANLIB}" \
@@ -946,7 +915,7 @@ C_SRC= ${LIBSRC} ${CALCSRC} ${UTIL_C_SRC}
 # These files are found (but not built) in the distribution
 #
 DISTLIST= ${C_SRC} ${H_SRC} ${MAKE_FILE} BUGS CHANGES LIBRARY README \
-	calc.man lint.sed README.FIRST ${UTIL_MISC_SRC}
+	calc.man lint.sed README.FIRST HOWTO.INSTALL ${UTIL_MISC_SRC}
 
 # complete list of .o files
 #
@@ -1841,6 +1810,98 @@ args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h have_string.h
 	    true; \
 	fi
 
+calc_errno.h: calc_errno.c ${MAKE_FILE}
+	-${Q}rm -f calc_errno.h calc_errno calc_errno_tmp
+	${Q}echo 'forming calc_errno.h'
+	${Q}echo '/*' > calc_errno.h
+	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> calc_errno.h
+	${Q}echo ' */' >> calc_errno.h
+	${Q}echo '' >> calc_errno.h
+	${Q}echo '' >> calc_errno.h
+	${Q}echo '#if !defined(__CALC_ERRNO_H__)' >> calc_errno.h
+	${Q}echo '#define __CALC_ERRNO_H__' >> calc_errno.h
+	${Q}echo '' >> calc_errno.h
+	${Q}echo '' >> calc_errno.h
+	-${Q}if [ X"${ERRNO_DECL}" = X"-DERRNO_NO_DECL" ]; then \
+	    echo '/*' >> calc_errno.h; \
+	    echo ' * The calc Makefile explicitly told us' >> calc_errno.h; \
+	    echo ' * how to declare errno and friends.' >> calc_errno.h; \
+	    echo ' */' >> calc_errno.h; \
+	    echo '' >> calc_errno.h; \
+	    echo '#include <stdio.h>' >> calc_errno.h; \
+	    echo '#include <errno.h>' >> calc_errno.h; \
+	elif [ X"${ERRNO_DECL}" = X"-DERRNO_STD_DECL" ]; then \
+	    echo '/*' >> calc_errno.h; \
+	    echo ' * The calc Makefile explicitly told us' >> calc_errno.h; \
+	    echo ' * how to declare errno and friends.' >> calc_errno.h; \
+	    echo ' */' >> calc_errno.h; \
+	    echo '' >> calc_errno.h; \
+	    echo 'extern int errno;			' \
+		 '/* last system error */' >> calc_errno.h; \
+	    echo 'extern const char *const sys_errlist[];' \
+		 ' /* system error messages*/' >> calc_errno.h; \
+	    echo 'extern int sys_nerr;			' \
+		 '/* number of system errors */' >> calc_errno.h; \
+	elif [ X"${ERRNO_DECL}" = X"-DERRNO_OLD_DECL" ]; then \
+	    echo '/*' >> calc_errno.h; \
+	    echo ' * The calc Makefile explicitly told us' >> calc_errno.h; \
+	    echo ' * how to declare errno and friends.' >> calc_errno.h; \
+	    echo ' */' >> calc_errno.h; \
+	    echo '' >> calc_errno.h; \
+	    echo 'extern int errno;		' \
+		 '/* last system error */' >> calc_errno.h; \
+	    echo 'extern char *sys_errlist[];' \
+		 '	 /* system error messages*/' >> calc_errno.h; \
+	    echo 'extern int sys_nerr;		' \
+		 '/* number of system errors */' >> calc_errno.h; \
+	else \
+	    ${CC} ${CCMAIN} -DTRY_ERRNO_NO_DECL \
+		  calc_errno.c -o calc_errno 2>calc_errno_tmp; \
+	    if [ -x ./calc_errno ]; then \
+		./calc_errno >> calc_errno.h; \
+	    else \
+		${CC} ${CCMAIN} -DTRY_ERRNO_STD_DECL \
+		      calc_errno.c -o calc_errno 2>calc_errno_tmp; \
+		if [ -x ./calc_errno ]; then \
+		    ./calc_errno >> calc_errno.h; \
+		else \
+		    ${CC} ${CCMAIN} -DTRY_ERRNO_OLD_DECL \
+			  calc_errno.c -o calc_errno 2>calc_errno_tmp; \
+		    if [ -x ./calc_errno ]; then \
+			./calc_errno >> calc_errno.h; \
+		    else \
+	    echo '/*' >> calc_errno.h; \
+	    echo ' * We were unable to to determine' >> calc_errno.h; \
+	    echo ' * how to declare errno and friends.' >> calc_errno.h; \
+	    echo ' * So we will guess this will work' >> calc_errno.h; \
+	    echo ' * and hope for the best.' >> calc_errno.h; \
+	    echo ' */' >> calc_errno.h; \
+	    echo '' >> calc_errno.h; \
+	    echo 'extern int errno;			' \
+		 '/* last system error */' >> calc_errno.h; \
+	    echo 'extern const char *const sys_errlist[];' \
+		 ' /* system error messages*/' >> calc_errno.h; \
+	    echo 'extern int sys_nerr;			' \
+		 '/* number of system errors */' >> calc_errno.h; \
+		    fi; \
+		fi; \
+	    fi; \
+	fi
+	${Q}echo '' >> calc_errno.h
+	${Q}echo '' >> calc_errno.h
+	${Q}echo '#endif /* !__CALC_ERRNO_H__ */' >> calc_errno.h
+	-${Q}rm -f calc_errno calc_errno_tmp
+	${Q}echo 'calc_errno.h formed'
+	-@if [ -z "${Q}" ]; then \
+	    echo ''; \
+	    echo '=-=-= start of $@ =-=-='; \
+	    cat $@; \
+	    echo '=-=-= end of $@ =-=-='; \
+	    echo ''; \
+	else \
+	    true; \
+	fi
+
 calcerr.h: calcerr.tbl calcerr_h.sed calcerr_h.awk ${MAKE_FILE}
 	-${Q}rm -f calerr.h
 	${Q}echo 'forming calcerr.h'
@@ -2227,7 +2288,7 @@ env:
 	@echo "HAVE_UID_T=${HAVE_UID_T}"; echo ""
 	@echo "HAVE_NEWSTR=${HAVE_NEWSTR}"; echo ""
 	@echo "ALIGN32=${ALIGN32}"; echo ""
-	@echo "MAIN=${MAIN}"; echo ""
+	@echo "ERRNO_DECL=${ERRNO_DECL}"; echo ""
 	@echo "BINDIR=${BINDIR}"; echo ""
 	@echo "TOPDIR=${TOPDIR}"; echo ""
 	@echo "LIBDIR=${LIBDIR}"; echo ""

README

@@ -4,6 +4,11 @@
 #
 # Arbitrary precision calculator.
 
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    NOTE: This is an old historic README.  We recommend that you
+	  read README.FIRST and HOWTO.INSTALL for more info.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 I am allowing this calculator to be freely distributed for your enjoyment.
 Like all multi-precision programs, you should not depend absolutely on
 its results, since bugs in such programs can be insidious and only rarely

README.FIRST

@@ -1,12 +1,17 @@
-Dear alpha tester,
+Dear calc user,
 
-Thanks for taking the time to try out this alpha version of calc!  We are
-interested in any/all feedback that you may have on this version.  In
-particular we would like to hear about:
+See the HOWTO.INSTALL file for information on how to build and install calc.
 
+To be sure that your version of calc is up to date, check out:
+
+	http://reality.sgi.com/chongo/calc/calc-download.html
+
+We are interested in any/all feedback on recent versions of calc.
+In particular we would like to hear about:
+
+    * compiler warnings
     * compile problems
     * regression test problems (try: make check)
-    * compiler warnings
     * special compile flags/options that you needed
     * Makefile problems
     * help file problems
@@ -15,38 +20,35 @@ particular we would like to hear about:
 We would like to offer a clean compile across a wide verity of platforms,
 so if you can test on several, so much the better!
 
-Calc distributions may be obtained from:
-
-	ftp://ftp.uu.net/pub/calc
-
-If you don't have ftp access to that site, or if you do not find a more
-recent version (you may have a special pre-released version that is
-more advanced than what is in the ftp archive) send EMail to:
-
-	chongo@toad.com
-
-Indicate the version you have and that you would like a more up
-to date version.
+If you run into problems, see the BUGS file.
 
 =-=
 
-Misc items TODO before Beta release:
+See the file:
 
-    * improve the coverage in the 'SEE ALSO' help file lists
+    help/todo
 
-    * where reasonable, be sure that regress.cal tests builtin functions
+or run:
 
-    * add the Blum-Blum-Shub random() generator code
+    calc 'help todo'
 
-    * add code to allow of the reading, writing and processing of binary data
+for a wish/todo list.  Code contributions are welcome.
 
-    * add shs, shs-1 and md5 hashing functions.  Use align32.h.
+=-=
 
-    * add mod h*2^n+/-1 function for integers
+To join the calc-tester mailing list.  Send a request to:
 
-    * be sure that CHANGES is up to date,
-      look over the help/todo file and update as needed,
-      revisit issues in the BUGS file and
-      change this file  :-)
+     calc-tester-request@postofc.corp.sgi.com
 
-    * clean the source code and document it better
+Your message body (not the subject) should consist of:
+
+     subscribe calc-tester address
+     end
+     name your_full_name
+
+where ``address'' is your EMail address and ``your_full_name'' is
+your full name.
+
+The calc web site is located at:
+
+	http://reality.sgi.com/chongo/calc

align32.c

@@ -30,7 +30,7 @@
 static void buserr(void);	/* catch alignment errors */
 
 
-MAIN
+int
 main(void)
 {
 	char byte[2*sizeof(USB32)];	/* mis-alignment buffer */
@@ -58,7 +58,8 @@ main(void)
 	   '/', '/');
 
 #endif
-	exit(0);
+	/* exit(0); */
+	return 0;
 }
 
 

block.c

@@ -71,7 +71,7 @@ static void blkchk(BLOCK*);
 BLOCK *
 blkalloc(int len, int chunk)
 {
-	BLOCK *new;	/* new block allocated */
+	BLOCK *nblk;	/* new block allocated */
 
 	/*
 	 * firewall
@@ -84,8 +84,8 @@ blkalloc(int len, int chunk)
 	/*
 	 * allocate BLOCK
 	 */
-	new = (BLOCK *)malloc(sizeof(BLOCK));
-	if (new == NULL) {
+	nblk = (BLOCK *)malloc(sizeof(BLOCK));
+	if (nblk == NULL) {
 		math_error("cannot allocate block");
 		/*NOTREACHED*/
 	}
@@ -93,23 +93,23 @@ blkalloc(int len, int chunk)
 	/*
 	 * initialize BLOCK
 	 */
-	new->blkchunk = chunk;
-	new->maxsize = ((len+chunk)/chunk)*chunk;
-	new->data = (USB8*)malloc(new->maxsize);
-	if (new->data == NULL) {
+	nblk->blkchunk = chunk;
+	nblk->maxsize = ((len+chunk)/chunk)*chunk;
+	nblk->data = (USB8*)malloc(nblk->maxsize);
+	if (nblk->data == NULL) {
 		math_error("cannot allocate block data storage");
 		/*NOTREACHED*/
 	}
-	memset(new->data, 0, new->maxsize);
-	new->datalen = len;
+	memset(nblk->data, 0, nblk->maxsize);
+	nblk->datalen = len;
 
 	/*
 	 * return BLOCK
 	 */
 	if (conf->calc_debug > 0) {
-		blkchk(new);
+		blkchk(nblk);
 	}
-	return new;
+	return nblk;
 }
 
 
@@ -227,7 +227,7 @@ blkchk(BLOCK *blk)
 BLOCK *
 blkrealloc(BLOCK *blk, int newlen, int newchunk)
 {
-	USB8 *new;	/* realloced storage */
+	USB8 *nblk;	/* realloced storage */
 	int newmax;	/* new maximum stoage size */
 
 	/*
@@ -258,20 +258,20 @@ blkrealloc(BLOCK *blk, int newlen, int newchunk)
 	if (newmax != blk->maxsize) {
 
 		/* reallocate new storage */
-		new = (USB8*)realloc(blk->data, newmax);
-		if (new == NULL) {
+		nblk = (USB8*)realloc(blk->data, newmax);
+		if (nblk == NULL) {
 			math_error("cannot reallocate block storage");
 			/*NOTREACHED*/
 		}
 
 		/* clear any new storage */
 		if (newmax > blk->maxsize) {
-			memset(new + blk->maxsize, 0, (newmax - blk->maxsize));
+			memset(nblk+blk->maxsize, 0, (newmax-blk->maxsize));
 		}
 		blk->maxsize = newmax;
 
 		/* restore the data pointers */
-		blk->data = new;
+		blk->data = nblk;
 	}
 
 	/*
@@ -391,13 +391,13 @@ blktrunc(BLOCK *blk)
 BLOCK *
 blk_copy(BLOCK *blk)
 {
-	BLOCK *new;		/* copy of blk */
+	BLOCK *nblk;		/* copy of blk */
 
 	/*
 	 * malloc new block
 	 */
-	new = (BLOCK *)malloc(sizeof(BLOCK));
-	if (new == NULL) {
+	nblk = (BLOCK *)malloc(sizeof(BLOCK));
+	if (nblk == NULL) {
 		math_error("blk_copy: cannot malloc BLOCK");
 		/*NOTREACHED*/
 	}
@@ -405,18 +405,18 @@ blk_copy(BLOCK *blk)
 	/*
 	 * duplicate most of the block
 	 */
-	*new = *blk;
+	*nblk = *blk;
 
 	/*
 	 * duplicate block data
 	 */
-	new->data = (USB8 *)malloc(blk->maxsize);
-	if (new->data == NULL) {
+	nblk->data = (USB8 *)malloc(blk->maxsize);
+	if (nblk->data == NULL) {
 		math_error("blk_copy: cannot duplicate block data");
 		/*NOTREACHED*/
 	}
-	memcpy(new->data, blk->data, blk->maxsize);
-	return new;
+	memcpy(nblk->data, blk->data, blk->maxsize);
+	return nblk;
 }
 
 

calc.c

@@ -67,7 +67,7 @@ static void intint(int arg);	/* interrupt routine */
 /*
  * Top level calculator routine.
  */
-MAIN
+int
 main(int argc, char **argv)
 {
 	static char *str;	/* current option string or expression */
@@ -301,8 +301,8 @@ main(int argc, char **argv)
 	 * all done
 	 */
 	libcalc_call_me_last();
-	exit(0);
-	/*NOTREACHED*/
+	/* exit(0); */
+	return 0;
 }
 
 

calc_errno.c

@@ -0,0 +1,123 @@
+/*
+ * errno - Determine how to declare errno, sys_errlist and sys_nerr
+ *
+ * On most machines: errno sys_errlist and sys_nerr are declared
+ * by either <stdio.h> and/or <errno.h>.  But some systems declare
+ * them somewhere else or do not declare them at all!
+ *
+ * If the system were doing a proper job in headers, this should declare them:
+ *
+ *	#include <stdio.h>
+ *	#include <errno.h>
+ *
+ * But one some systems one must explicitly declare them as:
+ *
+ *	extern int errno;
+ *	extern const char *const sys_errlist[];
+ *	extern int sys_nerr;
+ *
+ * and on some old systems they must be explicitly and incorrectly declared as:
+ *
+ *	extern int errno;
+ *	extern char *sys_errlist[];
+ *	extern int sys_nerr;
+ *
+ * The purpose of this utility is try and find the right way to declare
+ * them and to output the middle of a header file called calc_errno.h.
+ */
+
+/*
+ * 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 <stdio.h>
+#if defined(TRY_ERRNO_NO_DECL)
+#  include <errno.h>
+#endif /* TRY_ERRNO_NO_DECL */
+
+int
+main(void)
+{
+
+#if defined(TRY_ERRNO_NO_DECL)
+	printf("/*\n");
+	printf(" * The following comments were produced by calc_errno\n");
+	printf(" * in an effort to see if these values were correctly\n");
+	printf(" * declared when calc_errno.c was compiled.\n");
+	printf(" */\n\n");
+	printf("/* Initially errno is %d */\n", errno);
+	printf("/* There are %d entries in sys_errlist[] */\n", sys_nerr);
+	printf("/* The 2nd sys_errlist entry is \"%s\" */\n\n", sys_errlist[1]);
+	printf("/*\n");
+	printf(" * Based on the above, calc_errno now knows\n");
+	printf(" * how to declare errno and friends.\n");
+	printf(" */\n\n");
+	printf("#include <stdio.h>\n");
+	printf("#include <errno.h>\n");
+#elif defined(TRY_ERRNO_OLD_DECL)
+	extern int errno;		/* last system error */
+	extern char *sys_errlist[];	/* system error messages */
+	extern int sys_nerr;		/* number of system errors*/
+
+	printf("/*\n");
+	printf(" * The following comments were produced by calc_errno\n");
+	printf(" * in an effort to see if these values were correctly\n");
+	printf(" * declared when calc_errno.c was compiled.\n");
+	printf(" */\n\n");
+	printf("/* Initially errno is %d */\n", errno);
+	printf("/* There are %d entries in sys_errlist[] */\n", sys_nerr);
+	printf("/* The 2nd sys_errlist entry is \"%s\" */\n\n", sys_errlist[1]);
+	printf("/*\n");
+	printf(" * Based on the above, calc_errno now knows\n");
+	printf(" * how to declare errno and friends.\n");
+	printf(" */\n\n");
+	printf("extern int errno;\t\t/* last system error */\n");
+	printf("extern char *sys_errlist[];\t"
+	       "/* system error messages */\n");
+	printf("extern int sys_nerr;\t\t/* number of system errors*/\n");
+#else	/* assume defined(TRY_ERRNO_STD_DECL) */
+	extern int errno;			/* last system error */
+	extern const char *const sys_errlist[];	/* system error messages */
+	extern int sys_nerr;			/* number of system errors*/
+
+	printf("/*\n");
+	printf(" * The following comments were produced by calc_errno\n");
+	printf(" * in an effort to see if these values were correctly\n");
+	printf(" * declared when calc_errno.c was compiled.\n");
+	printf(" */\n\n");
+	printf("/* Initially errno is %d */\n", errno);
+	printf("/* There are %d entries in sys_errlist[] */\n", sys_nerr);
+	printf("/* The 2nd sys_errlist entry is \"%s\" */\n\n", sys_errlist[1]);
+	printf("/*\n");
+	printf(" * Based on the above, calc_errno now knows\n");
+	printf(" * how to declare errno and friends.\n");
+	printf(" */\n\n");
+	printf("extern int errno;\t\t\t/* last system error */\n");
+	printf("extern const char *const sys_errlist[];\t"
+	       "/* system error messages */\n");
+	printf("extern int sys_nerr;\t\t\t/* number of system errors*/\n");
+#endif
+
+	/* exit(0); */
+	return 0;
+}

check.awk

@@ -71,5 +71,9 @@ END {
     if (error > 0 && havebuf0) {
 	print buf0;
     }
-    exit (error > 0);
+    if (error > 0) {
+	exit(1);
+    } else {
+	exit(0);
+    }
 }

endian.c

@@ -39,41 +39,42 @@
 char byte[8] = { (char)0x12, (char)0x36, (char)0x48, (char)0x59,
 		 (char)0x01, (char)0x23, (char)0x45, (char)0x67 };
 
-MAIN
+int
 main(void)
 {
-    /* pointers into the byte order array */
-    int *intp = (int *)byte;
+	/* pointers into the byte order array */
+	int *intp = (int *)byte;
 #if defined(DEBUG)
-    short *shortp = (short *)byte;
-    long *longp = (long *)byte;
+	short *shortp = (short *)byte;
+	long *longp = (long *)byte;
 
-    printf("byte: %02x %02x %02x %02x %02x %02x %02x %02x\n",
-	byte[0], byte[1], byte[2], byte[3],
-	byte[4], byte[5], byte[6], byte[7]);
-    printf("short: %04x %04x %04x %04x\n",
-	shortp[0], shortp[1], shortp[2], shortp[3]);
-    printf("int: %08x %08x\n",
-	intp[0], intp[1]);
-    printf("long: %08x %08x\n",
-	longp[0], longp[1]);
+	printf("byte: %02x %02x %02x %02x %02x %02x %02x %02x\n",
+	    byte[0], byte[1], byte[2], byte[3],
+	    byte[4], byte[5], byte[6], byte[7]);
+	printf("short: %04x %04x %04x %04x\n",
+	    shortp[0], shortp[1], shortp[2], shortp[3]);
+	printf("int: %08x %08x\n",
+	    intp[0], intp[1]);
+	printf("long: %08x %08x\n",
+	    longp[0], longp[1]);
 #endif
 
-    /* Print the standard <machine/endian.h> defines */
-    printf("#define BIG_ENDIAN\t4321\n");
-    printf("#define LITTLE_ENDIAN\t1234\n");
+	/* Print the standard <machine/endian.h> defines */
+	printf("#define BIG_ENDIAN\t4321\n");
+	printf("#define LITTLE_ENDIAN\t1234\n");
 
-    /* Determine byte order */
-    if (intp[0] == 0x12364859) {
-	/* Most Significant Byte first */
-	printf("#define CALC_BYTE_ORDER\tBIG_ENDIAN\n");
-    } else if (intp[0] == 0x59483612) {
-	/* Least Significant Byte first */
-	printf("#define CALC_BYTE_ORDER\tLITTLE_ENDIAN\n");
-    } else {
-	fprintf(stderr,
-	    "Unknown int Byte Order, set CALC_BYTE_ORDER in Makefile\n");
-	exit(1);
-    }
-    exit(0);
+	/* Determine byte order */
+	if (intp[0] == 0x12364859) {
+	    /* Most Significant Byte first */
+	    printf("#define CALC_BYTE_ORDER\tBIG_ENDIAN\n");
+	} else if (intp[0] == 0x59483612) {
+	    /* Least Significant Byte first */
+	    printf("#define CALC_BYTE_ORDER\tLITTLE_ENDIAN\n");
+	} else {
+	    fprintf(stderr,
+		"Unknown int Byte Order, set CALC_BYTE_ORDER in Makefile\n");
+	    exit(1);
+	}
+	/* exit(0); */
+	return 0; 
 }

file.c

@@ -1141,6 +1141,7 @@ rewindall(void)
  *
  * NOTE: Does not support negative file positions.
  */
+/*ARGSUSED*/
 static ZVALUE
 filepos2z(FILEPOS pos)
 {
@@ -1493,6 +1494,7 @@ setloc(FILEID id, ZVALUE zpos)
  * returns:
  *	file size as a ZVALUE
  */
+/*ARGSUSED*/
 static ZVALUE
 off_t2z(off_t siz)
 {
@@ -1555,6 +1557,7 @@ dev2z(dev_t dev)
  * returns:
  *	file size as a ZVALUE
  */
+/*ARGSUSED*/
 static ZVALUE
 inode2z(ino_t inode)
 {
@@ -1841,7 +1844,8 @@ getscanfield(FILE *fp, BOOL skip, unsigned int width, int scannum, char *scanptr
 			if (c == EOF || c == '\0')
 				break;
 			chnum++;
-			if(scannum && (memchr(scanptr,c,scannum)==NULL) ^ comp)
+			if(scannum &&
+			   ((memchr(scanptr,c,scannum)==NULL) ^ comp))
 				break;
 			if (!skip) {
 				*b++ = c;
@@ -1918,7 +1922,7 @@ getscanwhite(FILE *fp, BOOL skip, unsigned int width, int scannum, char **strptr
 			if (c == EOF || c == '\0')
 				break;
 			chnum++;
-			if(scannum && !isspace(c) ^ comp)
+			if(scannum && (!isspace(c) ^ comp))
 				break;
 			if (!skip) {
 				*b++ = c;
@@ -1980,11 +1984,11 @@ fscanfile(FILE *fp, char *fmt, int count, VALUE **vals)
 	for (;;) {
 		for (;;) {
 			f = *fmt++;
-			if (isspace(f)) {
+			if (isspace((int)f)) {
 				getscanwhite(fp,1,0,6,NULL);
 				do {
 					f = *fmt++;
-				} while (isspace(f));
+				} while (isspace((int)f));
 			}
 			c = fgetc(fp);
 			if (c == EOF)

fposval.c

@@ -60,7 +60,7 @@
 
 char *program;			/* our name */
 
-MAIN
+int
 main(int argc, char **argv)
 {
 	int stsizelen;		/* bit length of st_size in buf */
@@ -225,5 +225,6 @@ main(int argc, char **argv)
 	printf("#define SWAP_HALF_IN_INODE(dest, src)\t%s%d%s\n",
 	    "memcpy((void *)(dest), (void *)(src), sizeof(",inodelen,"))");
 #endif /* CALC_BYTE_ORDER == BIG_ENDIAN */
-	exit(0);
+	/* exit(0); */
+	return 0;
 }

func.c

@@ -13,11 +13,12 @@
 
 #if defined(FUNCLIST)
 
-#include <stdio.h>
 #define CONST /* disabled for FUNCLIST in case NATIVE_CC doesn't have it */
 
 #else /* FUNCLIST */
 
+#include "calc_errno.h"
+
 #include "have_unistd.h"
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
@@ -77,9 +78,6 @@ static VALUE f_fsize(VALUE *vp);
 /*
  * external declarations
  */
-extern int errno;				/* last system error */
-extern char *sys_errlist[];			/* system error messages */
-extern int sys_nerr;				/* number of system errors */
 extern char cmdbuf[];				/* command line expression */
 extern CONST char *error_table[E__COUNT+2];	/* calc coded error messages */
 extern void matrandperm(MATRIX *M);
@@ -4838,14 +4836,14 @@ strscan(char *s, int count, VALUE **vals)
 	while (*s != '\0') {
 		s--;
 		while ((ch = *++s)) {
-			if (!isspace(ch))
+			if (!isspace((int)ch))
 				break;
 		}
 		if (ch == '\0' || count-- == 0)
 			return n;
 		s0 = s;
 		while ((ch = *++s)) {
-			if (isspace(ch))
+			if (isspace((int)ch))
 				break;
 		}
 		chtmp = ch;

hash.c

@@ -147,13 +147,13 @@ hash_free(HASH *state)
 HASH *
 hash_copy(HASH *state)
 {
-	HASH *new;		/* copy of state */
+	HASH *hnew;		/* copy of state */
 
 	/*
 	 * malloc new state
 	 */
-	new = (HASH *)malloc(sizeof(HASH));
-	if (new == NULL) {
+	hnew = (HASH *)malloc(sizeof(HASH));
+	if (hnew == NULL) {
 		math_error("hash_init: cannot malloc HASH");
 		/*NOTREACHED*/
 	}
@@ -161,8 +161,8 @@ hash_copy(HASH *state)
 	/*
 	 * duplicate state
 	 */
-	memcpy((void *)new, (void *)state, sizeof(HASH));
-	return new;
+	memcpy((void *)hnew, (void *)state, sizeof(HASH));
+	return hnew;
 }
 
 

have_const.c

@@ -42,7 +42,7 @@
 
 #include <stdio.h>
 
-MAIN
+int
 main(void)
 {
 #if defined(HAVE_NO_CONST)
@@ -56,5 +56,6 @@ main(void)
 	printf("#undef CONST\n");
 	printf("#define CONST %s /* yes */\n", str);
 #endif /* HAVE_NO_CONST */
-	exit(0);
+	/* exit(0); */
+	return 0;
 }

have_fpos.c

@@ -32,22 +32,23 @@
 
 #include <stdio.h>
 
-MAIN
+int
 main(void)
 {
 #if !defined(HAVE_NO_FPOS)
-    fpos_t pos;		/* file position */
+	fpos_t pos;		/* file position */
 
-    /* get the current position */
-    (void) fgetpos(stdin, &pos);
+	/* get the current position */
+	(void) fgetpos(stdin, &pos);
 
-    /* set the current position */
-    (void) fsetpos(stdin, &pos);
+	/* set the current position */
+	(void) fsetpos(stdin, &pos);
 
-    /* print a have_fpos.h body that says we have the functions */
-    printf("#undef HAVE_FPOS\n");
-    printf("#define HAVE_FPOS 1  /* yes */\n\n");
-    printf("typedef fpos_t FILEPOS;\n");
+	/* print a have_fpos.h body that says we have the functions */
+	printf("#undef HAVE_FPOS\n");
+	printf("#define HAVE_FPOS 1  /* yes */\n\n");
+	printf("typedef fpos_t FILEPOS;\n");
 #endif
-    exit(0);
+	/* exit(0); */
+	return 0;
 }

have_memmv.c

@@ -44,7 +44,7 @@
 char src[] = "chongo was here";
 char dest[MOVELEN+1];
 
-MAIN
+int
 main(void)
 {
 #if defined(HAVE_NO_MEMMOVE)
@@ -54,5 +54,6 @@ main(void)
 
 	printf("#define HAVE_MEMMOVE /* yes */\n");
 #endif /* HAVE_NO_MEMMOVE */
-	exit(0);
+	/* exit(0); */
+	return 0;
 }

have_newstr.c

@@ -46,7 +46,7 @@
 char src[] = "chongo was here";
 char dest[MOVELEN+1];
 
-MAIN
+int
 main(void)
 {
 #if defined(HAVE_NO_NEWSTR)
@@ -58,5 +58,6 @@ main(void)
 
 	printf("#define HAVE_NEWSTR /* yes */\n");
 #endif /* HAVE_NO_NEWSTR */
-	exit(0);
+	/* exit(0); */
+	return 0;
 }

have_offscl.c

@@ -45,7 +45,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-MAIN
+int
 main(void)
 {
 #if !defined(OFF_T_NON_SCALAR)
@@ -79,5 +79,6 @@ main(void)
 #else
 	printf("#undef HAVE_OFF_T_SCALAR /* off_t is not a simple value */\n");
 #endif
-	exit(0);
+	/* exit(0); */
+	return 0;
 }

have_posscl.c

@@ -46,7 +46,7 @@
 #include <sys/stat.h>
 #include "have_fpos.h"
 
-MAIN
+int
 main(void)
 {
 #if !defined(FILEPOS_NON_SCALAR)
@@ -80,5 +80,6 @@ main(void)
 #else
 	printf("#undef HAVE_FILEPOS_SCALAR /* FILEPOS is not a simple value */\n");
 #endif
-	exit(0);
+	/* exit(0); */
+	return 0;
 }

have_stdvs.c

@@ -54,86 +54,88 @@ char buf[BUFSIZ];
 
 
 void
-try(char *fmt, ...)
+try_this(char *fmt, ...)
 {
-    va_list ap;
+	va_list ap;
 
-    va_start(ap, fmt);
+	va_start(ap, fmt);
 #if !defined(DONT_HAVE_VSPRINTF)
-    vsprintf(buf, fmt, ap);
+	vsprintf(buf, fmt, ap);
 #else
-    sprintf(buf, fmt, ap);
+	sprintf(buf, fmt, ap);
 #endif
-    va_end(ap);
+	va_end(ap);
 }
 
 
-MAIN
+int
 main(void)
 {
-    /*
-     * setup
-     */
-    buf[0] = '\0';
+	/*
+	 * setup
+	 */
+	buf[0] = '\0';
 
-    /*
-     * test variable args and vsprintf/sprintf
-     */
-    try("@%d:%s:%d@", 1, "hi", 2);
-    if (strcmp(buf, "@1:hi:2@") != 0) {
+	/*
+	 * test variable args and vsprintf/sprintf
+	 */
+	try_this("@%d:%s:%d@", 1, "hi", 2);
+	if (strcmp(buf, "@1:hi:2@") != 0) {
 #if !defined(DONT_HAVE_VSPRINTF)
-	/* <stdarg.h> with vsprintf() didn't work */
+	    /* <stdarg.h> with vsprintf() didn't work */
 #else
-	/* <stdarg.h> with sprintf() simulating vsprintf() didn't work */
+	    /* <stdarg.h> with sprintf() simulating vsprintf() didn't work */
 #endif
-	exit(1);
-    }
-    try("%s %d%s%d%d %s",
-	"Landon Noll 1st proved that", 2, "^", 23209, -1, "was prime");
-    if (strcmp(buf, "Landon Noll 1st proved that 2^23209-1 was prime") != 0) {
+	    exit(1);
+	}
+	try_this("%s %d%s%d%d %s",
+	    "Landon Noll 1st proved that", 2, "^", 23209, -1, "was prime");
+	if (strcmp(buf,
+		   "Landon Noll 1st proved that 2^23209-1 was prime") != 0) {
 #if !defined(DONT_HAVE_VSPRINTF)
-	/* <stdarg.h> with vsprintf() didn't work */
+	    /* <stdarg.h> with vsprintf() didn't work */
 #else
-	/* <stdarg.h> with sprintf() simulating vsprintf() didn't work */
+	    /* <stdarg.h> with sprintf() simulating vsprintf() didn't work */
 #endif
-	exit(1);
-    }
+	    exit(1);
+	}
 
-    /*
-     * report the result
-     */
-    puts("/* what type of variable args do we have? */");
+	/*
+	 * report the result
+	 */
+	puts("/* what type of variable args do we have? */");
 #if defined(DONT_HAVE_VSPRINTF)
-    puts("/*");
-    puts(" * SIMULATE_STDARG");
-    puts(" *");
-    puts(" * WARNING: This type of stdarg makes assumptions about the stack");
-    puts(" * 	    that may not be true on your system.  You may want to");
-    puts(" *	    define STDARG (if using ANSI C) or VARARGS.");
-    puts(" */");
-    puts("typedef char *va_list;");
-    puts("#define va_start(ap,parmn) (void)((ap) = (char*)(&(parmn) + 1))");
-    puts("#define va_end(ap) (void)((ap) = 0)");
-    puts("#define va_arg(ap, type) \\");
-    puts("        (((type*)((ap) = ((ap) + sizeof(type))))[-1])");
-    puts("#define SIMULATE_STDARG /* use std_arg.h to simulate <stdarg.h> */");
+	puts("/*");
+	puts(" * SIMULATE_STDARG");
+	puts(" *");
+	puts(" * WARNING: This type of stdarg makes assumptions about the stack");
+	puts(" * 	    that may not be true on your system.  You may want to");
+	puts(" *	    define STDARG (if using ANSI C) or VARARGS.");
+	puts(" */");
+	puts("typedef char *va_list;");
+	puts("#define va_start(ap,parmn) (void)((ap) = (char*)(&(parmn) + 1))");
+	puts("#define va_end(ap) (void)((ap) = 0)");
+	puts("#define va_arg(ap, type) \\");
+	puts("        (((type*)((ap) = ((ap) + sizeof(type))))[-1])");
+	puts("#define SIMULATE_STDARG /* use std_arg.h to simulate <stdarg.h> */");
 #else
-    puts("#define STDARG /* use <stdarg.h> */");
-    puts("#include <stdarg.h>");
+	puts("#define STDARG /* use <stdarg.h> */");
+	puts("#include <stdarg.h>");
 #endif
-    puts("\n/* should we use vsprintf()? */");
+	puts("\n/* should we use vsprintf()? */");
 #if !defined(DONT_HAVE_VSPRINTF)
-    puts("#define HAVE_VS /* yes */");
+	puts("#define HAVE_VS /* yes */");
 #else
-    puts("/*");
-    puts(" * Hack aleart!!!");
-    puts(" *");
-    puts(" * Systems that do not have vsprintf() need something.  In some");
-    puts(" * cases the sprintf function will deal correctly with the");
-    puts(" * va_alist 3rd arg.  Hope for the best!");
-    puts(" */");
-    puts("#define vsprintf sprintf");
-    puts("#undef HAVE_VS");
+	puts("/*");
+	puts(" * Hack aleart!!!");
+	puts(" *");
+	puts(" * Systems that do not have vsprintf() need something.  In some");
+	puts(" * cases the sprintf function will deal correctly with the");
+	puts(" * va_alist 3rd arg.  Hope for the best!");
+	puts(" */");
+	puts("#define vsprintf sprintf");
+	puts("#undef HAVE_VS");
 #endif
-    exit(0);
+	/* exit(0); */
+	return 0;
 }

have_uid_t.c

@@ -47,7 +47,7 @@
 #include <sys/types.h>
 #endif /* ! HAVE_NO_UID_T */
 
-MAIN
+int
 main(void)
 {
 #if defined(HAVE_NO_UID_T)
@@ -60,5 +60,6 @@ main(void)
 
 	printf("#define HAVE_UID_T /* yes */\n");
 #endif /* HAVE_NO_UID_T */
-	exit(0);
+	/* exit(0); */
+	return 0;
 }

have_varvs.c

@@ -52,7 +52,7 @@ char buf[BUFSIZ];
 #include <varargs.h>
 
 void
-try(char *fmt, ...)
+try_this(char *fmt, ...)
 {
     va_list ap;
 
@@ -68,7 +68,7 @@ try(char *fmt, ...)
 #else
 
 void
-try(char *a, int b, char *c, int d)
+try_this(char *a, int b, char *c, int d)
 {
     return;
 }
@@ -76,56 +76,58 @@ try(char *a, int b, char *c, int d)
 #endif
 
 
-MAIN
+int
 main(void)
 {
-    /*
-     * setup
-     */
-    buf[0] = '\0';
+	/*
+	 * setup
+	 */
+	buf[0] = '\0';
 
-    /*
-     * test variable args and vsprintf/sprintf
-     */
-    try("@%d:%s:%d@", 1, "hi", 2);
-    if (strcmp(buf, "@1:hi:2@") != 0) {
+	/*
+	 * test variable args and vsprintf/sprintf
+	 */
+	try_this("@%d:%s:%d@", 1, "hi", 2);
+	if (strcmp(buf, "@1:hi:2@") != 0) {
 #if !defined(DONT_HAVE_VSPRINTF)
-	/* <varargs.h> with vsprintf() didn't work */
+	    /* <varargs.h> with vsprintf() didn't work */
 #else
-	/* <varargs.h> with sprintf() simulating vsprintf() didn't work */
+	    /* <varargs.h> with sprintf() simulating vsprintf() didn't work */
 #endif
-	exit(1);
-    }
-    try("%s %d%s%d%d %s",
-	"Landon Noll 1st proved that", 2, "^", 23209, -1, "was prime");
-    if (strcmp(buf, "Landon Noll 1st proved that 2^23209-1 was prime") != 0) {
+	    exit(1);
+	}
+	try_this("%s %d%s%d%d %s",
+	    "Landon Noll 1st proved that", 2, "^", 23209, -1, "was prime");
+	if (strcmp(buf,
+		   "Landon Noll 1st proved that 2^23209-1 was prime") != 0) {
 #if !defined(DONT_HAVE_VSPRINTF)
-	/* <stdarg.h> with vsprintf() didn't work */
+	    /* <stdarg.h> with vsprintf() didn't work */
 #else
-	/* <stdarg.h> with sprintf() simulating vsprintf() didn't work */
+	    /* <stdarg.h> with sprintf() simulating vsprintf() didn't work */
 #endif
-	exit(1);
-    }
+	    exit(1);
+	}
 
-    /*
-     * report the result
-     */
-    puts("/* what type of variable args do we have? */");
-    puts("#define VARARGS /* use <varargs.h> */");
-    puts("#include <varargs.h>");
-    puts("\n/* should we use vsprintf()? */");
+	/*
+	 * report the result
+	 */
+	puts("/* what type of variable args do we have? */");
+	puts("#define VARARGS /* use <varargs.h> */");
+	puts("#include <varargs.h>");
+	puts("\n/* should we use vsprintf()? */");
 #if !defined(DONT_HAVE_VSPRINTF)
-    puts("#define HAVE_VS /* yes */");
+	puts("#define HAVE_VS /* yes */");
 #else
-    puts("/*");
-    puts(" * Hack aleart!!!");
-    puts(" *");
-    puts(" * Systems that do not have vsprintf() need something.  In some");
-    puts(" * cases the sprintf function will deal correctly with the");
-    puts(" * va_alist 3rd arg.  Hope for the best!");
-    puts(" */");
-    puts("#define vsprintf sprintf");
-    puts("#undef HAVE_VS");
+	puts("/*");
+	puts(" * Hack aleart!!!");
+	puts(" *");
+	puts(" * Systems that do not have vsprintf() need something.  In some");
+	puts(" * cases the sprintf function will deal correctly with the");
+	puts(" * va_alist 3rd arg.  Hope for the best!");
+	puts(" */");
+	puts("#define vsprintf sprintf");
+	puts("#undef HAVE_VS");
 #endif
-    exit(0);
+	/* exit(0); */
+	return 0;
 }

help/todo

@@ -235,3 +235,11 @@ Needed enhancements
       One should make available a the fundimental math operations
       on ZVALUE, NUMBER and perhaps COMPLEX (without all of the
       other stuff) in a separate library.
+
+    * improve the coverage in the 'SEE ALSO' help file lists
+
+    * where reasonable, be sure that regress.cal tests builtin functions
+
+    * add mod h*2^n+/-1 function for integers
+
+    * clean the source code and document it better

hist.c

@@ -421,12 +421,12 @@ do_map_line(char *line)
 	char	*map_name;
 
 	cp = line;
-	while (isspace(*cp))
+	while (isspace((int)*cp))
 		cp++;
 	if (*cp == '\0')
 		return NULL;
 	map_name = cp;
-	while ((*cp != '\0') && !isspace(*cp))
+	while ((*cp != '\0') && !isspace((int)*cp))
 		cp++;
 	*cp = '\0';
 	return find_map(map_name);
@@ -461,7 +461,7 @@ do_bind_line(KEY_MAP *map, char *line)
 	else if (key == '\\')
 		key = *cp++;
 
-	while (isspace(*cp))
+	while (isspace((int)*cp))
 		cp++;
 	if (*cp == '\0') {
 		unbind_key(map, key);
@@ -469,11 +469,11 @@ do_bind_line(KEY_MAP *map, char *line)
 	}
 
 	func_name = cp;
-	while ((*cp != '\0') && !isspace(*cp))
+	while ((*cp != '\0') && !isspace((int)*cp))
 		cp++;
 	if (*cp) {
 		*cp++ = '\0';
-		while (isspace(*cp))
+		while (isspace((int)*cp))
 			cp++;
 	}
 	func = find_func(func_name);
@@ -488,11 +488,11 @@ do_bind_line(KEY_MAP *map, char *line)
 			next = base_map;
 	} else {
 		next_name = cp;
-		while ((*cp != '\0') && !isspace(*cp))
+		while ((*cp != '\0') && !isspace((int)*cp))
 			cp++;
 		if (*cp) {
 			*cp++ = '\0';
-			while (isspace(*cp))
+			while (isspace((int)*cp))
 				cp++;
 		}
 		next = find_map(next_name);
@@ -515,18 +515,18 @@ do_default_line(KEY_MAP *map, char *line)
 	if (map == NULL)
 		return;
 	cp = line;
-	while (isspace(*cp))
+	while (isspace((int)*cp))
 		cp++;
 	if (*cp == '\0')
 		return;
 
 	func_name = cp;
-	while ((*cp != '\0') && !isspace(*cp))
+	while ((*cp != '\0') && !isspace((int)*cp))
 		cp++;
 	if (*cp != '\0')
 	{
 		*cp++ = '\0';
-		while (isspace(*cp))
+		while (isspace((int)*cp))
 			cp++;
 	}
 	func = find_func(func_name);
@@ -538,12 +538,12 @@ do_default_line(KEY_MAP *map, char *line)
 	else
 	{
 		next_name = cp;
-		while ((*cp != '\0') && !isspace(*cp))
+		while ((*cp != '\0') && !isspace((int)*cp))
 			cp++;
 		if (*cp != '\0')
 		{
 			*cp++ = '\0';
-			while (isspace(*cp))
+			while (isspace((int)*cp))
 				cp++;
 		}
 		next = find_map(next_name);
@@ -577,7 +577,7 @@ read_bindings(FILE *fp)
 
 	while (fgets(line, sizeof(line) - 1, fp)) {
 		cp = line;
-		while (isspace(*cp))
+		while (isspace((int)*cp))
 			cp++;
 
 		if ((*cp == '\0') || (*cp == '#') || (*cp == '\n'))

lib_util.c

@@ -241,8 +241,8 @@ convhex2z(char *hex)
 		/* slen is even now */
 
 		/* eat two hex chars at a time until the HALF is full */
-		for (; (slen % (BASEB/4)) != 0; slen -= 2) {
-			*hp = ((*hp<<8) | hex2bin(*sp++, *sp++));
+		for (; (slen % (BASEB/4)) != 0; slen -= 2, sp += 2) {
+			*hp = ((*hp<<8) | hex2bin(sp[0], sp[1]));
 		}
 
 		/* move on to the next HALF */

longbits.c

@@ -97,9 +97,15 @@
 
 #include "longlong.h"
 
+#if defined(__linux)
+# if !defined(isascii)
+   extern int isascii(int c);
+# endif /* !isascii */
+#endif /* __linux */
+
 char *program;		/* our name */
 
-MAIN
+int
 main(int argc, char **argv)
 {
 	int exitcode = 0;	/* how we will exit */
@@ -118,7 +124,7 @@ main(int argc, char **argv)
 	case 2:
 		/* ignore empty or leading space args */
 		if (argv[1][0] == '\0' ||
-		    (isascii(argv[1][0]) && isspace(argv[1][0]))) {
+		    (isascii((int)argv[1][0]) && isspace((int)argv[1][0]))) {
 			long_bits = sizeof(long)*8;
 		/* process the forced size arg */
 		} else {
@@ -356,5 +362,6 @@ main(int argc, char **argv)
 	}
 
 	/* all done */
-	exit(exitcode);
+	/* exit(exitcode); */
+	return exitcode;
 }

longlong.c

@@ -66,7 +66,7 @@ unsigned long long val = 4294967297ULL;
 long long val2 = -4294967297LL;
 
 
-MAIN
+int
 main(int argc, char **argv)
 {
 	int longlong_bits;	/* bits in a long long, or <=0 => dont use */
@@ -100,5 +100,6 @@ main(int argc, char **argv)
 			    longlong_bits);
 		}
 	}
-	exit(0);
+	/* exit(0); */
+	return 0;
 }

qfunc.c

@@ -1284,7 +1284,7 @@ qcfsim(NUMBER *q, long rnd)
 	zmodinv(q->num, q->den, &den1);
 	if (s >= 0) {
 		zsub(q->den, den1, &den2);
-		if (s > 0 || ((zrel(den1, den2) < 0) ^ !(rnd & 16))) {
+		if (s > 0 || ((zrel(den1, den2) < 0) ^ (!(rnd & 16)))) {
 			zfree(den1);
 			res->den = den2;
 			zmul(den2, q->num, &tmp1);

sample/Makefile

@@ -95,18 +95,6 @@ TOPDIR= /usr/local/lib
 LIBDIR= ${TOPDIR}/calc
 HELPDIR= ${LIBDIR}/help
 
-# The return value type of main() differs from platform to platform.
-# In some cases, a compiler warning is issued because main() does
-# or does not return a value.
-#
-# MAIN= -DMAIN=void     main() is of type void
-# MAIN= -DMAIN=int      main() is of type int
-#
-# When in doubt, try MAIN= -DMAIN=void.  If you get a warning try the other.
-#
-MAIN= -DMAIN=void
-#MAIN= -DMAIN=int
-
 # Normally, the upper level makefile will set these values.  We provide
 # a default here just in case you want to build from this directory.
 #
@@ -251,7 +239,7 @@ CCMISC=
 CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} ${ALLOW_CUSTOM}
 ICFLAGS= ${CCWARN} ${CCMISC}
 #
-CCMAIN= ${ICFLAGS} ${MAIN}
+CCMAIN= ${ICFLAGS}
 #
 LCFLAGS=
 LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}

sample/many_random.c

@@ -59,7 +59,7 @@ typedef struct {
 extern char *program;	/* our name */
 
 
-MAIN
+int
 main(int argc, char **argv)
 {
 	RANDOM *prev_state;	/* previous random number state */
@@ -176,5 +176,6 @@ main(int argc, char **argv)
 	/*
 	 * all done
 	 */
-	exit(0);
+	/* exit(0); */
+	return 0;
 }

sample/test_random.c

@@ -57,7 +57,7 @@ typedef struct {
 extern char *program;	/* our name */
 
 
-MAIN
+int
 main(int argc, char **argv)
 {
 	RANDOM *prev_state;	/* previous random number state */
@@ -121,5 +121,6 @@ main(int argc, char **argv)
 	/*
 	 * all done
 	 */
-	exit(0);
+	/* exit(0); */
+	return 0;
 }

shs.c

@@ -598,7 +598,7 @@ shs_final_state(HASH *state)
 	/*
 	 * load ZVALUE
 	 */
-#if BASEB == 16
+#if BASEB == 16 && CALC_BYTE_ORDER == LITTLE_ENDIAN
 	for (i=0; i < ret.len; i+=2) {
 		ret.v[ret.len-i-1] = ((HALF*)dig->digest)[i+1];
 		ret.v[ret.len-i-2] = ((HALF*)dig->digest)[i];

shs1.c

@@ -574,7 +574,7 @@ shs1_final_state(HASH *state)
 	/*
 	 * load ZVALUE
 	 */
-#if BASEB == 16
+#if BASEB == 16 && CALC_BYTE_ORDER == LITTLE_ENDIAN
 	for (i=0; i < ret.len; i+=2) {
 		ret.v[ret.len-i-1] = ((HALF*)dig->digest)[i+1];
 		ret.v[ret.len-i-2] = ((HALF*)dig->digest)[i];

version.c

@@ -10,9 +10,9 @@
 #include "calc.h"
 
 #define MAJOR_VER	2	/* major version */
-#define MINOR_VER	10	/* minor version */
-#define MAJOR_PATCH	3	/* patch level or 0 if no patch */
-#define MINOR_PATCH	"t5.46"	/* test number or empty string if no patch */
+#define MINOR_VER	11	/* minor version */
+#define MAJOR_PATCH	0	/* patch level or 0 if no patch */
+#define MINOR_PATCH	"3"	/* test number or empty string if no patch */
 
 /*
  * calc version constants

zfunc.c

@@ -1522,7 +1522,7 @@ zsqrt(ZVALUE z, ZVALUE *dest, long rnd)
 	u = (HALF)(s ? BASE1 : 0);
 	if (k < BASEB) {
 		A[m1 - 1] = (HALF)(e >> (BASEB - 1));
-		A[m1 - 2] = (HALF)(e << 1 | (s > 0));
+		A[m1 - 2] = ((HALF)(e << 1) | (HALF)(s > 0));
 		A[m1 - 3] = (HALF)(f >> BASEB);
 		A[m1 - 4] = (HALF)f;
 		m = m1 - 2;
@@ -1531,7 +1531,7 @@ zsqrt(ZVALUE z, ZVALUE *dest, long rnd)
 	else {
 		A[m1 - 1] = 1;
 		A[m1 - 2] = (HALF)(e >> (BASEB - 1));
-		A[m1 - 3] = (HALF)(e << 1 | (s > 0));
+		A[m1 - 3] = ((HALF)(e << 1) | (HALF)(s > 0));
 		A[m1 - 4] = u;
 		A[m1 - 5] = (HALF)(f >> BASEB);
 		A[m1 - 6] = (HALF)f;
@@ -1585,7 +1585,7 @@ zsqrt(ZVALUE z, ZVALUE *dest, long rnd)
 				if (x & TOPHALF)
 					a[1] |= 1;
 			}
-			*a = (HALF)((x << 1) | (u > 0));
+			*a = ((HALF)(x << 1) | (HALF)(u > 0));
 		}
 		else
 			*a = u;
@@ -1683,7 +1683,7 @@ done:	if (s == 0) {
 void
 zroot(ZVALUE z1, ZVALUE z2, ZVALUE *dest)
 {
-	ZVALUE try, quo, old, temp, temp2;
+	ZVALUE ztry, quo, old, temp, temp2;
 	ZVALUE k1;			/* holds k - 1 */
 	int sign;
 	long i;
@@ -1733,12 +1733,12 @@ zroot(ZVALUE z1, ZVALUE z2, ZVALUE *dest)
 	 * is unimportant.
 	 */
 	highbit = (highbit + k - 1) / k;
-	try.len = (highbit / BASEB) + 1;
-	try.v = alloc(try.len);
-	zclearval(try);
-	try.v[try.len-1] = ((HALF)1 << (highbit % BASEB));
-	try.sign = 0;
-	old.v = alloc(try.len);
+	ztry.len = (highbit / BASEB) + 1;
+	ztry.v = alloc(ztry.len);
+	zclearval(ztry);
+	ztry.v[ztry.len-1] = ((HALF)1 << (highbit % BASEB));
+	ztry.sign = 0;
+	old.v = alloc(ztry.len);
 	old.len = 1;
 	zclearval(old);
 	old.sign = 0;
@@ -1746,10 +1746,10 @@ zroot(ZVALUE z1, ZVALUE z2, ZVALUE *dest)
 	 * Main divide and average loop
 	 */
 	for (;;) {
-		zpowi(try, k1, &temp);
+		zpowi(ztry, k1, &temp);
 		zquo(z1, temp, &quo, 0);
 		zfree(temp);
-		i = zrel(try, quo);
+		i = zrel(ztry, quo);
 		if (i <= 0) {
 			/*
 			 * Current try is less than or equal to the root since it is
@@ -1758,24 +1758,24 @@ zroot(ZVALUE z1, ZVALUE z2, ZVALUE *dest)
 			 * we are done since no improvement occurred.
 			 * If not, save the improved value and loop some more.
 			 */
-			if ((i == 0) || (zcmp(old, try) == 0)) {
+			if ((i == 0) || (zcmp(old, ztry) == 0)) {
 				zfree(quo);
 				zfree(old);
-				try.sign = (BOOL)((HALF)sign);
-				zquicktrim(try);
-				*dest = try;
+				ztry.sign = (BOOL)((HALF)sign);
+				zquicktrim(ztry);
+				*dest = ztry;
 				return;
 			}
-			old.len = try.len;
-			zcopyval(try, old);
+			old.len = ztry.len;
+			zcopyval(ztry, old);
 		}
 		/* average current try and quotent for the new try */
-		zmul(try, k1, &temp);
-		zfree(try);
+		zmul(ztry, k1, &temp);
+		zfree(ztry);
 		zadd(quo, temp, &temp2);
 		zfree(temp);
 		zfree(quo);
-		zquo(temp2, z2, &try, 0);
+		zquo(temp2, z2, &ztry, 0);
 		zfree(temp2);
 	}
 }

zmath.h

@@ -577,7 +577,7 @@ typedef struct {
  */
 #if FULL_BITS == 64
 
-# if defined(__STDC__) && __STDC__ != 0
+# if (defined(__STDC__) && __STDC__ != 0) || defined(__cplusplus)
 #  define HVAL(a,b) (HALF)(0x ## a ## b)
 # else
 #  define HVAL(a,b) (HALF)(0x/**/a/**/b)
@@ -585,7 +585,7 @@ typedef struct {
 
 #elif 2*FULL_BITS == 64
 
-# if defined(__STDC__) && __STDC__ != 0
+# if (defined(__STDC__) && __STDC__ != 0) || defined(__cplusplus)
 #  define HVAL(a,b) (HALF)0x##b, (HALF)0x##a
 # else
    /* NOTE: Due to a SunOS cc bug, don't put spaces in the HVAL call! */

zprime.c

@@ -778,8 +778,8 @@ small_factor(ZVALUE z, FULL limit)
 #if BASEB == 32
 		div.v[0] = (HALF)factor;
 #else
-		div.v[0] = (factor & BASE1);
-		div.v[1] = (factor >> BASEB);
+		div.v[0] = (HALF)(factor & BASE1);
+		div.v[1] = (HALF)(factor >> BASEB);
 #endif
 
 		if (zdivides(z, div))
@@ -1483,8 +1483,8 @@ zlowfactor(ZVALUE z, long count)
 #if BASEB == 32
 		div.v[0] = (HALF)factor;
 #else
-		div.v[0] = (factor & BASE1);
-		div.v[1] = (factor >> BASEB);
+		div.v[0] = (HALF)(factor & BASE1);
+		div.v[1] = (HALF)(factor >> BASEB);
 #endif
 
 		if (zdivides(z, div))

zrand.h

@@ -142,7 +142,7 @@
 #if FULL_BITS == SBITS
 
 # define SLEN 1		/* a 64 bit slot can be held in a FULL */
-# if defined(__STDC__) && __STDC__ != 0
+# if (defined(__STDC__) && __STDC__ != 0) || defined(__cplusplus)
 #  define SVAL(a,b) (FULL)U(0x ## a ## b)
 #  define SHVAL(a,b,c,d) (HALF)0x ## c ## d, (HALF)0x ## a ## b
 # else
@@ -166,7 +166,7 @@
 #elif 2*FULL_BITS == SBITS
 
 # define SLEN 2			/* a 64 bit slot needs 2 FULLs */
-# if defined(__STDC__) && __STDC__ != 0
+# if (defined(__STDC__) && __STDC__ != 0) || defined(__cplusplus)
 #  define SVAL(a,b) (FULL)0x##b, (FULL)0x##a
 #  define SHVAL(a,b,c,d) (HALF)0x##d, (HALF)0x##c, \
 			 (HALF)0x##b, (HALF)0x##a

zrandom.c

@@ -1733,7 +1733,7 @@ zsrandom2(CONST ZVALUE seed, CONST ZVALUE newn)
 			math_error("srandom newn == 0 reserved for future use");
 			/*NOTREACHED*/
 		}
-		set = z1tol(newn);
+		set = (HALF)z1tol(newn);
 		if (!zistiny(newn) || set > BLUM_PREGEN) {
 			math_error("srandom small newn must be [1,20]");
 			/*NOTREACHED*/