From 7cb0a77c25e06d89838cab1b86601e61f12be2fe Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Sat, 6 Nov 1999 15:00:08 -0800 Subject: [PATCH] Release calc version 2.11.0t9.4.1 --- BUGS | 2 +- CHANGES | 12 +++++++- Makefile | 3 -- README | 2 +- align32.c | 2 +- blkcpy.c | 2 +- block.c | 2 +- block.h | 2 +- calc.man | 2 +- config.h | 2 +- custom.c | 2 +- custom.h | 2 +- custom/CUSTOM_CAL | 2 +- custom/Makefile | 2 +- custom/argv.cal | 2 +- custom/c_argv.c | 2 +- custom/c_devnull.c | 2 +- custom/c_help.c | 2 +- custom/c_sysinfo.c | 2 +- custom/custtbl.c | 2 +- custom/halflen.cal | 2 +- help/archive | 2 +- help/contrib | 2 +- help/hash | 4 +-- help/seed | 4 +-- help/srandom | 3 +- lib/README | 12 ++++++-- lib/chrem.cal | 2 +- lib/lucas.cal | 2 +- lib/lucas_chk.cal | 2 +- lib/lucas_tbl.cal | 2 +- lib/mfactor.cal | 2 +- lib/pi.cal | 72 ++++++++++++++++++++++++++++++++++++++++++++++ lib/qtime.cal | 2 +- lib/randmprime.cal | 2 +- lib/seedrandom.cal | 2 +- lib/test1700.cal | 2 +- lib/test2300.cal | 2 +- lib/test2600.cal | 2 +- lib/test2700.cal | 2 +- lib/test3100.cal | 2 +- lib/test3300.cal | 2 +- lib/test3400.cal | 2 +- lib/test3500.cal | 2 +- lib/test4000.cal | 2 +- lib/test4100.cal | 2 +- lib/test4600.cal | 2 +- lib/test5100.cal | 2 +- lib/test5200.cal | 2 +- lib/test8400.cal | 2 +- math_error.h | 2 +- nametype.h | 2 +- poly.c | 2 +- quickhash.c | 6 ++-- sample/Makefile | 2 +- seed.c | 10 +++---- shs.c | 4 +-- shs.h | 2 +- shs1.c | 2 +- shs1.h | 2 +- version.c | 12 +++++--- zrand.c | 2 +- zrand.h | 2 +- zrandom.c | 5 ++-- zrandom.h | 2 +- 65 files changed, 171 insertions(+), 82 deletions(-) diff --git a/BUGS b/BUGS index 312d700..de07e76 100644 --- a/BUGS +++ b/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 =-= diff --git a/CHANGES b/CHANGES index a1eae89..f2ad3ae 100644 --- a/CHANGES +++ b/CHANGES @@ -144,6 +144,16 @@ Following is the change from calc version 2.11.0t8.9.1 to date: 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 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. + Following is the change from calc version 2.11.0t8 to 2.11.0t8.9: @@ -444,7 +454,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. diff --git a/Makefile b/Makefile index 8aba8af..5b4330b 100644 --- a/Makefile +++ b/Makefile @@ -746,8 +746,6 @@ CC= ${PURIFY} ${LCC} # Warning: Some HP-UX optimizers are brain-damaged. If 'make check' fails use: # DEBUG= -g # -# On a systems call the C compiler 'cchp' instead of 'cc'. -# #CCWARN= #CCOPT= ${DEBUG} ${NO_SHARED} #CCMISC= +e @@ -760,7 +758,6 @@ CC= ${PURIFY} ${LCC} #ILDFLAGS= # #LCC= cc -#LCC= cchp #CC= ${PURIFY} ${LCC} # ### diff --git a/README b/README index 869b1f5..edebaf6 100644 --- a/README +++ b/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/ diff --git a/align32.c b/align32.c index 61a67cd..20616cc 100644 --- a/align32.c +++ b/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 /\../\ * diff --git a/blkcpy.c b/blkcpy.c index ba8754f..78246b2 100644 --- a/blkcpy.c +++ b/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 diff --git a/block.c b/block.c index cc1017d..1742614 100644 --- a/block.c +++ b/block.c @@ -28,7 +28,7 @@ * Happy bit twiddling, * * Landon Curt Noll - * http://reality.sgi.com/chongo + * http://reality.sgi.com/chongo/ * * chongo /\../\ */ diff --git a/block.h b/block.h index a07857e..94febb3 100644 --- a/block.h +++ b/block.h @@ -28,7 +28,7 @@ * Happy bit twiddling, * * Landon Curt Noll - * http://reality.sgi.com/chongo + * http://reality.sgi.com/chongo/ * * chongo /\../\ */ diff --git a/calc.man b/calc.man index 65f07d3..51a3e9f 100644 --- a/calc.man +++ b/calc.man @@ -618,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 diff --git a/config.h b/config.h index 6ff14fa..d14081c 100644 --- a/config.h +++ b/config.h @@ -29,7 +29,7 @@ * Happy bit twiddling, * * Landon Curt Noll - * http://reality.sgi.com/chongo + * http://reality.sgi.com/chongo/ * * chongo /\../\ */ diff --git a/custom.c b/custom.c index 9876007..ece0ae2 100644 --- a/custom.c +++ b/custom.c @@ -25,7 +25,7 @@ * Happy bit twiddling, * * Landon Curt Noll - * http://reality.sgi.com/chongo + * http://reality.sgi.com/chongo/ * * chongo /\../\ */ diff --git a/custom.h b/custom.h index 898f0dd..08ac0b2 100644 --- a/custom.h +++ b/custom.h @@ -29,7 +29,7 @@ * Happy bit twiddling, * * Landon Curt Noll - * http://reality.sgi.com/chongo + * http://reality.sgi.com/chongo/ * * chongo /\../\ */ diff --git a/custom/CUSTOM_CAL b/custom/CUSTOM_CAL index bd63df6..aba52ce 100644 --- a/custom/CUSTOM_CAL +++ b/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 diff --git a/custom/Makefile b/custom/Makefile index 10bd173..d58f07d 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -27,7 +27,7 @@ # Happy bit twiddling, # # Landon Curt Noll -# http://reality.sgi.com/chongo +# http://reality.sgi.com/chongo/ # # chongo /\../\ diff --git a/custom/argv.cal b/custom/argv.cal index 7e561a1..48c0e85 100644 --- a/custom/argv.cal +++ b/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 diff --git a/custom/c_argv.c b/custom/c_argv.c index d045592..8e9e843 100644 --- a/custom/c_argv.c +++ b/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 /\../\ */ diff --git a/custom/c_devnull.c b/custom/c_devnull.c index acc17b4..24ba013 100644 --- a/custom/c_devnull.c +++ b/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 /\../\ */ diff --git a/custom/c_help.c b/custom/c_help.c index da3fe84..dae643f 100644 --- a/custom/c_help.c +++ b/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 /\../\ */ diff --git a/custom/c_sysinfo.c b/custom/c_sysinfo.c index 1b22ef0..29f5236 100644 --- a/custom/c_sysinfo.c +++ b/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 /\../\ */ diff --git a/custom/custtbl.c b/custom/custtbl.c index 849580e..5bea277 100644 --- a/custom/custtbl.c +++ b/custom/custtbl.c @@ -25,7 +25,7 @@ * Happy bit twiddling, * * Landon Curt Noll - * http://reality.sgi.com/chongo + * http://reality.sgi.com/chongo/ * * chongo /\../\ */ diff --git a/custom/halflen.cal b/custom/halflen.cal index 4e4fd98..e70822e 100644 --- a/custom/halflen.cal +++ b/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 diff --git a/help/archive b/help/archive index 142221e..7c41431 100644 --- a/help/archive +++ b/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 /\../\ diff --git a/help/contrib b/help/contrib index 5cc5998..80a431b 100644 --- a/help/contrib +++ b/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 /\../\ diff --git a/help/hash b/help/hash index 7402452..ca9d255 100644 --- a/help/hash +++ b/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 diff --git a/help/seed b/help/seed index c845c46..82e85c3 100644 --- a/help/seed +++ b/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 diff --git a/help/srandom b/help/srandom index 0ac3a16..4d8288f 100644 --- a/help/srandom +++ b/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 diff --git a/lib/README b/lib/README index c8250ac..31c2da1 100644 --- a/lib/README +++ b/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 + ) 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 diff --git a/lib/chrem.cal b/lib/chrem.cal index 8587c88..7329ca9 100644 --- a/lib/chrem.cal +++ b/lib/chrem.cal @@ -86,7 +86,7 @@ * i.e., any value that is 301 mod 420. * * Written by: Ernest W Bowen - * 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 */ diff --git a/lib/lucas.cal b/lib/lucas.cal index 6a6014c..6ce5d78 100644 --- a/lib/lucas.cal +++ b/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 /\../\ */ diff --git a/lib/lucas_chk.cal b/lib/lucas_chk.cal index 6c80181..f083426 100644 --- a/lib/lucas_chk.cal +++ b/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 /\../\ */ diff --git a/lib/lucas_tbl.cal b/lib/lucas_tbl.cal index 46921e5..1382354 100644 --- a/lib/lucas_tbl.cal +++ b/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 /\../\ */ diff --git a/lib/mfactor.cal b/lib/mfactor.cal index 4ad8a6a..7a876aa 100644 --- a/lib/mfactor.cal +++ b/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 /\../\ */ diff --git a/lib/pi.cal b/lib/pi.cal index 0831c82..7ef766a 100644 --- a/lib/pi.cal +++ b/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 + * 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); + } +} diff --git a/lib/qtime.cal b/lib/qtime.cal index 6f83e0e..96ea706 100644 --- a/lib/qtime.cal +++ b/lib/qtime.cal @@ -7,7 +7,7 @@ * utc_hr_offset Offset from UTC in hours. * * Written by: Klaus Alexander Seistrup - * With minor mods by: Landon Curt Noll + * With minor mods by: Landon Curt Noll * * See: * http://www.magnetic-ink.dk/download/qtime.html diff --git a/lib/randmprime.cal b/lib/randmprime.cal index 2bad6a8..a19a93d 100644 --- a/lib/randmprime.cal +++ b/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 /\../\ */ diff --git a/lib/seedrandom.cal b/lib/seedrandom.cal index 2bbb368..0fcc417 100644 --- a/lib/seedrandom.cal +++ b/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 /\../\ */ diff --git a/lib/test1700.cal b/lib/test1700.cal index 74c9d0d..47dd564 100644 --- a/lib/test1700.cal +++ b/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 /\../\ * diff --git a/lib/test2300.cal b/lib/test2300.cal index 823eca3..3e592d2 100644 --- a/lib/test2300.cal +++ b/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 /\../\ * diff --git a/lib/test2600.cal b/lib/test2600.cal index 1b79ee1..c53c6ab 100644 --- a/lib/test2600.cal +++ b/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. */ diff --git a/lib/test2700.cal b/lib/test2700.cal index 0a9f955..adefa61 100644 --- a/lib/test2700.cal +++ b/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. */ diff --git a/lib/test3100.cal b/lib/test3100.cal index a4ee9da..bf8c52a 100644 --- a/lib/test3100.cal +++ b/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. */ diff --git a/lib/test3300.cal b/lib/test3300.cal index 829a52b..5ee7d77 100644 --- a/lib/test3300.cal +++ b/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. */ diff --git a/lib/test3400.cal b/lib/test3400.cal index 23a5789..d947729 100644 --- a/lib/test3400.cal +++ b/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. */ diff --git a/lib/test3500.cal b/lib/test3500.cal index b18e044..5a31184 100644 --- a/lib/test3500.cal +++ b/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. */ diff --git a/lib/test4000.cal b/lib/test4000.cal index 61d9e10..f52e091 100644 --- a/lib/test4000.cal +++ b/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. */ diff --git a/lib/test4100.cal b/lib/test4100.cal index 67ce2f2..318942c 100644 --- a/lib/test4100.cal +++ b/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. */ diff --git a/lib/test4600.cal b/lib/test4600.cal index 8697d69..659e9bf 100644 --- a/lib/test4600.cal +++ b/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. */ diff --git a/lib/test5100.cal b/lib/test5100.cal index 19f2c35..892be2a 100644 --- a/lib/test5100.cal +++ b/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. */ diff --git a/lib/test5200.cal b/lib/test5200.cal index 941adaf..d2a2183 100644 --- a/lib/test5200.cal +++ b/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. */ diff --git a/lib/test8400.cal b/lib/test8400.cal index fd7da90..16ba708 100644 --- a/lib/test8400.cal +++ b/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 /\../\ * diff --git a/math_error.h b/math_error.h index 159e968..80bfd67 100644 --- a/math_error.h +++ b/math_error.h @@ -28,7 +28,7 @@ * Happy bit twiddling, * * Landon Curt Noll - * http://reality.sgi.com/chongo + * http://reality.sgi.com/chongo/ * * chongo /\../\ */ diff --git a/nametype.h b/nametype.h index 81ae513..416c692 100644 --- a/nametype.h +++ b/nametype.h @@ -29,7 +29,7 @@ * Happy bit twiddling, * * Landon Curt Noll - * http://reality.sgi.com/chongo + * http://reality.sgi.com/chongo/ * * chongo /\../\ */ diff --git a/poly.c b/poly.c index ac636da..c65d085 100644 --- a/poly.c +++ b/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" diff --git a/quickhash.c b/quickhash.c index a113c8e..852ed25 100644 --- a/quickhash.c +++ b/quickhash.c @@ -20,7 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. * * Landon Curt Noll - * http://reality.sgi.com/chongo + * http://reality.sgi.com/chongo/ * * chongo /\../\ */ @@ -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 diff --git a/sample/Makefile b/sample/Makefile index 6509003..f83334a 100644 --- a/sample/Makefile +++ b/sample/Makefile @@ -27,7 +27,7 @@ # Happy bit twiddling, # # Landon Curt Noll -# http://reality.sgi.com/chongo +# http://reality.sgi.com/chongo/ # # chongo /\../\ diff --git a/seed.c b/seed.c index 47677d0..397e44e 100644 --- a/seed.c +++ b/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 /\../\ * @@ -160,12 +160,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 @@ -251,7 +251,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 diff --git a/shs.c b/shs.c index 87f9fbc..a6d5ded 100644 --- a/shs.c +++ b/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 /\../\ * @@ -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. * **** * diff --git a/shs.h b/shs.h index cc819c6..a8ec954 100644 --- a/shs.h +++ b/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 /\../\ * diff --git a/shs1.c b/shs1.c index 03d343d..9b9d718 100644 --- a/shs1.c +++ b/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 /\../\ * diff --git a/shs1.h b/shs1.h index 6c0b11e..8861385 100644 --- a/shs1.h +++ b/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 /\../\ * diff --git a/version.c b/version.c index f97e928..d0c1adb 100644 --- a/version.c +++ b/version.c @@ -7,12 +7,18 @@ */ #include -#include "calc.h" +#if defined(CALC_VER) +#include +#include +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.4" /* test number or empty string if no patch */ +#define MINOR_PATCH "9.4.1" /* test number or empty string if no patch */ /* * calc version constants @@ -84,8 +90,6 @@ version(void) #if defined(CALC_VER) -char *program; /* our name */ - /* * version - print the calc version */ diff --git a/zrand.c b/zrand.c index 2b0b60d..aaebb93 100644 --- a/zrand.c +++ b/zrand.c @@ -29,7 +29,7 @@ * Happy bit twiddling, * * Landon Curt Noll - * http://reality.sgi.com/chongo + * http://reality.sgi.com/chongo/ * * chongo /\../\ */ diff --git a/zrand.h b/zrand.h index d3b0ec5..ee59e9e 100644 --- a/zrand.h +++ b/zrand.h @@ -29,7 +29,7 @@ * Happy bit twiddling, * * Landon Curt Noll - * http://reality.sgi.com/chongo + * http://reality.sgi.com/chongo/ * * chongo /\../\ */ diff --git a/zrandom.c b/zrandom.c index 9580cae..8abc2ec 100644 --- a/zrandom.c +++ b/zrandom.c @@ -29,7 +29,7 @@ * Happy bit twiddling, * * Landon Curt Noll - * http://reality.sgi.com/chongo + * http://reality.sgi.com/chongo/ * * chongo /\../\ */ @@ -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. * diff --git a/zrandom.h b/zrandom.h index 46d00fd..eba7da9 100644 --- a/zrandom.h +++ b/zrandom.h @@ -29,7 +29,7 @@ * Happy bit twiddling, * * Landon Curt Noll - * http://reality.sgi.com/chongo + * http://reality.sgi.com/chongo/ * * chongo /\../\ */