Release v2.14.2.0

The following are the changes in this release:

    Ported calc to the s390x IBM Mainframe running RHEL9.1.

    Added cal/splitbits.cal:

	splitbits(x, b)

	Given an integer x, split the value into a list of integers,
	each of which is at most b bits long.

	The value b must be an integer > 0.

	The number of elements in the returned list is:

	    ceil((highbit(x) + 1) / b)

	If x == 0, then a list of 1 element containing 0 is returned.

	If x < 0, then the two's compliment of abs(x) is returned.
	Even though calc represents negative integers as positive values
	with sign bit, the bits returned by this function are as if
	the integer converted as if the integer was a two's compliment value.

	See also the help command:

	    ; help resource

.github/ISSUE_TEMPLATE/calc-bug-report.md

@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-Calc bug report template version: 1.2 2022-02-24
+Calc bug report template version: 1.3 2022-11-27
 
 **Describe the bug**
 A clear and concise description of what the bug is.
@@ -19,7 +19,7 @@ Steps to reproduce the behavior:
     I.e., provide the command line you used to launch calc
 
 1. Calc commands and their output
-    Please provide any calc commands you entered on the the terminal.
+    Please provide any calc commands you entered on the terminal.
     Please provide the calc command line output inline as well.
     If the above is long, please attach a file.
 
@@ -33,11 +33,11 @@ Steps to reproduce the behavior:
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
-**Attach make debug output**
-IMPORTANT: Please attach the output from `make debug`.
+**Attach debug.out**
+IMPORTANT: Please run `make debug` and then attach the `debug.out` file.
 
-**Screenshots**
-If applicable, attach screenshots to help explain your problem.
+**Screen shots**
+If applicable, attach screen shots to help explain your problem.
 
 **Execution environment (please complete the following information):**
  - OS:
@@ -48,14 +48,14 @@ If applicable, attach screenshots to help explain your problem.
                  or if no uname command, a description of the OS version/release you are using
 
  - OS distribution:
-        E.g., macOS Monterey, contents of /etc/redhat-releaseor /etc/os-release, etc.
+        E.g., macOS 13.0.1, contents of /etc/redhat-release, or /etc/os-release, etc.
 
  - Calc Version
         E.g., output of calc -v
                  or if you cannot compile calc, the version you downloaded and from where it came from
 
  - Shell and shell version
-        E.g.., bash, zsh, power shell, etc.
+        E.g., bash, zsh, power shell, etc.
                  and the version of the shell you are using, if known
 
 **Calc mods**

.github/workflows/codeql-analysis.yml

@@ -43,7 +43,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/dependabot.yml

@@ -0,0 +1,12 @@
+# Set update schedule for GitHub Actions
+#
+# See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
+
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"

.gitignore

@@ -6,6 +6,7 @@
 #
 .dynamic
 .hsrc
+Makefile.our
 NOTES
 align32.h
 args.h
@@ -29,6 +30,7 @@ cscript/simple
 cscript/square
 custom/.all
 custom/libcustcalc*
+debug.out
 endian
 endian_calc.h
 fposval.h
@@ -36,7 +38,7 @@ have_arc4random.h
 have_ban_pragma.h
 have_const.h
 have_environ.h
-have_fpos.h
+have_fgetsetpos.h
 have_fpos_pos.h
 have_getpgid.h
 have_getprid.h
@@ -48,12 +50,16 @@ have_newstr.h
 have_offscl.h
 have_posscl.h
 have_rusage.h
+have_statfs.h
 have_stdlib.h
 have_stdvs
 have_strdup.h
 have_string.h
 have_strlcat.h
 have_strlcpy.h
+have_sys_mount.h
+have_sys_param.h
+have_sys_vfs.h
 have_times.h
 have_uid_t.h
 have_unistd.h
@@ -92,7 +98,6 @@ libcalc*
 libcustcalc*
 longbits
 longbits.h
-Makefile.our
 sample_many
 sample_rand
 tags

BUGS

@@ -28,7 +28,7 @@ Click in the triangle to open up the Assets then click on
 the approptiate package to download.
 
 If you made and modifications to calc beyond the simple Makefile
-configuration, try backing those changges out and see if things get
+configuration, try backing those changes out and see if things get
 better.
 
 If you have tried all of the above and things still are not right,
@@ -60,44 +60,7 @@ GitHub web page, click on this button:
 
     ((New Issue))
 
-=-=
-
-If you prefer to not use GitHub, then you
-may send bug and bug fixes reports to:
-
-    calc-bugrept-mail at asthe dot com
-
-    NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-
-    NOTE: This replaces the old calc-bugs at asthe dot com address.
-
-PLEASE put following the SPECIAL PHRASE somewhere in your Email Subject line:
-
-    calc bug report
-
-You may add additional words to your subject line.
-
-Suggestion:
-
-    From time to time, the Email address and Subject SPECIAL PHRASE
-    may change so verify you have the current info by visiting:
-
-	http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
-
-IMPORTANT:
-
-    PLEASE use the above SPECIAL PHRASE somewhere in the Subject line or
-    the mail system won't deliver your Email message.
-
-Keep in mind that the best way to report on a calc bug is
-via the above mentioned calc GitHub issue URL.
-
-Please be patient as we cannot always respond to Email messages quickly.
-
-=-=
-
-When you send your report, via the calc GitHub issue URL or Email,
-please include the following information:
+Please include the following information in the new issue:
 
     * A description of the problem
 
@@ -123,12 +86,13 @@ please include the following information:
     * If calc dumped core, try to send us a core dump stack trace
 
     * cd to the calc source directory, and send the contents
-      of debug.out produced by this command:
+      of debug.out.txt produced by this command:
 
-	make debug > debug.out 2>&1
+	make debug > debug.out.txt 2>&1
 
-Fell free to use the above address to send in bug fixes (in the form
-of a context diff patch).
+PLEASE attach the debug.out.txt file to your GitHub issue (bug report)!!
+
+Please be patient as we cannot always respond to pull requests quickly.
 
 =-=
 
@@ -192,9 +156,18 @@ mis-features in calc:
 
       will not.
 
+    * The numerator is assumed
+
+	The numerator value of 1 appears to be assumed.  In calc:
+
+	     / 2
+
+	will produce a value of 0.5 as if the numerator 1 was given.
+
+
 =-=
 
-## Copyright (C) 1999-2014,2021  Landon Curt Noll
+## Copyright (C) 1999-2014,2021,2023  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

CHANGES

@@ -1,4 +1,354 @@
-The following are the changes from calc version 2.14.1.0 to date:
+The following are the changes from calc version 2.14.2.0 to date:
+
+    Ported calc to the s390x IBM Mainframe running RHEL9.1.
+
+    Added cal/splitbits.cal:
+
+	splitbits(x, b)
+
+	Given an integer x, split the value into a list of integers,
+	each of which is at most b bits long.
+
+	The value b must be an integer > 0.
+
+	The number of elements in the returned list is:
+
+	    ceil((highbit(x) + 1) / b)
+
+	If x == 0, then a list of 1 element containing 0 is returned.
+
+	If x < 0, then the two's compliment of abs(x) is returned.
+	Even though calc represents negative integers as positive values
+	with sign bit, the bits returned by this function are as if
+	the integer converted as if the integer was a two's compliment value.
+
+	See also the help command:
+
+	    ; help resource
+
+
+The following are the changes from calc version 2.14.1.5 to 2.14.1.6:
+
+    Fixed version numbers in two cases in CHANGES that referred
+    to the 2.14.2.x instead of 2.14.1.x.
+
+    Rename MINGW Makefile variable (a holdover from MINGW32_NT-5.0)
+    to OSNAME.
+
+    Fixed FUNCPTR typedef in hist.c to fix deprecated compiler warnings.
+
+    Fixed when USE_READLINE, READLINE_LIB, READLINE_EXTRAS, and
+    READLINE_INCLUDE are set to empty (disable use of the GNU-readline
+    facility).
+
+    Fix cases of spaces before tabs in Makefile and Makefile.simple.
+
+    Fixed obsolete references to the atoz() in LIBRARY to use the
+    correct internal function name of str2z().
+
+    Fixed obsolete references to the atoq() in LIBRARY to use the
+    correct internal function name of str2q().
+
+    Document in help/unexpected that * operator has has a higher
+    precedence than << in calc, which differs from C.  Thanks
+    goes to GitHub user @inguin for pointing put this difference.
+
+
+The following are the changes from calc version 2.14.1.3 to 2.14.1.4:
+
+    Fixed missing <string.h include in have_fpos_pos.c.
+
+    Change calc version from 2.14.1.2 to 2.14.2.3 as part of a test to
+    build calc RPMs on a reference RHEL8.7 platform (formerly a RHEL7.9
+    platform).
+
+    Changes #! lines in Makefiles to "#!/usr/bin/env make".
+
+    Set SHELL in Makefiles to the basename of the shell.
+
+    Updated COPYING file to indicate that these files are now
+    covered under "The Unlicense" (see https://unlicense.org):
+
+	    sha1.c
+	    sha1.h
+	    cal/dotest.cal
+	    cal/screen.cal
+
+    Updated help/credit to match the above changes to COPYING.
+
+    Updated CONTRIB-CODE and calc.man to refer to using GitHub pull requests
+    for contributing to calc (instead of using Email).
+
+    Updated BUGS and calc.man to refer to using GitHub issues
+    for reporting calc bugs (instead of using Email).
+
+    Updated QUESTIONS and calc.man to refer to using GitHub issues
+    for asking calc questions (instead of using Email).
+
+    Fixed Makefile.local command example to refer to overriding the
+    Makefile variable DEBUG (instead of CDEBUG).
+
+    Fixed all make chk ASAN warnings under macOS 13.2.1 when calc is compiled
+    with the following uncommented lines in Makefile.local:
+
+	DEBUG:= -O0 -g
+	CFLAGS+= -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined
+	LDFLAGS+= -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined
+	CALC_ENV+= ASAN_OPTIONS=detect_stack_use_after_return=1
+
+    Improved how pointers to functions are declared for the builtins
+    array in func.c to avoid function declarations without a prototype
+    that is now deprecated in C.
+
+    Improved how pointers to functions are declared for the opcodes
+    array in opcodes.c to avoid function declarations without a prototype
+
+    Replaced use of egrep with grep -E in Makefiles.
+
+    Fixed cases where variables were set but not used in symbol.c, calc.c,
+    and the main function in func.c as used by funclist.c.
+
+    Added rule name to "DO NOT EDIT -- generated by the Makefile" lines
+    in constructed files.
+
+    Test if <sys/vfs.h> exists and set HAVE_SYS_VFS_H accordingly
+    in have_sys_vfs.h.  Added HAVE_SYS_VFS_H to allow one to force
+    this value.
+
+    Test if <sys/param.h> exists and set HAVE_SYS_PARAM_H accordingly
+    in have_sys_param.h.  Added HAVE_SYS_PARAM_H to allow one to force
+    this value.
+
+    Test if <sys/mount.h> exists and set HAVE_SYS_MOUNT_H accordingly
+    in have_sys_mount.h.  Added HAVE_SYS_MOUNT_H to allow one to force
+    this value.
+
+    Test if the system as the statfs() system call and set HAVE_STATFS
+    accordingly in have_statfs.h.  Added HAVE_STATFS to allow one
+    to force this value.
+
+    The pseudo_seed() function will also try to call statfs() if
+    possible and permitted by the HAVE_STATFS value.
+
+    Test if makedepend command is available before trying to build
+    the Makefile dependency list via "make depend".
+
+
+The following are the changes from calc version 2.14.1.0 to 2.14.1.2:
+
+    Attempted to address a paranoid compiler warning -Wmaybe-uninitialized
+    in swap_HALF_in_ZVALUE() where the gcc compiler seems to ignore the
+    fact that calling not_reached() above the call to zcopyval()
+    should prevent dest from being NULL to the 1st zcopyval() call.
+    Thanks to <GitHub user mattdm> for raising this potential concern.
+
+    Fixed a -Wuse-after-free warning that identified a call to realloc()
+    in find_tty_state() could move the fd_setup array.  Thanks goes to
+    <GitHub user mattdm> for reporting this bug!
+
+    In find_tty_state(), we changed how we expand fd_orig as an original
+    pre-modified copy of fd_setup.  We realloc the fd_orig array and copy
+    the fd_setup into it first, before touching the fd_setup array.
+
+    In pseudo_seed(), we removed a call to setjmp() that was only
+    there to add more information to mix into the seed.  For compilers
+    such as gcc that used -Wclobbered, the call to setjmp() gave the
+    impression that the hash_val might be clobbered by a longjmp().
+    Where there is no longjmp() that would use the previous setjmp(),
+    the gcc compiler has nil ways to notice that. So to avoid confusion
+    we removed the setjmp() call.  Thanks to <GitHub user mattdm> for
+    raising this potential concern.
+
+    Added config("tilde_space", boolean).  The "tilde_space" controls
+    whether or not a space (' ') is printed after leading tilde ('~').
+    By default, config("tilde_space") is false.
+
+    For example, with the default, config("tilde_space", 0):
+
+	; 1/3
+		~0.33333333333333333333
+	; sqrt(7 + 5i,1e-100)
+		~2.79305614578749801863+~0.89507688693280053094i
+
+    With config("tilde_space", 1):
+
+	; 1/3
+		~ 0.33333333333333333333
+	; sqrt(7 + 5i,1e-100)
+		~ 2.79305614578749801863+~ 0.89507688693280053094i
+
+    NOTE: Use of config("tilde_space", 1) can break printing and scanning
+	  of complex values via "%c".
+
+    To enable "tilde_space", use config("tilde_space", 1) on the
+    command line and/or use config("tilde_space", 1),; in your ~/.calcrc.
+    Thanks goes to <GitHub use ljramalho> for this suggestion.
+
+    Added config("tilde_space", boolean) to help/config, along with
+    a few few minor text improvements.  Updated cal/regress to test
+    config("tilde_space").
+
+    For example, with the default, config("tilde_space", 0):
+
+	; pi(1e-50)
+		~3.14159265358979323846
+
+    With config("tilde_space", 1):
+
+	; pi(1e-50)
+		~ 3.14159265358979323846
+
+    Added config("fraction_space", boolean).  The "fraction_space" controls
+    whether or not a space (' ') is printed before and after fractions.
+    By default, config("fraction_space") is false.
+
+    For example, with the default, config("fraction_space", 0):
+
+	; base(1/3),
+	; 1/7
+		1/7
+
+    With config("fraction_space", 1):
+
+	; base(1/3),
+	; 1/7
+		1 / 7
+
+    NOTE: Use of config("fraction_space", 1) can break printing and scanning
+	  of fractional values via "%r".
+
+    NOTE: Use of config("fraction_space", 1) can break printing and scanning
+	  of complex values via "%c".
+
+    Added config("fraction_space", boolean) to help/config, along with
+    a few few minor text improvements.  Updated cal/regress to test
+    config("tilde_space").
+
+    Added config("complex_space", boolean).  The "complex_space" controls
+    whether or not a space (' ') is printed before and after the + or -
+    in complex values.
+
+    By default, config("complex_space") is false.
+
+    For example, with the default, config("complex_space", 0):
+
+	; asin(2)
+		1.57079632679489661923-1.31695789692481670863i
+
+    With config("complex_space", 1):
+
+	; asin(2)
+		1.57079632679489661923 - 1.31695789692481670863i
+
+    NOTE: Use of config("complex_space", 1) can break printing and scanning
+	  of fractional values via "%r".
+
+    NOTE: Use of config("complex_space", 1) can break printing and scanning
+	  of complex values via "%c".
+
+    Added config("complex_space", boolean) to help/config, along with
+    a few few minor text improvements.  Updated cal/regress to test
+    config("complex_space").
+
+    Clarify in the calc man page, the relationship between -q and
+    calc start scripts such as the ~/.calcrc file.
+
+    Fixed in the calc man page, the issue of -f not implying -q.
+
+
+The following are the changes from calc version 2.14.1.2 to date:
+
+    Restored use of the #define FPOS_POS_LEN symbol.  This refers to
+    the length of the __pos element (if the __pos element exists),
+    the fpos_t type (if that type exists).
+
+    Changed SWAP_HALF_IN_FILEPOS(dest, src) mato to use FILEPOS_LEN Little
+    Endian when FILEPOS is a simple scalar type (i.e., HAVE_FILEPOS_SCALAR
+    is defined).
+
+    Changed #define HAVE_FPOS to HAVE_FGETSETPOS.
+
+    Corrected comment in have_fpos_pos.h.  The HAVE_FPOS_POS symbol was
+    NOT related to fgetpos & fsetpos but rather if we we have an __pos
+    element in FILEPOS.
+
+    Changed #define HAVE_NO_FPOS to HAVE_NO_FGETSETPOS.
+
+    Improved comments in have_fpos_pos.h to show why and how
+    HAVE_FPOS_POS, FPOS_POS_BITS, and FPOS_POS_LEN were defined or undefed.
+
+    Changed showfiles builtin to print sizes cast to (long int) with
+    the "%ld" printf format to avoid implementations that do not support
+    the "%lld" printf format specifier.
+
+    Renamed have_fpos.h to have_fgetsetpos.h.  Renamed CALC_HAVE_FPOS_H
+    to CALC_HAVE_FGETSETPOS_H.  The make install and the olduninstall
+    rules remove the any old have_fpos.h that was previously installed.
+
+    Added swap_HALFs(dest, src, len) function to byteswap.c.
+
+    Calc can now handle Big Engian file position sizes that are a
+    multiple of BASEB bits in length.  Before handle Big Engian file
+    positions could only be 32 and 64 bits in length.  This will allow,
+    for example, a Big Engian file position size of 128 (assuming that
+    128/BASEB is is an integer).
+
+    Temporary workaround for musl libc systems such as gentoo Linux that
+    allows them to compile calc and successfully run the regression test.
+
+
+The following are the changes from calc version 2.14.1.1 to 2.14.1.1:
+
+    Added a few remarks on calc version numbers to version.c.
+
+    Fixed how fposval.h is built.  On a number of systems, the fposval.c
+    file failed to compile incorrectly.  This caused problems for systems in
+    which fposval.h.def was not correct.
+
+    Fixed how have_memmv.h is built.  On a number of systems, the have_memmv.c
+    file failed to compile incorrectly, producing a potentially incorrect
+    have_memmv.h file for such systems.
+
+    Fixed how align32.h is built.  On a number of systems, the align32.c
+    file failed to compile incorrectly, producing a potentially incorrect
+    align32.h file for such systems.
+
+    Fixed how have_newstr.h is built.  On a number of systems, the have_newstr.c
+    failed to compile incorrectly, producing a potentially incorrect
+    have_newstr.h file for such systems.
+
+    Fixed how have_strdup.h is built.  On a number of systems, the have_strdup.c
+    file failed to compile incorrectly, producing a potentially incorrect
+    have_strdup.h file for such systems.
+
+    Fixed how have_strlcat.h is built.  On a number of systems, the have_strlcat.c
+    file failed to compile incorrectly, producing a potentially incorrect
+    have_strlcat.h file for such systems.
+
+    Fixed how have_strlcpy.h is built.  On a number of systems, the have_strlcpy.c
+    file failed to compile incorrectly, producing a potentially incorrect
+    have_strlcpy.h file for such systems.
+
+    Fixed how have_uid_t.h is built.  On a number of systems, the have_uid_t.c
+    file failed to compile incorrectly, producing a potentially incorrect
+    have_uid_t.h file for such systems.
+
+    Fixed how have_uid_t.h is built.  On a number of systems, the have_uid_t.c
+    file failed to compile incorrectly, producing a potentially incorrect
+    have_uid_t.h file for such systems.
+
+    Added full_debug rule to Makefile.  This does the work of the
+    old debug rule in a more verbose mode by using Q= H=@ S= E= V=@.
+
+    The debug rule in the Makefile now pre-removes debug.out and then
+    runs make full_debug sending stdout and stderr to debug.out.  It then
+    prints a few instructions about filing a GitHub issue bug report.
+
+    The full_debug rule will no longer stop when one of the sub-tasks
+    failed (exit non-zero).
+
+
+The following are the changes from calc version 2.14.1.0 to 2.14.1.0:
 
     Fixed alignment of show item section of help command.
 
@@ -6,6 +356,65 @@ The following are the changes from calc version 2.14.1.0 to date:
     Adjusted cal/test8900.cal to reflect this bug fix.
     Added tests to cal/regress.cal to help verify bug fix is fixed.
 
+    Fixed a \-escape bug in calc(1) man page.
+
+    Added cal/comma.cal:
+
+	Convert numbers into strings with 3-digit group and integer-fraction
+	separators.
+
+	If the value is an integer, the integer-fraction separator is not used.
+
+	str_comma(x, [group, [decimal]])
+
+	    Convert x into a string.
+
+	    If group is given and is a string, group will be used as
+	    the 3-digit group separator, otherwise the default 3-digit
+	    group separator will be used.
+
+	    If decimal is given and is a string, group will be used as
+	    the integer-fraction separator, otherwise the default
+	    integer-fraction separator will be used.
+
+	    The decimal and group arguments are optional.
+
+	set_default_group_separator(group)
+
+	    Change the default 3-digit group separator if group is a string,
+	    otherwise the default 3-digit group separator will not be
+	    changed.  Return the old 3-digit group separator.
+
+	set_default_decimal_separator(decimal)
+
+	    Change the default 3-digit group separator if decimal is a
+	    string, otherwise the default integer-fraction separator
+	    will not be changed.  Return the old integer-fraction separator.
+
+	print_comma(x, [group, [decimal]])
+
+	    Print the value produced by str_comma(x, [group, [decimal]])
+	    followed by a newline.
+
+	    If the str_comma() does not return a string, nothing is printed.
+
+	    The decimal and group arguments are optional.
+
+	    The value produced by str_comma() is returned.
+
+	fprint_comma(fd, x, [group, [decimal]])
+
+	    Print the value produced by str_comma(x, [group, [decimal]]),
+	    without a trailing newline, on file fd.
+
+	    If the str_comma() does not return a string, nothing is printed.
+
+	    If fd is not an open file, nothing is printed.
+
+	    The decimal and group arguments are optional.
+
+	    The value produced by str_comma() is returned.
+
 
 The following are the changes from calc version 2.14.0.15 to 2.14.0.15:
 

CONTRIB-CODE

@@ -1,73 +1,37 @@
 Calc is open source. Contributions of code are welcome.
 
-We welcome and encourage you to send us:
+In order to consider integrating your contributions, we need:
 
-    * calc resource files (cal/*.cal files)
-    * calc shell scripts (cscript/*.calc files)
-    * builtin functions that you have modified or written, i.e.:
-	assocfunc.c comfunc.c func.c func.h
-	listfunc.c matfunc.c qfunc.c zfunc.c
-    * custom functions that you have modified or written
-    * help files modified or written (help/*)
-    * Makefile improvements (Makefile, */Makefile)
-    * other source code modifications (*.c, *.h)
-    * etc. (* */* :) )
+    * your changes applied agsinst the top of the calc master branch:
 
-In order to consider integrating your code, we need:
+          https://github.com/lcn2/calc/
 
-    * calc version you are working with (please try use the latest version)
     * new help files or help file patches, if applicable (documentation)
-    * proposed text for the CHANGES file (brief description of what it does)
-    * regress.cal test patch as needed
-    * your source code and/or source code changes (:-))
 
-If you add functionality to calc, please be sure to modify/patch/add
+    * Update CHANGES file (brief description of what it does)
+
+    * regress.cal test patch as needed
+
+If you add functionality to calc, please be sure to modify
 Makefiles, help files, cal/regress.cal test code as well.
 Regression test cases are vital to maintaining calc's level
 of correctness and helps us avoid code bug regression.
 
-Please try to generate a patch against the most recent
-version of calc, and if you use GitHub, the top of the
-master branch:
-
-    https://github.com/lcn2/calc
-
 The best way contribute to calc bug is to generate calc
-GitHub pull request:
+GitHub pull request against the calc GitHub repo:
 
     https://github.com/lcn2/calc/pulls
 
+Please be patient as we cannot always respond pull requests quickly.
+
+=-=
+
+IMPORTANT:
+
 Your code needs to be contributed under either the 2.1 of the GNU
-Lesser General Public License (LGPL 2.1) or in the public domain.
+Lesser General Public License (LGPL 2.1) or under "The Unlicense":
 
-If you do not want to use calc GitHub, then send Email to:
-
-    calc-contrib-mail at asthe dot com
-
-    NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-
-You MUST use following SPECIAL PHRASE in your Email Subject line:
-
-    calc contribution
-
-You may add additional words to your subject line.
-
-Suggestion:
-
-    From time to time, the Email address and Subject SPECIAL PHRASE
-    may change so verify you have the current info by visiting:
-
-	http://www.isthe.com/chongo/tech/comp/calc/calc-contrib.html
-
-IMPORTANT: If your Email doesn't contain the above phrase,
-	   then we WILL NOT SEE your Email.
-
-PLEASE BE SURE you have that SPECIAL PHRASE somewhere in the subject line!
-
-Keep in mind that the best way to report on a calc bug is to use
-the above mentioned calc GitHub procedure.
-
-Please be patient as we cannot always respond to Email messages quickly.
+    https://unlicense.org
 
 =-=
 
@@ -77,7 +41,7 @@ See also the calc wishlist by running the calc command:
 
 =-=
 
-## Copyright (C) 1999,2014,2021  Landon Curt Noll
+## Copyright (C) 1999,2014,2021,2023  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

COPYING

@@ -4,9 +4,10 @@
 This file is Copyrighted
 ------------------------
 
+    This file is not covered under version 2.1 of the GNU LGPL.
     This file is covered under the following Copyright:
 
-	Copyright (C) 1999-2021  Landon Curt Noll
+	Copyright (C) 1999-2023  Landon Curt Noll
 	All rights reserved.
 
 	Everyone is permitted to copy and distribute verbatim copies
@@ -120,11 +121,13 @@ Calc copyrights and exception files
 	Copyright (C) year  Ernest Bowen
 	Copyright (C) year  Petteri Kettunen and Landon Curt Noll
 	Copyright (C) year  Christoph Zurnieden
+	Copyright (C) year  Landon Curt Noll and Thomas Jones-Low
+	Copyright (C) year  Klaus Alexander Seistrup and Landon Curt Noll
 
     These files are not covered under one of the Copyrights listed above:
 
 	    sha1.c		sha1.h		COPYING
-	    COPYING-LGPL	cal/qtime.cal	cal/screen.cal
+	    COPYING-LGPL	cal/screen.cal
 
     The file COPYING-LGPL, which contains a copy of the version 2.1
     GNU Lesser General Public License, is itself Copyrighted by the
@@ -136,8 +139,16 @@ Calc copyrights and exception files
     top of this file.  It is important to note that you may distribute
     verbatim copies of this file but you may not modify this file.
 
-    Some of these exception files are in the public domain.  Other files
-    are under the LGPL but have different authors that those listed above.
+    These files are covered under "The Unlicense":
+
+	    sha1.c
+	    sha1.h
+	    cal/dotest.cal
+	    cal/screen.cal
+
+    For more information on this license, see:
+
+	    https://unlicense.org
 
     In all cases one may use and distribute these exception files freely.
     And because one may freely distribute the LGPL covered files, the

LIBRARY

@@ -344,7 +344,7 @@ values of 0 and 1 are so common that special checks are made for them.
 
 For initial values besides 0 or 1, you need to call itoz to convert a long
 value into a ZVALUE, as shown in the above example.  Or alternatively,
-for larger numbers you can use the atoz routine to convert a string which
+for larger numbers you can use the str2z routine to convert a string which
 represents a number into a ZVALUE.  The string can be in decimal, octal,
 hex, or binary according to the leading digits.
 
@@ -357,7 +357,7 @@ over a long sequence of operations.
 	ZVALUE z1, z2, z3;
 
 	z1 = _one_;
-	atoz("12345678987654321", &z2);
+	str2z("12345678987654321", &z2);
 	zadd(z1, z2, &z3);
 	zfree(z1);
 	zfree(z2);
@@ -446,10 +446,10 @@ to free them first.  The following illustrates this:
 	itoz(55L, &q->num);
 
 A better way to create NUMBERs with particular values is to use the itoq,
-iitoq, or atoq functions.  Using itoq makes a long value into a NUMBER,
+iitoq, or str2q functions.  Using itoq makes a long value into a NUMBER,
 using iitoq makes a pair of longs into the numerator and denominator of a
-NUMBER (reducing them first if needed), and atoq converts a string representing
-a number into the corresponding NUMBER.	 The atoq function accepts input in
+NUMBER (reducing them first if needed), and str2q converts a string representing
+a number into the corresponding NUMBER.	 The str2q function accepts input in
 integral, fractional, real, or exponential formats.  Examples of allocating
 numbers are:
 
@@ -457,7 +457,7 @@ numbers are:
 
 	q1 = itoq(66L);
 	q2 = iitoq(2L, 3L);
-	q3 = atoq("456.78");
+	q3 = str2q("456.78");
 
 Also unlike ZVALUEs, NUMBERs are quickly copied.  This is because they contain
 a link count, which is the number of pointers there are to the NUMBER.	The
@@ -504,8 +504,8 @@ For example, to calculate sin(0.5) to 100 decimal places, you could do:
 
 	NUMBER *q, *ans, *epsilon;
 
-	q = atoq("0.5");
-	epsilon = atoq("1e-100");
+	q = str2q("0.5");
+	epsilon = str2q("1e-100");
 	ans = qsin(q, epsilon);
 
 There are many convenience macros similar to the ones for ZVALUEs which can

Makefile.local

@@ -1,3 +1,4 @@
+#!/usr/bin/env make
 #
 # Makefile.local - local Makefile variables
 #
@@ -24,16 +25,16 @@
 # For example, a AddressSanitizer.  You do NOT want to do this by
 # by default!  Do this only if you are debugging with libasan:
 #
-# For Linux gcc version 4.8.5 with libasan-4.8.5-4 you might try:
+# For Linux gcc version 11.3.1 with libasan-11.3.1-2.1 you might try:
 #
-#	CDEBUG:= -O0 -g
+#	DEBUG:= -O0 -g
 #	CFLAGS+= -fsanitize=address -fno-omit-frame-pointer
 #	LDFLAGS+= -fsanitize=address -fno-omit-frame-pointer
 #	CALC_ENV+= ASAN_OPTIONS=detect_stack_use_after_return=1
 #
-# For macOS 12.1 with clang version 13.0.0 (clang-1300.0.29.30) you might try:
+# For macOS 13.2.1 with clang version 14.0.0 (clang-1400.0.29.202) you might try:
 #
-#	CDEBUG:= -O0 -g
+#	DEBUG:= -O0 -g
 #	CFLAGS+= -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined
 #	LDFLAGS+= -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined
 #	CALC_ENV+= ASAN_OPTIONS=detect_stack_use_after_return=1

QUESTIONS

@@ -1,37 +1,28 @@
-If you have a simple general question about calc, send Email to:
+If you have a general question about calc, consider opening
+a new Github discussion under:
 
-    calc-quest-mail at asthe dot com
+	https://github.com/lcn2/calc/discussions
 
-    NOTE: Remove spaces and replace 'at' with @, and 'dot' with .
+Look over the existing discussions to see of your question fits
+under one of those exiting discussions.
 
-PLEASE put following the SPECIAL PHRASE somewhere in your Email Subject line:
+You may wish to add your question as a comment to an existing discussion.
+Otherwise click on:
 
-    calc question
+    ((New discussion))
 
-You may add additional words to your subject line.
-
-IMPORTANT: If your Email doesn't contain the above phrase,
-	   then we WILL NOT SEE your Email.
-
-PLEASE BE SURE you have that SPECIAL PHRASE somewhere in the subject line!
-
-Suggestion:
-
-    From time to time, the Email address and Subject SPECIAL PHRASE
-    may change so verify you have the current info by visiting:
-
-	http://www.isthe.com/chongo/tech/comp/calc/calc-question.html
+and ask your question in that new discussion.
 
 Please limit your questions to general questions about calc.  We
 cannot go into great detail in our answers, nor can we do your
-homework, nor can we do much more than answer short general questions
+homework, nor can we do much more than answer general questions
 about calc.
 
-Please be patient as we cannot always respond to Email messages quickly.
+Please be patient as we cannot always respond to discussion messages quickly.
 
 =-=
 
-## Copyright (C) 2021  Landon Curt Noll
+## Copyright (C) 2021,2023  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

README.WINDOWS

@@ -3,16 +3,8 @@ Dear calc user on a Windows based system,
 See the HOWTO.INSTALL file for information on how to build and install calc.
 See also the README file.
 
-BTW: While we are unable to use Windows 11, we welcome
-     Windows 11 developers to try compiling calc natively
-     (instead of via a Linux virtual machine).  If you are
-     able to compile Windows 11 natively, we would welcome
-     GitHub pull requests showing any needed modifications:
-
-	https://github.com/lcn2/calc/pulls
-
      Please also add notes to the 'Compiling calc under Windows 11'
-     section in README.WINDOWS file.
+     and 'Compiling with Cygwin' section in README.WINDOWS file.
 
 NOTE: The main developers do not have access to a Windows based platform.
       While we will make an effort to not break calc Windows based system,
@@ -21,10 +13,18 @@ NOTE: The main developers do not have access to a Windows based platform.
       Of course you are welcome to send us any patches that fix your
       Windows build environment.
 
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 =-= Compiling calc under Windows 11 =-=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
+BTW: While we are unable to use Windows 11, we welcome Windows 11
+     developers to try compiling calc natively (instead of via a Linux
+     virtual machine).  If you are able to compile Windows 11 natively,
+     we would welcome GitHub pull requests showing any needed modifications:
+
+	https://github.com/lcn2/calc/pulls
+
 We were given this advice from a Windows 11 developer:
 
     Windows 11 users could use Cygwin:
@@ -34,66 +34,78 @@ We were given this advice from a Windows 11 developer:
     IMPORTANT: While installing Cygwin, and during Cygwin Setup, be sure to
 	       select all the MinGW64 packages relating to gcc.
 
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-=-= Compiling calc via virtual machine under Windows 11 =-=
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+	       See the "Compiling with Cygwin" section below.
 
-We would prefer a Windows 11 solution that does not require a Windows 11
-developer to install a Linux virtual machine.  Nevertheless, a Windows 11
-user might want to use the Microsoft Windows Subsystem (WSL) for Linux:
+NOTE: Compiling calc under Windows 11 is work in progress.  If you run into
+      problems, consider the "Compiling with Cygwin" section below.
 
-	https://docs.microsoft.com/en-us/windows/wsl/
-
-    We have been told that you will need to turn on virtualization
-    to use this WSL subsystem.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-=-= Compiling calc under Windows 10 via Windows Subsystem for Linux (WSL) =-=
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-It has been reported that calc version 2.12.6.4 has been successfully
-compiled, installed and running on Windows 10 on 2018 Jan 21.
-
-We were told:
-
-  "The Windows Subsystem for Linux (WSL) is a new Windows 10 feature that
-   enables you to run native Linux command-line tools directly on Windows"
-
-   https://docs.microsoft.com/cs-cz/windows/wsl/about
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-=-= compiling with Cygwin =-=
+=-= Compiling with Cygwin =-=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 An effort is being made to allow windows users to compile calc using the
 Cygwin project (http://sources.redhat.com/cygwin/) with the GCC compiler
-and Un*x tools for Windows.
+and Unix tools for Windows.
 
 The major porting work for Cygwin was performed by Thomas Jones-Low
 (tjoneslo at softstart dot com).
 
-In March 2009, Michael Penk (mpenk at wuska dot com) reported success in
-installs under Cygwin:
+In December 2022, GitHub user @Leoongithub successfully compiled
+calc-2.14.1.2 under cygwin 2.924 (64 bit). The following are the
+compilation steps that GitHub user @Leoongithub recommends:
 
-    On my fairly complete Cygwin installs, everything compiles,
-    checks, and installs correctly.  My Cygwin is configured
-    in a very standard way (out of the box, using all of Cygwin's
-    defaults).  The install worked on 5 different machines with
-    Cygwin on them: one XP home, one XP professional, and three
-    Vista professionals.
+0. Install the latest version of cygwin (https://cygwin.com/install.html).
 
-Using the calc Makefile, he did the following:
+    NOTE: In addition to the default packages, you also need to check these
+	  three packages: gcc-core, make, and libreadline-devel. The version
+	  of these packages does not matter. Just choose the latest version.
 
-    make all target=Cygwin
-    make check
-    make install
+    NOTE: The addition of "target=Cygwin" to make commands below
+	  is done just in case the target is not set properly by make.
 
-He also reports:
+1. Change (cd) into the top of the source code directory of calc.
 
-    Of course, one should be logged in as an Administrator when
-    one builds and installs calc.
+   NOTE: The make command assume you are at the top of the calc source directory.
+
+2. make clobber target=Cygwin
+
+   NOTE: This helps ensure that you are starting from a so-called "clean slate",
+	 and that you have nothing hanging around from previous attempts to compile.
+
+3. make all target=Cygwin
+
+   NOTE: If successful, you should have a calc executable.  However that executable
+	 may not be working properly.  Advance to step (4) to test.
+
+4. make chk target=Cygwin
+
+   NOTE: If you want this command be be verbose, try:
+
+	    make check target=Cygwin
+
+   NOTE: This will run calc with the regress.cal regression suite.  This step could take
+	 for a while to run, depending on the speed/performance of your machine.
+	 If all is well (all regression tests pass), you will see at the end:
+
+	    chk OK
+
+         Otherwise you may see calc exit non-zero after it prints some lines with '****'
+	 error messages followed by a line including a final error count of the form:
+
+	   **** 2 error(s) found  \/++\/
+
+         If you see some errors that may relate to files and I/O, all may not be lost.
+	 It could simply mean that your Windows environment is not conforming to standard
+	 I/O and file operations.  The calc mathematical engine may be just fine.  On the
+	 other hand if you see mathematical related regression test failures, this is
+	 bad sign that your calc executable under Windows is not usable.
+
+5. make install target=Cygwin
+
+   NOTE: This step is optional.  While calc is usable at the top of the source code directory
+         of calc, installing calc may be of benefit so you can use calc elsewhere on your system.
 
-He was compiling calc 2.12.4.0 with Cygwin version 1.5.25-15.
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 =-= If all else fails, for Cygwin =-=
@@ -118,6 +130,10 @@ In particular:
     source directory, edit them (if needed) and build using the
     Cygwin GCC compiler and Cygwin build environment.
 
+NOTE: The use of win32_hsrc and this method has been deprecated.
+      It may go away once the Windows 11 methods are stable.
+
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 =-= compiling under DJGPP =-=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -178,8 +194,43 @@ Look for Makefile comments of the form:
 Follow those recommendations.  In cases where they conflict with
 the above Makefile list, follow the recommendation in the Makefile.
 
+NOTE: The use of DJGPP and this method has been deprecated.
+      It may go away once the Windows 11 methods are stable.
 
-## Copyright (C) 2002-2009,2021  Landon Curt Noll and Thomas Jones-Low
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+=-= Compiling calc via virtual machine under Windows 11 =-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+We would prefer a Windows 11 solution that does not require a Windows 11
+developer to install a Linux virtual machine.  Nevertheless, a Windows 11
+user might want to use the Microsoft Windows Subsystem (WSL) for Linux:
+
+	https://docs.microsoft.com/en-us/windows/wsl/
+
+    We have been told that you will need to turn on virtualization
+    to use this WSL subsystem.
+
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+=-= Compiling calc under Windows 10 via Windows Subsystem for Linux (WSL) =-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+It has been reported that calc version 2.12.6.4 has been successfully
+compiled, installed and running on Windows 10 on 2018 Jan 21.
+
+We were told:
+
+  "The Windows Subsystem for Linux (WSL) is a new Windows 10 feature that
+   enables you to run native Linux command-line tools directly on Windows"
+
+   https://docs.microsoft.com/cs-cz/windows/wsl/about
+
+NOTE: The use of calc under Windows 10 has been deprecated in favor of one
+      of the Windows 11 methods above.
+
+
+## Copyright (C) 2002-2009,2021,2022  Landon Curt Noll and Thomas Jones-Low
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

README.md

@@ -1,3 +1,25 @@
+# TL;DR Try calc
+
+## TL;DR Install calc
+
+```
+misc linux: sudo yum install calc
+on Debian:  sudo apt install calc
+on RHEL:    sudo dnf install calc
+on Ubuntu:  sudo apt install calc
+via Termux: apt install calc
+via src:    sudo make clobber all chk instsll
+```
+
+## TL;DR Run calc
+
+```
+misc shell:   calc
+via bash:     calc
+via misc app: launch calc via Termux
+via zsh:      calc
+```
+
 # What is calc?
 
 Calc is an interactive calculator which provides for easy large

SECURITY.md

@@ -15,5 +15,5 @@ FYI: please review the BUGS file, or enter the calc command:
 Please create a calc GitHub repo issue:
 
     https://github.com/lcn2/calc/issues
-    
+
 Click on ((New issue)) and follow the issue template.

align32.c

@@ -27,6 +27,11 @@
 
 #include <stdio.h>
 #include <signal.h>
+#include "have_stdlib.h"
+#if defined(HAVE_STDLIB_H)
+#include <stdlib.h>
+#endif
+
 #include "longbits.h"
 
 #include "have_unistd.h"
@@ -34,11 +39,13 @@
 #include <unistd.h>
 #endif
 
+#include "have_unused.h"
+
 
 #include "banned.h"	/* include after system header <> includes */
 
 
-static void buserr(void);	/* catch alignment errors */
+static void buserr(int arg);	/* catch alignment errors */
 
 
 int
@@ -46,7 +53,7 @@ main(void)
 {
 	char byte[2*sizeof(USB32)];	/* mis-alignment buffer */
 	USB32 *p;			/* mis-alignment pointer */
-	int i;
+	unsigned long i;
 
 #if defined(MUST_ALIGN32)
 	/* force alignment */
@@ -82,7 +89,7 @@ main(void)
  */
 /*ARGSUSED*/
 static void
-buserr(int arg)
+buserr(int UNUSED(arg))
 {
 	/* alignment is required */
 	printf("#define MUST_ALIGN32\t%c* must align 32 bit values *%c\n",

byteswap.c

@@ -40,7 +40,7 @@
  *	dest	- pointer to where the swapped src will be put or
  *		  NULL to allocate the storage
  *	src	- pointer to a HALF array to swap
- *	len	- length of the src HALF array
+ *	len	- length of the src HALF array in HALFs
  *
  * returns:
  *	pointer to where the swapped src has been put
@@ -276,7 +276,7 @@ swap_b8_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all)
  *	dest	- pointer to where the swapped src will be put or
  *		  NULL to allocate the storage
  *	src	- pointer to a HALF array to swap
- *	len	- length of the src HALF array
+ *	len	- length of the src HALF array in HALFs
  *
  * returns:
  *	pointer to where the swapped src has been put
@@ -309,6 +309,50 @@ swap_b16_in_HALFs(HALF *dest, HALF *src, LEN len)
 }
 
 
+/*
+ * swap_HALFs - swap HALFs in an array of HALFs
+ *
+ * given:
+ *	dest	- pointer to where the swapped src will be put or
+ *		  NULL to allocate the storage
+ *	src	- pointer to a HALF array to swap
+ *	len	- length of the src HALF array in HALFs
+ *
+ * returns:
+ *	pointer to where the swapped src has been put
+ */
+HALF *
+swap_HALFs(HALF *dest, HALF *src, LEN len)
+{
+	HALF *s;	/* src swap pointer */
+	HALF *d;	/* dest swap pointer */
+	HALF *ret;
+	LEN i;
+
+	/*
+	 * allocate storage if needed
+	 */
+	if (dest == NULL) {
+		dest = alloc(len);
+	}
+	ret = dest;
+
+	/*
+	 * swap HALFs in the array
+	 */
+	s = src;
+	d = &dest[len-1];
+	for (i=0; i < len; ++i, --d, ++s) {
+		*d = *s;
+	}
+
+	/*
+	 * return the result
+	 */
+	return ret;
+}
+
+
 /*
  * swap_b16_in_ZVALUE - swap 16 bits in a ZVALUE
  *
@@ -531,7 +575,7 @@ swap_HALF_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all)
 		/*
 		 * allocate the storage
 		 */
-		dest = malloc(sizeof(ZVALUE));
+		dest = calloc(1, sizeof(ZVALUE));
 		if (dest == NULL) {
 			math_error("swap_HALF_in_ZVALUE: Not enough memory");
 			not_reached();

cal/Makefile

@@ -1,8 +1,8 @@
-#!/bin/make
+#!/usr/bin/env make
 #
 # cal - makefile for calc standard resource files
 #
-# Copyright (C) 1999-2006,2017,2021,2022  Landon Curt Noll
+# Copyright (C) 1999-2006,2017,2021-2023  Landon Curt Noll
 #
 # SRC: cal/Makefile
 #
@@ -44,20 +44,21 @@
 # If your system has a up to date, bash shell, then
 # you may wish to use:
 #
-#	SHELL= /bin/bash
+#	SHELL= bash
 #
 # On some systems such as macOS, the bash shell is very
 # far behind to the point where is cannot be depended on.
 # On such systems, the sh may be a much better alternative
 # shell for this Makefile to use:
 #
-#	SHELL= /bin/sh
+#	SHELL= sh
 #
-SHELL= /bin/bash
-#SHELL= /bin/sh
+SHELL= bash
+#SHELL= sh
 #if 0	/* start of skip for non-Gnu makefiles */
+#
 ifeq ($(target),Darwin)
-SHELL:= /bin/zsh
+SHELL:= /bin/sh
 endif
 #endif	/* end of skip for non-Gnu makefiles */
 
@@ -266,21 +267,22 @@ TRUE= true
 # to keep this list in nice sorted order.
 #
 CALC_FILES= README alg_config.cal beer.cal bernoulli.cal \
-	bernpoly.cal bigprime.cal bindings brentsolve.cal chi.cal chrem.cal \
-	constants.cal deg.cal dms.cal dotest.cal ellip.cal factorial.cal \
-	factorial2.cal gvec.cal hello.cal hms.cal infinities.cal intfile.cal \
-	intnum.cal lambertw.cal linear.cal lnseries.cal lucas.cal \
-	lucas_chk.cal mersenne.cal mfactor.cal mod.cal natnumset.cal \
-	palindrome.cal pell.cal pi.cal pix.cal pollard.cal poly.cal prompt.cal \
-	psqrt.cal qtime.cal quat.cal randbitrun.cal randmprime.cal \
-	randombitrun.cal randomrun.cal randrun.cal regress.cal repeat.cal \
-	screen.cal seedrandom.cal set8700.cal set8700.line smallfactors.cal \
-	solve.cal specialfunctions.cal statistics.cal strings.cal sumsq.cal \
-	sumtimes.cal surd.cal test1700.cal test2300.cal test2600.cal \
-	test2700.cal test3100.cal test3300.cal test3400.cal test3500.cal \
-	test4000.cal test4100.cal test4600.cal test5100.cal test5200.cal \
-	test8400.cal test8500.cal test8600.cal test8900.cal toomcook.cal \
-	unitfrac.cal varargs.cal xx_print.cal zeta2.cal
+	bernpoly.cal bigprime.cal bindings brentsolve.cal chi.cal \
+	chrem.cal comma.cal constants.cal deg.cal dms.cal dotest.cal \
+	ellip.cal factorial.cal factorial2.cal gvec.cal hello.cal hms.cal \
+	infinities.cal intfile.cal intnum.cal lambertw.cal linear.cal \
+	lnseries.cal lucas.cal lucas_chk.cal mersenne.cal mfactor.cal mod.cal \
+	natnumset.cal palindrome.cal pell.cal pi.cal pix.cal pollard.cal \
+	poly.cal prompt.cal psqrt.cal qtime.cal quat.cal randbitrun.cal \
+	randmprime.cal randombitrun.cal randomrun.cal randrun.cal regress.cal \
+	repeat.cal screen.cal seedrandom.cal set8700.cal set8700.line \
+	smallfactors.cal solve.cal specialfunctions.cal splitbits.cal \
+	statistics.cal strings.cal sumsq.cal sumtimes.cal surd.cal \
+	test1700.cal test2300.cal test2600.cal test2700.cal test3100.cal \
+	test3300.cal test3400.cal test3500.cal test4000.cal test4100.cal \
+	test4600.cal test5100.cal test5200.cal test8400.cal test8500.cal \
+	test8600.cal test8900.cal toomcook.cal unitfrac.cal varargs.cal \
+	xx_print.cal zeta2.cal
 
 # These calc files are now obsolete and are removed by the install rule.
 #

cal/README

@@ -263,6 +263,64 @@ chrem.cal
     Chinese remainder theorem/problem solver.
 
 
+comma.cal
+
+    Convert numbers into strings with 3-digit group and integer-fraction
+    separators.
+
+    If the value is an integer, the integer-fraction separator is not used.
+
+    str_comma(x, [group, [decimal]])
+
+	Convert x into a string.
+
+	If group is given and is a string, group will be used as
+	the 3-digit group separator, otherwise the default 3-digit
+	group separator will be used.
+
+	If decimal is given and is a string, group will be used as
+	the integer-fraction separator, otherwise the default
+	integer-fraction separator will be used.
+
+	The decimal and group arguments are optional.
+
+    set_default_group_separator(group)
+
+	Change the default 3-digit group separator if group is a string,
+	otherwise the default 3-digit group separator will not be
+	changed.  Return the old 3-digit group separator.
+
+    set_default_decimal_separator(decimal)
+
+	Change the default 3-digit group separator if decimal is a
+	string, otherwise the default integer-fraction separator
+	will not be changed.  Return the old integer-fraction separator.
+
+    print_comma(x, [group, [decimal]])
+
+	Print the value produced by str_comma(x, [group, [decimal]])
+	followed by a newline.
+
+	If the str_comma() does not return a string, nothing is printed.
+
+	The decimal and group arguments are optional.
+
+	The value produced by str_comma() is returned.
+
+    fprint_comma(fd, x, [group, [decimal]])
+
+	Print the value produced by str_comma(x, [group, [decimal]]),
+	without a trailing newline, on file fd.
+
+	If the str_comma() does not return a string, nothing is printed.
+
+	If fd is not an open file, nothing is printed.
+
+	The decimal and group arguments are optional.
+
+	The value produced by str_comma() is returned.
+
+
 deg.cal
 
     deg(deg, min, sec)
@@ -1375,6 +1433,60 @@ specialfunctions.cal
     on the script zeta2.cal.
 
 
+splitbits.cal
+
+    splitbits(x, b)
+
+    Given an integer x, split the value into a list of integers,
+    each of which is at most b bits long.
+
+    The value b must be an integer > 0.
+
+    The number of elements in the returned list is:
+
+	ceil((highbit(x) + 1) / b)
+
+    If x == 0, then a list of 1 element containing 0 is returned.
+
+    If x < 0, then the two's compliment of abs(x) is returned.
+    Even though calc represents negative integers as positive values
+    with sign bit, the bits returned by this function are as if
+    the integer converted as if the integer was a two's compliment
+    value.  For example:
+
+	; L = splitbits(-1, 8);
+	; print L[[0]]
+	255
+
+	; L = splitbits(-2, 8);
+	; print L[[0]]
+	254
+
+	; L = splitbits(-3, 8);
+	; print L[[0]]
+	253
+
+    The first element of the list contains the lowest order bits
+    of x.  The last element of the list contains the highest number
+    bits of x.
+
+    For example:
+
+	; x = 2^23209-1
+	; L = splitbits(x, 16);
+	; print size(L), L[[0]]
+
+	; print istype(2, 3i), istype(2, "2"), istype(2, null())
+	0 0 0
+
+	; mat a[2]
+	; b = list(1,2,3)
+	; c = assoc()
+	; obj chongo {was, here} d;
+	; print istype(a,b), istype(b,c), istype(c,d)
+	0 0 0
+
+
 statistics.cal
 
     gammaincoctave(z,a)

cal/comma.cal

@@ -0,0 +1,437 @@
+/*
+ * comma - convert numbers into strings with 3-digit group and integer-fraction separators
+ *
+ * Convert numbers into strings with 3-digit group and integer-fraction separators.
+ *
+ * If the value is an integer, the integer-fraction separator is not used.
+ *
+ * str_comma(x, [group, [decimal]])
+ *
+ *	Convert x into a string.
+ *
+ *	If group is given and is a string, group will be used as
+ *	the 3-digit group separator, otherwise the default 3-digit
+ *	group separator will be used.
+ *
+ *	If decimal is given and is a string, group will be used as
+ *	the integer-fraction separator, otherwise the default
+ *	integer-fraction separator will be used.
+ *
+ *	The decimal and group arguments are optional.
+ *
+ * set_default_group_separator(group)
+ *
+ *	Change the default 3-digit group separator if group is a string,
+ *	otherwise the default 3-digit group separator will not be
+ *	changed.  Return the old 3-digit group separator.
+ *
+ * set_default_decimal_separator(decimal)
+ *
+ *	Change the default 3-digit group separator if decimal is a
+ *	string, otherwise the default integer-fraction separator
+ *	will not be changed.  Return the old integer-fraction separator.
+ *
+ * print_comma(x, [group, [decimal]])
+ *
+ *	Print the value produced by str_comma(x, [group, [decimal]])
+ *	followed by a newline.
+ *
+ *	If the str_comma() does not return a string, nothing is printed.
+ *
+ *	The decimal and group arguments are optional.
+ *
+ *	The value produced by str_comma() is returned.
+ *
+ * fprint_comma(fd, x, [group, [decimal]])
+ *
+ *	Print the value produced by str_comma(x, [group, [decimal]]),
+ *	without a trailing newline, on file fd.
+ *
+ *	If the str_comma() does not return a string, nothing is printed.
+ *
+ *	If fd is not an open file, nothing is printed.
+ *
+ *	The decimal and group arguments are optional.
+ *
+ *	The value produced by str_comma() is returned.
+ *
+ * Copyright (C) 2022  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Under source code control:   2022/06/20 15:51:49
+ * File existed as early as:    2022
+ *
+ * Share and enjoy!  :-)        http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+static default_group_separator = ",";	/* default 3-digit group separator */
+static default_decimal_separator = ".";	/* default integer-fraction separator */
+
+
+/*
+ * str_comma - convert number into base 10 string with 3-digit groups and integer-fraction separator
+ *
+ *
+ * This function converts a real number into a base 10 string, where
+ * groups of 3 digits are separated by a 3-digit group separator and
+ * a integer-fraction separator is printed between integer and decimal fraction.
+ *
+ * For example:
+ *
+ *	string = str_comma(x);
+ *	string = str_comma(x), " ", ".");
+ *	string = str_comma(x), ".", ",");
+ *
+ * Internally the function calls:
+ *
+ *     strprintf("%f", x);
+ *
+ * and thus the number of decimal fraction digits is subject to
+ * the display() or config("display") value.  See:
+ *
+ *     man display
+ *
+ * for details.
+ *
+ * given:
+ *
+ *	x		number to convert
+ *
+ * optional args:
+ *
+ *	group		use this 3-digit group separator
+ *	decimal		use this integer-fraction separator
+ *
+ * returns:
+ *
+ *	string containing the base 10 digits with group and decimal separators, OR
+ *	null() if x is not a number, OR
+ *	null() if group is neither null() (not given) nor a string, OR
+ *	null() if group is null() (not given) AND default_group_separator is not a string, OR
+ *	null() if decimal is neither null() (not given) nor a string, OR
+ *	null() if decimal is null() (not given) AND default_decimal_separator is not a string.
+ */
+define str_comma(x, group, decimal)
+{
+    local group_separator;	/* 3-digit group separator */
+    local decimal_separator;	/* separator between decimal integer and decimal fraction */
+    local sign_str;		/* leading - if x < 0 or empty if x >= 0 */
+    local integer;		/* integer part of absolute value of x */
+    local int_str;		/* integer as a string */
+    local int_len;		/* number of digits in int_str */
+    local first_group_len;	/* length of 1st group before the 1st 3-digit group separator */
+    local fraction;		/* factional part of absolute value of x */
+    local frac_str;		/* fraction as a string */
+    local frac_len;		/* number of digits in frac_str including leading 0. */
+    local ret;			/* string to return */
+    local config_leadzero;	/* config("leadzero") to restore */
+    local config_tilde;		/* config("tilde") to restore */
+    local i;
+
+    /*
+     * parse args - return null if args are bogus
+     *
+     * Return null() if args or conditions are bogus.
+     */
+    if (!isreal(x)) {
+	return null();
+    }
+    group_separator = isnull(group) ? default_group_separator : group;
+    decimal_separator = isnull(decimal) ? default_decimal_separator : decimal;
+    if (!isstr(group_separator)) {
+	return null();
+    }
+    if (!isstr(decimal_separator)) {
+	return null();
+    }
+
+    /*
+     * split number
+     */
+    if (x < 0) {
+	sign_str = "-";
+	integer = int(-x);
+	fraction = frac(-x);
+    } else {
+	sign_str = "";
+	integer = int(x);
+	fraction = frac(x);
+    }
+    ret = sign_str;
+
+    /*
+     * convert digits
+     *
+     * Avoid printing ~ and leading zeros for factional part.
+     */
+    int_str = strprintf("%d", integer);
+    config_leadzero = config("leadzero", 0);
+    config_tilde = config("tilde", 0);
+    frac_str = strprintf("%d", fraction);
+    config("leadzero", config_leadzero),;
+    config("tilde", config_tilde),;
+
+    /*
+     * determine number of digits in the integer part
+     */
+    int_len = strlen(int_str);
+    frac_len = strlen(frac_str);
+
+    /*
+     * form integer part with group separators as needed
+     */
+
+    /*
+     * case: integer is 3 or fewer digits
+     */
+    if (integer < 1000) {
+	ret += int_str;
+
+    /*
+     * case: integer is 4 or more digits
+     */
+    } else {
+
+	/*
+	 * form a decimal string using group separators
+	 */
+
+	/*
+	 * form the initial leading digits before 1st group separator
+	 */
+	first_group_len = int_len % 3;
+	if (first_group_len == 0) {
+	    first_group_len = 3;
+	}
+	ret += substr(int_str, 1, first_group_len);
+
+	/*
+	 * until end of digits, print group separator followed by 3 more digits
+	 */
+	for (i = first_group_len+1; i < int_len; i += 3) {
+	    ret += group_separator + substr(int_str, i, 3);
+	}
+    }
+
+    /*
+     * form fractional part using decimal separator as needed
+     */
+
+    /*
+     * case: x is an integer
+     */
+    if (fraction == 0) {
+
+	/* no fraction, nothing more to do */
+
+    /*
+     * case: x is not an integer
+     */
+    } else {
+
+	/*
+	 * add integer-fraction separator
+	 */
+	ret += decimal_separator;
+
+	/*
+	 * add remaining digits
+	 *
+	 * Skip over the leading 0. in frac_str
+	 */
+	ret += substr(frac_str, 2, frac_len-1);
+    }
+
+    /*
+     * All Done!!! -- Jessica Noll, Age 2
+     */
+    return ret;
+}
+
+
+/*
+ * set_default_group_separator - change the default 3-digit group separator
+ *
+ * If group is not a string, then the default 3-digit group separator
+ * is not changed.  Thus, this will only return the default 3-digit group separator:
+ *
+ *	set_default_group_separator(null());
+ *
+ * given:
+ *
+ *	group		3-digit group separator
+ *
+ * returns:
+ *
+ *	previous 3-digit group separator value
+ */
+define set_default_group_separator(group)
+{
+    local old_default_group_separator;		/* previous default 3-digit group separator to return */
+
+    /*
+     * save current 3-digit group separator
+     */
+    old_default_group_separator = default_group_separator;
+
+    /*
+     * change 3-digit group separator if group is a string
+     */
+    if (isstr(group)) {
+	default_group_separator = group;
+    }
+    return old_default_group_separator;
+}
+
+
+/*
+ * set_default_decimal_separator - change the default integer-fraction separator
+ *
+ * If decimal is not a string, then the default integer-fraction separator
+ * is not changed.  Thus, this will only return the integer-fraction separator:
+ *
+ *	set_default_decimal_separator(null());
+ *
+ * given:
+ *
+ *	decimal		separator between decimal integer and decimal fraction (def: ".")
+ *
+ * returns:
+ *
+ *	previous integer-fraction separator value
+ */
+define set_default_decimal_separator(decimal)
+{
+    local old_default_decimal_separator;	/* previous default integer-fraction separator */
+
+    /*
+     * save current integer-fraction separator
+     */
+    old_default_decimal_separator = default_decimal_separator;
+
+    /*
+     * change 3-digit decimal integer-fraction if decimal is a string
+     */
+    if (isstr(decimal)) {
+	default_decimal_separator = decimal;
+    }
+    return old_default_decimal_separator;
+}
+
+
+/*
+ * print_comma - print base 10 string with 3-digit group separators & integer-fraction separator + newline
+ *
+ * This function prints the result of str_comma(x, group, decimal) followed by a newline.
+ * For example:
+ *
+ *	print_comma(x);
+ *	print_comma(x), " ", ".");
+ *	print_comma(x), ".", ",");
+ *
+ * If str_comma() does not return a string, this function prints nothing.
+ *
+ * NOTE: To print without a newline, use fprint_comma(fd, x, group, decimal).
+ *
+ * given:
+ *	x		number to convert
+ *
+ * optional args:
+ *
+ *	group		use this 3-digit group separator
+ *	decimal		use this integer-fraction separator
+ *
+ * returns:
+ *
+ *	string containing the base 10 digits with group and decimal separators, OR
+ *	null() if x is not a number, OR
+ *	null() if group is neither null() (not given) nor a string, OR
+ *	null() if group is null() (not given) AND default_group_separator is not a string, OR
+ *	null() if decimal is neither null() (not given) nor a string, OR
+ *	null() if decimal is null() (not given) AND default_decimal_separator is not a string.
+ */
+define print_comma(x, group, decimal)
+{
+    local ret;		/* base 10 string with 3-digit group and integer-fraction separators */
+
+    /*
+     * convert to string
+     */
+    ret = str_comma(x, group, decimal);
+
+    /*
+     * print converted string
+     */
+    if (isstr(ret)) {
+	printf("%s\n", ret);
+    }
+    return ret;
+}
+
+
+/*
+ * fprint_comma - print base 10 string with 3-digit group separators & integer-fraction separator w/o newline
+ *
+ * This function prints the result of str_comma(x, group, decimal) on an open file, without a trailing newline.
+ * For example:
+ *
+ *	fprint_comma(files(1), x);
+ *	fprint_comma(fd, x), " ", ".");
+ *	fprint_comma(files(2), x), ".", ",");
+ *
+ * If str_comma() does not return a string, this function prints nothing.
+ *
+ * This function flushes output to the open file before returning.
+ *
+ * NOTE: To print with a newline, use print_comma(x, group, decimal).
+ *
+ * given:
+ *	fd		open file
+ *	x		number to convert
+ *
+ * optional args:
+ *
+ *	group		use this 3-digit group separator
+ *	decimal		use this integer-fraction separator
+ *
+ * returns:
+ *
+ *	string containing the base 10 digits with group and integer-fraction separators, OR
+ *	null() if x is not a number, OR
+ *	null() if group is neither null() (not given) nor a string, OR
+ *	null() if group is null() (not given) AND default_group_separator is not a string, OR
+ *	null() if decimal is neither null() (not given) nor a string, OR
+ *	null() if decimal is null() (not given) AND default_decimal_separator is not a string.
+ */
+define fprint_comma(fd, x, group, decimal)
+{
+    local ret;		/* base 10 string with 3-digit group and integer-fraction separators */
+
+    /*
+     * convert to string
+     */
+    ret = str_comma(x, group, decimal);
+
+    /*
+     * print converted string
+     */
+    if (isstr(ret) && isfile(fd)) {
+	fprintf(fd, "%s", ret);
+	fflush(fd);
+    }
+    return ret;
+}

cal/dotest.cal

@@ -4,19 +4,37 @@
  * This file was created by Ernest Bowen <ebowen at une dot edu dot au>
  * and modified by Landon Curt Noll.
  *
- * This dotest_code has been placed in the public domain.  Please do not
- * copyright this dotest_code.
- *
- * ERNEST BOWEN AND LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS         SOFTWARE,  INCLUDING  ALL IMPLIED WARRANTIES OF MER-
- * CHANTABILITY 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.
- *
  * This file is not covered under version 2.1 of the GNU LGPL.
+ * This file is covered under "The unlicense":
+ *
+ *	https://unlicense.org
+ *
+ * In particular:
+ *
+ * This is free and unencumbered software released into the public domain.
+ *
+ * Anyone is free to copy, modify, publish, use, compile, sell, or
+ * distribute this software, either in source code form or as a compiled
+ * binary, for any purpose, commercial or non-commercial, and by any
+ * means.
+ *
+ * In jurisdictions that recognize copyright laws, the author or authors
+ * of this software dedicate any and all copyright interest in the
+ * software to the public domain. We make this dedication for the benefit
+ * of the public at large and to the detriment of our heirs and
+ * successors. We intend this dedication to be an overt act of
+ * relinquishment in perpetuity of all present and future rights to this
+ * software under copyright law.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * For more information, please refer to <http://unlicense.org/>
  *
  * Under source dotest_code control:	2006/03/08 05:54:09
  * File existed as early as:	2006

cal/regress.cal

@@ -541,7 +541,16 @@ define test_config()
 	vrfy(issimple(config("dupvar_warn")),
 		'562: issimple(config("rdupvar_warn"))');
 
-	print '563: Ending test_config';
+
+	/* test new space modes */
+	vrfy(config("tilde_space") == 0,
+		'563: config("tilde_space") == 0');
+	vrfy(config("fraction_space") == 0,
+		'564: config("fraction_space") == 0');
+	vrfy(config("complex_space") == 0,
+		'565: config("complex_space") == 0');
+
+	print '566: Ending test_config';
 }
 print '010: parsed test_config()';
 
@@ -3924,7 +3933,7 @@ define test_fileops()
 	vrfy(!iserror(p=fopen("tmp4200","r")),
 			'4274: !iserror(p=fopen("tmp4200","r"))');
 	vrfy(!iserror(s=fgetline(p)),	  '4275: !iserror(s=fgetline(p))');
-	vrfy(strcmp(s,"chongo") == 0, 	  '4276: strcmp(s,"chongo") == 0');
+	vrfy(strcmp(s,"chongo") == 0,	  '4276: strcmp(s,"chongo") == 0');
 	vrfy(!iserror(s=fgetfile(p)),	  '4277: !iserror(s=fgetfile(p))');
 	vrfy(strcmp(s,"w\0a\0s\nhere\n") == 0,
 			'4278: strcmp(s,"w\0a\0s\nhere\n") == 0');
@@ -4296,84 +4305,119 @@ define test_strprintf()
 	print				    '4804: c = config("display", 2)';
 	c = config("tilde", 0);
 	print				    '4805: c = config("tilde", 0)';
+	c = config("tilde_space", 1);
+	print				    '4806: c = config("tilde_space", 1)';
 	c = config("leadzero", 0);
-	print				    '4806: c = config("leadzero", 0)';
+	print				    '4807: c = config("leadzero", 0)';
 	c = config("fullzero", 0);
-	print				    '4807: c = config("fullzero", 0)';
+	print				    '4808: c = config("fullzero", 0)';
 
 	/* tests with tilde == 0 */
 	vrfy(strprintf("%d%d", 27, 29) == "2729",
-			'4808: strprintf("%d%d", 27, 29) == "2729"');
+			'4809: strprintf("%d%d", 27, 29) == "2729"');
 	vrfy(strprintf("%5d%3d", 27, 29) == "   27 29",
-			'4809: strprintf("%5d%3d", 27, 29) == "   27 29"; ');
+			'4810: strprintf("%5d%3d", 27, 29) == "   27 29"; ');
 	vrfy(strprintf("%-5d%-3d", 27, 29) == "27   29 ",
-			'4810: strprintf("%-5d%-3d", 27, 29) == "27   29 "');
+			'4811: strprintf("%-5d%-3d", 27, 29) == "27   29 "');
 	vrfy(strprintf("%f", 1.375) == "1.38",
-			'4811: strprintf("%f", 1.375) == "1.38"');
+			'4812: strprintf("%f", 1.375) == "1.38"');
 	vrfy(strprintf("%f", 1.385) == "1.38",
-			'4812: strprintf("%f", 1.385) == "1.38"');
+			'4813: strprintf("%f", 1.385) == "1.38"');
 	vrfy(strprintf("%f", .375) == ".38",
-			'4813: strprintf("%f", .375) == ".38"');
+			'4814: strprintf("%f", .375) == ".38"');
 	vrfy(strprintf("%f", .385) == ".38",
-			'4814: strprintf("%f", .385) == ".38"');
+			'4815: strprintf("%f", .385) == ".38"');
 
 	/* tests with tilde == 1 */
 	c = config("tilde", 1);
-	print		'4815: c = config("tilde", 1)';
-	vrfy(strprintf("%f", 1.375) == "~1.38",
-			'4816: strprintf("%f", 1.375) == "~1.38"');
-	vrfy(strprintf("%f", 27/29) == "~.93",
-			'4817: strprintf("%f", 27/29) == "~.93"');
+	print		'4816: c = config("tilde", 1)';
+	vrfy(strprintf("%f", 1.375) == "~ 1.38",
+			'4817: strprintf("%f", 1.375) == "~ 1.38"');
+	vrfy(strprintf("%f", 27/29) == "~ .93",
+			'4818: strprintf("%f", 27/29) == "~ .93"');
 	vrfy(strprintf("%r", 27/29) == "27/29",
-			'4818: strprintf("%r", 27/29) == "27/29"');
+			'4819: strprintf("%r", 27/29) == "27/29"');
 	vrfy(strprintf("%o", 27/29) == "033/035",
-			'4819: strprintf("%o", 27/29) == "033/035"');
+			'4820: strprintf("%o", 27/29) == "033/035"');
 	vrfy(strprintf("%x", 27/29) == "0x1b/0x1d",
-			'4820: strprintf("%x", 27/29) == "0x1b/0x1d"');
+			'4821: strprintf("%x", 27/29) == "0x1b/0x1d"');
 	vrfy(strprintf("%b", 27/29) == "0b11011/0b11101",
-			'4821: strprintf("%b", 27/29) == "0b11011/0b11101"');
+			'4822: strprintf("%b", 27/29) == "0b11011/0b11101"');
+	vrfy(strprintf("%e", 12345) == "~ 1.23e4",
+			'4823: strprintf("%e", 12345) == "~ 1.23e4"');
+	vrfy(strprintf("%g", .385) == "~ .38",
+			'4824: strprintf("%g", .385) == "~ .38"');
+	vrfy(strprintf("%g", 385) == "~ 3.8e2",
+			'4825: strprintf("%g", 385) == "~ 3.8e2"');
+
+	/* tests with tilde == 1 and tilde_space == 0 */
+	c = config("tilde_space", 0);
+	print		'4826: c = config("tilde_space", 0)';
+	vrfy(strprintf("%f", 1.375) == "~1.38",
+			'4827: strprintf("%f", 1.375) == "~1.38"');
+	vrfy(strprintf("%f", 27/29) == "~.93",
+			'4828: strprintf("%f", 27/29) == "~.93"');
 	vrfy(strprintf("%e", 12345) == "~1.23e4",
-			'4822: strprintf("%e", 12345) == "~1.23e4"');
+			'4829: strprintf("%e", 12345) == "~1.23e4"');
 	vrfy(strprintf("%g", .385) == "~.38",
-			'4823: strprintf("%g", .385) == "~.38"');
+			'4830: strprintf("%g", .385) == "~.38"');
 	vrfy(strprintf("%g", 385) == "~3.8e2",
-			'4824: strprintf("%g", 385) == "~3.8e2"');
+			'4831: strprintf("%g", 385) == "~3.8e2"');
+
+	/* tests with tilde_space == 0 */
+	c = config("tilde_space", 1);
+	print		'4832: c = config("tilde_space", 1)';
+	vrfy(strprintf("%f", 1.375) == "~ 1.38",
+			'4833: strprintf("%f", 1.375) == "~ 1.38"');
+	vrfy(strprintf("%f", 27/29) == "~ .93",
+			'4834: strprintf("%f", 27/29) == "~ .93"');
+	vrfy(strprintf("%e", 12345) == "~ 1.23e4",
+			'4835: strprintf("%e", 12345) == "~ 1.23e4"');
+	vrfy(strprintf("%g", .385) == "~ .38",
+			'4836: strprintf("%g", .385) == "~ .38"');
+	vrfy(strprintf("%g", 385) == "~ 3.8e2",
+			'4837: strprintf("%g", 385) == "~ 3.8e2"');
 
 	/* mode tests with tilde == 0 */
 	c = config("tilde", 0);
-	print		'4825: c = config("tilde", 0)';
+	print		'4838: c = config("tilde", 0)';
 	vrfy(strprintf("%e", 12345) == "1.23e4",
-			'4826: strprintf("%e", 12345) == "1.23e4"');
+			'4839: strprintf("%e", 12345) == "1.23e4"');
 	vrfy(strprintf("%.3e", 12345) == "1.234e4",
-			'4827: strprintf("%.3e", 12345) == "1.234e4"');
+			'4840: strprintf("%.3e", 12345) == "1.234e4"');
 	vrfy(strprintf("%e", .00012345) == "1.23e-4",
-			'4828: strprintf("%e", .00012345) == "1.23e-4"');
+			'4841: strprintf("%e", .00012345) == "1.23e-4"');
 	vrfy(strprintf("%d %d", 27) == "27 ",
-			'4829: strprintf("%d %d", 27) == "27 "');
+			'4842: strprintf("%d %d", 27) == "27 "');
 	vrfy(strprintf("%d", 27, 29) == "27",
-			'4830: strprintf("%d", 27, 29) == "27"');
+			'4843: strprintf("%d", 27, 29) == "27"');
 	vrfy(strprintf("%r = %f", 27/29, 27/29) == "27/29 = .93",
-		'4831: strprintf("%r = %f", 27/29, 27/29) == "27/29 = .93"');
+		'4844: strprintf("%r = %f", 27/29, 27/29) == "27/29 = .93"');
 	vrfy(strprintf("%s", "abc") == "abc",
-		'4832: strprintf("%s", "abc") == "abc"');
+		'4845: strprintf("%s", "abc") == "abc"');
 	vrfy(strprintf("%f", "abc") == "abc",
-		'4833: strprintf("%f", "abc") == "abc"');
+		'4846: strprintf("%f", "abc") == "abc"');
 	vrfy(strprintf("%e", "abc") == "abc",
-		'4834: strprintf("%e", "abc") == "abc"');
+		'4847: strprintf("%e", "abc") == "abc"');
 	vrfy(strprintf("%5s", "abc") == "  abc",
-		'4835: strprintf("%5s", "abc") == "  abc"');
+		'4848: strprintf("%5s", "abc") == "  abc"');
 	vrfy(strprintf("%-5s", "abc") == "abc  ",
-		'4836: strprintf("%-5s", "abc") == "abc	 "');
+		'4849: strprintf("%-5s", "abc") == "abc	 "');
 	vrfy(strprintf("%g", .385) == ".38",
-			'4837: strprintf("%g", .385) == ".38"');
+			'4850: strprintf("%g", .385) == ".38"');
 	vrfy(strprintf("%g", 385) == "3.8e2",
-			'4838: strprintf("%g", 385) == "3.8e2"');
+			'4851: strprintf("%g", 385) == "3.8e2"');
+
+	c = config("fraction_space", 1);
+	print				    '4852: c = config("fraction_space", 1)';
+	vrfy(strprintf("%r = %f", 27/29, 27/29) == "27 / 29 = .93",
+		'4853: strprintf("%r = %f", 27/29, 27/29) == "27 / 29 = .93"');
 
 	/* restore config */
 	c = config("all", callcfg);
-	print				    '4839: c = config("all", callcfg)';
+	print				    '4854: c = config("all", callcfg)';
 
-	print '4840: Ending test_strprintf';
+	print '4855: Ending test_strprintf';
 }
 print '088: parsed test_fileop()';
 
@@ -8129,7 +8173,7 @@ vrfy(config("redecl_warn",0),	  '8651: config("redecl_warn",0)');
 vrfy(config("dupvar_warn",0),	  '8652: config("dupvar_warn",0)');
 vrfy(u_glob == 6,		  '8653: u_glob == 6');
 global u_glob = 555;
-print 				  '8654: declare u_glob';
+print				  '8654: declare u_glob';
 vrfy(u_glob == 555,		  '8655: u_glob == 555');
 define func_8650(u_glob) { local u_glob; return u_glob; }
 print				  '8656: u_glob as both local and parameter';

cal/screen.cal

@@ -3,19 +3,37 @@
  *
  * This file was created by Ernest Bowen <ebowen at une dot edu dot au>.
  *
- * This code has been placed in the public domain.  Please do not
- * copyright this code.
- *
- * ERNEST BOWEN DISCLAIMS ALL WARRANTIES WITH  REGARD  TO
- * THIS	 SOFTWARE,  INCLUDING  ALL IMPLIED WARRANTIES OF MER-
- * CHANTABILITY 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.
- *
  * This file is not covered under version 2.1 of the GNU LGPL.
+ * This file is covered under "The unlicense":
+ *
+ *	https://unlicense.org
+ *
+ * In particular:
+ *
+ * This is free and unencumbered software released into the public domain.
+ *
+ * Anyone is free to copy, modify, publish, use, compile, sell, or
+ * distribute this software, either in source code form or as a compiled
+ * binary, for any purpose, commercial or non-commercial, and by any
+ * means.
+ *
+ * In jurisdictions that recognize copyright laws, the author or authors
+ * of this software dedicate any and all copyright interest in the
+ * software to the public domain. We make this dedication for the benefit
+ * of the public at large and to the detriment of our heirs and
+ * successors. We intend this dedication to be an overt act of
+ * relinquishment in perpetuity of all present and future rights to this
+ * software under copyright law.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * For more information, please refer to <http://unlicense.org/>
  *
  * Under source code control:	2006/03/08 05:54:09
  * File existed as early as:	2006

cal/splitbits.cal

@@ -0,0 +1,83 @@
+/*
+ * splitbits - split an integer into list on bit boundardies of a fixed size
+ *
+ * Copyright (C) 2018,2023  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Under source code control:	2006/06/07 14:10:11
+ * File existed as early as:	2006
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+/*
+ * setup splitbits errors
+ */
+static E_SPLITBITS_1, E_SPLITBITS_2, E_SPLITBITS_3;
+if (! iserror(E_SPLITBITS_1)) E_SPLITBITS_1 = newerror("1st argument to splitbits must be an integer");
+if (! iserror(E_SPLITBITS_2)) E_SPLITBITS_2 = newerror("2nd argument to splitbits must be an integer");
+if (! iserror(E_SPLITBITS_3)) E_SPLITBITS_3 = newerror("2nd argument must be an integer > 0");
+
+
+/*
+ * define splitbits function
+ */
+define splitbits(x, b)
+{
+    local ret;		/* list to return */
+    local mask;		/* 2^b-1 */
+    local x_is_reg = 0;	/* true if x < 0 */
+
+    /* firewall */
+    if (! isint(x)) {
+	return error(E_SPLITBITS_1);
+    }
+    if (! isint(b)) {
+	return error(E_SPLITBITS_2);
+    }
+    if (b <= 0) {
+	return error(E_SPLITBITS_3);
+    }
+
+    /* special case: x == 0 */
+    if (x == 0) {
+	return list(0);
+    }
+
+    /* setup for splitting x */
+    ret = list();
+    mask = 2^b-1;
+    if (x < 0) {
+	x_is_reg = 1;
+	x = abs(x);
+    }
+
+    /* split x */
+    while (x > 0) {
+	printf("%d %x\n", size(ret), x);
+	if (x_is_reg) {
+	    append(ret, xor(x & mask, mask));
+	} else {
+	    append(ret, x & mask);
+	}
+	x >>= b;
+    }
+
+    /* return list */
+    return ret;
+}

calc.c

@@ -108,8 +108,6 @@ main(int argc, char **argv)
 	int c;			/* option */
 	int index;
 	int maxindex;
-	/* fix gcc warning bug */
-	int unusedint = 0;
 	char *cp;
 	char *endcp;
 	char *bp;
@@ -289,9 +287,7 @@ main(int argc, char **argv)
 						    exit(6);
 						}
 						calc_debug = cp;
-						/* fix gcc warning bug */
-						unusedint =
-						    strtol(cp, &endcp, 10);
+						(void) strtol(cp, &endcp, 10);
 						cp = endcp;
 						if (*cp != '\0' &&
 						    *cp != ' ' && *cp != ':') {
@@ -323,9 +319,7 @@ main(int argc, char **argv)
 						    exit(9);
 						}
 						resource_debug = cp;
-						/* fix gcc warning bug */
-						unusedint =
-						    strtol(cp, &endcp, 10);
+						(void) strtol(cp, &endcp, 10);
 						cp = endcp;
 						if (*cp != '\0' &&
 						    *cp != ' ' && *cp != ':') {
@@ -355,8 +349,7 @@ main(int argc, char **argv)
 					    exit(12);
 					}
 					user_debug = cp;
-					/* unusedint avoids gcc warning bug */
-					unusedint = strtol(cp, &endcp, 10);
+					(void) strtol(cp, &endcp, 10);
 					cp = endcp;
 					if (*cp != '\0' && *cp != ' ') {
 						fprintf(stderr, "Bad syntax in"
@@ -765,8 +758,6 @@ main(int argc, char **argv)
 	/*
 	 * All done! - Jessica Noll, Age 2
 	 */
-	/* fix gcc warning bug */
-	unusedint++;
 	libcalc_call_me_last();
 	return (run_state == RUN_EXIT_WITH_ERROR ||
 		run_state == RUN_ZERO) ? 1 : 0;

calc.man

@@ -251,9 +251,6 @@ For example:
 \fI#!${BINDIR}/calc\fP \fB\-q\fP \fB\-f\fP
 .fi
 .in -5n
-.sp 1
-This allows the script to run independently of
-startup scripts.
 
 .sp 1
 See
@@ -294,6 +291,24 @@ This will cause calc to process lines in
 in
 .BR "shell script mode" .
 
+.sp 1
+.B NOTE:
+The use of
+.BR \-f
+does
+.B NOT
+imply
+.BR \-q
+and thus one would need to use
+.sp 1
+.in +5n
+.nf
+\fIcalc\fP\ [optional_other_flags\ \&...] \fB\-q\fP \fB\-f\fP filename
+.fi
+.in -5n
+.sp 1
+to disable the use of calc startup files as well.
+
 .sp 1
 The use of
 .B \-f
@@ -458,6 +473,13 @@ flag overrides
 .TP
 .B \-q
 Disable the reading of the startup scripts.
+.sp 1
+This allows the script to run independently of
+startup scripts such those managed by the
+.B $CALCRC
+environment variable.
+For example, this will disable the use of the common calcrc file
+(usually ~/.calcrc).
 
 .TP
 .B \-s
@@ -596,7 +618,7 @@ may have to be replaced by:
 .sp 1
 .in +5n
 .nf
-print 27! ^2	or	print 27\!^2
+print 27! ^2	or	print 27\\!^2
 .fi
 .in -5n
 
@@ -813,6 +835,23 @@ are automatically set if
 .B \-i
 is not given.
 .sp 1
+.B NOTE:
+The use of
+.BR \-f
+does
+.B NOT
+imply
+.BR \-q
+and thus one would need to use
+.sp 1
+.in +5n
+.nf
+\fIcalc\fP\ [optional_other_flags\ \&...] \fB\-q\fP \fB\-f\fP filename
+.fi
+.in -5n
+.sp 1
+to disable the use of calc startup files as well.
+.sp 1
 For example, if
 the file
 .BR /tmp/mersenne :
@@ -1186,6 +1225,7 @@ The calc commands:
 help copyright
 help copying
 help copying-lgpl
+help credit
 .fi
 .in -0.5i
 .sp
@@ -1220,6 +1260,10 @@ Copyright (C) year  David I. Bell, Landon Curt Noll and Ernest Bowen
 Copyright (C) year  Landon Curt Noll
 Copyright (C) year  Ernest Bowen and Landon Curt Noll
 Copyright (C) year  Ernest Bowen
+Copyright (C) year  Petteri Kettunen and Landon Curt Noll
+Copyright (C) year  Christoph Zurnieden
+Copyright (C) year  Landon Curt Noll and Thomas Jones-Low
+Copyright (C) year  Klaus Alexander Seistrup and Landon Curt Noll
 .fi
 .in -0.5i
 .sp
@@ -1227,12 +1271,22 @@ This man page is:
 .sp
 .in +0.5i
 .nf
-Copyright (C) 1999-2021  Landon Curt Noll
+Copyright (C) 1999-2023  Landon Curt Noll
 .fi
 .in -0.5i
 .sp
 and is covered under version 2.1 GNU Lesser General
 Public License.
+.sp
+A few files in calc are covered under "The Unlicense".
+For more information on this license, see:
+.sp
+.in +0.5i
+.nf
+https://unlicense.org
+.fi
+.in -0.5i
+.sp
 
 .PP
 
@@ -1240,61 +1294,38 @@ Public License.
 
 .PP
 
-If you have a simple general question about calc, send Email to:
-.sp
-.in +0.5i
-calc-quest-mail at asthe dot com
-.sp
-NOTE: Remove spaces and replace 'at' with @, and 'dot' with .
-.in -0.5i
-.sp
-.in +0.5i
-NOTE: Yes, the Email address uses 'asthe',
-while the web site uses 'isthe'.
-.in -0.5i
-.sp
-.B PLEASE
-put following the
-.B SPECIAL PHRASE
-somewhere in your Email Subject line:
-.sp
-.in +0.5i
-.B calc question
-.in -0.5i
-.sp
-You may add additional words to your subject line.
-.sp
-.B IMPORTANT:
-If your Email doesn't contain the above phrase,
-then we
-.B WILL NOT SEE
-your Email.
-.sp
-.B PLEASE BE SURE
-you have that
-.B SPECIAL PHRASE
-somewhere in the subject line!
-.sp
-.B Suggestion:
-.sp
-.in +0.5i
-From time to time, the Email address and Subject
-.B SPECIAL PHRASE
-may change so verify you have the current info by visiting:
+To ask the calc maintainers a general question about calc,
+see the output of the following calc command:
+
 .sp
 .in +0.5i
 .nf
-http://www.isthe.com/chongo/tech/comp/calc/calc-question.html
+; help question
 .fi
-.in -0.5i
-.in -0.5i
+.in +0.5i
 .sp
-Please limit your questions to general questions about calc.
-We cannot go into great detail in our answers,
-nor can we do your homework, nor can
-we do much more than answer short general questions about calc.
+.PP
+
+or read the source file:
+
+.sp
+.in +0.5i
+.nf
+QUESTIONS
+.fi
+.in +0.5i
+.sp
+
+.PP
+
+or visit the following URL:
+.sp
+.in +0.5i
+.nf
+https://github.com/lcn2/calc/blob/master/QUESTIONS
+.fi
+.in +0.5i
 .sp
-Please be patient as we cannot always respond to Email messages quickly.
 
 .PP
 
@@ -1302,71 +1333,37 @@ Please be patient as we cannot always respond to Email messages quickly.
 
 .PP
 
-Send bug reports and bug fixes to:
+To inform the calc maintainers about a bug, or to submit a bug fix,
+see the output of the following calc command:
+
 .sp
 .in +0.5i
 .nf
-calc-bugrept at asthe dot com
+; help bugs
 .fi
-.sp
-NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-.sp
-NOTE: Yes, the Email address uses 'asthe',
-while the web site uses 'isthe'.
-.in -0.5i
-.sp
-You
-.B MUST
-use following
-.B SPECIAL PHRASE
-in your Email Subject line:
-.sp
 .in +0.5i
-.B calc bug report
-.in -0.5i
 .sp
-You may add additional words to your subject line.
-.sp
-.B Suggestion:
-.sp
-.in +0.5i
-From time to time, the Email address and Subject
-.B SPECIAL PHRASE
-may change so verify you have the current info by visiting:
+.PP
+
+or read the source file:
+
 .sp
 .in +0.5i
 .nf
-http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
+BUGS
 .fi
-.in -0.5i
-.in -0.5i
+.in +0.5i
 .sp
-.B IMPORTANT:
-If your Email doesn't contain the above phrase,
-then we
-.B WILL NOT SEE
-your Email.
-.sp
-.B PLEASE BE SURE
-you have that
-.B SPECIAL PHRASE
-somewhere in the subject line!
-.sp
-See the
-.I BUGS
-source file or use the
-.I calc
-command:
+.PP
+
+or visit the following URL:
 .sp
 .in +0.5i
 .nf
-help bugs
+https://github.com/lcn2/calc/blob/master/BUGS
 .fi
-.in -0.5i
+.in +0.5i
 .sp
-for more information about bug reporting.
-.sp
-Please be patient as we cannot always respond to Email messages quickly.
 
 .PP
 
@@ -1376,126 +1373,40 @@ Please be patient as we cannot always respond to Email messages quickly.
 
 .I Calc
 is open source.
-Contributions of code are welcome.
-.sp
-We welcome and encourage you to send us:
+You are welcome to contribute code to calc, or submit bug fixes to to calc.
 .sp
+To contribute code to calc, please see see the output of
+the following calc command:
+
 .sp
 .in +0.5i
 .nf
-* calc resource files (cal/*.cal)
-* calc shell scripts (cscript/*.calc)
-* builtin functions that you have modified or written, i.e.:
-  assocfunc.c comfunc.c func.c func.h
-  listfunc.c matfunc.c qfunc.c zfunc.c
-* custom functions that you have modified or written (custom/*)
-* help files modified or written (help/*)
-* brief description of you added, fixed, improved in CHANGES
-* regression test cases (cal/regress.cal)
-* Makefile improvements (Makefile, */Makefile)
-* other source code modifications (*.c, *.h)
-* etc. (* */* :) )
+; help contrib
 .fi
-.in -0.5i
-.sp
-If you add functionality to calc, please be sure to modify/patch/add
-Makefiles, help files, cal/regress.cal test code as well.
-Regression test cases are vital to maintaining calc's level
-of correctness and helps us avoid code bug regression.
-.sp
-In order to consider integrating your code, we need:
-.sp
-.nf
 .in +0.5i
-* calc version you are working with (please try use the latest version)
-* new help files or help file patches, if applicable (documentation)
-* proposed text for the CHANGES file (brief description of what it does)
-* regress.cal test patch as needed
-* your source code and/or source code changes (:-))
-.in -0.5i
-.fi
 .sp
-The best way to send us new code, if your changes are small, is
-via a patch (diff -c from the latest alpha code to your code).
-If your change is large, you should send entire files (either
-as a diff -c /dev/null your-file patch, or as a uuencoded and
-gziped (or compressed) tar file).
-.sp
-Please try to generate a patch against the most recent
-version of calc, and if you use GitHub, the top of the
-master branch:
-.sp
-.nf
-.in +0.5i
-https://github.com/lcn2/calc
-.in -0.5i
-.fi
-.sp
-.sp
-The best way contribute to calc bug is to generate calc
-GitHub pull request:
-.sp
-.nf
-.in +0.5i
-https://github.com/lcn2/calc/pulls
-.in -0.5i
-.fi
-.sp
-Your code needs to be contributed under either the 2.1 of the
-.B GNU Lesser General Public License (LGPL 2.1)
-or be in the public domain.
-.sp
-If you do not want to use calc GitHub, then send Email to:
+
+.PP
+
+or read the source file:
+
 .sp
 .in +0.5i
 .nf
-calc-contrib at asthe dot com
+CONTRIB-CODE
 .fi
-.sp
-NOTE: Remove spaces and replace 'at' with @, 'dot' with .
-.sp
-NOTE: Yes, the Email address uses 'asthe',
-while the web site uses 'isthe'.
-.in -0.5i
-.sp
-You
-.B MUST
-use following
-.B SPECIAL PHRASE
-in your Email Subject line:
-.sp
 .in +0.5i
-.B calc contribution
-.in -0.5i
-.sp
-You may add additional words to your subject line.
-.sp
-.B Suggestion:
-.sp
-.in +0.5i
-From time to time, the Email address and Subject
-.B SPECIAL PHRASE
-may change so verify you have the current info by visiting:
+
+.PP
+
+or visit the following URL:
 .sp
 .in +0.5i
 .nf
-http://www.isthe.com/chongo/tech/comp/calc/calc-contrib.html
+https://github.com/lcn2/calc/blob/master/CONTRIB-CODE
 .fi
-.in -0.5i
-.in -0.5i
+.in +0.5i
 .sp
-.B IMPORTANT:
-If your Email doesn't contain the above phrase,
-then we
-.B WILL NOT SEE
-your Email.
-.sp
-.B PLEASE BE SURE
-you have that
-.B SPECIAL PHRASE
-somewhere in the subject line!
-.sp
-Please be patient as we cannot always respond to Email messages quickly.
 
 .PP
 
@@ -1510,5 +1421,30 @@ web site is located at:
 .in +0.5i
 www.isthe.com/chongo/tech/comp/calc/
 .in -0.5i
+
+.SH "CALC SOURCE CODE"
+
+The latest version of calc source code may be obtained at
+the following GitHub repo:
 .sp
-Share and Enjoy! :\-)
+.in +0.5i
+https://github.com/lcn2/calc
+.in -0.5i
+.sp
+The very latest calc souece is found at the top master branch.
+
+.PP
+
+You may download the calc releases from:
+.sp
+.in +0.5i
+https://github.com/lcn2/calc/releases
+.in -0.5i
+.sp
+The releases marked
+.B ((Pre-release))
+are beta releases.
+.sp
+The most recent release that is NOT  marked
+.B ((Pre-release))
+is the recommended stable release.

comfunc.c

@@ -1191,12 +1191,18 @@ comprint(COMPLEX *c)
 	qtmp = c->imag[0];
 	if (qiszero(&qtmp))
 		return;
+	if (conf->complex_space) {
+	    math_chr(' ');
+	}
 	if (!qiszero(c->real) && !qisneg(&qtmp))
 		math_chr('+');
 	if (qisneg(&qtmp)) {
 		math_chr('-');
 		qtmp.num.sign = 0;
 	}
+	if (conf->complex_space) {
+	    math_chr(' ');
+	}
 	qprintnum(&qtmp, MODE_DEFAULT, conf->outdigits);
 	math_chr('i');
 }
@@ -1223,7 +1229,13 @@ cprintfr(COMPLEX *c)
 	zprintval(i->num, 0L, 0L);
 	math_chr('i');
 	if (qisfrac(i)) {
+		if (conf->fraction_space) {
+		    math_chr(' ');
+		}
 		math_chr('/');
+		if (conf->fraction_space) {
+		    math_chr(' ');
+		}
 		zprintval(i->den, 0L, 0L);
 	}
 }

config.c

@@ -93,6 +93,9 @@ NAMETYPE configs[] = {
 	{"pow2",	CONFIG_POW2},
 	{"redc2",	CONFIG_REDC2},
 	{"tilde",	CONFIG_TILDE},
+	{"tilde_space",	CONFIG_TILDE_SPACE},
+	{"fraction_space",	CONFIG_FRACTION_SPACE},
+	{"complex_space",	CONFIG_COMPLEX_SPACE},
 	{"tab",		CONFIG_TAB},
 	{"quomod",	CONFIG_QUOMOD},
 	{"quo",		CONFIG_QUO},
@@ -150,8 +153,11 @@ CONFIG oldstd = {	/* backward compatible standard configuration */
 	SQ_ALG2,		/* size of number to use square alg 2 */
 	POW_ALG2,		/* size of modulus to use REDC for powers */
 	REDC_ALG2,		/* size of modulus to use REDC algorithm 2 */
-	TRUE,			/* OK to print a tilde on approximations */
-	TRUE,			/* OK to print tab before numeric values */
+	TRUE,			/* TRUE ==> print a tilde on approximations */
+	FALSE,			/* TRUE ==> print a space after tilde on approximations */
+	FALSE,			/* TRUE ==> print spaces around / in fractions */
+	FALSE,			/* TRUE ==> print spaces around + or - in complex values */
+	TRUE,			/* TRUE ==> print tab before numeric values */
 	0,			/* quomod() default rounding mode */
 	2,			/* quotient // default rounding mode */
 	0,			/* mod % default rounding mode */
@@ -161,8 +167,8 @@ CONFIG oldstd = {	/* backward compatible standard configuration */
 	8,			/* cfsim() default rounding mode */
 	2,			/* output default rounding mode */
 	24,			/* round()/bround() default rounding mode */
-	FALSE,			/* OK to print leading 0 before decimal pt */
-	0,			/* OK to print trailing 0's */
+	FALSE,			/* TRUE ==> print leading 0 before decimal pt */
+	0,			/* TRUE ==> print trailing 0's */
 	MAXSCANCOUNT,		/* max scan errors before abort */
 	PROMPT1,		/* normal prompt */
 	PROMPT2,		/* prompt when inside multi-line input */
@@ -173,30 +179,30 @@ CONFIG oldstd = {	/* backward compatible standard configuration */
 	0,			/* internal calc debug level */
 	3,			/* calc resource file debug level */
 	0,			/* user defined debug level */
-	FALSE,			/* print Quit or abort executed messages */
+	FALSE,			/* TRUE ==> print Quit or abort executed messages */
 	CTRL_D_VIRGIN_EOF,	/* ^D only exits on virgin lines */
 	NULL,			/* our name */
 	NULL,			/* basename of our name */
 #if defined(_WIN32) || defined(_WIN64)
-	TRUE,			/* running under windows */
+	TRUE,			/* TRUE ==> running under windows */
 #else
-	FALSE,			/* not using windows */
+	FALSE,			/* FALSE ==> not using windows */
 #endif
 #if defined(__CYGWIN__)
-	TRUE,			/* compiled under cygwin */
+	TRUE,			/* TRUE ==> compiled under cygwin */
 #else
-	FALSE,			/* not compiled with cygwin */
+	FALSE,			/* FALSE ==> not compiled with cygwin */
 #endif
 #if defined(CUSTOM)
-	TRUE,			/* compiled with -DCUSTOM */
+	TRUE,			/* TRUE ==> compiled with -DCUSTOM */
 #else
-	FALSE,			/* compiled without -DCUSTOM */
+	FALSE,			/* FALSE ==> compiled without -DCUSTOM */
 #endif
 	&allow_custom,		/* *TRUE=> custom functions are enabled */
 	NULL,			/* version */
 	BASEB,			/* base for calculations */
-	TRUE,			/* warn when redeclaring */
-	TRUE,			/* warn when variable names collide */
+	TRUE,			/* TRUE ==> warn when redeclaring */
+	TRUE,			/* TRUE ==> warn when variable names collide */
 };
 CONFIG newstd = {	/* new non-backward compatible configuration */
 	MODE_INITIAL,		/* current output mode */
@@ -210,8 +216,11 @@ CONFIG newstd = {	/* new non-backward compatible configuration */
 	SQ_ALG2,		/* size of number to use square alg 2 */
 	POW_ALG2,		/* size of modulus to use REDC for powers */
 	REDC_ALG2,		/* size of modulus to use REDC algorithm 2 */
-	TRUE,			/* OK to print a tilde on approximations */
-	TRUE,			/* OK to print tab before numeric values */
+	TRUE,			/* TRUE ==> print a tilde on approximations */
+	FALSE,			/* TRUE ==> print spaces around / in fractions */
+	FALSE,			/* TRUE ==> print a space after tilde on approximations */
+	FALSE,			/* TRUE ==> print spaces around + or - in complex values */
+	TRUE,			/* TRUE ==> print tab before numeric values */
 	0,			/* quomod() default rounding mode */
 	2,			/* quotient // default rounding mode */
 	0,			/* mod % default rounding mode */
@@ -221,8 +230,8 @@ CONFIG newstd = {	/* new non-backward compatible configuration */
 	8,			/* cfsim() default rounding mode */
 	24,			/* output default rounding mode */
 	24,			/* round()/bround() default rounding mode */
-	TRUE,			/* OK to print leading 0 before decimal pt */
-	0,			/* OK to print trailing 0's */
+	TRUE,			/* TRUE ==> print leading 0 before decimal pt */
+	0,			/* TRUE ==> print trailing 0's */
 	MAXSCANCOUNT,		/* max scan errors before abort */
 	"; ",			/* normal prompt */
 	";; ",			/* prompt when inside multi-line input */
@@ -233,30 +242,30 @@ CONFIG newstd = {	/* new non-backward compatible configuration */
 	0,			/* internal calc debug level */
 	3,			/* calc resource file debug level */
 	0,			/* user defined debug level */
-	FALSE,			/* print Quit or abort executed messages */
+	FALSE,			/* TRUE ==> print Quit or abort executed messages */
 	CTRL_D_VIRGIN_EOF,	/* ^D only exits on virgin lines */
 	NULL,			/* our name */
 	NULL,			/* basename of our name */
 #if defined(_WIN32) || defined(_WIN64)
-	TRUE,			/* running under windows */
+	TRUE,			/* TRUE ==> running under windows */
 #else
-	FALSE,			/* not using windows */
+	FALSE,			/* FALSE ==> not using windows */
 #endif
 #if defined(__CYGWIN__)
-	TRUE,			/* compiled under cygwin */
+	TRUE,			/* TRUE ==> compiled under cygwin */
 #else
-	FALSE,			/* not compiled with cygwin */
+	FALSE,			/* FALSE ==> not compiled with cygwin */
 #endif
 #if defined(CUSTOM)
-	TRUE,			/* compiled with -DCUSTOM */
+	TRUE,			/* TRUE ==> compiled with -DCUSTOM */
 #else
-	FALSE,			/* compiled without -DCUSTOM */
+	FALSE,			/* FALSE ==> compiled without -DCUSTOM */
 #endif
-	&allow_custom,		/* *TRUE=> custom functions are enabled */
+	&allow_custom,		/* *TRUE ==> custom functions are enabled */
 	NULL,			/* version */
 	BASEB,			/* base for calculations */
-	TRUE,			/* warn when redeclaring */
-	TRUE,			/* warn when variable names collide */
+	TRUE,			/* TRUE ==> warn when redeclaring */
+	TRUE,			/* TRUE ==> warn when variable names collide */
 };
 CONFIG *conf = NULL;	/* loaded in at startup - current configuration */
 
@@ -624,6 +633,48 @@ setconfig(int type, VALUE *vp)
 		}
 		break;
 
+	case CONFIG_TILDE_SPACE:
+		if (vp->v_type == V_NUM) {
+			q = vp->v_num;
+			conf->tilde_space = !qiszero(q);
+		} else if (vp->v_type == V_STR) {
+			temp = lookup_long(truth, vp->v_str->s_str);
+			if (temp < 0) {
+				math_error("Illegal truth value for tilde_space");
+				not_reached();
+			}
+			conf->tilde_space = (int)temp;
+		}
+		break;
+
+	case CONFIG_FRACTION_SPACE:
+		if (vp->v_type == V_NUM) {
+			q = vp->v_num;
+			conf->fraction_space = !qiszero(q);
+		} else if (vp->v_type == V_STR) {
+			temp = lookup_long(truth, vp->v_str->s_str);
+			if (temp < 0) {
+				math_error("Illegal truth value for fraction_space");
+				not_reached();
+			}
+			conf->fraction_space = (int)temp;
+		}
+		break;
+
+	case CONFIG_COMPLEX_SPACE:
+		if (vp->v_type == V_NUM) {
+			q = vp->v_num;
+			conf->complex_space = !qiszero(q);
+		} else if (vp->v_type == V_STR) {
+			temp = lookup_long(truth, vp->v_str->s_str);
+			if (temp < 0) {
+				math_error("Illegal truth value for complex_space");
+				not_reached();
+			}
+			conf->complex_space = (int)temp;
+		}
+		break;
+
 	case CONFIG_TAB:
 		if (vp->v_type == V_NUM) {
 			q = vp->v_num;
@@ -1205,6 +1256,18 @@ config_value(CONFIG *cfg, int type, VALUE *vp)
 		i = (cfg->tilde_ok ? 1 : 0);
 		break;
 
+	case CONFIG_TILDE_SPACE:
+		i = (cfg->tilde_space ? 1 : 0);
+		break;
+
+	case CONFIG_FRACTION_SPACE:
+		i = (cfg->fraction_space ? 1 : 0);
+		break;
+
+	case CONFIG_COMPLEX_SPACE:
+		i = (cfg->complex_space ? 1 : 0);
+		break;
+
 	case CONFIG_TAB:
 		i = (cfg->tab_ok ? 1 : 0);
 		break;

config.h

@@ -94,6 +94,9 @@
 #define CONFIG_REDECL_WARN	44
 #define CONFIG_DUPVAR_WARN	45
 #define CONFIG_HZ	46
+#define CONFIG_TILDE_SPACE	47
+#define CONFIG_FRACTION_SPACE	48
+#define CONFIG_COMPLEX_SPACE	49
 
 
 /*
@@ -123,7 +126,7 @@ struct config {
 	int outmode2;		/* current secondary output mode */
 	LEN outdigits;		/* current output digits for float or exp */
 	NUMBER *epsilon;	/* default error for real functions */
-	    long epsilonprec;	/* epsilon binary precision (tied to epsilon) */
+	long epsilonprec;	/* epsilon binary precision (tied to epsilon) */
 	FLAG traceflags;	/* tracing flags */
 	LEN maxprint;		/* number of elements to print */
 	LEN mul2;		/* size of number to use multiply algorithm 2 */
@@ -131,6 +134,9 @@ struct config {
 	LEN pow2;		/* size of modulus to use REDC for powers */
 	LEN redc2;		/* size of modulus to use REDC algorithm 2 */
 	BOOL tilde_ok;		/* OK to print a tilde on approximations */
+	BOOL tilde_space;	/* print space after tilde on approximations */
+	BOOL fraction_space;	/* TRUE => print spaces around / in fractions */
+	BOOL complex_space;	/* TRUE => print spaces around + or - in complex values */
 	BOOL tab_ok;		/* OK to print tab before numeric values */
 	LEN quomod;		/* quomod() default rounding mode */
 	LEN quo;		/* quotient // default rounding mode */

cscript/Makefile

@@ -1,7 +1,8 @@
+#!/usr/bin/env make
 #
 # cscript - makefile for calc shell script files
 #
-# Copyright (C) 1999-2006,2014,2017,2021,2022  Landon Curt Noll
+# Copyright (C) 1999-2006,2014,2017,2021-2023  Landon Curt Noll
 #
 # SRC: cscript/Makefile
 #
@@ -43,20 +44,21 @@
 # If your system has a up to date, bash shell, then
 # you may wish to use:
 #
-#	SHELL= /bin/bash
+#	SHELL= bash
 #
 # On some systems such as macOS, the bash shell is very
 # far behind to the point where is cannot be depended on.
 # On such systems, the sh may be a much better alternative
 # shell for this Makefile to use:
 #
-#	SHELL= /bin/sh
+#	SHELL= sh
 #
-SHELL= /bin/bash
-#SHELL= /bin/sh
+SHELL= bash
+#SHELL= sh
 #if 0	/* start of skip for non-Gnu makefiles */
+#
 ifeq ($(target),Darwin)
-SHELL:= /bin/zsh
+SHELL:= /bin/sh
 endif
 #endif	/* end of skip for non-Gnu makefiles */
 

custom/Makefile

@@ -1,8 +1,8 @@
-#!/bin/make
+#!/usr/bin/env make
 #
 # custom - makefile for calc custom routines
 #
-# Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
+# Copyright (C) 1999-2006,2014,2017-2018,2021,2023  Landon Curt Noll
 #
 # SRC: custom/Makefile
 #
@@ -44,20 +44,21 @@
 # If your system has a up to date, bash shell, then
 # you may wish to use:
 #
-#	SHELL= /bin/bash
+#	SHELL= bash
 #
 # On some systems such as macOS, the bash shell is very
 # far behind to the point where is cannot be depended on.
-# On such systems, the zsh may be a much better alternative
+# On such systems, the sh may be a much better alternative
 # shell for this Makefile to use:
 #
-#	SHELL= /bin/zsh
+#	SHELL= sh
 #
-SHELL= /bin/bash
-#SHELL= /bin/sh
+SHELL= bash
+#SHELL= sh
 #if 0	/* start of skip for non-Gnu makefiles */
+#
 ifeq ($(target),Darwin)
-SHELL:= /bin/zsh
+SHELL:= /bin/sh
 endif
 #endif	/* end of skip for non-Gnu makefiles */
 
@@ -474,7 +475,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.14.1.0
+VERSION= 2.14.2.0
 
 # Names of shared libraries with versions
 #
@@ -491,7 +492,7 @@ CO= co
 CP= cp
 DIFF= diff
 FMT= fmt
-GREP= egrep
+GREP= grep
 LN= ln
 LS= ls
 MAKE= make
@@ -801,11 +802,17 @@ Makefile.simple: Makefile ../Makefile
 
 depend:
 	${Q} if [ -f ${MAKE_FILE}.bak ]; then \
-	    echo "custom/${MAKE_FILE}.bak exists, remove or move it"; \
+	    echo "custom/${MAKE_FILE}.bak exists, remove or move it" 1>&2; \
 	    exit 1; \
 	else \
 	    ${TRUE}; \
 	fi
+	${Q} if type -f ${MAKEDEPEND}; then \
+	    ${TRUE}; \
+	else \
+	    echo "make depend failed: cannot find makedepend command: ${MAKEDEPEND}" 1>&2; \
+	    exit 1; \
+	fi
 	${Q} echo forming custom/skel
 	${Q} ${RM} -rf skel
 	${Q} ${MKDIR} -p skel
@@ -826,7 +833,7 @@ depend:
 	    echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
 	done
 	${Q} (cd ..; ${MAKE} -f ${MAKE_FILE} hsrc)
-	${MAKE} -f ../${MAKE_FILE} h_list 2>/dev/null | \
+	(cd ..; ${MAKE} -f ${MAKE_FILE} h_list 2>/dev/null) | \
 	    while read i; do \
 		if [ ! -f "../$$i" ]; then continue; fi; \
 		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
@@ -840,13 +847,13 @@ depend:
 	${Q} echo custom/skel formed
 	${Q} echo forming custom dependency list
 	${Q} :> skel/custom/makedep.out
-	${Q} cd skel/custom; ${MAKEDEPEND} \
+	-${Q} cd skel/custom; ${MAKEDEPEND} \
 	    -I../../.. -w 1 -f makedep.out -- \
 	    ${CFLAGS} -- \
 	    ${C_SRC} 2>/dev/null
 	${Q} ${CP} -f skel/custom/makedep.out skel/custom/makedep.in
 	${Q} ${SED} -e 's|: ../../|: |' -E < skel/custom/makedep.in | \
-	    ${GREP} -v /usr/include > skel/custom/makedep.out
+	    ${GREP} -E -v /usr/include > skel/custom/makedep.out
 	-${Q} for i in ${C_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
@@ -860,7 +867,7 @@ depend:
 	${Q} ${MV} ${MAKE_FILE} ${MAKE_FILE}.bak
 	${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' \
 		    ${MAKE_FILE}.bak > ${MAKE_FILE}
-	${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE}
+	${Q} ${GREP} -E -v '^#' skel/custom/makedep.out >> ${MAKE_FILE}
 	${Q} echo removing skel
 	${Q} ${RM} -rf skel
 	-${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \

custom/Makefile.simple

@@ -1,8 +1,8 @@
-#!/bin/make
+#!/usr/bin/env make
 #
 # custom - makefile for calc custom routines
 #
-# Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
+# Copyright (C) 1999-2006,2014,2017-2018,2021,2023  Landon Curt Noll
 #
 # SRC: custom/Makefile.simple - non-GNU version
 #
@@ -44,17 +44,17 @@
 # If your system has a up to date, bash shell, then
 # you may wish to use:
 #
-#	SHELL= /bin/bash
+#	SHELL= bash
 #
 # On some systems such as macOS, the bash shell is very
 # far behind to the point where is cannot be depended on.
-# On such systems, the zsh may be a much better alternative
+# On such systems, the sh may be a much better alternative
 # shell for this Makefile to use:
 #
-#	SHELL= /bin/zsh
+#	SHELL= sh
 #
-SHELL= /bin/bash
-#SHELL= /bin/sh
+SHELL= bash
+#SHELL= sh
 
 
 # PREFIX - Top level location for calc
@@ -445,7 +445,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.14.1.0
+VERSION= 2.14.2.0
 
 # Names of shared libraries with versions
 #
@@ -462,7 +462,7 @@ CO= co
 CP= cp
 DIFF= diff
 FMT= fmt
-GREP= egrep
+GREP= grep
 LN= ln
 LS= ls
 MAKE= make
@@ -806,11 +806,17 @@ calcliblist: ${CALCLIBLIST}
 
 depend:
 	${Q} if [ -f ${MAKE_FILE}.bak ]; then \
-	    echo "custom/${MAKE_FILE}.bak exists, remove or move it"; \
+	    echo "custom/${MAKE_FILE}.bak exists, remove or move it" 1>&2; \
 	    exit 1; \
 	else \
 	    ${TRUE}; \
 	fi
+	${Q} if type -f ${MAKEDEPEND}; then \
+	    ${TRUE}; \
+	else \
+	    echo "make depend failed: cannot find makedepend command: ${MAKEDEPEND}" 1>&2; \
+	    exit 1; \
+	fi
 	${Q} echo forming custom/skel
 	${Q} ${RM} -rf skel
 	${Q} ${MKDIR} -p skel
@@ -831,7 +837,7 @@ depend:
 	    echo '#endif /* '"$$tag"' */' >> "skel/custom/$$i"; \
 	done
 	${Q} (cd ..; ${MAKE} -f ${MAKE_FILE} hsrc)
-	${MAKE} -f ../${MAKE_FILE} h_list 2>/dev/null | \
+	(cd ..; ${MAKE} -f ${MAKE_FILE} h_list 2>/dev/null) | \
 	    while read i; do \
 		if [ ! -f "../$$i" ]; then continue; fi; \
 		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
@@ -845,13 +851,13 @@ depend:
 	${Q} echo custom/skel formed
 	${Q} echo forming custom dependency list
 	${Q} :> skel/custom/makedep.out
-	${Q} cd skel/custom; ${MAKEDEPEND} \
+	-${Q} cd skel/custom; ${MAKEDEPEND} \
 	    -I../../.. -w 1 -f makedep.out -- \
 	    ${CFLAGS} -- \
 	    ${C_SRC} 2>/dev/null
 	${Q} ${CP} -f skel/custom/makedep.out skel/custom/makedep.in
 	${Q} ${SED} -e 's|: ../../|: |' -E < skel/custom/makedep.in | \
-	    ${GREP} -v /usr/include > skel/custom/makedep.out
+	    ${GREP} -E -v /usr/include > skel/custom/makedep.out
 	-${Q} for i in ${C_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
@@ -865,7 +871,7 @@ depend:
 	${Q} ${MV} ${MAKE_FILE} ${MAKE_FILE}.bak
 	${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' \
 		    ${MAKE_FILE}.bak > ${MAKE_FILE}
-	${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE}
+	${Q} ${GREP} -E -v '^#' skel/custom/makedep.out >> ${MAKE_FILE}
 	${Q} echo removing skel
 	${Q} ${RM} -rf skel
 	-${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \

file.c

@@ -39,7 +39,7 @@
 #include "calc.h"
 #include "alloc.h"
 #include "longbits.h"
-#include "have_fpos.h"
+#include "have_fgetsetpos.h"
 #include "have_fpos_pos.h"
 #include "fposval.h"
 #include "file.h"
@@ -1459,7 +1459,7 @@ z2filepos(ZVALUE zpos)
 	if (zpos.len >= FILEPOS_BITS/BASEB) {
 		/* copy the lower FILEPOS_BITS of the ZVALUE */
 		memset(&tmp, 0, sizeof(tmp)); /* FILEPOS could be non-scalar */
-		memcpy(&tmp, zpos.v, MIN(sizeof(tmp), FILEPOS_LEN);
+		memcpy(&tmp, zpos.v, MIN(sizeof(tmp), FILEPOS_LEN));
 	} else {
 		/* copy what bits we can into the temp value */
 		memset(&tmp, 0, sizeof(tmp)); /* FILEPOS could be non-scalar */
@@ -2022,7 +2022,7 @@ showfiles(void)
 			math_chr('\n');
 			continue;
 		}
-		printf(" size = %lld\n", (long long int)sizes[i]);
+		printf(" size = %ld\n", (long int)sizes[i]);
 		for (j = i + 1; j < idnum; j++) {
 			if (listed[j] || sizes[j] == -1)
 				continue;

file.h

@@ -32,9 +32,9 @@
 
 
 #if defined(CALC_SRC)	/* if we are building from the calc source tree */
-# include "have_fpos.h"
+# include "have_fgetsetpos.h"
 #else
-# include <calc/have_fpos.h>
+# include <calc/have_fgetsetpos.h>
 #endif
 
 
@@ -71,7 +71,7 @@ typedef struct {
  * Some obscure systems without fgetpos/fsetpos may not have a simple
  * scalar type.	 In these cases the f_tell macro below will fail.
  */
-#if defined(HAVE_FPOS)
+#if defined(HAVE_FGETSETPOS)
 
 #define f_seek_set(stream, loc) fsetpos((FILE*)(stream), (FILEPOS*)(loc))
 #define f_tell(stream, loc) fgetpos((FILE*)(stream), (FILEPOS*)(loc))

fposval.c

@@ -1,7 +1,7 @@
 /*
  * fposval - Determine information about the file position type
  *
- * Copyright (C) 1999,2021  Landon Curt Noll
+ * Copyright (C) 1999,2021,2023  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -59,12 +59,20 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "have_fpos.h"
+#include "have_string.h"
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#include "decl.h"
+#include "have_fgetsetpos.h"
 #include "endian_calc.h"
 #include "have_offscl.h"
 #include "have_posscl.h"
 #include "have_fpos_pos.h"
 #include "alloc.h"
+#include "have_unused.h"
+#include "have_memmv.h"
+#include "zmath.h"
 
 
 #include "banned.h"	/* include after system header <> includes */
@@ -73,7 +81,7 @@
 char *program;			/* our name */
 
 int
-main(int argc, char **argv)
+main(int UNUSED(argc), char **argv)
 {
 	int stsizelen;		/* bit length of st_size in buf */
 	int fileposlen;		/* bit length of FILEPOS */
@@ -89,7 +97,7 @@ main(int argc, char **argv)
 	/*
 	 * print the file position information
 	 */
-#if defined(HAVE_FPOS_POS)
+#if defined(HAVE_FPOS_POS) && defined(FPOS_POS_BITS)
 	fileposlen = FPOS_POS_BITS;
 #else /* ! HAVE_FPOS_POS */
 # if defined(FPOS_BITS)
@@ -107,13 +115,17 @@ main(int argc, char **argv)
 	 * Big Endian
 	 */
 	if (fileposlen == 64) {
-		printf("#define SWAP_HALF_IN_FILEPOS(dest, src)\t\t%s\n",
-		    "SWAP_HALF_IN_B64(dest, src)");
+		printf("#define SWAP_HALF_IN_FILEPOS(dest, src) \\\n"
+		       "\tSWAP_HALF_IN_B64(dest, src)\n");
 	} else if (fileposlen == 32) {
-		printf("#define SWAP_HALF_IN_FILEPOS(dest, src)\t\t%s\n",
-		    "SWAP_HALF_IN_B32(dest, src)");
+		printf("#define SWAP_HALF_IN_FILEPOS(dest, src) \\\n"
+		       "\tSWAP_HALF_IN_B32(dest, src)\n");
+	} else if (fileposlen%BASEB == 0) {
+		printf("#define SWAP_HALF_IN_FILEPOS(dest, src) \\\n"
+		       "\tswap_HALFs(dest, src, %d)\n",
+		       fileposlen/BASEB);
 	} else {
-		fprintf(stderr, "%s: unexpected FILEPOS bit size: %d\n",
+		fprintf(stderr, "%s: unexpected BIG_ENDIAN FILEPOS bit size: %d\n",
 		    program, fileposlen);
 		exit(1);
 	}
@@ -122,16 +134,15 @@ main(int argc, char **argv)
 	 * Little Endian
 	 */
 #if defined(HAVE_FILEPOS_SCALAR)
-	printf("#define SWAP_HALF_IN_FILEPOS(dest, src)\t\t%s\n",
-	    "(*(dest) = *(src))");
+	printf("#define SWAP_HALF_IN_FILEPOS(dest, src) \\\n"
+	       "\t(*(dest) = *(src))\n");
 #else /* HAVE_FILEPOS_SCALAR */
 	/*
 	 * Normally a "(*(dest) = *(src))" would do, but on some
 	 * systems a FILEPOS is not a scalar hence we must memcpy.
 	 */
-	printf("#define SWAP_HALF_IN_FILEPOS(dest, src)\t%s\n",
-	    "\\\n\tmemcpy((void *)(dest), (void *)(src), "
-	    "sizeof(FPOS_POS_LEN))");
+	printf("#define SWAP_HALF_IN_FILEPOS(dest, src) \\\n"
+	       "\tmemcpy((void *)(dest), (void *)(src), FILEPOS_LEN)\n");
 #endif /* HAVE_FILEPOS_SCALAR */
 #endif /* CALC_BYTE_ORDER == BIG_ENDIAN */
 	putchar('\n');

hash.c

@@ -956,6 +956,7 @@ hash_value(int type, void *v, HASH *state)
 		state = hash_len(type, value->v_config->pow2, state);
 		state = hash_len(type, value->v_config->redc2, state);
 		state = hash_bool(type, value->v_config->tilde_ok, state);
+		state = hash_bool(type, value->v_config->tilde_space, state);
 		state = hash_bool(type, value->v_config->tab_ok, state);
 		state = hash_long(type, (long)value->v_config->quomod, state);
 		state = hash_long(type, (long)value->v_config->quo, state);
@@ -1001,6 +1002,7 @@ hash_value(int type, void *v, HASH *state)
 		state = hash_int(type, value->v_config->baseb, state);
 		state = hash_bool(type, value->v_config->redecl_warn, state);
 		state = hash_bool(type, value->v_config->dupvar_warn, state);
+		state = hash_bool(type, value->v_config->fraction_space, state);
 		break;
 
 	case V_HASH:

have_fgetsetpos.c

@@ -1,7 +1,7 @@
 /*
  * have_fpos - Determine if have fgetpos and fsetpos functions
  *
- * Copyright (C) 1999,2021  Landon Curt Noll
+ * Copyright (C) 1999,2021,2022  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -25,10 +25,10 @@
  */
 
 /*
- * If the symbol HAVE_NO_FPOS is defined, we will output nothing.
+ * If the symbol HAVE_NO_FGETSETPOS is defined, we will output nothing.
  * If we are able to compile this program, then we must have the
  * fgetpos and fsetpos functions and we will output the
- * appropriate have_fpos.h file body.
+ * appropriate have_fgetsetpos.h file body.
  */
 
 #include <stdio.h>
@@ -40,7 +40,7 @@
 int
 main(void)
 {
-#if !defined(HAVE_NO_FPOS)
+#if !defined(HAVE_NO_FGETSETPOS)
 	fpos_t pos;		/* file position */
 
 	/* get the current position */
@@ -49,9 +49,9 @@ main(void)
 	/* 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");
+	/* print a have_fgetsetpos.h body that says we have the functions */
+	printf("#undef HAVE_FGETSETPOS\n");
+	printf("#define HAVE_FGETSETPOS 1  /* yes */\n\n");
 	printf("typedef fpos_t FILEPOS;\n");
 #endif
 	/* exit(0); */

have_fpos_pos.c

@@ -24,16 +24,14 @@
  * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
  */
 
-/*
- * If the symbol HAVE_NO_FPOS is defined, we will output nothing.
- * If the HAVE_FILEPOS_SCALAR is defined, we will output nothing.
- * If we are able to compile this program, then we must have the
- * __pos element in a non-scalar FILEPOS.
- */
 
 #include <stdio.h>
-#include "have_fpos.h"
+#include "have_fgetsetpos.h"
 #include "have_posscl.h"
+#include "have_string.h"
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
 
 
 #include "banned.h"	/* include after system header <> includes */
@@ -42,29 +40,43 @@
 int
 main(void)
 {
-#if !defined(HAVE_NO_FPOS) && !defined(HAVE_FILEPOS_SCALAR)
-	fpos_t pos;		/* file position */
+#if defined(HAVE_FILEPOS_SCALAR)
 
-	/* print a __pos element in fpos_t */
-	printf("#undef HAVE_FPOS_POS\n");
-	printf("#define HAVE_FPOS_POS 1  /* yes */\n\n");
-
-	/* determine __pos element size */
-	printf("#undef FPOS_POS_BITS\n");
-	printf("#undef FPOS_POS_LEN\n");
-# if defined(FPOS_POS_BITS)
-	printf("#define FPOS_POS_BITS %d\n", FPOS_POS_BITS);
-	printf("#define FPOS_POS_LEN %d\n", int(FPOS_POS_BITS/8));
-# else
-	printf("#define FPOS_POS_BITS %lu\n", sizeof(pos.__pos)*8);
-	printf("#define FPOS_POS_LEN %lu\n", sizeof(pos.__pos));
-# endif
-
-#else
-	/* we have no __pos element */
+	printf("/* HAVE_FILEPOS_SCALAR is defined, we assume FILEPOS is scalar */\n");
+	printf("/* we assume we have no __pos in FILEPOS */\n");
 	printf("#undef HAVE_FPOS_POS\t/* no */\n");
 	printf("#undef FPOS_POS_BITS\n");
 	printf("#undef FPOS_POS_LEN\n");
+
+#else
+
+	printf("/* HAVE_FILEPOS_SCALAR is undefined, we assume FILEPOS is not scalar */\n");
+# if defined(HAVE_NO_FPOS_POS)
+	printf("/* HAVE_NO_FPOS_POS defiled, we assume we have no __pos in FILEPOS */\n");
+	printf("#undef HAVE_FPOS_POS\t/* no */\n");
+	printf("#undef FPOS_POS_BITS\n");
+	printf("#undef FPOS_POS_LEN\n");
+
+# elif defined(FPOS_POS_BITS)
+	printf("/* FPOS_POS_BITS defiled, assume we have __pos in FILEPOS */\n");
+	printf("#undef HAVE_FPOS_POS\n");
+	printf("#define HAVE_FPOS_POS 1  /* yes */\n");
+	printf("#undef FPOS_POS_BITS\n");
+	printf("#define FPOS_POS_BITS %d\n", FPOS_POS_BITS);
+	printf("#undef FPOS_POS_LEN\n");
+	printf("#define FPOS_POS_LEN %d\n", int(FPOS_POS_BITS/8));
+# else
+	fpos_t pos;		/* file position */
+
+	memset(&pos, 0, sizeof(pos));	/* zeroize pos to "set it" */
+	printf("/* we successfully compiled with a fpos_t type wit an __pos element */\n");
+	printf("#undef HAVE_FPOS_POS\n");
+	printf("#define HAVE_FPOS_POS 1  /* yes */\n");
+	printf("#undef FPOS_POS_BITS\n");
+	printf("#define FPOS_POS_BITS %lu\n", sizeof(pos.__pos)*8);
+	printf("#undef FPOS_POS_LEN\n");
+	printf("#define FPOS_POS_LEN %lu\n", sizeof(pos.__pos));
+# endif
 #endif
 	/* exit(0); */
 	return 0;

have_posscl.c

@@ -48,7 +48,7 @@
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
-#include "have_fpos.h"
+#include "have_fgetsetpos.h"
 
 
 #include "banned.h"	/* include after system header <> includes */

have_statfs.c

@@ -0,0 +1,82 @@
+/*
+ * have_statfs - Determine if we have statfs()
+ *
+ * Copyright (C) 2023  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Under source code control:	2023/03/06 00:51:53
+ * File existed as early as:	2023
+ *
+ * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * usage:
+ *	have_statfs
+ *
+ * Not all systems have the statfs() function, so this may not
+ * compile on your system.
+ *
+ * This prog outputs several defines:
+ *
+ *	HAVE_STATFS
+ *		defined ==> use statfs()
+ *		undefined ==> do not call or cannot call statfs()
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "have_sys_vfs.h"
+#if defined(HAVE_SYS_VFS_H)
+# include <sys/vfs.h>
+#endif /* HAVE_SYS_VFS_H */
+
+#include "have_sys_param.h"
+#if defined(HAVE_SYS_PARAM_H)
+# include <sys/param.h>
+#endif /* HAVE_SYS_PARAM_H */
+
+#include "have_sys_mount.h"
+#if defined(HAVE_SYS_MOUNT_H)
+# include <sys/mount.h>
+#endif /* HAVE_SYS_MOUNT_H */
+
+#include "banned.h"	/* include after system header <> includes */
+
+
+int
+main(void)
+{
+#if defined(HAVE_NO_STATFS)
+
+	printf("#undef HAVE_STATFS /* no */\n");
+
+#else /* HAVE_NO_STATFS */
+
+	struct statfs statfs_dot;		/* usage stat of "." */
+
+	(void) statfs(".", &statfs_dot);
+
+	printf("#define HAVE_STATFS /* yes */\n");
+
+#endif /* HAVE_NO_STATFS */
+
+	/* exit(0); */
+	return 0;
+}

have_uid_t.c

@@ -65,6 +65,8 @@ main(void)
 	extern uid_t geteuid();
 
 	curds = geteuid();
+	/* force curds to be used, but do not print much info about our UID */
+	printf("/* geteuid() mod 2 == %ld */\n", ((long)curds) & 0x1);
 
 	printf("#define HAVE_UID_T /* yes */\n");
 

help/Makefile

@@ -1,8 +1,8 @@
-#!/bin/make
+#!/usr/bin/env make
 #
 # help - makefile for calc help files
 #
-# Copyright (C) 1999-2006,2017,2021,2022  Landon Curt Noll
+# Copyright (C) 1999-2006,2017,2021-2023  Landon Curt Noll
 #
 # SRC: help/Makefile
 #
@@ -44,20 +44,21 @@
 # If your system has a up to date, bash shell, then
 # you may wish to use:
 #
-#	SHELL= /bin/bash
+#	SHELL= bash
 #
 # On some systems such as macOS, the bash shell is very
 # far behind to the point where is cannot be depended on.
 # On such systems, the sh may be a much better alternative
 # shell for this Makefile to use:
 #
-#	SHELL= /bin/sh
+#	SHELL= sh
 #
-SHELL= /bin/bash
-#SHELL= /bin/sh
+SHELL= bash
+#SHELL= sh
 #if 0	/* start of skip for non-Gnu makefiles */
+#
 ifeq ($(target),Darwin)
-SHELL:= /bin/zsh
+SHELL:= /bin/sh
 endif
 #endif	/* end of skip for non-Gnu makefiles */
 
@@ -246,7 +247,7 @@ CHMOD= chmod
 CMP= cmp
 CP= cp
 FMT= fmt
-GREP= egrep
+GREP= grep
 ICFLAGS=
 ILDFLAGS=
 LCC= cc
@@ -716,7 +717,7 @@ builtin: builtin.top builtin.end ../func.c funclist.sed
 	    -I.. funclist.c -c ${S}
 	${Q} ${LCC} ${ILDFLAGS} funclist.o -o funclist${EXT} ${S}
 	${Q} ${RM} -f builtin
-	${Q} ${GREP} -v '^#'  builtin.top > builtin
+	${Q} ${GREP} -E -v '^#'  builtin.top > builtin
 	${Q} ./funclist${EXT} | \
 	    ${SED} -e 's/^/	/' -e 's/[	 ][	 ]*$$//' >> builtin
 	${Q} ${CAT} builtin.end >> builtin

help/config

@@ -34,6 +34,7 @@ DESCRIPTION
 	    "pow2"		sets size for alternate powering.
 	    "redc2"		sets size for alternate REDC.
 	    "tilde"		enable/disable printing of the roundoff '~'
+	    "tilde_space"	enable/disable printing space after roundoff tilde '~ '
 	    "tab"		enable/disable printing of leading tabs
 	    "quomod"		sets rounding mode for quomod
 	    "quo"		sets rounding mode for //, default for quo
@@ -134,6 +135,7 @@ DESCRIPTION
 	    config("display", 50);	    50 digits of output
 	    epsilon(epsilon() / 8);	    3 bits more accuracy
 	    config("tilde", 0)		    disable roundoff tilde printing
+	    config("tilde_space", 1)	    enable printing space after roundoff tilde
 	    config("tab", "off")	    disable leading tab printing
 
     =-=
@@ -264,7 +266,7 @@ DESCRIPTION
     config("mul2", int)
     config("sq2", int)
 
-    Mul2 and sq2 specify the sizes of numbers at which calc switches
+    Both "mul2" and "sq2" specify the sizes of numbers at which calc switches
     from its first to its second algorithm for multiplying and squaring.
     The first algorithm is the usual method of cross multiplying, which
     runs in a time of O(N^2).  The second method is a recursive and
@@ -305,7 +307,7 @@ DESCRIPTION
 
     config("pow2", int)
 
-    Pow2 specifies the sizes of numbers at which calc switches from
+    The "pow2" specifies the sizes of numbers at which calc switches from
     its first to its second algorithm for calculating powers modulo
     another number.  The first algorithm for calculating modular powers
     is by repeated squaring and multiplying and dividing by the modulus.
@@ -334,7 +336,7 @@ DESCRIPTION
 
     config("redc2", int)
 
-    Redc2 specifies the sizes of numbers at which calc switches from
+    The "redc2" specifies the sizes of numbers at which calc switches from
     its first to its second algorithm when using the REDC algorithm.
     The first algorithm performs a multiply and a modular reduction
     together in one loop which runs in O(N^2).	The second algorithm
@@ -363,16 +365,48 @@ DESCRIPTION
 
     config("tilde", boolean)
 
-    Config("tilde") controls whether or not a leading tilde ('~') is
+    The "tilde" controls whether or not a leading tilde ('~') is
     printed to indicate that a number has not been printed exactly
     because the number of decimal digits required would exceed the
-    specified maximum number.  The initial "tilde" value is 1.
+    specified maximum number.
+
+    If config("tilde") is false, then config("tilde_space") has no effect.
+
+    The initial "tilde" value is 1 (on).
+
+    =-=
+
+    config("tilde_space", boolean)
+
+    The "tilde_space" controls whether or not a space (' ') is
+    printed after leading tilde ('~').  See config("tilde") above.
+    If config("tilde") is false, then config("tilde_space") has no effect.
+
+    NOTE: Use of config("tilde_space", 1) can break printing and scanning
+	  of complex values via "%c".
+
+    The initial "tilde_space" value is 0 (off)
+
+    =-=
+
+    config("fraction_space", boolean)
+
+    The "fraction_space" controls whether or not a space (' ') is
+    printed both before and after '/' when printing a fraction.
+
+    NOTE: Use of config("fraction_space", 1) can break printing and scanning
+	  of fractional values via "%r".
+
+    NOTE: Use of config("fraction_space", 1) can break printing and scanning
+	  of complex values via "%c".
+
+    The initial "fraction_space" value is 0 (off).
 
     =-=
 
     config("tab", boolean)
 
-    Config ("tab") controls the printing of a tab before results
+    config("tab") controls the printing of a tab before results
     automatically displayed when working interactively.	 It does not
     affect the printing by the functions print, printf, etc.  The initial
     "tab" value is 1.
@@ -908,6 +942,7 @@ EXAMPLE
 	pow2            40
 	redc2           50
 	tilde           1
+	tilde_space     0
 	tab             1
 	quomod          0
 	quo             2
@@ -944,6 +979,7 @@ EXAMPLE
 	redecl_warn	1
 	dupvar_warn	1
 	hz		100
+	fraction_space     0
 
     ; display()
 	20

help/credit

@@ -26,13 +26,22 @@ Credits
 
     Most of this source and binary has one of the following copyrights:
 
-	    Copyright (C) year David I. Bell
-	    Copyright (C) year David I. Bell and Landon Curt Noll
-	    Copyright (C) year David I. Bell and Ernest Bowen
-	    Copyright (C) year David I. Bell, Landon Curt Noll and Ernest Bowen
-	    Copyright (C) year Landon Curt Noll
-	    Copyright (C) year Ernest Bowen and Landon Curt Noll
-	    Copyright (C) year Ernest Bowen
+	Copyright (C) year  David I. Bell
+	Copyright (C) year  David I. Bell and Landon Curt Noll
+	Copyright (C) year  David I. Bell and Ernest Bowen
+	Copyright (C) year  David I. Bell, Landon Curt Noll and Ernest Bowen
+	Copyright (C) year  Landon Curt Noll
+	Copyright (C) year  Ernest Bowen and Landon Curt Noll
+	Copyright (C) year  Ernest Bowen
+	Copyright (C) year  Petteri Kettunen and Landon Curt Noll
+	Copyright (C) year  Christoph Zurnieden
+	Copyright (C) year  Landon Curt Noll and Thomas Jones-Low
+	Copyright (C) year  Klaus Alexander Seistrup and Landon Curt Noll
+
+    A few files in calc are covered under "The Unlicense".  For more
+    information on this license, see:
+
+            https://unlicense.org
 
 
 Copying / Calc GNU Lesser General Public License
@@ -61,11 +70,11 @@ Copying / Calc GNU Lesser General Public License
 
 See also:
 
-    help copyright
-    help copying
-    help copying-lgpl
+	help copyright
+	help copying
+	help copying-lgpl
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2023  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

help/funclist.sed

@@ -2,11 +2,11 @@ s/VALUE/int/
 s/NUMBER[	 ]*\*/int /
 s/NUMBER/int/
 s/STRINGHEAD/int/
-s/\(".*",.*,.*\),.*,.*,.*,.*,/\1, 0, 0, 0, 0,/
+s/\(".*",.*,.*\),.*,.*,.*,.*,/\1, 0, 0, {.null = NULL}, {.null = NULL},/
 s/[	 ][	 ]*$//
 p
 
-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2023  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

help/unexpected

@@ -556,8 +556,14 @@ Unexpected
 	; print sin(d2r(30))
 	0.5
 
+    * operator has has a higher precedence than <<
+    ==============================================
 
-## Copyright (C) 1999-2007,2014,2017,2021  Landon Curt Noll
+    The * operator has has a higher precedence than <<, which differs from the C language.
+    So 3 << 2*5 evaluates to 3072 in C, whereas 3 << 2*5 evaluates to 60 in calc.
+
+
+## Copyright (C) 1999-2007,2014,2017,2021,2023  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

hist.c

@@ -98,7 +98,7 @@ STATIC	struct {
 } HS;
 
 
-typedef void (*FUNCPTR)();
+typedef void (*FUNCPTR)(int);
 
 typedef struct {
 	char	*name;
@@ -106,38 +106,38 @@ typedef struct {
 } FUNC;
 
 /* declare binding functions */
-S_FUNC void flush_input(void);
-S_FUNC void start_of_line(void);
-S_FUNC void end_of_line(void);
-S_FUNC void forward_char(void);
-S_FUNC void backward_char(void);
-S_FUNC void forward_word(void);
-S_FUNC void backward_word(void);
-S_FUNC void delete_char(void);
-S_FUNC void forward_kill_char(void);
-S_FUNC void backward_kill_char(void);
-S_FUNC void forward_kill_word(void);
-S_FUNC void kill_line(void);
-S_FUNC void new_line(void);
-S_FUNC void save_line(void);
-S_FUNC void forward_history(void);
-S_FUNC void backward_history(void);
+S_FUNC void flush_input(int key);
+S_FUNC void start_of_line(int key);
+S_FUNC void end_of_line(int key);
+S_FUNC void forward_char(int key);
+S_FUNC void backward_char(int key);
+S_FUNC void forward_word(int key);
+S_FUNC void backward_word(int key);
+S_FUNC void delete_char(int key);
+S_FUNC void forward_kill_char(int key);
+S_FUNC void backward_kill_char(int key);
+S_FUNC void forward_kill_word(int key);
+S_FUNC void kill_line(int key);
+S_FUNC void new_line(int key);
+S_FUNC void save_line(int key);
+S_FUNC void forward_history(int key);
+S_FUNC void backward_history(int key);
 S_FUNC void insert_char(int key);
-S_FUNC void goto_line(void);
-S_FUNC void list_history(void);
-S_FUNC void refresh_line(void);
-S_FUNC void swap_chars(void);
-S_FUNC void set_mark(void);
-S_FUNC void yank(void);
-S_FUNC void save_region(void);
-S_FUNC void kill_region(void);
-S_FUNC void reverse_search(void);
-S_FUNC void quote_char(void);
-S_FUNC void uppercase_word(void);
-S_FUNC void lowercase_word(void);
-S_FUNC void ignore_char(void);
-S_FUNC void arrow_key(void);
-S_FUNC void quit_calc(void) __attribute__((noreturn));
+S_FUNC void goto_line(int key);
+S_FUNC void list_history(int key);
+S_FUNC void refresh_line(int key);
+S_FUNC void swap_chars(int key);
+S_FUNC void set_mark(int key);
+S_FUNC void yank(int key);
+S_FUNC void save_region(int key);
+S_FUNC void kill_region(int key);
+S_FUNC void reverse_search(int key);
+S_FUNC void quote_char(int key);
+S_FUNC void uppercase_word(int key);
+S_FUNC void lowercase_word(int key);
+S_FUNC void ignore_char(int key);
+S_FUNC void arrow_key(int key);
+S_FUNC void quit_calc(int key) __attribute__((noreturn));
 
 
 STATIC	FUNC	funcs[] =
@@ -217,8 +217,8 @@ STATIC	int		save_len;
 STATIC	KEY_MAP		*cur_map;
 STATIC	KEY_MAP		*base_map;
 STATIC	KEY_ENT		key_table[MAX_KEYS];
-STATIC  HIST*    	hist_first = NULL;
-STATIC  HIST*   	hist_last = NULL;
+STATIC  HIST*		hist_first = NULL;
+STATIC  HIST*		hist_last = NULL;
 STATIC	char		save_buffer[SAVE_SIZE];
 
 /* declare other static functions */
@@ -650,12 +650,11 @@ read_key(void)
 		ent = &cur_map->default_ent;
 	if (ent->next)
 		cur_map = ent->next;
-	if (ent->func)
-		/* ignore Saber-C warning #65 - has 1 arg, expecting 0 */
-		/*	  OK to ignore in proc read_key */
+	if (ent->func != NULL) {
 		(*ent->func)(key);
-	else
+	} else {
 		insert_char(key);
+	}
 }
 
 
@@ -797,20 +796,20 @@ find_func(char *name)
 
 
 S_FUNC void
-arrow_key(void)
+arrow_key(int UNUSED(key))
 {
 	switch (fgetc(stdin)) {
 	case 'A':
-		backward_history();
+		backward_history(0);
 		break;
 	case 'B':
-		forward_history();
+		forward_history(0);
 		break;
 	case 'C':
-		forward_char();
+		forward_char(0);
 		break;
 	case 'D':
-		backward_char();
+		backward_char(0);
 		break;
 	}
 }
@@ -867,13 +866,13 @@ decrement_end(int n)
 
 
 S_FUNC void
-ignore_char(void)
+ignore_char(int UNUSED(key))
 {
 }
 
 
 S_FUNC void
-flush_input(void)
+flush_input(int UNUSED(key))
 {
 	echo_rest_of_line();
 	while (HS.end > HS.buf)
@@ -884,21 +883,21 @@ flush_input(void)
 
 
 S_FUNC void
-start_of_line(void)
+start_of_line(int UNUSED(key))
 {
 	goto_start_of_line();
 }
 
 
 S_FUNC void
-end_of_line(void)
+end_of_line(int UNUSED(key))
 {
 	goto_end_of_line();
 }
 
 
 S_FUNC void
-forward_char(void)
+forward_char(int UNUSED(key))
 {
 	if (HS.pos < HS.end)
 		echo_char(*HS.pos++);
@@ -906,7 +905,7 @@ forward_char(void)
 
 
 S_FUNC void
-backward_char(void)
+backward_char(int UNUSED(key))
 {
 	if (HS.pos > HS.buf)
 		back_over_char((int)(*--HS.pos));
@@ -914,7 +913,7 @@ backward_char(void)
 
 
 S_FUNC void
-uppercase_word(void)
+uppercase_word(int UNUSED(key))
 {
 	while ((HS.pos < HS.end) && !in_word((int)(*HS.pos)))
 		echo_char(*HS.pos++);
@@ -927,7 +926,7 @@ uppercase_word(void)
 
 
 S_FUNC void
-lowercase_word(void)
+lowercase_word(int UNUSED(key))
 {
 	while ((HS.pos < HS.end) && !in_word((int)(*HS.pos)))
 		echo_char(*HS.pos++);
@@ -940,7 +939,7 @@ lowercase_word(void)
 
 
 S_FUNC void
-forward_word(void)
+forward_word(int UNUSED(key))
 {
 	while ((HS.pos < HS.end) && !in_word((int)(*HS.pos)))
 		echo_char(*HS.pos++);
@@ -950,7 +949,7 @@ forward_word(void)
 
 
 S_FUNC void
-backward_word(void)
+backward_word(int UNUSED(key))
 {
 	if ((HS.pos > HS.buf) && in_word((int)(*HS.pos)))
 		back_over_char((int)(*--HS.pos));
@@ -964,7 +963,7 @@ backward_word(void)
 
 
 S_FUNC void
-forward_kill_char(void)
+forward_kill_char(int UNUSED(key))
 {
 	int	rest;
 	char	ch;
@@ -986,7 +985,7 @@ forward_kill_char(void)
 
 
 S_FUNC void
-delete_char(void)
+delete_char(int UNUSED(key))
 {
 	/*
 	 * quit delete_char (usually ^D) is at start of line and we are allowed
@@ -997,30 +996,30 @@ delete_char(void)
 	if ((HS.end == HS.buf) &&
 	    (conf->ctrl_d == CTRL_D_EMPTY_EOF ||
 	     (conf->ctrl_d == CTRL_D_VIRGIN_EOF && HS.virgin_line == TRUE))) {
-		quit_calc();
+		quit_calc(0);
 	}
 
 	/*
 	 * normal case: just forward_kill_char
 	 */
 	if (HS.end > HS.buf)
-		forward_kill_char();
+		forward_kill_char(0);
 }
 
 
 S_FUNC void
-backward_kill_char(void)
+backward_kill_char(int UNUSED(key))
 {
 	if (HS.pos > HS.buf) {
 		HS.pos--;
 		back_over_char((int)(*HS.pos));
-		forward_kill_char();
+		forward_kill_char(0);
 	}
 }
 
 
 S_FUNC void
-forward_kill_word(void)
+forward_kill_word(int UNUSED(key))
 {
 	char	*cp;
 
@@ -1044,7 +1043,7 @@ forward_kill_word(void)
 
 
 S_FUNC void
-kill_line(void)
+kill_line(int UNUSED(key))
 {
 	if (HS.end <= HS.pos)
 		return;
@@ -1063,7 +1062,7 @@ kill_line(void)
  * decide whether or not this should be done.
  */
 S_FUNC void
-new_line(void)
+new_line(int UNUSED(key))
 {
 	int	len;
 
@@ -1087,21 +1086,21 @@ new_line(void)
 
 
 S_FUNC void
-save_line(void)
+save_line(int UNUSED(key))
 {
 	int	len;
 
 	len = HS.end - HS.buf;
 	if (len > 0) {
 		hist_saveline(HS.buf, len);
-		flush_input();
+		flush_input(0);
 	}
 	HS.curhist = HS.histcount;
 }
 
 
 S_FUNC void
-goto_line(void)
+goto_line(int UNUSED(key))
 {
 	int	num;
 	char	*cp;
@@ -1115,7 +1114,7 @@ goto_line(void)
 		beep();
 		return;
 	}
-	flush_input();
+	flush_input(0);
 	HS.curhist = HS.histcount - num;
 	hp = get_event(HS.curhist);
 	memcpy(HS.buf, hp->data, hp->len);
@@ -1125,11 +1124,11 @@ goto_line(void)
 
 
 S_FUNC void
-forward_history(void)
+forward_history(int UNUSED(key))
 {
 	HIST	*hp;
 
-	flush_input();
+	flush_input(0);
 	if (++HS.curhist >= HS.histcount)
 		HS.curhist = 0;
 	hp = get_event(HS.curhist);
@@ -1142,11 +1141,11 @@ forward_history(void)
 
 
 S_FUNC void
-backward_history(void)
+backward_history(int UNUSED(key))
 {
 	HIST	*hp;
 
-	flush_input();
+	flush_input(0);
 	if (--HS.curhist < 0)
 		HS.curhist = HS.histcount - 1;
 	hp = get_event(HS.curhist);
@@ -1208,7 +1207,7 @@ insert_string(char *str, int len)
 
 
 S_FUNC void
-list_history(void)
+list_history(int UNUSED(key))
 {
 	HIST	*hp;
 	int	hnum;
@@ -1218,12 +1217,12 @@ list_history(void)
 		printf("\n%3d: ", HS.histcount - hnum);
 		echo_string(hp->data, hp->len);
 	}
-	refresh_line();
+	refresh_line(0);
 }
 
 
 S_FUNC void
-refresh_line(void)
+refresh_line(int UNUSED(key))
 {
 	char	*cp;
 
@@ -1239,7 +1238,7 @@ refresh_line(void)
 
 
 S_FUNC void
-swap_chars(void)
+swap_chars(int UNUSED(key))
 {
 	char	ch1;
 	char	ch2;
@@ -1258,14 +1257,14 @@ swap_chars(void)
 
 
 S_FUNC void
-set_mark(void)
+set_mark(int UNUSED(key))
 {
 	HS.mark = HS.pos;
 }
 
 
 S_FUNC void
-save_region(void)
+save_region(int UNUSED(key))
 {
 	int	len;
 
@@ -1280,7 +1279,7 @@ save_region(void)
 
 
 S_FUNC void
-kill_region(void)
+kill_region(int UNUSED(key))
 {
 	char	*cp;
 	char	*left;
@@ -1312,14 +1311,14 @@ kill_region(void)
 
 
 S_FUNC void
-yank(void)
+yank(int UNUSED(key))
 {
 	insert_string(save_buffer, save_len);
 }
 
 
 S_FUNC void
-reverse_search(void)
+reverse_search(int UNUSED(key))
 {
 	int	len;
 	int	count;
@@ -1345,7 +1344,7 @@ reverse_search(void)
 
 	HS.curhist = testhist;
 	save_pos = HS.pos;
-	flush_input();
+	flush_input(0);
 	memcpy(HS.buf, hp->data, hp->len);
 	HS.end = &HS.buf[hp->len];
 	goto_end_of_line();
@@ -1355,7 +1354,7 @@ reverse_search(void)
 
 
 S_FUNC void
-quote_char(void)
+quote_char(int UNUSED(key))
 {
 	int	ch;
 
@@ -1451,7 +1450,7 @@ memrcpy(char *dest, char *src, int len)
 #endif /* !USE_READLINE */
 
 S_FUNC void
-quit_calc(void)
+quit_calc(int UNUSED(ch))
 {
 	hist_term();
 	putchar('\n');
@@ -1493,7 +1492,7 @@ hist_getline(char *prompt, char *buf, size_t len)
 		case CTRL_D_VIRGIN_EOF:
 		case CTRL_D_EMPTY_EOF:
 		default:
-			quit_calc();
+			quit_calc(0);
 			not_reached();
 		}
 	}

lib_calc.c

@@ -321,6 +321,7 @@ libcalc_call_me_first(void)
 	if (d_flag) {
 		conf->resource_debug = 0;
 		conf->tilde_ok = 0;
+		conf->tilde_space = 0;
 	}
 
 	/*
@@ -693,7 +694,7 @@ calc_strdup(CONST char *s1)
 #else /* HAVE_STRDUP */
 
 	char *ret;	/* return string */
-	size_t s1_len; 	/* length of string to duplicate */
+	size_t s1_len;	/* length of string to duplicate */
 
 	/*
 	 * firewall
@@ -737,7 +738,7 @@ S_FUNC int
 find_tty_state(int fd)
 {
 	int *new_fd_setup;		/* new fd_setup array */
-	ttystruct *new_fd_orig; /* new fd_orig array */
+	ttystruct *new_fd_orig;		/* new fd_orig array */
 	ttystruct *new_fd_cur;		/* new fd_cur array */
 	int i;
 
@@ -764,7 +765,7 @@ find_tty_state(int fd)
 		if (fd_orig == NULL) {
 			return -1;
 		}
-		fd_cur = (ttystruct *)malloc(sizeof(fd_orig[0]));
+		fd_cur = (ttystruct *)malloc(sizeof(fd_cur[0]));
 		if (fd_cur == NULL) {
 			return -1;
 		}
@@ -796,26 +797,35 @@ find_tty_state(int fd)
 	/*
 	 * no empty slots exist, realloc another slot
 	 */
+	/* expand fd_orig as an original pre-modified copy of fd_setup */
+	new_fd_orig = (ttystruct *)realloc(fd_orig, sizeof(fd_orig[0]) *
+					    (fd_setup_len+1));
+	if (new_fd_orig == NULL) {
+		return -1;
+	}
+	fd_orig = new_fd_orig;
+	memcpy(fd_orig, fd_setup, sizeof(fd_orig[0]) * (fd_setup_len+1));
+
+	/* expand fd_setup */
 	new_fd_setup = (int *)realloc(fd_setup, sizeof(fd_setup[0]) *
 				      (fd_setup_len+1));
 	if (new_fd_setup == NULL) {
 		return -1;
 	}
+	fd_setup = new_fd_setup;
 	new_fd_setup[fd_setup_len] = -1;
-	new_fd_orig = (ttystruct *)realloc(fd_setup, sizeof(fd_orig[0]) *
-					    (fd_setup_len+1));
-	if (new_fd_orig == NULL) {
-		return -1;
-	}
+
+	/* expand fd_cur */
 	new_fd_cur = (ttystruct *)realloc(fd_cur, sizeof(fd_cur[0]) *
 					  (fd_setup_len+1));
 	if (new_fd_cur == NULL) {
 		return -1;
 	}
-	fd_setup = new_fd_setup;
-	fd_orig = new_fd_orig;
 	fd_cur = new_fd_cur;
+
+	/* expand fd setup length */
 	++fd_setup_len;
+
 	/* return the new slot */
 	return fd_setup_len-1;
 }

qio.c

@@ -201,16 +201,24 @@ qprintnum(NUMBER *q, int outmode, LEN outdigits)
 	}
 	switch (outmode) {
 	case MODE_INT:
-		if (conf->tilde_ok && qisfrac(q))
+		if (conf->tilde_ok && qisfrac(q)) {
 			PUTCHAR('~');
+			if (conf->tilde_space && qisfrac(q)) {
+				PUTCHAR(' ');
+			}
+		}
 		qprintfd(q, 0L);
 		break;
 
 	case MODE_REAL:
 		prec = qdecplaces(q);
 		if ((prec < 0) || (prec > outdigits)) {
-			if (conf->tilde_ok)
+			if (conf->tilde_ok) {
 			    PUTCHAR('~');
+			    if (conf->tilde_space) {
+				PUTCHAR(' ');
+			    }
+			}
 		}
 		if (conf->fullzero || (prec < 0) ||
 		    (prec > outdigits))
@@ -412,7 +420,13 @@ qprintfr(NUMBER *q, long width, BOOL force)
 {
 	zprintval(q->num, 0L, width);
 	if (force || qisfrac(q)) {
+		if (conf->fraction_space) {
+		    PUTCHAR(' ');
+		}
 		PUTCHAR('/');
+		if (conf->fraction_space) {
+		    PUTCHAR(' ');
+		}
 		zprintval(q->den, 0L, width);
 	}
 }
@@ -446,7 +460,13 @@ qprintfx(NUMBER *q, long width)
 {
 	zprintx(q->num, width);
 	if (qisfrac(q)) {
+		if (conf->fraction_space) {
+		    PUTCHAR(' ');
+		}
 		PUTCHAR('/');
+		if (conf->fraction_space) {
+		    PUTCHAR(' ');
+		}
 		zprintx(q->den, 0L);
 	}
 }
@@ -461,7 +481,13 @@ qprintfb(NUMBER *q, long width)
 {
 	zprintb(q->num, width);
 	if (qisfrac(q)) {
+		if (conf->fraction_space) {
+		    PUTCHAR(' ');
+		}
 		PUTCHAR('/');
+		if (conf->fraction_space) {
+		    PUTCHAR(' ');
+		}
 		zprintb(q->den, 0L);
 	}
 }
@@ -476,7 +502,13 @@ qprintfo(NUMBER *q, long width)
 {
 	zprinto(q->num, width);
 	if (qisfrac(q)) {
+		if (conf->fraction_space) {
+		    PUTCHAR(' ');
+		}
 		PUTCHAR('/');
+		if (conf->fraction_space) {
+		    PUTCHAR(' ');
+		}
 		zprinto(q->den, 0L);
 	}
 }
@@ -749,6 +781,12 @@ fitprint(NUMBER *q, long width)
 		width1 = width - width2;
 	}
 	fitzprint(q->num, numdigits, width1);
+	if (conf->fraction_space) {
+	    PUTCHAR(' ');
+	}
 	PUTCHAR('/');
+	if (conf->fraction_space) {
+	    PUTCHAR(' ');
+	}
 	fitzprint(q->den, dendigits, width2);
 }

quickhash.c

@@ -439,6 +439,7 @@ config_hash(CONFIG *cfg, QCKHASH val)
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->pow2);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->redc2);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->tilde_ok);
+	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->tilde_space);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->tab_ok);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->quomod);
 	value = (((value>>5) | (value<<27)) ^ (USB32)cfg->quo);

rpm.mk

@@ -1,9 +1,8 @@
-#!/bin/make
-#****h* calc/rpm.mk
+#!/usr/bin/env make
 #
 # rpm.mk - Makefile for building rpm packages for calc
 #
-# Copyright (C) 2003,2014,2021  Petteri Kettunen and Landon Curt Noll
+# Copyright (C) 2003,2014,2021,2023  Petteri Kettunen and Landon Curt Noll
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -63,7 +62,7 @@
 
 # setup
 #
-SHELL= /bin/sh
+SHELL= bash
 RPMBUILD_TOOL= rpmbuild
 TARCH= x86_64
 RPMBUILD_OPTION= -ba --target=$(TARCH) --buildroot=${RPM_BUILD_ROOT}
@@ -76,7 +75,6 @@ RM= rm
 LS= ls
 CPIO= cpio
 CP= cp
-EGREP= egrep
 MKDIR= mkdir
 GREP= grep
 SORT= sort
@@ -172,8 +170,8 @@ srcpkg: make_rhdir
 	${V} echo PROJECT_RELEASE="${PROJECT_RELEASE}"
 	${RM} -rf "$(TMPDIR)/$(PROJECT)"
 	${FIND} . -depth -print | \
-	    ${EGREP} -v '/RCS|/CVS|/NOTES|/\.|\.out$$|\.safe$$\.tar\.bz2$$' | \
-	    ${EGREP} -v '/old[._-]|\.old$$|\.tar\.gz$$|/ver_calc$$' | \
+	    ${GREP} -E -v '/RCS|/CVS|/NOTES|/\.|\.out$$|\.safe$$\.tar\.bz2$$' | \
+	    ${GREP} -E -v '/old[._-]|\.old$$|\.tar\.gz$$|/ver_calc$$' | \
 	    LANG=C ${SORT} | \
 	    ${CPIO} -dumpv "$(TMPDIR)/$(PROJECT)"
 	${RM} -f "$(TMPDIR)/$(PROJECT)/Makefile"
@@ -278,8 +276,8 @@ chkpkg:
 .PHONY: chksys
 chksys:
 	${V} echo '=-=-=-=-= rpm.mk start of $@ rule =-=-=-=-='
-	${RPM_TOOL} -qa | ${GREP} "$(PROJECT_NAME)"
-	${RPM_TOOL} -qa | ${GREP} "$(PROJECT_NAME)-devel"
+	${RPM_TOOL} -qa | ${GREP} -E "$(PROJECT_NAME)"
+	${RPM_TOOL} -qa | ${GREP} -E "$(PROJECT_NAME)-devel"
 	${V} echo '=-=-=-=-= rpm.mk end of $@ rule =-=-=-=-='
 
 .PHONY: test

seed.c

@@ -66,24 +66,30 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "have_times.h"
+
 #if defined(HAVE_TIME_H)
 #include <time.h>
-#endif
+#endif /* HAVE_TIME_H */
+
 #if defined(HAVE_SYS_TIME_H)
 #include <sys/time.h>
-#endif
+#endif /* HAVE_SYS_TIME_H */
+
 #if defined(HAVE_SYS_TIMES_H)
 #include <sys/times.h>
-#endif
+#endif /* HAVE_SYS_TIMES_H */
+
 #if !defined(_WIN32) && !defined(_WIN64)
 # include <sys/resource.h>
 #endif
+
 #if defined(HAVE_STDLIB_H)
 # include <stdlib.h>
 /* NOTE: RANDOM_CNT should remain 32 to circular shift 31-bit returns */
 # define RANDOM_CNT (32) /* random() call repeat and circular shift */
 # define INITSTATE_SIZE (256)	/* initstate pool size */
-#endif
+#endif /* HAVE_STDLIB_H */
+
 #include <setjmp.h>
 #include "alloc.h"
 #include "qmath.h"
@@ -98,15 +104,33 @@
 #include "have_uid_t.h"
 #include "have_environ.h"
 #include "have_arc4random.h"
+
 #if defined(HAVE_USTAT)
 # include <ustat.h>
-#endif
+#endif /* HAVE_USTAT */
+
 #if defined(HAVE_URANDOM)
 # include <fcntl.h>
 # define DEV_URANDOM "/dev/urandom"
 # define DEV_URANDOM_POOL (16)
-#endif
+#endif /* HAVE_URANDOM */
 
+#include "have_sys_vfs.h"
+#if defined(HAVE_SYS_VFS_H)
+# include <sys/vfs.h>
+#endif /* HAVE_SYS_VFS_H */
+
+#include "have_sys_param.h"
+#if defined(HAVE_SYS_PARAM_H)
+# include <sys/param.h>
+#endif /* HAVE_SYS_PARAM_H */
+
+#include "have_sys_mount.h"
+#if defined(HAVE_SYS_MOUNT_H)
+# include <sys/mount.h>
+#endif /* HAVE_SYS_MOUNT_H */
+
+#include "have_statfs.h"
 
 #include "banned.h"	/* include after system header <> includes */
 
@@ -417,6 +441,25 @@ pseudo_seed(void)
 	/* usage stat of "/var/log/messages" */
 	struct ustat ustat_messages;
 #endif
+#if defined(HAVE_STATFS)
+	struct statfs statfs_dot;	/* filesystem stat of "." */
+	struct statfs statfs_dotdot;	/* filesystem stat of ".." */
+	struct statfs statfs_tmp;	/* filesystem stat of "/tmp" */
+	struct statfs statfs_root;	/* filesystem stat of "/" */
+	struct statfs statfs_tty;	/* filesystem stat of "/dev/tty" */
+	struct statfs statfs_console;	/* filesystem stat of "/dev/console" */
+	struct statfs statfs_stdin;	/* filesystem stat of stdin */
+	struct statfs statfs_stdout;	/* filesystem stat of stdout */
+	struct statfs statfs_stderr;	/* filesystem stat of stderr */
+	struct statfs statfs_zero;	/* filesystem stat of "/dev/zero" */
+	struct statfs statfs_null;	/* filesystem stat of "/dev/null" */
+	struct statfs statfs_sh;	/* filesystem stat of "/bin/sh" */
+	struct statfs statfs_ls;	/* filesystem stat of "/bin/ls" */
+	/* filesystem stat of "/var/log/system.log" */
+	struct statfs statfs_system;
+	/* filesystem stat of "/var/log/messages" */
+	struct statfs statfs_messages;
+#endif
 #if defined(HAVE_GETSID)
 	pid_t getsid;			/* session ID */
 #endif
@@ -559,6 +602,23 @@ pseudo_seed(void)
     (void) ustat(sdata.stat_system.st_dev, &sdata.ustat_system);
     (void) ustat(sdata.stat_messages.st_dev, &sdata.ustat_messages);
 #endif
+#if defined(HAVE_STATFS)
+    (void) statfs("..", &sdata.statfs_dot);
+    (void) statfs(".", &sdata.statfs_dotdot);
+    (void) statfs("/tmp", &sdata.statfs_tmp);
+    (void) statfs("/", &sdata.statfs_root);
+    (void) statfs("/dev/tty", &sdata.statfs_tty);
+    (void) statfs("/dev/console", &sdata.statfs_console);
+    (void) statfs(".dev/stdin", &sdata.statfs_stdin);
+    (void) statfs("/dev/stdout", &sdata.statfs_stdout);
+    (void) statfs("/dev/stderr", &sdata.statfs_stderr);
+    (void) statfs("/dev/zero", &sdata.statfs_zero);
+    (void) statfs("/dev/null", &sdata.statfs_null);
+    (void) statfs("/bin/sh", &sdata.statfs_sh);
+    (void) statfs("/dev/ls", &sdata.statfs_ls);
+    (void) statfs("/var/log/system.log", &sdata.statfs_system);
+    (void) statfs("/var/log/messages", &sdata.statfs_messages);
+#endif
 #if defined(HAVE_GETSID)
     sdata.getsid = getsid((pid_t)0);
 #endif
@@ -592,7 +652,6 @@ pseudo_seed(void)
     sdata.size = sizeof(sdata);
     sdata.prev_hash64_copy = prev_hash64;	/* load previous hash */
     sdata.call_count_copy = ++call_count;	/* update call count */
-    (void) setjmp(sdata.env);
 #if defined(HAVE_ENVIRON)
     sdata.environ_copy = environ;
 #endif /* HAVE_ENVIRON */

sha1.c

@@ -3,26 +3,37 @@
  *
  * Written 2 September 1992, Peter C. Gutmann.
  *
- * This file has been extensively modified by:
- *
- *	Landon Curt Noll
- *	http://www.isthe.com/chongo/
- *
- *	chongo <was here> /\../\
- *
- * This code has been placed in the public domain.  Please do not
- * copyright this code.
- *
- * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH  REGARD  TO
- * THIS	 SOFTWARE,  INCLUDING  ALL IMPLIED WARRANTIES OF MER-
- * CHANTABILITY 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.
- *
  * This file is not covered under version 2.1 of the GNU LGPL.
+ * This file is covered under "The unlicense":
+ *
+ *	https://unlicense.org
+ *
+ * In particular:
+ *
+ * This is free and unencumbered software released into the public domain.
+ *
+ * Anyone is free to copy, modify, publish, use, compile, sell, or
+ * distribute this software, either in source code form or as a compiled
+ * binary, for any purpose, commercial or non-commercial, and by any
+ * means.
+ *
+ * In jurisdictions that recognize copyright laws, the author or authors
+ * of this software dedicate any and all copyright interest in the
+ * software to the public domain. We make this dedication for the benefit
+ * of the public at large and to the detriment of our heirs and
+ * successors. We intend this dedication to be an overt act of
+ * relinquishment in perpetuity of all present and future rights to this
+ * software under copyright law.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * For more information, please refer to <http://unlicense.org/>
  */
 
 

sha1.h

@@ -3,26 +3,37 @@
  *
  * Written 2 September 1992, Peter C. Gutmann.
  *
- * This file and been extensively modified by:
- *
- *	Landon Curt Noll
- *	http://www.isthe.com/chongo/
- *
- *	chongo <was here> /\../\
- *
- * This code has been placed in the public domain.  Please do not
- * copyright this code.
- *
- * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH  REGARD  TO
- * THIS	 SOFTWARE,  INCLUDING  ALL IMPLIED WARRANTIES OF MER-
- * CHANTABILITY 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.
- *
  * This file is not covered under version 2.1 of the GNU LGPL.
+ * This file is covered under "The unlicense":
+ *
+ *	https://unlicense.org
+ *
+ * In particular:
+ *
+ * This is free and unencumbered software released into the public domain.
+ *
+ * Anyone is free to copy, modify, publish, use, compile, sell, or
+ * distribute this software, either in source code form or as a compiled
+ * binary, for any purpose, commercial or non-commercial, and by any
+ * means.
+ *
+ * In jurisdictions that recognize copyright laws, the author or authors
+ * of this software dedicate any and all copyright interest in the
+ * software to the public domain. We make this dedication for the benefit
+ * of the public at large and to the detriment of our heirs and
+ * successors. We intend this dedication to be an overt act of
+ * relinquishment in perpetuity of all present and future rights to this
+ * software under copyright law.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * For more information, please refer to <http://unlicense.org/>
  */
 
 

symbol.c

@@ -373,7 +373,6 @@ freeglobals(void)
 {
 	GLOBAL **hp;		/* hash table head address */
 	GLOBAL *sp;		/* current global symbol pointer */
-	long count;		/* number of global variables freed */
 
 	/*
 	 * We prevent the hp pointer from walking behind globalhash
@@ -384,12 +383,10 @@ freeglobals(void)
 	 * short and running the loop one last time manually helps make
 	 * code checkers such as insure happy.
 	 */
-	count = 0;
 	for (hp = &globalhash[HASHSIZE-1]; hp > globalhash; hp--) {
 		for (sp = *hp; sp; sp = sp->g_next) {
 			if (sp->g_value.v_type != V_NULL) {
 				freevalue(&sp->g_value);
-				count++;
 			}
 		}
 	}
@@ -397,7 +394,6 @@ freeglobals(void)
 	for (sp = *hp; sp; sp = sp->g_next) {
 		if (sp->g_value.v_type != V_NULL) {
 			freevalue(&sp->g_value);
-			count++;
 		}
 	}
 }

value.c

@@ -377,6 +377,7 @@ negvalue(VALUE *vp, VALUE *vres)
 void
 addvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 {
+	unsigned int twoval_as_uint;	/* TWOVAL(a,b) or TWOVAL_INVALID */
 	COMPLEX *c;
 	VALUE tmp;
 	NUMBER *q;
@@ -403,7 +404,8 @@ addvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 		return;
 	}
 	vres->v_type = v1->v_type;
-	switch (TWOVAL(v1->v_type, v2->v_type)) {
+	twoval_as_uint = TWOVAL_AS_UINT(v1->v_type, v2->v_type);
+	switch (twoval_as_uint) {
 	case TWOVAL(V_NUM, V_NUM):
 		vres->v_num = qqadd(v1->v_num, v2->v_num);
 		return;
@@ -474,13 +476,15 @@ addvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 void
 subvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 {
+	unsigned int twoval_as_uint;	/* TWOVAL(a,b) or TWOVAL_INVALID */
 	COMPLEX *c;
 	NUMBER *q;
 	int i;
 
 	vres->v_type = v1->v_type;
 	vres->v_subtype = V_NOSUBTYPE;
-	switch (TWOVAL(v1->v_type, v2->v_type)) {
+	twoval_as_uint = TWOVAL_AS_UINT(v1->v_type, v2->v_type);
+	switch (twoval_as_uint) {
 	case TWOVAL(V_NUM, V_NUM):
 		vres->v_num = qsub(v1->v_num, v2->v_num);
 		return;
@@ -562,11 +566,13 @@ subvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 void
 mulvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 {
+	unsigned int twoval_as_uint;	/* TWOVAL(a,b) or TWOVAL_INVALID */
 	COMPLEX *c;
 
 	vres->v_type = v1->v_type;
 	vres->v_subtype = V_NOSUBTYPE;
-	switch (TWOVAL(v1->v_type, v2->v_type)) {
+	twoval_as_uint = TWOVAL_AS_UINT(v1->v_type, v2->v_type);
+	switch (twoval_as_uint) {
 	case TWOVAL(V_NUM, V_NUM):
 		vres->v_num = qmul(v1->v_num, v2->v_num);
 		return;
@@ -727,6 +733,8 @@ invertvalue(VALUE *vp, VALUE *vres)
 void
 andvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 {
+	unsigned int twoval_as_uint;	/* TWOVAL(a,b) or TWOVAL_INVALID */
+
 	vres->v_subtype = V_NOSUBTYPE;
 	if (v1->v_type == V_NULL) {
 		copyvalue(v2, vres);
@@ -737,7 +745,8 @@ andvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 		return;
 	}
 	vres->v_type = v1->v_type;
-	switch (TWOVAL(v1->v_type, v2->v_type)) {
+	twoval_as_uint = TWOVAL_AS_UINT(v1->v_type, v2->v_type);
+	switch (twoval_as_uint) {
 	case TWOVAL(V_NUM, V_NUM):
 		vres->v_num = qand(v1->v_num, v2->v_num);
 		return;
@@ -783,6 +792,8 @@ andvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 void
 orvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 {
+	unsigned int twoval_as_uint;	/* TWOVAL(a,b) or TWOVAL_INVALID */
+
 	if (v1->v_type == V_NULL) {
 		copyvalue(v2, vres);
 		return;
@@ -793,7 +804,8 @@ orvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 	}
 	vres->v_type = v1->v_type;
 	vres->v_subtype = V_NOSUBTYPE;
-	switch (TWOVAL(v1->v_type, v2->v_type)) {
+	twoval_as_uint = TWOVAL_AS_UINT(v1->v_type, v2->v_type);
+	switch (twoval_as_uint) {
 	case TWOVAL(V_NUM, V_NUM):
 		vres->v_num = qor(v1->v_num, v2->v_num);
 		return;
@@ -840,9 +852,12 @@ orvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 void
 xorvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 {
+	unsigned int twoval_as_uint;	/* TWOVAL(a,b) or TWOVAL_INVALID */
+
 	vres->v_type = v1->v_type;
 	vres->v_subtype = V_NOSUBTYPE;
-	switch (TWOVAL(v1->v_type, v2->v_type)) {
+	twoval_as_uint = TWOVAL_AS_UINT(v1->v_type, v2->v_type);
+	switch (twoval_as_uint) {
 	case (TWOVAL(V_NUM, V_NUM)):
 		vres->v_num = qxor(v1->v_num, v2->v_num);
 		return;
@@ -886,11 +901,13 @@ xorvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 void
 hashopvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 {
+	unsigned int twoval_as_uint;	/* TWOVAL(a,b) or TWOVAL_INVALID */
 	NUMBER *q;
 
 	vres->v_type = v1->v_type;
 	vres->v_subtype = V_NOSUBTYPE;
-	switch (TWOVAL(v1->v_type, v2->v_type)) {
+	twoval_as_uint = TWOVAL_AS_UINT(v1->v_type, v2->v_type);
+	switch (twoval_as_uint) {
 	case TWOVAL(V_NUM, V_NUM):
 		q = qsub(v1->v_num, v2->v_num);
 		vres->v_num = qqabs(q);
@@ -952,9 +969,12 @@ backslashvalue(VALUE *vp, VALUE *vres)
 void
 setminusvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 {
+	unsigned int twoval_as_uint;	/* TWOVAL(a,b) or TWOVAL_INVALID */
+
 	vres->v_type = v1->v_type;
 	vres->v_subtype = V_NOSUBTYPE;
-	switch (TWOVAL(v1->v_type, v2->v_type)) {
+	twoval_as_uint = TWOVAL_AS_UINT(v1->v_type, v2->v_type);
+	switch (twoval_as_uint) {
 	case TWOVAL(V_NUM, V_NUM):
 		vres->v_num = qandnot(v1->v_num, v2->v_num);
 		return;
@@ -2010,6 +2030,7 @@ powvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 void
 powervalue(VALUE *v1, VALUE *v2, VALUE *v3, VALUE *vres)
 {
+	unsigned int twoval_as_uint;	/* TWOVAL(a,b) or TWOVAL_INVALID */
 	NUMBER *epsilon;
 	COMPLEX *c, ctmp1, ctmp2;
 
@@ -2042,7 +2063,8 @@ powervalue(VALUE *v1, VALUE *v2, VALUE *v3, VALUE *vres)
 		return;
 	}
 
-	switch (TWOVAL(v1->v_type, v2->v_type)) {
+	twoval_as_uint = TWOVAL_AS_UINT(v1->v_type, v2->v_type);
+	switch (twoval_as_uint) {
 	case TWOVAL(V_NUM, V_NUM):
 		if (qisneg(v1->v_num)) {
 			ctmp1.real = v1->v_num;
@@ -2098,6 +2120,7 @@ powervalue(VALUE *v1, VALUE *v2, VALUE *v3, VALUE *vres)
 void
 divvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 {
+	unsigned int twoval_as_uint;	/* TWOVAL(a,b) or TWOVAL_INVALID */
 	COMPLEX *c;
 	COMPLEX ctmp;
 	NUMBER *q;
@@ -2124,7 +2147,8 @@ divvalue(VALUE *v1, VALUE *v2, VALUE *vres)
 		return;
 	}
 	vres->v_type = v1->v_type;
-	switch (TWOVAL(v1->v_type, v2->v_type)) {
+	twoval_as_uint = TWOVAL_AS_UINT(v1->v_type, v2->v_type);
+	switch (twoval_as_uint) {
 	case TWOVAL(V_NUM, V_NUM):
 		vres->v_num = qqdiv(v1->v_num, v2->v_num);
 		return;

value.h

@@ -167,7 +167,8 @@ struct value {
 #define V_OPTR	19	/* octet address as pointer */
 #define V_SPTR	20	/* string address as pointer */
 #define V_NPTR	21	/* number address as pointer */
-#define V_MAX	21	/* highest legal value */
+
+#define V_MAX	V_NPTR	/* highest legal value - must be last and match highest V_something value */
 
 #define V_NOSUBTYPE	0	/* subtype has no meaning */
 #define V_NOASSIGNTO	1	/* protection status 1 */
@@ -189,7 +190,46 @@ struct value {
  */
 
 
-#define TWOVAL(a,b) ((a) << 5 | (b))	/* for switch of two values */
+/*
+ * NOTE: The shift of 8 in TWOVAL() macro below assumes V_MAX < 1<<8
+ *
+ * The macro TWOVAL_ARGS_OK(a,b) will return true if both a and b are in range,
+ * otherwise it will return false.
+ *
+ * The TWOVAL_INVALID is a value that TWOVAL_ARGS_OK(a,b) is true,
+ * will never match a TWOVAL(a,b) value (i.e., using V_something defined values).
+ *
+ * The TWOVAL_AS_UINT(a,b) may be assigned to a unsigned int value so that
+ * with one switches on that unsigned int, cases with a and/or b being
+ * out of range will fall into the default (non-matching) case.
+ *
+ *	unsigned int twoval_as_uint;
+ *
+ *	...
+ *
+ *	twoval_as_uint = TWOVAL_AS_UINT(a,b);
+ *	switch (twoval_as_uint) {
+ *		case TWOVAL(V_INT,V_INT):
+ *			...
+ *			break;
+ *		case TWOVAL(V_INT,V_NUM):
+ *			...
+ *			break;
+ *		default:
+ *			...
+ *			break;
+ *	}
+ *
+ *	 If a is NOT 0 <= a <= V_MAX or if b is NOT 0 <= b <= V_MAX,
+ *	 when () macro returns -1 (all bits set) in order to
+ *	 not match and true TWOVAL() macro combination that uses
+ *	 uses a V_something defined value above.
+ */
+
+#define TWOVAL(a,b) ((unsigned int)(((a) << 8) | (b)))	/* logical OR for switch of two V_something values */
+#define TWOVAL_ARGS_OK(a,b) (((a) >= 0) && ((a) <= V_MAX) && ((b) >= 0) && ((b) <= V_MAX))
+#define TWOVAL_INVALID  ((unsigned int)(-1))		/* never a valid TWOVAL(a,b) value when a and b are in range */
+#define TWOVAL_AS_UINT(a,b) (TWOVAL_ARGS_OK(a,b) ? TWOVAL(a,b) : TWOVAL_INVALID)
 
 #define NULL_VALUE	((VALUE *) 0)
 

version.c

@@ -1,7 +1,7 @@
 /*
  * version - determine the version of calc
  *
- * Copyright (C) 1999-2021  David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999-2023  David I. Bell and Landon Curt Noll
  *
  * Primary author:  David I. Bell
  *
@@ -51,9 +51,39 @@ static char *program;
 #include "banned.h"	/* include after system header <> includes */
 
 
+/*
+ * MAJOR_VER
+ *
+ *      The MAJOR_VER remains at 2.  That are concepts for version 3 calc,
+ *      but that is a long way off.  One of the main reasons why MAJOR_VER
+ *      might incremented is if fundamental calc data objects (such as when ZVALUE
+ *      or NUMBER or COMPLEX need to change) that would cause an incompatibility
+ *      with existing hardware accelerators that are using fundamental calc data objects.
+ *
+ * MINOR_VER
+ *
+ *      The MINOR_VER changes when there are incompatible changes to the calc library
+ *      or calc custom library.   The MINOR_VER might change if we need to make a major
+ *      change to the math engine.  For example, when the way 0^x was evaluated, we
+ *      changed MINOR_VER from 13 to 14.
+ *
+ * MAJOR_PATCH
+ *
+ *      The MAJOR_PATCH changes when there is an update to the calc library
+ *      or calc custom library.  For example, the MAJOR_PATCH might increment when there
+ *      are new builtin functions available, or when there is a change to how existing
+ *      builtin functions process arguments.
+ *
+ * MINOR_PATCH
+ *
+ *      The MINOR_PATCH changes whenever there is any change in the calc release.
+ *      For example, when the documentation changes, the MINOR_PATCH will increment.
+ *      Moreover, when we are working towards a new production release,
+ *      bug fix and improvement updates will cause MINOR_PATCH to increment.
+ */
 #define MAJOR_VER	2	/* major library version */
 #define MINOR_VER	14	/* minor library version */
-#define MAJOR_PATCH	1	/* major software version level */
+#define MAJOR_PATCH	2	/* major software version level */
 #define MINOR_PATCH	0	/* minor software version level */
 
 
@@ -78,7 +108,7 @@ STATIC char *stored_version = NULL;	/* version formed if != NULL */
 char *Copyright = "\n"
   "calc - arbitrary precision calculator\n"
   "\n"
-  "Copyright (C) 1999-2021  David I. Bell, Landon Curt Noll "
+  "Copyright (C) 1999-2023  David I. Bell, Landon Curt Noll "
 					   "and Ernest Bowen\n"
   "\n"
   "Initial author:  David I. Bell\n"

win32.mkdef

@@ -36,6 +36,9 @@ HAVE_UNISTD_H=NO
 HAVE_LIMITS_H=YES
 HAVE_ENVIRON=-DHAVE_NO_ENVIRON
 HAVE_ARC4RANDOM=-DHAVE_NO_ARC4RANDOM
+HAVE_SYS_VFS_H=NO
+HAVE_SYS_PARAM_H=NO
+HAVE_SYS_MOUNT_H=NO
 
 BINDIR=/usr/bin/calc
 LIBDIR=/lib/calc

zfunc.c

@@ -1036,7 +1036,7 @@ zgcd(ZVALUE z1, ZVALUE z2, ZVALUE *res)
 			}
 			g = (FULL) (*a0 * w);
 			if (h < BASEB) {
-			    g &= (1 << h) - 1;
+			    g &= (FULL)lowhalf[h];
 			} else {
 			    g &= BASE1;
 			}
@@ -1354,14 +1354,14 @@ zlog10(ZVALUE z, BOOL *was_10_power)
 		}
 
 		/* create power10 table */
-		power10 = malloc(sizeof(long) * (max_power10_exp+1));
+		power10 = calloc(max_power10_exp+1, sizeof(long));
 		if (power10 == NULL) {
 			math_error("cannot malloc power10 table");
 			not_reached();
 		}
 
 		/* load power10 table */
-		for (i=0, v = 1L; i <= max_power10_exp; ++i, v *= 10L) {
+		for (i=0, v = 1L; i < max_power10_exp; ++i, v *= 10L) {
 			power10[i] = v;
 		}
 	}

zmath.c

@@ -88,9 +88,11 @@ HALF *half_tbl[] = {
 /*
  * highhalf[i] - masks off the upper i bits of a HALF
  * rhighhalf[i] - masks off the upper BASEB-i bits of a HALF
- * lowhalf[i] - masks off the upper i bits of a HALF
- * rlowhalf[i] - masks off the upper BASEB-i bits of a HALF
+ * lowhalf[i] - masks off the lower i bits of a HALF
+ * rlowhalf[i] - masks off the lower BASEB-i bits of a HALF
  * bitmask[i] - (1 << i) for  0 <= i <= BASEB*2
+ *
+ * NOTE: In all cases 0 <= i <= BASEB
  */
 HALF highhalf[BASEB+1] = {
 #if BASEB == 32

zmath.h

@@ -606,7 +606,7 @@ E_FUNC void zredcpower(REDC *rp, ZVALUE z1, ZVALUE z2, ZVALUE *res);
 #define MODE2_OFF	(MODE_MAX+1)
 
 /* XXX - perhaps we need the MODE_REAL_AUTO vs MODE_REAL as a config mode? */
-#if 0 	/* XXX - can we safely set MODE_INITIAL to MODE_REAL_AUTO ?? */
+#if 0	/* XXX - can we safely set MODE_INITIAL to MODE_REAL_AUTO ?? */
 #define MODE_INITIAL	MODE_REAL_AUTO
 #else
 #define MODE_INITIAL	MODE_REAL
@@ -643,6 +643,7 @@ E_FUNC void math_error(char *, ...) \
 E_FUNC HALF *swap_b8_in_HALFs(HALF *dest, HALF *src, LEN len);
 E_FUNC ZVALUE *swap_b8_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all);
 E_FUNC HALF *swap_b16_in_HALFs(HALF *dest, HALF *src, LEN len);
+E_FUNC HALF *swap_HALFs(HALF *dest, HALF *src, LEN len);
 E_FUNC ZVALUE *swap_b16_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all);
 E_FUNC ZVALUE *swap_HALF_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all);
 

zrandom.c

@@ -2861,7 +2861,7 @@ zrandom(long cnt, ZVALUE *res)
 			t = blum.bits-(dest.bit+1);
 			*dest.loc-- = (blum.buffer >> t);
 			dest.bit = BASEB-t-1;
-			*dest.loc = ((blum.buffer&lowhalf[t]) << (dest.bit+1));
+			*dest.loc = (HALF)(((unsigned long)(blum.buffer&lowhalf[t])) << (dest.bit+1));
 		}
 		dest.len -= blum.bits;
 	}
@@ -2896,7 +2896,7 @@ zrandom(long cnt, ZVALUE *res)
 			t = loglogn-(dest.bit+1);
 			*dest.loc-- |= (blum.buffer >> t);
 			dest.bit = BASEB-t-1;
-			*dest.loc = ((blum.buffer&lowhalf[t]) << (dest.bit+1));
+			*dest.loc = (HALF)(((unsigned long)(blum.buffer&lowhalf[t])) << (dest.bit+1));
 		}
 		dest.len -= loglogn;
 	}