Release v2.13.0.0

The following are the changes in this release:

    Fixed typo (missing quotes) in the env rule.

    Fixed intendation problem in CHANGES.

    Combined 2.12.9.1 changes into the 2.12.8.2 to 2.12.9.0
    range, and thus renamed the range to 2.12.8.2 to 2.12.9.1.

    Fixed issues related to building Makefile.simple.

    Fixed how the Makefile variable MANPATH is set for macOS.

    Added a bunch of information to the near bottom of HOWTO.INSTALL
    on calc Makefiles.  This information discusses the various
    Makefiles found in the calc source.

    Added comments in various calc Makefiles about their origin.
    In particular, for Makefiles that are constructed such as
    Makefile.simple, custom/Makefile and custom/Makefile.simple
    there are comments about how they were made.

    For all calc Makefiles, including those in sub-directories,
    near the top there is now a line of the form:

	# SRC: ... some message about the origin ...

    Fixed how the calc(1) man page is installed under macOS.

    Fixed how calc man page in ${CATDIR} is formed.

    Fixed how Makefile.simple is formed.

    Fixed the #! calc script argument processing.  The initial #!
    line must end in a -f.  For example, if calc is in /usr/local/bin/calc,
    then the following would be the first line of a calc script:

	#!/usr/local/bin/calc -f
	...

    It is common that -q be usde with a calc script, so assuming the
    same /usr/local/bin/calc path:

	#!/usr/local/bin/calc -q -f
	...

    Use of -s in the #! first line of a calc script is not needed
    since -f implies -f.

    The argv() will now return values more typical of C's main().
    Before it returned one less than the number of arguments.  Now,
    for example, when calc is given 2 args, argv() will return 3.

    The value of argv(0) will be the path to calc, or in the
    case of a #! calc cscript, it will return the name of the script.

    Updated the calc man page and help/argv to reflect the
    above changes.

    Improved the formatting of the calc man page.

    Fixed the formation of the win32 sub-directory via the win32_hsrc
    Makefile rule.

    Due to incompatible changes to the argv() function, and #! calc
    scripts, we are setting the version to the next minor number:

	2.13.0

BUGS

@@ -116,59 +116,12 @@ of a context diff patch).
 
 Known bugs in calc:
 
-    Under macOS, the installation of the calc man page fails.
-
     The output of the alg_config.cal resource file is bogus.
     We would welcome a replacement for this code.
 
     Calc shell scripts do not read from stdin properly,
     we all as a number of the cscript examples.
 
-    The argv() function is behaving differently
-    when run in calc shell script mode:
-
-	When calc is run as:
-
-	    calc -s a bb ccc
-
-        and given this input on the command prompt:
-
-	    print "config(\"program\")=", config("program");
-	    print "argv()=", argv();
-	    argc = argv();
-	    for (i=0; i < argc; ++i) {
-		print "argv(":i:")=", argv(i);
-	    }
-
-	calc prints:
-
-	    config("program")= calc
-	    argv()= 3
-	    argv(0)= a
-	    argv(1)= bb
-	    argv(2)= ccc
-
-	but when it is run as a script called ./simple:
-
-	    #!/usr/local/bin/calc -q -s -f
-	    print "config(\"program\")=", config("program");
-	    print "argv()=", argv();
-	    argc = argv();
-	    for (i=0; i < argc; ++i) {
-		print "argv(":i:")=", argv(i);
-	    }
-
-	under Linux prints:
-
-	    config("program")= /usr/bin/calc
-	    argv()= 4
-	    argv(0)= ./simple
-	    argv(1)= a
-	    argv(2)= bb
-	    argv(3)= ccc
-
-	and under macOS simply enters into interactive mode.
-
     We are sure some more bugs exist.  When you find them, please let
     us know!  See the above for details on how to report and were to
     Email your bug reports and hopefully patches to fix them.

CHANGES

@@ -1,14 +1,74 @@
-The following are the changes from calc version 2.12.9.1 to date:
+The following are the changes from calc version 2.13.0 to date:
 
-    Fixed a typo typo in help/Makefile that caused the build of
-    2.12.9.0 to fail in a number of cases.  Thanks to a report by
-    <GitHub user balducci>.
+    Fixed typo (missing quotes) in the env rule.
 
-    Pass form Makefile variables ${Q}, ${S}, ${E}, ${H} and ${V} down
-    to all sub-directory Makefiles from the top level Makefile.
+    Fixed intendation problem in CHANGES.
+
+    Combined 2.12.9.1 changes into the 2.12.8.2 to 2.12.9.0
+    range, and thus renamed the range to 2.12.8.2 to 2.12.9.1.
+
+    Fixed issues related to building Makefile.simple.
+
+    Fixed how the Makefile variable MANPATH is set for macOS.
+
+    Added a bunch of information to the near bottom of HOWTO.INSTALL
+    on calc Makefiles.  This information discusses the various
+    Makefiles found in the calc source.
+
+    Added comments in various calc Makefiles about their origin.
+    In particular, for Makefiles that are constructed such as
+    Makefile.simple, custom/Makefile and custom/Makefile.simple
+    there are comments about how they were made.
+
+    For all calc Makefiles, including those in sub-directories,
+    near the top there is now a line of the form:
+
+	# SRC: ... some message about the origin ...
+
+    Fixed how the calc(1) man page is installed under macOS.
+
+    Fixed how calc man page in ${CATDIR} is formed.
+
+    Fixed how Makefile.simple is formed.
+
+    Fixed the #! calc script argument processing.  The initial #!
+    line must end in a -f.  For example, if calc is in /usr/local/bin/calc,
+    then the following would be the first line of a calc script:
+
+	#!/usr/local/bin/calc -f
+	...
+
+    It is common that -q be usde with a calc script, so assuming the
+    same /usr/local/bin/calc path:
+
+	#!/usr/local/bin/calc -q -f
+	...
+
+    Use of -s in the #! first line of a calc script is not needed
+    since -f implies -f.
+
+    The argv() will now return values more typical of C's main().
+    Before it returned one less than the number of arguments.  Now,
+    for example, when calc is given 2 args, argv() will return 3.
+
+    The value of argv(0) will be the path to calc, or in the
+    case of a #! calc cscript, it will return the name of the script.
+
+    Updated the calc man page and help/argv to reflect the
+    above changes.
+
+    Improved the formatting of the calc man page.
+
+    Fixed the formation of the win32 sub-directory via the win32_hsrc
+    Makefile rule.
+
+    Due to incompatible changes to the argv() function, and #! calc
+    scripts, we are setting the version to the next minor number:
+
+	2.13.0
 
 
-The following are the changes from calc version 2.12.8.2 to 2.12.9.0:
+The following are the changes from calc version 2.12.8.2 to 2.12.9.1:
 
     Added notes to help/unexpected about:
 
@@ -42,59 +102,59 @@ The following are the changes from calc version 2.12.8.2 to 2.12.9.0:
 
     Removed the need for HAVE_UNUSED in building the have_unused.h file.
 
-     CCBAN is given to ${CC} in order to control if banned.h is in effect.
+    CCBAN is given to ${CC} in order to control if banned.h is in effect.
 
-     The banned.h attempts to ban the use of certain dangerous functions
-     that, if improperly used, could compromise the computational integrity
-     if calculations.
+    The banned.h attempts to ban the use of certain dangerous functions
+    that, if improperly used, could compromise the computational integrity
+    if calculations.
 
-     In the case of calc, we are motivated in part by the desire for calc
-     to correctly calculate: even during extremely long calculations.
+    In the case of calc, we are motivated in part by the desire for calc
+    to correctly calculate: even during extremely long calculations.
 
-     If UNBAN is NOT defined, then calling certain functions
-     will result in a call to a non-existent function (link error).
+    If UNBAN is NOT defined, then calling certain functions
+    will result in a call to a non-existent function (link error).
 
-     While we do NOT encourage defining UNBAN, there may be
-     a system / compiler environment where re-defining a
-     function may lead to a fatal compiler complication.
-     If that happens, consider compiling as:
+    While we do NOT encourage defining UNBAN, there may be
+    a system / compiler environment where re-defining a
+    function may lead to a fatal compiler complication.
+    If that happens, consider compiling as:
 
 	make clobber all chk CCBAN=-DUNBAN
 
-     as see if this is a work-a-round.
+    as see if this is a work-a-round.
 
-     If YOU discover a need for the -DUNBAN work-a-round, PLEASE tell us!
-     Please send us a bug report.  See the file:
+    If YOU discover a need for the -DUNBAN work-a-round, PLEASE tell us!
+    Please send us a bug report.  See the file:
 
 	BUGS
 
-     or the URL:
+    or the URL:
 
 	http://www.isthe.com/chongo/tech/comp/calc/calc-bugrept.html
 
-     for how to send us such a bug report.
+    for how to send us such a bug report.
 
-     Added the building of have_ban_pragma.h, which will determine
-     if "#pragma GCC poison func_name" is supported.  If it is not,
-     or of HAVE_PRAGMA_GCC_POSION=-DHAVE_NO_PRAGMA_GCC_POSION, then
-     banned.h will have no effect.
+    Added the building of have_ban_pragma.h, which will determine
+    if "#pragma GCC poison func_name" is supported.  If it is not,
+    or of HAVE_PRAGMA_GCC_POSION=-DHAVE_NO_PRAGMA_GCC_POSION, then
+    banned.h will have no effect.
 
-     Fixed building of the have_getpgid.h file.
-     Fixed building of the have_getprid.h file.
-     Fixed building of the have_getsid.h file.
-     Fixed building of the have_gettime.h file.
-     Fixed building of the have_strdup.h file.
-     Fixed building of the have_ustat.h file.
-     Fixed building of the have_rusage.h file.
+    Fixed building of the have_getpgid.h file.
+    Fixed building of the have_getprid.h file.
+    Fixed building of the have_getsid.h file.
+    Fixed building of the have_gettime.h file.
+    Fixed building of the have_strdup.h file.
+    Fixed building of the have_ustat.h file.
+    Fixed building of the have_rusage.h file.
 
-     Added HAVE_NO_STRLCPY to control if we want to test if
-     the system has a strlcpy() function.  This in turn produces
-     the have_strlcpy.h file wherein the symbol HAVE_STRLCPY will
-     be defined, or not depending if the system comes with a
-     strlcpy() function.
+    Added HAVE_NO_STRLCPY to control if we want to test if
+    the system has a strlcpy() function.  This in turn produces
+    the have_strlcpy.h file wherein the symbol HAVE_STRLCPY will
+    be defined, or not depending if the system comes with a
+    strlcpy() function.
 
-     If the system does not have a strlcpy() function, we
-     compile our own strlcpy() function.  See strl.c for details.
+    If the system does not have a strlcpy() function, we
+    compile our own strlcpy() function.  See strl.c for details.
 
      Added HAVE_NO_STRLCAT to control if we want to test if
      the system has a strlcat() function.  This in turn produces
@@ -123,6 +183,13 @@ The following are the changes from calc version 2.12.8.2 to 2.12.9.0:
 
      Compile custom code, if needed, after main code is compiled.
 
+    Fixed a typo typo in help/Makefile that caused the build of
+    2.12.9.0 to fail in a number of cases.  Thanks to a report by
+    <GitHub user balducci>.
+
+    Pass form Makefile variables ${Q}, ${S}, ${E}, ${H} and ${V} down
+    to all sub-directory Makefiles from the top level Makefile.
+
 
 The following are the changes from calc version 2.12.8.1 to 2.12.8.2:
 

HOWTO.INSTALL

@@ -1,6 +1,10 @@
+
+IMPORTANT: Please see the section at the bottom of this file for
+	   some important information on Makefiles used in calc.
+
 Installing calc from the bzip2-ed tarball in 4 easy steps:
 
-    0)  If your platform supports i686 RPMs, you may want to go to:
+    (0)  If your platform supports i686 RPMs, you may want to go to:
 
 	    http://www.isthe.com/chongo/src/calc/
 
@@ -25,7 +29,7 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 		cd /var/tmp
 		bunzip2 -c /usr/src/redhat/SOURCES/calc-*.tar.bz2 | tar -xvf -
 
-    1)	Look at the makefile, and adjust it to suit your needs.
+    (1)	Look at the makefile, and adjust it to suit your needs.
 
 	The top level Makefile and the custom/Makefile require a GNU
 	Make (such as gmake) or an equivalently advanced make.	On many
@@ -33,9 +37,9 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 	one must use gmake instead of make.
 
 	Some report that under macOS, one has to declare the target
-	to be darwin.  So for macOS, one might have to do:
+	to be Darwin.  So for macOS, one might have to do:
 
-	    # for macOS users only, force the target to be darwin
+	    # for macOS users only, force the target to be Darwin
 	    #
 	    make target=Darwin clobber
 	    make target=Darwin all
@@ -148,7 +152,7 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 
 	   Adjust other Makefile variables as needed.
 
-    2)	build calc:
+    (2)	build calc:
 
 	The top level Makefile and the custom/Makefile require a GNU
 	Make (such as gmake) or an equivalently advanced make.	On many
@@ -180,7 +184,7 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 		make clobber
 		make calc-dynamic-only BLD_TYPE=calc-dynamic-only
 
-    3)	test calc:
+    (3)	test calc:
 
 	make check
 
@@ -191,13 +195,222 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 
 		make chk
 
-    4)	install calc:
+    (4)	install calc:
 
 	make install
 
 We suggest that you might want to read the README.FIRST file and look at
 the calc help subsystem.  See also the README.md file.
 
+=-=
+
+On calc Makefiles:
+
+How to tell the origin of of a Makefile:
+
+    The "# SRC: ... - ..." comment line near the top
+    of the file indicates the origin of this file.
+    In each segment below, we indicate what the SRC
+    comment like will read.
+
+SHELL= ...
+
+    On some systems, /bin/sh is a rather reduced shell with
+    deprecated behavior.
+
+    If your system has a up to date, bash shell, then
+    you may wish to edit the Makefile to use:
+
+	    SHELL= /bin/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
+    shell for this Makefile to use:
+
+	    SHELL= /bin/zsh
+
+Makefile
+
+    # SRC: Makefile - Our calc build environment
+
+    This is our internal Makefile that drives how we build calc.
+    For critical rules in Makefile.ship, there is a corresponding
+    rule in Makefile that calls ${MAKE} -f Makefile.ship with,
+    additional commands, args and Makefile variables.  The ${XVAR}
+    Makefile variable, for example, is passed on each call to
+    ${MAKE} -f Makefile.ship so that the environment and parameters of
+    Makefile.ship may be managed for our build environment.
+
+    This Makefile is used to make the calc rpm.  In addition to these
+    comments, this Makefile differs from the non-rpm bzip2-ed tarball
+    source Makefile in at least the the following ways:
+
+	CCWERR= -Werror
+	USE_READLINE= -DUSE_READLINE
+	READLINE_LIB= -lreadline -lhistory -lncurses
+
+    If the Makefile is not suitable for you, then
+    you may wish to replace it with Makefile.ship:
+
+	mv -f -v Makefile.ship Makefile
+
+    This Makefile assumes you have a modern make command such as
+    the GNU make.  See Makefile.simple comment below if you do not
+    have such a modern make command.
+
+    In packages such as RPMs, and the tar.bz2 source tarball,
+    Makefile contains the contents of Makefile.ship.  If Makefile.ship
+    is missing it has likely moved to replace Makefile.
+
+    In the calc GitHub repo, Makefile is the calc build environment
+    and Makefile.ship is the top level Makefile:
+
+	https://github.com/lcn2/calc
+
+Makefile.ship
+
+    # SRC: Makefile.ship - top level Makefile
+
+    This is the main top level Makefile.
+
+    In calc packages such as RPMs, and the tar.bz2 source tarball,
+    Makefile.ship has been moved into Makefile.
+
+    In the calc GitHub repo, Makefile is the calc build environment
+    and Makefile.ship is the top level Makefile:
+
+	https://github.com/lcn2/calc
+
+    The Makefile.simple rule of Makefile.ship, when forming the
+    Makefile.simple file, removes lines from Makefile.ship between
+    pairs of '#if 0' AND '#endif':
+
+	#if 0
+	lines removed when forming Makefile.simple
+	...
+	lines removed when forming Makefile.simple
+	#endif
+
+    The '#if 0' AND '#endif' MUST be at the start of the line.
+    Any text after the '#if 0' OR '#endif' is ignored.
+
+    While they may look like a CPP directives, they are not.  The
+    inline awk script of the Makefile.simple rule does NOT allow
+    them to nest:
+
+	#if 0 /* DO NOT DO THIS */
+	lines removed when forming Makefile.simple
+	...
+	#if 0 /* DO NOT DO THIS */
+	...
+	#endif /* DO NOT DO THIS */
+	...
+	#endif /* DO NOT DO THIS */
+
+    The custom/Makefile rule of Makefile.ship is used to form
+    the custom/Makefile.  In particular the Makefile.ship lines:
+
+	# start of host target cut
+	... these go in between custom/Makefile.head and custom/Makefile.tail
+	# end of host target cut
+
+Makefile.simple
+
+    # SRC: non-GNU Makefile via make -f Makefile.ship Makefile.simple
+
+    This is a non-GNU or simple Makefile designed for environments
+    that do not have a modern make command.
+
+    If you have a Makefile.simple file, use these commands to
+    form a Makefile:
+
+	if [ -f Makefile ]; then mv -f Makefile Makefile.orig; fi
+	cp Makefile.simple Makefile
+
+    The Makefile.simple rule from Makefile.ship is used to construct
+    this file from the contents of Makefile.ship.
+
+    In calc packages such as RPMs, and the tar.bz2 source the
+    Makefile.simple exists.  In the calc GitHub repo:
+
+	https://github.com/lcn2/calc
+
+    this file does NOT exist and must be made via the Makefile.simple
+    make rule.  Therefore, non-GNU and simple make commands are NOT
+    supported by the calc GitHub repo master branch.  Instead, you
+    need to extract Makefile.simple from one of the calc tar.bz2
+    source tarball source from a calc source mirror:
+
+	http://www.isthe.com/chongo/tech/comp/calc/calc-mirror.html
+
+custom/Makefile.head
+
+    # SRC: custom/Makefile.head
+
+    This file forms the top part of the custom/Makefile.
+
+custom/Makefile.tail
+
+    # SRC: custom/Makefile.tail
+
+    This file forms the bottom part of the custom/Makefile.
+
+custom/Makefile
+
+    # SRC: Makefile via make -f Makefile custom/Makefile
+
+    This is the custom directory Makefile.
+
+    The custom/Makefile rule of Makefile.ship is used to form
+    the custom/Makefile.  In particular the Makefile.ship lines:
+
+	# start of host target cut
+	... these go in between custom/Makefile.head and custom/Makefile.tail
+	# end of host target cut
+
+    NOTE: The clobber rule does not remove this file. - XXX
+
+custom/Makefile.simple
+
+    # SRC: non-GNU Makefile via make -f Makefile custom/Makefile.simple
+
+    This is a non-GNU or simple Makefile for the custom directory
+    that is designed for environments that do not have a modern make
+    command.
+
+    In calc packages such as RPMs, and the tar.bz2 source the
+    Makefile.simple exists.  In the calc GitHub repo:
+
+	https://github.com/lcn2/calc
+
+    this file does NOT exist and must be made via the
+    custom/Makefile.simple make rule.  Therefore, non-GNU and simple
+    make commands are NOT supported by the calc GitHub repo master
+    branch.  Instead, you need to extract custom/Makefile.simple
+    from one of the calc tar.bz2 source tarball source from a calc
+    source mirror:
+
+	http://www.isthe.com/chongo/tech/comp/calc/calc-mirror.html
+
+cal/Makefile
+
+    # SRC: cal/Makefile
+
+    The Makefile for the cal sub-directory.
+
+cscript/Makefile
+
+    # SRC: cscript/Makefile
+
+    The Makefile for the cscript sub-directory.
+
+help/Makefile
+
+    # SRC: help/Makefile
+
+    The Makefile for the help sub-directory.
+
 ## Copyright (C) 1999-2007,2021  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under

Makefile

@@ -2,33 +2,15 @@
 #
 # calc - arbitrary precision calculator
 #
-# (Linux calc rpm building makefile)
-#
-#  NOTE: This Makefile is used to make the calc rpm.  In addition to these
-#	 comments, this Makefile differs from the non-rpm bzip2-ed tarball
-#	 source Makefile in the following ways:
-#
-#	 CCWERR= -Werror
-#	 USE_READLINE= -DUSE_READLINE
-#	 READLINE_LIB= -lreadline -lhistory -lncurses
-#
 # Copyright (C) 1999-2018,2021  Landon Curt Noll
 #
-# The Makefile.ship makefile becomes the Makefile found in the
-# calc-*.tar.bz2 bzip2 source tarball.
+# SRC: Makefile - Our calc build environment
 #
-# This Makefile drives the makefile: Makefile.ship.
+#	The "# SRC: ... - ..." comment line above indicates
+#	the origin of this file.
 #
-# This makefile mostly contains critical variables (such as SHELL, MAKE, etc.)
-# as well as those which we choose to override defaults found in
-# Makefile.ship.  Make variables unique to this Makefile start with X.
-#
-# This makefile contains only those critical rules (such as all, clean, etc.)
-# and the common rules needed in development (such as chk, check, etc.).
-# This makefile has a few special rules that are used to set the version
-# string in the shipped makefiles (such as Makefile.ship).
-
-# Copyright (C) 1999-2008,2014  Landon Curt Noll
+# IMPORTANT: Please see the section on Makefiles near the
+#	     bottom of the HOWTO.INSTALL file.
 #
 # 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
@@ -53,11 +35,16 @@
 # calculator by David I. Bell with help/mods from others
 # Makefile by Landon Curt Noll
 
+# Try uname -s if the target was not already set on the make command line
+#
+ifeq ($(target),)
+target=$(shell uname -s 2>/dev/null)
+endif
 
 # The shell used by this Makefile
 #
 # On some systems, /bin/sh is a rather reduced shell with
-# deprecated behavor.
+# deprecated behavior.
 #
 # If your system has a up to date, bash shell, then
 # you may wish to use:
@@ -71,10 +58,15 @@
 #
 #	SHELL= /bin/zsh
 #
-#SHELL= /bin/sh
+ifeq ($(target),Darwin)
+SHELL= /bin/zsh
+else
 SHELL= /bin/bash
-#SHELL= /bin/zsh
+endif
 
+##############################################################################
+#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
+##############################################################################
 
 # CCBAN is given to ${CC} in order to control if banned.h is in effect.
 #
@@ -111,17 +103,6 @@ SHELL= /bin/bash
 CCBAN= -UUNBAN
 #CCBAN= -DUNBAN
 
-
-# Try uname -s if the target was not already set on the make command line
-#
-ifeq ($(target),)
-target=$(shell uname -s 2>/dev/null)
-endif
-
-##############################################################################
-#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
-##############################################################################
-
 # Determine of the GNU-readline facility will be used instead of the
 # built-in calc binding method.
 #
@@ -147,12 +128,6 @@ endif
 #READLINE_INCLUDE= -I/usr/gnu/include
 #READLINE_INCLUDE= -I/usr/local/include
 
-# Where man pages are installed
-#
-# Under macOS, we cannot modify /usr/share/man.
-#
-MANDIR= /usr/local/man/man1
-
 # Normally certain files depend on the Makefile.  If the Makefile is
 # changed, then certain steps should be redone.	 If MAKE_FILE is
 # set to Makefile, then these files will depend on Makefile.  If
@@ -265,7 +240,6 @@ XVAR= \
 	EXT='${EXT}' \
 	H='${H}' \
 	MAKE_FILE='${MAKE_FILE}' \
-	MANDIR='${MANDIR}' \
 	NROFF='${NROFF}' \
 	Q='${Q}' \
 	READLINE_INCLUDE='${READLINE_INCLUDE}' \
@@ -757,6 +731,11 @@ Makefile.simple:
 	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
 	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
 
+custom/Makefile.simple:
+	${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-='
+	${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR}
+	${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-='
+
 
 ##
 #

Makefile.ship

@@ -1,29 +1,17 @@
+#!/bin/make
 #
 # calc - arbitrary precision calculator
 #
-########################################################################
-# Gnu makefile: # This is a Gnu make makefile.  If your make does not  #
-# Gnu makefile: # understand this makefile format, then edit and use   #
-# Gnu makefile: # Makefile.simple instead of this Makefile.            #
-########################################################################
-#
-# (Generic calc makefile)
-#
-#  NOTE: This is NOT the calc rpm Makefile.  This Makefile is a generic
-#	 Makefile for the people who build calc from the bzip2-ed tarball.
-#	 Without modification, it does not assume the system has readline,
-#	 ncurses or less.  It compiles with gcc -O3 -g3 as well.  You can
-#	 change all this by modifying the Makefile variables below.
-#
-#  NOTE: You might want use the READLINE facility if  your system
-#	 has the GNU readline headers and libraries:
-#
-#	 USE_READLINE= -DUSE_READLINE
-#	 READLINE_LIB= -lreadline
-#	 READLINE_EXTRAS= -lhistory -lncurses
-#
 # Copyright (C) 1999-2018,2021  Landon Curt Noll
 #
+# SRC: Makefile.ship - top level Makefile
+#
+#	The "# SRC: ... - ..." comment line above indicates
+#	the origin of this file.
+#
+# IMPORTANT: Please see the section on Makefiles near the
+#	     bottom of the HOWTO.INSTALL file.
+#
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of version 2.1 of the GNU Lesser General Public License
 # as published by the Free Software Foundation.
@@ -51,7 +39,7 @@
 # The shell used by this Makefile
 #
 # On some systems, /bin/sh is a rather reduced shell with
-# deprecated behavor.
+# deprecated behavior.
 #
 # If your system has a up to date, bash shell, then
 # you may wish to use:
@@ -70,6 +58,26 @@ SHELL= /bin/sh
 #SHELL= /bin/zsh
 
 
+#if 0	/* start of skip for non-Gnu makefiles */
+##############################################################################
+#-=-=-=-=-=-=-=-=- Identify the target machine, if possible -=-=-=-=-=-=-=-=-#
+##############################################################################
+
+# NOTE: You can force a target value by defining target as in:
+#
+#	make ...__optional_arguments_... target=value
+
+# Try uname -s if the target was not already set on the make command line
+#
+ifeq ($(target),)
+target=$(shell uname -s 2>/dev/null)
+endif
+#endif	/* end of skip for non-Gnu makefiles */
+
+##############################################################################
+#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
+##############################################################################
+
 # CCBAN is given to ${CC} in order to control if banned.h is in effect.
 #
 # The banned.h attempts to ban the use of certain dangerous functions
@@ -105,27 +113,6 @@ SHELL= /bin/sh
 CCBAN= -UUNBAN
 #CCBAN= -DUNBAN
 
-
-#if 0	/* start of skip for non-Gnu makefiles */
-##############################################################################
-#-=-=-=-=-=-=-=-=- Identify the target machine, if possible -=-=-=-=-=-=-=-=-#
-##############################################################################
-
-# NOTE: You can force a target value by defining target as in:
-#
-#	make ...__optional_arguments_... target=value
-
-# Try uname -s if the target was not already set on the make command line
-#
-ifeq ($(target),)
-target=$(shell uname -s 2>/dev/null)
-endif
-#endif	/* end of skip for non-Gnu makefiles */
-
-##############################################################################
-#-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
-##############################################################################
-
 # Determine the type of terminal controls that you want to use
 #
 #	value		  meaning
@@ -845,16 +832,30 @@ SCRIPTDIR= ${BINDIR}/cscript
 #
 T=
 
-# where man pages are installed
+# where man section 1 pages are installed
 #
 # Select MANDIR= /dev/env/DJDIR/man/man1 for DJGPP.
 #
 # Use MANDIR= to disable installation of the calc man (source) page.
 #
+# NOTE: man pages not installed by macOS must go under,
+# (according to MANPATH as found in /private/etc/man.conf):
+#
+#	MANDIR= /usr/local/share/man/man1
+#
 #MANDIR=
 #MANDIR= /usr/local/man/man1
 #MANDIR= /usr/man/man1
+#
+#if 0	/* start of skip for non-Gnu makefiles */
+ifeq ($(target),Darwin)
+MANDIR= /usr/local/share/man/man1
+else
+#endif	/* end of skip for non-Gnu makefiles */
 MANDIR= /usr/share/man/man1
+#if 0	/* start of skip for non-Gnu makefiles */
+endif
+#endif	/* end of skip for non-Gnu makefiles */
 #MANDIR= /dev/env/DJDIR/man/man1
 #MANDIR= /usr/man/u_man/man1
 #MANDIR= /usr/contrib/man/man1
@@ -865,6 +866,9 @@ MANDIR= /usr/share/man/man1
 #
 # Use CATDIR= to disable installation of the calc cat (formatted) page.
 #
+# NOTE: If CATDIR is non-empty, then one should have either the
+#	${NROFF} executable and/or the ${MANMAKE} executable.
+#
 CATDIR=
 #CATDIR= /usr/local/man/cat1
 #CATDIR= /usr/local/catman/cat1
@@ -1149,7 +1153,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.12.9.1
+VERSION= 2.13.0.0
 
 # Names of shared libraries with versions
 #
@@ -1248,6 +1252,11 @@ endif
 COMMON_LDFLAGS= ${EXTRA_LDFLAGS}
 
 # start of host target cut - Do not remove this line
+
+###########################################################
+# NOTE: Start of section from the middle of Makefile.ship #
+###########################################################
+
 ##############################################################################
 #-=-=-=-=-=- host target section - targets that override defaults -=-=-=-=-=-#
 ##############################################################################
@@ -1357,10 +1366,8 @@ LIBCUSTCALC_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -1375,9 +1382,9 @@ CC= ${PURIFY} ${LCC} ${CCWERR}
 #
 endif
 
-##############################
-# Apple OS X / Darwin target #
-##############################
+###############################
+# Apple macOS / Darwin target #
+###############################
 
 ifeq ($(target),Darwin)
 #
@@ -1425,10 +1432,8 @@ LIBCUSTCALC_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -1495,10 +1500,8 @@ LIBCUSTCALC_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -1557,10 +1560,8 @@ LIBCUSTCALC_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -1613,10 +1614,8 @@ LD_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -1667,10 +1666,8 @@ LD_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -1824,10 +1821,8 @@ LD_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -1872,6 +1867,11 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
 #######################################################################
 #-=-=-=-=-=- end of target section - only make rules below -=-=-=-=-=-#
 #######################################################################
+
+#########################################################
+# NOTE: End of section from the middle of Makefile.ship #
+#########################################################
+
 # end of host target cut - Do not remove this line
 
 ###############################################################################
@@ -2823,7 +2823,7 @@ have_unistd.h: ${MAKE_FILE}
 	${Q} echo '' >> $@
 	${Q} echo '/* do we have <unistd.h>? */' >> $@
 	-${Q} if [ X"${HAVE_UNISTD_H}" = X"YES" ]; then \
-	    echo '#define $@	/* yes */' >> $@; \
+	    echo '#define HAVE_UNISTD_H	/* yes */' >> $@; \
 	elif [ X"${HAVE_UNISTD_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_UNISTD_H  /* no */' >> $@; \
 	elif echo '#include <unistd.h>' | ${CC} -E - ${S}; then \
@@ -2859,7 +2859,7 @@ have_string.h: ${MAKE_FILE}
 	${Q} echo '' >> $@
 	${Q} echo '/* do we have <string.h>? */' >> $@
 	-${Q} if [ X"${HAVE_STRING_H}" = X"YES" ]; then \
-	    echo '#define $@	/* yes */' >> $@; \
+	    echo '#define HAVE_STRING_H	/* yes */' >> $@; \
 	elif [ X"${HAVE_STRING_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_STRING_H  /* no */' >> $@; \
 	elif echo '#include <string.h>' | ${CC} -E - ${S}; then \
@@ -3581,7 +3581,7 @@ have_urandom.h: ${MAKE_FILE}
 	${Q} echo '' >> $@
 	${Q} echo '/* do we have /dev/urandom? */' >> $@
 	-${Q} if [ X"${HAVE_URANDOM}" = X"YES" ]; then \
-	    echo '#define $@	/* yes */' >> $@; \
+	    echo '#define HAVE_URANDOM	/* yes */' >> $@; \
 	elif [ X"${HAVE_URANDOM}" = X"NO" ]; then \
 	    echo '#undef HAVE_URANDOM  /* no */' >> $@; \
 	elif [ -r /dev/urandom ] 2>/dev/null; then \
@@ -3971,10 +3971,11 @@ have_strlcat.h: have_strlcat.c banned.h have_ban_pragma.h ${MAKE_FILE}
 #
 ###
 
-win32_hsrc: win32.mkdef ${MAKE_FILE}
+win32_hsrc: win32.mkdef banned.h have_ban_pragma.h alloc.h ${MAKE_FILE}
 	${H} echo 'forming win32 directory'
 	${Q} ${RM} -rf win32
 	${Q} ${MKDIR} -p win32
+	${Q} ${CP} banned.h have_ban_pragma.h alloc.h win32
 	${Q} ${CP} ${UTIL_C_SRC} win32
 	${Q} ${CP} ${UTIL_MISC_SRC} win32
 	${Q} ${CP} ${MAKE_FILE} win32/${MAKE_FILE}
@@ -4269,11 +4270,15 @@ calcliblistfmt:
 custom/Makefile: ${MAKE_FILE} custom/Makefile.head custom/Makefile.tail
 	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
 	${Q} ${RM} -f $@
-	${Q} ${CAT} custom/Makefile.head > $@
+	${Q} ${CAT} custom/Makefile.head | \
+	     ${SED} -e 's;^# SRC:.*;# SRC: Makefile via;' \
+		    -e 's;via$$;via ${MAKE} -f ${MAKE_FILE} $@;' >> $@
 	${Q} ${SED} -n -e \
 	    "/^# start of host target cut/,/^# end of host target cut/p" \
 	    ${MAKE_FILE} >> $@
-	${Q} ${CAT} custom/Makefile.tail >> $@
+	${Q} ${CAT} custom/Makefile.tail | \
+	     ${SED} -e 's;^# SRC:.*;# SRC: Makefile via;' \
+		    -e 's;via$$;via ${MAKE} -f ${MAKE_FILE} $@;' >> $@
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
 
 Makefile.simple: ${MAKE_FILE} custom/Makefile.simple
@@ -4281,7 +4286,9 @@ Makefile.simple: ${MAKE_FILE} custom/Makefile.simple
 	${Q} ${RM} -f $@
 	${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
 	    ${MAKE_FILE} | \
-	    ${SED} -e 's/cd custom; $${MAKE} -f Makefile/&.simple/g' > $@
+	    ${SED} -e 's/cd custom; $${MAKE} -f Makefile/&.simple/' \
+		   -e 's;^# SRC:.*;# SRC: non-GNU Makefile via;' \
+		   -e 's;via$$;via ${MAKE} -f ${MAKE_FILE} $@;' > $@
 	${Q} echo >> $@
 	${Q} echo 'Makefile.simple:' >> $@
 	${Q} echo '	$${Q} if [ ! -f Makefile.simple ]; then '"\\" >> $@
@@ -4551,9 +4558,9 @@ env:
 	@echo 'UTIL_TMP=${UTIL_TMP}'; echo ''
 	@echo 'V=${V}'; echo ''
 	@echo 'VERSION=${VERSION}'; echo ''
-	@echo 'WNO_ERROR_LONG_LONG=${WNO_ERROR_LONG_LONG}; echo ''
-	@echo 'WNO_IMPLICT=${WNO_IMPLICT}; echo ''
-	@echo 'WNO_LONG_LONG=${WNO_LONG_LONG}; echo ''
+	@echo 'WNO_ERROR_LONG_LONG=${WNO_ERROR_LONG_LONG}'; echo ''
+	@echo 'WNO_IMPLICT=${WNO_IMPLICT};' echo ''
+	@echo 'WNO_LONG_LONG=${WNO_LONG_LONG}'; echo ''
 	@echo 'XARGS=${XARGS}'; echo ''
 	@echo 'target=${target}'; echo ''
 	@echo '=-=-=-=-= ${MAKE_FILE} end of major make variable dump =-=-=-=-='
@@ -4801,16 +4808,20 @@ clobber: clean custom/Makefile
 	${RM} -f a.out
 	${RM} -f all
 	${V} echo '=-=-=-=-= Invoking $@ rule for help =-=-=-=-='
-	-cd help; ${RM} -f all; ${MAKE} -f Makefile ${HELP_PASSDOWN} $@
+	-${RM} -f help/all; \
+	    cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} $@
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for cal =-=-=-=-='
-	-cd cal; ${RM} -f all; ${MAKE} -f Makefile ${CAL_PASSDOWN} $@
+	-${RM} -f cal/all; \
+	    cd cal; ${MAKE} -f Makefile ${CAL_PASSDOWN} $@
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
-	cd custom; ${RM} -f all; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} $@
+	-${RM} -f custom/all; \
+	    cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} $@
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for cscript =-=-=-=-='
-	cd cscript; ${RM} -f all; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} $@
+	-${RM} -f cscript/all; \
+	    cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} $@
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo remove files that are obsolete
 	${RM} -rf win32 build
@@ -4984,7 +4995,7 @@ endif
 #if 0	/* start of skip for non-Gnu makefiles */
 ifdef ALLOW_CUSTOM
 #endif	/* end of skip for non-Gnu makefiles */
-	${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
+	${V} echo 'XXX =-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
 	${Q} cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} install
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 #if 0	/* start of skip for non-Gnu makefiles */
@@ -5099,10 +5110,7 @@ endif
 	    if ${CMP} -s calc.1 ${T}${MANDIR}/calc.${MANEXT}; then \
 		${TRUE}; \
 	    else \
-		if [ -z "${NROFF}" ]; then \
-		    echo "${MANMAKE} calc.1 ${T}${CATDIR}"; \
-		    ${MANMAKE} calc.1 ${T}${CATDIR}; \
-		else \
+		if [ -n "${NROFF}" ]; then \
 		    ${RM} -f ${T}${CATDIR}/calc.${CATEXT}.new; \
 		    ${NROFF} ${NROFF_ARG} calc.1 > \
 			     ${T}${CATDIR}/calc.${CATEXT}.new; \
@@ -5110,6 +5118,9 @@ endif
 		    ${MV} -f ${T}${CATDIR}/calc.${CATEXT}.new \
 			  ${T}${CATDIR}/calc.${CATEXT}; \
 		    echo "installed ${T}${CATDIR}/calc.${CATEXT}"; \
+		elif [ -x "${MANNAME}" ]; then \
+		    echo "${MANMAKE} calc.1 ${T}${CATDIR}"; \
+		    ${MANMAKE} calc.1 ${T}${CATDIR}; \
 		fi; \
 	    fi; \
 	fi

cal/Makefile

@@ -4,6 +4,14 @@
 #
 # Copyright (C) 1999-2006,2017,2021  Landon Curt Noll
 #
+# SRC: cal/Makefile
+#
+#	The "# SRC: ... - ..." comment line above indicates
+#	the origin of this file.
+#
+# IMPORTANT: Please see the section on Makefiles near the
+#	     bottom of the HOWTO.INSTALL file.
+#
 # 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.
@@ -31,7 +39,7 @@
 # The shell used by this Makefile
 #
 # On some systems, /bin/sh is a rather reduced shell with
-# deprecated behavor.
+# deprecated behavior.
 #
 # If your system has a up to date, bash shell, then
 # you may wish to use:

calc.c

@@ -123,6 +123,11 @@ main(int argc, char **argv)
 	 * parse args
 	 */
 	program = argv[0];
+	script_name = strdup(argv[0]);
+	if (script_name == NULL) {
+		fprintf(stderr, "%s: failed to strdup(argv[0])\n", program);
+		exit(1);
+	}
 
 	cmdbuf[0] = '\0';
 	cmdlen = 0;
@@ -399,19 +404,35 @@ main(int argc, char **argv)
 						}
 					}
 					bp = cmdbuf + cmdlen;
+					/*
+					 * duplicate -f filename arg
+					 * as a new script_name value
+					 */
+					if (script_name != NULL) {
+						free(script_name);
+					}
+					script_name = NULL;
+					script_name = strdup(cp);
+					if (script_name == NULL) {
+						fprintf(stderr,
+							"strdup(-f argument)"
+							"failed\n");
+						exit(17);
+					}
+					/* process -f filename arg */
 					if (haveendstr) {
 						len = strlen(cp);
 						if (len == 0) {
 							fprintf(stderr,
 								"Null"
-								" filename!");
-							exit(17);
+								" filename!\n");
+							exit(18);
 						}
 						if (cmdlen + len + 2 > MAXCMD) {
 							fprintf(stderr,
 								"Commands too"
-								" long");
-							exit(18);
+								" long\n");
+							exit(19);
 						}
 						/* XXX - what if *cp = '\''? */
 						*bp++ = '\'';
@@ -423,10 +444,10 @@ main(int argc, char **argv)
 					} else {
 						do {
 							if (cmdlen > MAXCMD) {
-								fprintf(stderr,
-								   "Commands"
-								   " too long");
-								exit(19);
+							    fprintf(stderr,
+							       "Commands"
+							       " too long\n");
+							    exit(20);
 							}
 							*bp++ =  *cp++;
 							cmdlen++;
@@ -439,7 +460,10 @@ main(int argc, char **argv)
 					*bp++ = ';';
 					*bp = '\0';
 					cmdlen++;
-					s_flag = TRUE;	/* -f implies -s */
+
+					/* -f implies -s */
+					s_flag = TRUE;
+					maxindex = index + 1;
 					break;
 
 				case 's':
@@ -462,7 +486,7 @@ main(int argc, char **argv)
 		"usage: %s ... -f filename\n"
 		"1st cscript line: #/path/to/calc ... -s -f\n",
 		program, program);
-					exit(20);
+					exit(21);
 			}
 			if (havearg)
 				break;
@@ -488,7 +512,7 @@ main(int argc, char **argv)
 			fprintf(stderr,
 				"%s: commands too long\n",
 				program);
-			exit(21);
+			exit(22);
 		}
 		strlcpy(cmdbuf + cmdlen, cp, cplen+1);
 		cmdbuf[newcmdlen] = '\0';
@@ -511,7 +535,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	argc_value = argc - maxindex;
+	argc_value = argc - maxindex + 1;
 	argv_value = argv + maxindex;
 
 	/*
@@ -799,7 +823,7 @@ calc_interrupt(char *fmt, ...)
 		 * don't call libcalc_call_me_last() -- we might loop
 		 * and besides ... this is an unusual internal error case
 		 */
-		exit(22);
+		exit(24);
 	}
 }
 

calc.h

@@ -216,6 +216,7 @@ EXTERN int havecommands;	/* TRUE if have cmd args) */
 EXTERN char *program;	/* our name */
 EXTERN char *base_name;	/* basename of our name */
 EXTERN char cmdbuf[];	/* command line expression */
+EXTERN char *script_name;	/* program name or -f filename arg or NULL */
 
 EXTERN int abortlevel;	/* current level of aborts */
 EXTERN BOOL inputwait;	/* TRUE if in a terminal input wait */

calc.man

@@ -37,6 +37,7 @@ calc \- arbitrary precision calculator
 .RB [ -D\ \&calc_debug[:resource_debug[:user_debug]] ]
 .br
 .RB [ \-e ]
+.RB [ \-f\ \&filename ]
 .RB [ \-h ]
 .RB [ \-i ]
 .RB [ \-m\ \&mode ]
@@ -50,11 +51,12 @@ calc \- arbitrary precision calculator
 .RB [ [\-\-]\ calc_cmd\ \&.\|.\|. ]
 .in -5n
 .sp
-\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-s\fP \fB\-f\fP
+\fI#!${BINDIR}/calc\fP\ [optional_other_flags\ \&...] \fB\-f\fP
+
+.PP
+
 .SH DESCRIPTION
-\&
-.br
-CALC OPTIONS
+
 .PP
 
 .TP
@@ -218,48 +220,55 @@ Ignore any environment variables on startup.
 The getenv() builtin will still return values, however.
 
 .TP
-.B \-f
+.BR \-f " filename"
 This flag is normally only with calc shell scripts.
 .sp 1
 This flag is required when using calc in
 .BR "shell script mode" .
 It must be at the end of the initial
 .B #!
-line of the script
-and must be immediately preceded by the
-.B \-s
-flag.
-.sp 1
-If the first line of an executable file begins
-.B #!
-followed by the absolute pathname of the
-.B calc
-program and if the first line ends with the two flags
-.B \-s
-.B \-f
-as in:
+line of the script, as in:
 .sp 1
 .in +5n
 .nf
-\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-s\fP \fB\-f\fP
+\fI#!${BINDIR}/calc\fP\ [optional_other_flags\ \&...] \fB\-f\fP
 .fi
 .in -5n
 .sp 1
 the rest of the file will be processed in
 .BR "shell script mode" .
+
+.sp 1
+A common flag to use, prior to the
+.B \-f
+on the #! line is the
+.B \-q
+flag.
+For example:
+.sp 1
+.in +5n
+.nf
+\fI#!${BINDIR}/calc\fP \fB\-q\fP \fB\-f\fP
+.fi
+.in -5n
+.sp 1
+This allows the script to run independely of
+startup scripts.
+
+.sp 1
 See
 .B "SHELL SCRIPT MODE"
 section of this man page
 below for details.
 .sp 1
-The actual form of this flag is:
+While the actual form of this flag is:
 .sp 1
 .in +5n
-.B \-f
+.BR \-f
 filename
 .in -5n
 .sp 1
-On systems that treat an executable that begins with
+for systems that treat an executable that begins with
 .B #!
 as a script, the path of the executable is appended by the kernel
 as the final argument to the exec() system call.
@@ -270,12 +279,13 @@ flag at the very end of the
 line.
 .sp 1
 It is possible use
-.B \-f\ filename
+.B \-f
+filename
 on the command line:
 .sp 1
 .in +5n
 .nf
-\fIcalc\fP\ [other_flags\ \&...] \fB\-s\fP \fB\-f\fP filename
+\fIcalc\fP\ [optional_other_flags\ \&...] \fB\-f\fP filename
 .fi
 .in -5n
 .sp 1
@@ -283,28 +293,14 @@ This will cause calc to process lines in
 .B filename
 in
 .BR "shell script mode" .
-.sp 1
-Use of
-.B \-f
-implies
-.BR \-s .
-However in a calc shell script,
-one must include
-.B \-f
-before
-.B \-s
-on the initial
-.B #!
-line.
 
 .sp 1
-In addition,
-.B \-d
-and
-.B \-p
-are implied if
-.B \-i
-is not given.
+The use of
+.B \-f
+filename
+implies the
+.B \-s
+flag.
 
 .TP
 .B \-h
@@ -491,16 +487,16 @@ This is useful when entering negative values on the command line as in:
 .in +5n
 .nf
 calc \-p \-\- \-1 - -7
-.sp 1
 .fi
 .in -5n
+.sp 1
 
 .PP
 
-\&
-.br
-CALC COMMAND LINE
+.SH CALC COMMAND LINE
+
 .PP
+
 With no
 .I calc_cmd
 arguments,
@@ -638,10 +634,10 @@ to parse interactive commands, flushes data on standard input.
 
 .PP
 
-\&
-.br
-CALC STARTUP FILES
+.SH CALC STARTUP FILES
+
 .PP
+
 Normally on startup,
 if the environment variable
 .B $CALCRC
@@ -678,10 +674,12 @@ files is also disabled as if
 .B \-q
 was given.
 
-\&
-.br
-CALC FILE SEARCH PATH
 .PP
+
+.SH CALC FILE SEARCH PATH
+
+.PP
+
 If the environment variable
 .B $CALCPATH
 is undefined, or if it
@@ -758,24 +756,24 @@ help config
 .fi
 .in -5n
 .sp 1
+
 .PP
 
-\&
-.br
-SHELL SCRIPT MODE
+.SH SHELL SCRIPT MODE
+
 .PP
+
 If the first line of an executable file begins
 .B #!
 followed by the absolute pathname of the
 .B calc
-program and the first line ends with the two flags
-.B \-s
+program and the first line ends with the flag
 .B \-f
 as in:
 .sp 1
 .in +5n
 .nf
-\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-s\fP \fB\-f\fP
+\fI#!${BINDIR}/calc\fP\ [optional_other_flags\ \&...] \fB\-f\fP
 .fi
 .in -5n
 .sp 1
@@ -786,11 +784,11 @@ Note that
 .B \-f
 must at the end of the initial ``#!'' line.
 Any other optional
-.B "other_flags"
+.B "optional_other_flags"
 must come before
 the
-.B \-s
-.BR \-f .
+.B \-f
+flag.
 .sp 1
 In
 .B "shell script mode"
@@ -799,7 +797,7 @@ executed as if they were in a file being processed by a read
 command, except that a "command" beginning with '#' followed by
 whitespace and ending at the next newline is treated as a comment.
 Any optional
-.B "other_flags"
+.B "optional_other_flags"
 will be parsed first followed by
 the later lines within the script itself.
 .sp 1
@@ -821,7 +819,7 @@ the file
 .sp 1
 .in +5n
 .nf
-\fI#!${BINDIR}/calc\fP\ \&\fB\-q\fP \&\fB\-s\fP \fB\-f\fP
+\fI#!${BINDIR}/calc\fP\ \&\fB\-q\fP \fB\-f\fP
 
 /* setup */
 argc = argv();
@@ -894,12 +892,13 @@ whereas
 .in -5n
 .sp 1
 will not.
+
 .PP
 
-\&
-.br
-DATA TYPES
+.SH DATA TYPES
+
 .PP
+
 Fundamental builtin data types include integers, real numbers,
 rational numbers, complex numbers and strings.
 .PP
@@ -922,12 +921,13 @@ help obj
 .br
 show objfuncs
 .in -1.0i
+
 .PP
 
-\&
-.br
-VARIABLES
+.SH VARIABLES
+
 .PP
+
 Variables in \fIcalc\fP are typeless.
 In other words, the fundamental type of a variable is determined by its content.
 Before a variable is assigned a value it has the value of zero.
@@ -950,12 +950,13 @@ help list
 .br
 show globals
 .in -1.0i
+
 .PP
 
-\&
-.br
-INPUT/OUTPUT
+.SH INPUT/OUTPUT
+
 .PP
+
 A leading ``0x'' implies a hexadecimal value,
 a leading ``0b'' implies a binary value,
 and a ``0'' followed by a digit implies an octal value.
@@ -985,12 +986,13 @@ command:
 .in 1.0i
 help file
 .in -1.0i
+
 .PP
 
-\&
-.br
-CALC LANGUAGE
+.SH CALC LANGUAGE
+
 .PP
+
 The \fIcalc\fP language is a C-like language.
 The language includes commands such as variable declarations,
 expressions, tests, labels, loops, file operations, function calls.
@@ -1017,10 +1019,13 @@ help operator
 .br
 help config
 .in -1.0i
+
 .PP
+
 .SH FILES
-\&
-.br
+
+.PP
+
 .PD 0
 .TP 5
 ${BINDIR}/calc
@@ -1062,9 +1067,13 @@ custom resource files
 ${CUSTOMHELPDIR}/*
 custom help files
 .sp 1
+
+.PP
+
 .SH ENVIRONMENT
-\&
-.br
+
+.PP
+
 .PD 0
 .TP 5
 CALCPATH
@@ -1123,9 +1132,13 @@ Location of the calc custom help directory.
 .sp
 Default value: ${CUSTOMHELPDIR}
 .sp
+
+.PP
+
 .SH CREDIT
-\&
-.br
+
+.PP
+
 The main chunk of
 .B calc
 was written by David I. Bell.
@@ -1154,10 +1167,13 @@ public domain arbitrarily precision routines which was posted
 to the net around 1984.
 By now, there is almost no recognizable
 code left from that original source.
-.sp
+
+.PP
+
 .SH "COPYING / CALC GNU LESSER GENERAL PUBLIC LICENSE"
-\&
-.sp
+
+.PP
+
 Calc is open software, and is
 covered under version 2.1 of the GNU Lesser General Public License.
 You are
@@ -1217,10 +1233,13 @@ Copyright (C) 1999-2021  Landon Curt Noll
 .sp
 and is covered under version 2.1 GNU Lesser General
 Public License.
-.sp
+
+.PP
+
 .SH "CALC QUESTIONS"
-\&
-.br
+
+.PP
+
 If you have a simple general question about calc, send Email to:
 .sp
 .in +0.5i
@@ -1276,11 +1295,13 @@ nor can we do your homework, nor can
 we do much more than answer short general questions about calc.
 .sp
 Please be patient as we cannot always respond to Email messages quickly.
-.sp
+
+.PP
+
 .SH "BUG REPORTS / BUG FIXES"
-\&
-.br
-.sp
+
+.PP
+
 Send bug reports and bug fixes to:
 .sp
 .in +0.5i
@@ -1346,11 +1367,13 @@ help bugs
 for more information about bug reporting.
 .sp
 Please be patient as we cannot always respond to Email messages quickly.
-.sp
+
+.PP
+
 .SH "CONTRIBUTING CODE TO CALC"
-\&
-.br
-.sp
+
+.PP
+
 .I Calc
 is open source.
 Contributions of code are welcome.
@@ -1473,10 +1496,13 @@ you have that
 somewhere in the subject line!
 .sp
 Please be patient as we cannot always respond to Email messages quickly.
-.sp
+
+.PP
+
 .SH "CALC WEB SITE"
-\&
-.br
+
+.PP
+
 Landon Noll maintains the
 .B calc
 web site is located at:

cscript/4dsphere.calc

@@ -1,7 +1,9 @@
-#!/usr/local/src/bin/calc/calc -q -s -f
+#!/usr/local/src/bin/calc/calc -q -f
 /*
  * 4dsphere - determine if 6 points lie on the surface of a sphere in R^4
  *
+ * Copyright (C) 2001,2014,2019,2021  Landon Curt Noll
+ *
  * usage:
  *      4dsphere x0 y0 z0 w0 x1 y1 z1 w1 ... x5 y5 z5 w5
  *
@@ -10,8 +12,6 @@
  *	...		...
  *      x5 y5 z5 w5	point 5 in R^4
  *
- * Copyright (C) 2001,2014,2019  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.

cscript/Makefile

@@ -3,6 +3,14 @@
 #
 # Copyright (C) 1999-2006,2014,2017,2021  Landon Curt Noll
 #
+# SRC: cscript/Makefile
+#
+#	The "# SRC: ... - ..." comment line above indicates
+#	the origin of this file.
+#
+# IMPORTANT: Please see the section on Makefiles near the
+#	     bottom of the HOWTO.INSTALL file.
+#
 # 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.
@@ -30,7 +38,7 @@
 # The shell used by this Makefile
 #
 # On some systems, /bin/sh is a rather reduced shell with
-# deprecated behavor.
+# deprecated behavior.
 #
 # If your system has a up to date, bash shell, then
 # you may wish to use:

cscript/fproduct.calc

@@ -1,15 +1,15 @@
-#!/usr/local/src/bin/calc/calc -q -s -f
+#!/usr/local/src/bin/calc/calc -q -f
 /*
  * fproduct - write the big Endian product of terms to a file
  *
+ * Copyright (C) 2001,2014,2019,2021  Landon Curt Noll
+ *
  * usage:
  *	fproduct filename term [term ...]
  *
  *	filename	where to write the product, use - for stdout
  *	term ...	terms to multiply
  *
- * Copyright (C) 2001,2014,2019  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.

cscript/mersenne.calc

@@ -1,8 +1,8 @@
-#!/usr/local/src/bin/calc/calc -q -s -f
+#!/usr/local/src/bin/calc/calc -q -f
 /*
  * mersenne - print the value of a mersenne number
  *
- * Copyright (C) 1999-2007,2014,2019  Landon Curt Noll
+ * Copyright (C) 1999-2007,2014,2019,2021  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

cscript/piforever.calc

@@ -1,4 +1,4 @@
-#!/usr/local/src/bin/calc/calc -q -s -f
+#!/usr/local/src/bin/calc/calc -q -f
 /*
  * piforever - print digits of pi forever (or as long as your mem/CPU allow)
  *

cscript/plus.calc

@@ -1,8 +1,8 @@
-#!/usr/local/src/bin/calc/calc -q -s -f
+#!/usr/local/src/bin/calc/calc -q -f
 /*
  * plus - add two or more arguments together
  *
- * Copyright (C) 1999-2007,2014,2019  Landon Curt Noll
+ * Copyright (C) 1999-2007,2014,2019,2021  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
@@ -47,7 +47,7 @@ if (argc < 2) {
  * Since args are strings, we must eval them before using them numerically.
  */
 sum = 0;
-for (i=1; i < argv(); ++i) {
+for (i=1; i < argc; ++i) {
     sum += eval(argv(i));
 }
 print sum;

cscript/powerterm.calc

@@ -1,14 +1,22 @@
-#!/usr/local/src/bin/calc/calc -q -s -f
+#!/usr/local/src/bin/calc/calc -q -f
 /*
  * powerterm - print the argument as a sum of powers of integers
  *
+ * Copyright (C) 2001,2014,2019,2021  Landon Curt Noll
+ *
  * usage:
  *      powerterm [base_limit] value
  *
  *	base_limit	largest base we will consider (def: 10000)
  *      value		value to convert into sums of powers of integers
  *
- * Copyright (C) 2001,2014,2019  Landon Curt Noll
+ * Example:
+ *
+ *	powerterm 5 1000000
+ *
+ * prints:
+ *
+ *	4^10 - 3^10 + 5^6 - 4^6 - 4^5 - 2^5
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the powerterm of the version 2.1 of the GNU Lesser General Public License

cscript/simple.calc

@@ -1,8 +1,8 @@
-#!/usr/local/src/bin/calc/calc -q -s -f
+#!/usr/local/src/bin/calc/calc -q -f
 /*
  * simple - an example of a simple calc shell script
  *
- * Copyright (C) 1999-2007,2014,2019  Landon Curt Noll
+ * Copyright (C) 1999-2007,2014,2019,2021  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

cscript/square.calc

@@ -1,8 +1,8 @@
-#!/usr/local/src/bin/calc/calc -q -s -f
+#!/usr/local/src/bin/calc/calc -q -p -f
 /*
  * sqaure - print the squares of input values
  *
- * Copyright (C) 2000-2007,2014,2019  Ernest Bowen
+ * Copyright (C) 2000-2007,2014,2019,2021  Ernest Bowen
  *
  * 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
@@ -48,6 +48,8 @@
  *               1522756
  *       ln(2)
  *               ~.48045301391820142467
+ *	 2i
+ *		 -4
  *       config("mode","frac"), bernoulli(10)
  *               25/4356
  *       config("mode", "hex"), 0xff

custom/Makefile

@@ -4,6 +4,14 @@
 #
 # Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
 #
+# SRC: Makefile via make -f Makefile.ship custom/Makefile
+#
+#	The "# SRC: ... - ..." comment line above indicates
+#	the origin of this file.
+#
+# IMPORTANT: Please see the section on Makefiles near the
+#	     bottom of the HOWTO.INSTALL file.
+#
 # 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.
@@ -27,11 +35,30 @@
 # calculator by David I. Bell with help/mods from others
 # Makefile by Landon Curt Noll
 
+####################################################
+# NOTE: Start of section from custom/Makefile.head #
+####################################################
+
+#.###############################################################.#
+#.#								#.#
+#.# WARNING: This Makefile is generated from a combination of	#.#
+#.#	   custom/Makefile.head, Makefile.ship, and		#.#
+#.#	   custom/Makefile.tail.  We recommend that you NOT	#.#
+#.#	   edit this file, but instead edit the proper source	#.#
+#.#	   file and then make custom/Makefile:			#.#
+#.#								#.#
+#.#		make custom/Makefile				#.#
+#.#								#.#
+#.#	   See the '# NOTE .. section from ..' lines for	#.#
+#.#	   where the source file for the lines are from.	#.#
+#.#								#.#
+#.###############################################################.#
+
 
 # The shell used by this Makefile
 #
 # On some systems, /bin/sh is a rather reduced shell with
-# deprecated behavor.
+# deprecated behavior.
 #
 # If your system has a up to date, bash shell, then
 # you may wish to use:
@@ -431,7 +458,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.12.9.1
+VERSION= 2.13.0.0
 
 # Names of shared libraries with versions
 #
@@ -517,7 +544,16 @@ ILDFLAGS= ${COMMON_LDFLAGS}
 LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
 
 #endif	/* end of skip for non-Gnu makefiles */
+
+##################################################
+# NOTE: End of section from custom/Makefile.head #
+##################################################
 # start of host target cut - Do not remove this line
+
+###########################################################
+# NOTE: Start of section from the middle of Makefile.ship #
+###########################################################
+
 ##############################################################################
 #-=-=-=-=-=- host target section - targets that override defaults -=-=-=-=-=-#
 ##############################################################################
@@ -627,10 +663,8 @@ LIBCUSTCALC_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -645,9 +679,9 @@ CC= ${PURIFY} ${LCC} ${CCWERR}
 #
 endif
 
-##############################
-# Apple OS X / Darwin target #
-##############################
+###############################
+# Apple macOS / Darwin target #
+###############################
 
 ifeq ($(target),Darwin)
 #
@@ -695,10 +729,8 @@ LIBCUSTCALC_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -765,10 +797,8 @@ LIBCUSTCALC_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -827,10 +857,8 @@ LIBCUSTCALC_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -883,10 +911,8 @@ LD_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -937,10 +963,8 @@ LD_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -1094,10 +1118,8 @@ LD_STATIC=
 # This facility requires a Gnu Makefile, or a make command
 # that understands the += make operand.
 #
-#if 0	/* start of skip for non-Gnu makefiles */
 COMMON_CFLAGS+= ${COMMON_ADD}
 COMMON_LDFLAGS+= ${COMMON_ADD}
-#endif	/* end of skip for non-Gnu makefiles */
 #
 CCWARN= -Wall
 WNO_IMPLICT= -Wno-implicit
@@ -1142,7 +1164,27 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
 #######################################################################
 #-=-=-=-=-=- end of target section - only make rules below -=-=-=-=-=-#
 #######################################################################
+
+#########################################################
+# NOTE: End of section from the middle of Makefile.ship #
+#########################################################
+
 # end of host target cut - Do not remove this line
+#
+# Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
+#
+# SRC: Makefile via make -f Makefile.ship custom/Makefile
+#
+#	The "# SRC: ... - ..." comment line above indicates
+#	the origin of this file.
+#
+# IMPORTANT: Please see the section on Makefiles near the
+#	     bottom of the HOWTO.INSTALL file.
+
+####################################################
+# NOTE: Start of section from custom/Makefile.tail #
+####################################################
+
 ##############################################################################
 #-=-=-=-=-=-=-=-=- Be careful if you change something below -=-=-=-=-=-=-=-=-#
 ##############################################################################
@@ -1293,7 +1335,10 @@ Makefile.simple: ${MAKE_FILE}
 	${V} echo '=-=-=-=-= custom/${MAKE_FILE} start of $@ rule =-=-=-=-='
 	${Q} ${RM} -f $@
 	${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
-	    ${MAKE_FILE} > $@
+	    ${MAKE_FILE} | \
+	    ${GREP} -v '#\.#' | \
+	    ${SED} -e 's;^# SRC:.*;# SRC: non-GNU Makefile via;' \
+		   -e 's;via$$;via ${MAKE} -f ${MAKE_FILE} custom/$@;' > $@
 	${Q} echo >> $@
 	${Q} echo 'Makefile.simple:' >> $@
 	${Q} echo '	$${Q} if [ ! -f Makefile.simple ]; then '"\\" >> $@
@@ -1894,3 +1939,7 @@ custtbl.o: ../str.h
 custtbl.o: ../value.h
 custtbl.o: ../zmath.h
 custtbl.o: custtbl.c
+
+##################################################
+# NOTE: End of section from custom/Makefile.tail #
+##################################################

custom/Makefile.head

@@ -4,6 +4,14 @@
 #
 # Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
 #
+# SRC: custom/Makefile.head
+#
+#	The "# SRC: ... - ..." comment line above indicates
+#	the origin of this file.
+#
+# IMPORTANT: Please see the section on Makefiles near the
+#	     bottom of the HOWTO.INSTALL file.
+#
 # 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.
@@ -27,11 +35,30 @@
 # calculator by David I. Bell with help/mods from others
 # Makefile by Landon Curt Noll
 
+####################################################
+# NOTE: Start of section from custom/Makefile.head #
+####################################################
+
+#.###############################################################.#
+#.#								#.#
+#.# WARNING: This Makefile is generated from a combination of	#.#
+#.#	   custom/Makefile.head, Makefile.ship, and		#.#
+#.#	   custom/Makefile.tail.  We recommend that you NOT	#.#
+#.#	   edit this file, but instead edit the proper source	#.#
+#.#	   file and then make custom/Makefile:			#.#
+#.#								#.#
+#.#		make custom/Makefile				#.#
+#.#								#.#
+#.#	   See the '# NOTE .. section from ..' lines for	#.#
+#.#	   where the source file for the lines are from.	#.#
+#.#								#.#
+#.###############################################################.#
+
 
 # The shell used by this Makefile
 #
 # On some systems, /bin/sh is a rather reduced shell with
-# deprecated behavor.
+# deprecated behavior.
 #
 # If your system has a up to date, bash shell, then
 # you may wish to use:
@@ -431,7 +458,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.12.9.1
+VERSION= 2.13.0.0
 
 # Names of shared libraries with versions
 #
@@ -517,3 +544,7 @@ ILDFLAGS= ${COMMON_LDFLAGS}
 LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
 
 #endif	/* end of skip for non-Gnu makefiles */
+
+##################################################
+# NOTE: End of section from custom/Makefile.head #
+##################################################

custom/Makefile.tail

@@ -1,3 +1,18 @@
+#
+# Copyright (C) 1999-2006,2014,2017-2018,2021  Landon Curt Noll
+#
+# SRC: custom/Makefile.tail
+#
+#	The "# SRC: ... - ..." comment line above indicates
+#	the origin of this file.
+#
+# IMPORTANT: Please see the section on Makefiles near the
+#	     bottom of the HOWTO.INSTALL file.
+
+####################################################
+# NOTE: Start of section from custom/Makefile.tail #
+####################################################
+
 ##############################################################################
 #-=-=-=-=-=-=-=-=- Be careful if you change something below -=-=-=-=-=-=-=-=-#
 ##############################################################################
@@ -148,7 +163,10 @@ Makefile.simple: ${MAKE_FILE}
 	${V} echo '=-=-=-=-= custom/${MAKE_FILE} start of $@ rule =-=-=-=-='
 	${Q} ${RM} -f $@
 	${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
-	    ${MAKE_FILE} > $@
+	    ${MAKE_FILE} | \
+	    ${GREP} -v '#\.#' | \
+	    ${SED} -e 's;^# SRC:.*;# SRC: non-GNU Makefile via;' \
+		   -e 's;via$$;via ${MAKE} -f ${MAKE_FILE} custom/$@;' > $@
 	${Q} echo >> $@
 	${Q} echo 'Makefile.simple:' >> $@
 	${Q} echo '	$${Q} if [ ! -f Makefile.simple ]; then '"\\" >> $@
@@ -749,3 +767,7 @@ custtbl.o: ../str.h
 custtbl.o: ../value.h
 custtbl.o: ../zmath.h
 custtbl.o: custtbl.c
+
+##################################################
+# NOTE: End of section from custom/Makefile.tail #
+##################################################

func.c

@@ -8464,11 +8464,23 @@ f_argv(int count, VALUE **vals)
 			/*NOTREACHED*/
 		}
 
-		/* return the n-th argv string */
+		/* determine the arg value of the argv() function */
 		arg = qtoi(vals[0]->v_num);
-		if (arg < argc_value && argv_value[arg] != NULL) {
+
+		/* argv(0) is program or script_name if -f filename was used */
+		if (arg == 0) {
+			if (script_name == NULL) {
+				/* paranoia */
+				result.v_type = V_NULL;
+			} else {
+				result.v_type = V_STR;
+				result.v_str = makenewstring(script_name);
+			}
+
+		/* return the n-th argv string */
+		} else if (arg < argc_value && argv_value[arg-1] != NULL) {
 			result.v_type = V_STR;
-			result.v_str = makestring(strdup(argv_value[arg]));
+			result.v_str = makestring(strdup(argv_value[arg-1]));
 		} else {
 			result.v_type = V_NULL;
 		}

help/Makefile

@@ -4,6 +4,14 @@
 #
 # Copyright (C) 1999-2006,2017,2021  Landon Curt Noll
 #
+# SRC: help/Makefile
+#
+#	The "# SRC: ... - ..." comment line above indicates
+#	the origin of this file.
+#
+# IMPORTANT: Please see the section on Makefiles near the
+#	     bottom of the HOWTO.INSTALL file.
+#
 # 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.
@@ -31,7 +39,7 @@
 # The shell used by this Makefile
 #
 # On some systems, /bin/sh is a rather reduced shell with
-# deprecated behavor.
+# deprecated behavior.
 #
 # If your system has a up to date, bash shell, then
 # you may wish to use:

help/argv

@@ -11,14 +11,33 @@ TYPES
 
 DESCRIPTION
     Without args, this builtin returns the number of calc command line
-    strings available.
+    strings available, including the program or script name.
 
     If the numeric arg is supplied, then the corresponding command line
     string is return, if it exists.  Otherwise a nul() value is returned.
 
     In keeping with the argc/argv convention of C, argv(0) will refer
-    to the 1st argv string, and argv(argv()-1) will refer to the last.
-    This differs from the way the param() builtin works.
+    to the name of the program.  If the -f filename argument is used,
+    then argv(0) will refer to the filename.  In the case of a #! script,
+    assuming the calc is located in /usr/local/bin/calc, the first
+    line of a calc script would be:
+
+	#!/usr/local/bin/calc -f
+	...
+
+    then argv(0) will refer to the filename of the script.
+
+    As it is common to use -q in a calc script, and using that same
+    /usr/local/bin/calc location:
+
+	#!/usr/local/bin/calc -q -f
+	...
+
+    and again, argv(0) will refer to the filename of the script.
+
+    The 1st argument to calc will be argv(1), and argv(argv()-1)
+    will refer to the last.  This differs from the way the param()
+    builtin works.
 
     By default, calc will evaluate all of its command line arguments.
     However, if calc is invoked with -s, all non-dashed options will
@@ -27,22 +46,26 @@ DESCRIPTION
 	calc -i 2+2
 
     will cause calc to print 4 and enter interactive mode.  In this case
-    argv() will return 0.
+    argv() will return 1.
 
     On the other hand:
 
 	calc -i -s 2+2
 
-    will cause calc to interactive mode.  The argv() builtin will return 1
-    and argv(0) will return the string "2+2".
+    will cause calc to interactive mode.  The argv() builtin will return 2
+    and argv(1) will return the string "2+2".
 
 EXAMPLE
     $ calc -s a bb ccc
     ; argc = argv();
-    ; for (i = 0; i < argc; i++) print "argv[": i : '] = "': argv(i) : '"';
-    argv[0] = "a"
-    argv[1] = "bb"
-    argv[2] = "ccc"
+    ; print "argc =", argc;
+    argc = 4
+    ; print 'argv[0] = "': argv(0) : '"';
+    argv[0] = "calc"
+    ; for (i = 1; i < argc; i++) print "argv[": i : '] = "': argv(i) : '"';
+    argv[1] = "a"
+    argv[2] = "bb"
+    argv[3] = "ccc"
 
 LIMITS
     0 <= n < 2^31
@@ -53,7 +76,7 @@ LINK LIBRARY
 SEE ALSO
     param, system, usage
 
-## Copyright (C) 1999-2006  Landon Curt Noll
+## Copyright (C) 1999-2006,2021  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/script

@@ -123,7 +123,7 @@ Calc shell scripts
 	    calc "-q -s" $* << +
 	    global i, n, s;
 	    n = argv();
-	    for (i = 0; i < n; i++)
+	    for (i = 1; i < n; i++)
 		    s += eval(argv(i));
 	    print "sum =", s;
 	    +
@@ -133,20 +133,24 @@ Calc shell scripts
 	    ./addall2 2 3 4
 
     the $* in this script expands to  2 3 4, and because of the "-s"
-    in the options, calc starts with argv(0) = "2", argv(1) = "3",
-    argv(2)= "4".  As there is only one calc process involved and
+    in the options, calc starts with argv(1) = "2", argv(2) = "3",
+    argv(3)= "4".  As there is only one calc process involved and
     the eval() function accepts as argument any string that
-    represents the body of a calc function, the strings argv(0),
-    argv(1), ... could evaluate to any value types for which the
+    represents the body of a calc function, the strings argv(1),
+    argv(2), ... could evaluate to any value types for which the
     additions to be performed are defined, and variables defined in
     one argv() can be used in later arguments.
 
+    In case you are wondering, argv(0) returns the program
+    or calc script name.  In the case of the above example,
+    argv(0) = "./addall2".
+
     For systems that support interpreter files, essentially the
     same thing may be done more efficiently by using calc as an
     interpreter.  Assuming the full path for calc is
     /usr/local/bin/calc, one could use the file addall3 with contents
 
-	    #!/usr/bin/calc -q -s -f
+	    #!/usr/bin/calc -q -f
 	    global i, n, s;
 	    n = argv();
 	    for (i = 1; i < n; i++)
@@ -161,9 +165,9 @@ Calc shell scripts
 
     After the command:
 
-	    addall3 2 3 4
+	    ./addall3 2 3 4
 
-    the arguments calc receives are argv(0) = "addall3", argv(1) =
+    the arguments calc receives are argv(0) = "./addall3", argv(1) =
     "2", argv(3) = "3", argv(4) = "4".
 
     Another kind of script that can be useful is sqrts1:

lib_calc.c

@@ -119,6 +119,7 @@ char *program = "calc";		/* our name */
 char *base_name = "calc";	/* basename of our name */
 char cmdbuf[MAXCMD+1+1+1];	/* command line expression + "\n\0" + guard */
 run run_state = RUN_ZERO;	/* calc startup run state */
+char *script_name = NULL;	/* program name or -f filename arg or NULL */
 
 
 /*
@@ -614,6 +615,14 @@ libcalc_call_me_last(void)
 	 */
 	random_libcalc_cleanup();
 
+	/*
+	 * free script_name
+	 */
+	if (script_name != NULL) {
+		free(script_name);
+		script_name = NULL;
+	}
+
 	/*
 	 * restore all changed descriptor states
 	 */

lib_calc.h

@@ -1,5 +1,5 @@
 /*
- * math_error - a simple libcalc math error routine
+ * lib_calc - calc link library initialization and shutdown routines
  *
  * Copyright (C) 1999-2007,2014,2021  Landon Curt Noll
  *

version.c

@@ -52,9 +52,9 @@ static char *program;
 
 
 #define MAJOR_VER	2	/* major library version */
-#define MINOR_VER	12	/* minor library version */
-#define MAJOR_PATCH	9	/* major software version level */
-#define MINOR_PATCH	1	/* minor software version level */
+#define MINOR_VER	13	/* minor library version */
+#define MAJOR_PATCH	0	/* major software version level */
+#define MINOR_PATCH	0	/* minor software version level */
 
 
 /*

win32.mkdef

@@ -54,6 +54,7 @@ USE_READLINE=-DUSE_READLINE
 READLINE_LIB=
 READLINE_INCLUDE=
 CALCPAGER=less.exe
+CCBAN=-DUNBAN
 
 EXT=.exe