Zero out allocated memory

modified:   app/lib/ntext.cpp
	modified:   app/main/lexer.cpp
	modified:   app/system/language.cpp
	modified:   app/system/language_posix.cpp
	modified:   app/system/preferences_stdc.cpp
	modified:   lib/real/pow.c
	modified:   lib/platform.h

.gitignore

@@ -11,7 +11,10 @@ amath
 amath-test
 catalog/flexcat
 catalog/flexcat/flexcat
+build/flexcat/flexcat
 *_.3
 doxygen.warn
 *.deb
+*.zip
 Makefile
+/dist

.vscode/c_cpp_properties.json

@@ -0,0 +1,19 @@
+{
+    "configurations": [
+        {
+            "name": "amiga",
+            "includePath": [
+                "/opt/amiga/m68k-amigaos/ndk-include/",
+                "/opt/amiga/m68k-amigaos/clib2/include/",
+                "${workspaceFolder}/src/lib/"
+            ],
+            "defines": ["AMIGA"],
+            "compilerPath": "/opt/amiga/bin/m68k-amigaos-gcc",
+            "cStandard": "c99",
+            "cppStandard": "c++98",
+            "intelliSenseMode": "${default}",
+            "compilerArgs": []
+        }
+    ],
+    "version": 4
+}

.vscode/keybindings.json

@@ -0,0 +1,12 @@
+[
+    {
+    "key": "ctrl+shift+c",
+    "command": "workbench.action.tasks.runTask",
+    "args": "Clean all"
+    },
+    {
+        "key": "ctrl+t",
+        "command": "workbench.action.tasks.runTask",
+        "args": "Run tests"
+    }
+]

.vscode/launch.json

@@ -0,0 +1,27 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(gdb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/amath",
+            "args": ["--shell"],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,19 @@
+{
+    "cSpell.words": [
+        "amath",
+        "carsten",
+        "innolan",
+        "sonne"
+    ],
+    "files.associations": {
+        "type_traits": "cpp",
+        "cctype": "cpp",
+        "cstdarg": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstdint": "cpp",
+        "exception": "cpp",
+        "new": "cpp",
+        "typeinfo": "cpp"
+    }
+}

.vscode/tasks.json

@@ -0,0 +1,51 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Open shell",
+            "type": "shell",
+            "command": "${workspaceFolder}/amath --shell",
+            "problemMatcher": []
+        },
+        {
+            "label": "Build all",
+            "command": "make",
+            "args": [
+                "all"
+            ],
+            "options": {
+                "cwd": "${workspaceRoot}"
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "label": "Clean all",
+            "command": "make",
+            "args": [
+                "clean"
+            ],
+            "options": {
+                "cwd": "${workspaceRoot}"
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "Run tests",
+            "type": "shell",
+            "command": "${workspaceFolder}/amath --test",
+            "group": "test",
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            }
+        }
+    ]
+}

HISTORY

@@ -1,5 +1,27 @@
 amath release history
 
+v1.9.0 January 11 2021
+- AmigaOS ARexx interface.
+
+v1.8.5 August 07 2018
+- Fix build on compilers with broken endian detection.
+
+v1.8.4 August 05 2018
+- Ignore casing in hexadecimal numbers.
+
+v1.8.3 July 21 2017
+- Updated help texts and man page.
+- Fixed bug in ANSI switch.
+
+v1.8.2 July 14 2017
+- MIPS support.
+- Improved endianness detection.
+- Fixed configuration errors.
+
+v1.8.1 April 22 2017
+- OpenBSD support.
+- Fixed Haiku bug.
+
 v1.8.0 April 13 2017
 - Fixed bugs in numeral systems.
 - Fixed bugs related to infinity (Inf).
@@ -89,7 +111,7 @@ v1.5.3 October 26 2014
 v1.5.2 October 11 2014
 - Modified character handling code to comply with licenses.
 - Modified complex math code to comply with licenses.
-- Modified code base to work with Kickstart 2.04. 
+- Modified code base to work with Kickstart 2.04.
 - Square root of negative numbers now yields correct result.
 - Implemented scientific notation of numbers.
 - Infinity is now shown in division with 0.

LICENSE

@@ -1,5 +1,5 @@
 
-Copyright (c) 2014-2017 Carsten Sonne Larsen <cs@innolan.net>
+Copyright (c) 2014-2021 Carsten Sonne Larsen <cs@innolan.net>
 Copyright (c) 2007 The NetBSD Foundation, Inc.
 Copyright (c) 1990, 1993 The Regents of the University of California.
 All rights reserved.

README

@@ -26,4 +26,4 @@ Show version string:
 > amath version
 
 Run regression tests:
-> amath test
+> amath --test

README.md

@@ -29,4 +29,4 @@ Install by copying the desired amath binary to C: or any other appropriate locat
     > amath version
 
     Run regression tests:
-    > amath test
+    > amath --test

amath.1

@@ -1,6 +1,6 @@
-.\" Copyright (c) 2014-2017 Carsten Sonne Larsen <cs@innolan.net>
+.\" Copyright (c) 2014-2021 Carsten Sonne Larsen <cs@innolan.net>
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -9,7 +9,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -20,39 +20,27 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.TH amath 1 "Version 1.8.0" "April 13 2017"
+.TH amath 1 "Version 1.9.0" "January 11 2021"
 .SH NAME
 amath \- Simple command line calculator
 .SH SYNOPSIS
-\fC[ --noansi ] [ --shell | expression ]\fP
+\fC[ \fB--noansi\fR ] [ \fB--shell\fR |
+.IR expression
+]
 .SH DESCRIPTION
-amath(1) features a case sensitive command line interface, internal
+\fBamath\fP features a case sensitive command line interface, internal
 IEEE 754 calculations with 15 significant digits, calculations with
 real and complex numbers, variables and user defined functions,
 logarithmic and exponential functions, trigonometric and hyperbolic
 function and selected mathematical constants and rounding functions.
-.SH Statements
-.nf
-clear       Clear console window
-def         Define function
-delete      Delete variable or function
-digits      Set number of significant digits
-eval        Evaluate arithmetic expression
-execute     Execute statements in a file
-functions   Show list of user defined functions
-input       Change numeral input system
-help        Show basic help text
-output      Change numeral output system
-list        Show content of a directory
-show        Show content of a file
-load        Load variable and functions from file
-save        Save variable and functions to file
-variables   Show list of variables
-version     Show version string
-memory      Show internal memory usage
-exit        Exit program
-.fi
-.SH Operators
+.SH OPTIONS
+.TP
+.BR \-\-noansi
+Disable output of ANSI escape codes. Default is enable.
+.TP
+.BR \-\-shell
+Open an interactive shell.
+.SH OPERATORS
 .nf
 +           Mathematical addition
 -           Mathematical subtraction
@@ -61,14 +49,15 @@ exit        Exit program
 ^           Mathematical exponentiation
 =           Assignment of variable values
 |           Absolute value of number
-.SH Variables and constant
+.fi
+.SH VARIABLES AND CONSTANT
 .nf
 pi          Trigonometric constant
 e           Euler's number
 i           Imaginary unit
 ins         Result of last calculation
 .fi
-.SH Base functions
+.SH MISCELLANEOUS FUNCTIONS
 .nf
 abs         Absolute value of number
 sgn         Mathematical signum function
@@ -82,7 +71,7 @@ lb          Binary logarithm function (base 2)
 ln          Natural logarithm function (base e)
 lg          Common logarithm function (base 10)
 .fi
-.SH Trigonometric functions
+.SH TRIGONOMETRIC FUNCTIONS
 .nf
 sin         Trigonometric sine function
 cos         Trigonometric cosine function
@@ -103,7 +92,7 @@ arccrd      Inverse trigonometric chord function
 arcexsec    Inverse trigonometric exsecant function
 arcexcsc    Inverse trigonometric excosecant function
 .fi
-.SH Hyperbolic functions
+.SH HYPERBOLIC FUNCTIONS
 .nf
 sinh        Hyperbolic sine function
 cosh        Hyperbolic cosine function
@@ -118,7 +107,7 @@ arccoth     Inverse hyperbolic cotangent function
 arcsech     Inverse hyperbolic secant function
 arccsch     Inverse hyperbolic cosecant function
 .fi
-.SH Early trigonometric functions
+.SH EARLY TRIGONOMETRIC FUNCTIONS
 .nf
 ver         Versed sine function
 vcs         Versed cosine function
@@ -137,7 +126,54 @@ archvc      Inverse haversed cosine function
 archcv      Inverse hacoversed sine function
 archcc      Inverse hacoversed cosine function
 .fi
-.SH Example script
+.SH STATEMENTS
+.nf
+about       Show about text
+clear       Clear console window
+def         Define function
+delete      Delete variable or function
+digits      Set number of significant digits
+eval        Evaluate arithmetic expression
+execute     Execute statements in a file
+functions   Show list of user defined functions
+input       Change numeral input system
+help        Show basic help text
+output      Change numeral output system
+list        Show content of a directory
+show        Show content of a file
+load        Load variable and functions from file
+save        Save variable and functions to file
+variables   Show list of variables
+version     Show version string
+license     Show copyright and license texts
+memory      Show internal memory usage
+exit        Exit program
+.fi
+.SH EXIT STATUS
+\fBamath\fP exits 0 on success and >0 if an error occurs.
+.SH EXAMPLES
+Add two numbers:
+.RS
+$ amath 1.3 + 2.6
+.RE
+.PP
+Find cosine of pi/2:
+.RS
+$ amath "cos(pi/2)"
+.RE
+.PP
+Find square root of minus 25:
+.RS
+$ amath "sqrt(-25)"
+.RE
+.PP
+Show only 5 digits in the result of a division:
+.RS
+$ amath "digits 5;34/11"
+.RE
+.PP
+Script block with functions:
+.RS
 .nf
 round(1.5461);round(-1.5461);
 ceil(43.5461);ceil(-43.5461);
@@ -145,34 +181,34 @@ floor(39.9531);floor(-39.9531);
 trunc(23.827);trunc(-23.827);
 sqrt(100);sqrt(52.23);
 .fi
-.SH Example script with functions
+.RE
+.PP
+Script block with user defined functions:
+.RS
 .nf
 f(x)=x*2+1;
 g(y)=y^2+y*1.5+2;
 a=2;b=3;c=a+b;
-vars;funcs;
 f(2.2);c+1.1;
 .fi
-.SH Example script with complex numbers
-.nf
-cos(1+2i);
-sin(1+2i);
-tan(1+2i);
-coth(1+2i);
-sech(1+2i);
-csch(1+2i);
-.fi
-.SH HOMEPAGE
-http://amath.innolan.net/
-.SH AUTHORS
-.PP
-Written by Carsten Sonne Larsen <cs@innolan.net>. The code in MemSet and
-MemCopy is derived from software contributed to Berkeley by Mike Hibler and
-Chris Torek. The code in complex calculations is derived from software
-written by Stephen L. Moshier.
-.SH COPYRIGHT
-Copyright (c) 2014-2017 Carsten Sonne Larsen <cs@innolan.net>
+.RE
+.SH BUGS
+.IP \[bu] 2
+If \fBamath\fP is linked with system libraries (-lm) sometimes the real part
+of a result of arccosh of a complex number, is negative instead of positive.
+.IP \[bu]
+coth() with complex numbers is inaccurate on the 14th digit.
+.sp
+Please report any other bugs that you encounter via:
 .br
-Copyright (c) 1990, 1993 The Regents of the University of California
+\fIhttps://gitlab.com/rnger/amath/issues\fR.
+.SH HOMEPAGE
+https://amath.innolan.net/
 .SH SEE ALSO
-amathc(3), amathr(3), amathi(3)
+amathc(3), amathr(3), amathi(3)
+.SH AUTHORS
+Written by Carsten Sonne Larsen <cs@innolan.net>. Floating point to string
+conversion is based on software written by Ryan Juckett. The code in complex
+calculations is derived from software written by Stephen L. Moshier. The code
+in MemSet and MemCopy is derived from software contributed to Berkeley by
+Mike Hibler and Chris Torek.

amath.doxygen

@@ -1,7 +1,7 @@
 
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "amath"
-PROJECT_NUMBER         = "1.8.0"
+PROJECT_NUMBER         = "1.9.0"
 PROJECT_BRIEF          = "Simple command line calculator"
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = ../amath-doc
@@ -156,12 +156,12 @@ EXT_LINKS_IN_WINDOW    = NO
 FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
 USE_MATHJAX            = NO
-SEARCHENGINE           = YES
+SEARCHENGINE           = NO
 SERVER_BASED_SEARCH    = NO
 EXTERNAL_SEARCH        = NO
 SEARCHDATA_FILE        = searchdata.xml
 
-GENERATE_MAN           = YES
+GENERATE_MAN           = NO
 MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
 MAN_SUBDIR             =

arexx/test.rx

@@ -0,0 +1,4 @@
+/* Test program */
+Options RESULTS
+Address AMATH.1 '1.1+1.8'
+SAY (RESULT)

bin/amath.doc

@@ -0,0 +1,166 @@
+NAME
+       amath - Simple command line calculator
+
+SYNOPSIS
+       [ --noansi ] [ --shell | expression ]
+
+DESCRIPTION
+       amath features a case sensitive command line interface, internal IEEE
+       754 calculations with 15 significant digits, calculations with real and
+       complex numbers, variables and user defined functions, logarithmic and
+       exponential functions, trigonometric and hyperbolic function and
+       selected mathematical constants and rounding functions.
+
+OPTIONS
+       --noansi
+              Disable output of ANSI escape codes. Default is enable.
+
+       --shell
+              Open an interactive shell.
+
+OPERATORS
+       +           Mathematical addition
+       -           Mathematical subtraction
+       *           Mathematical multiplication
+       /           Mathematical division
+       ^           Mathematical exponentiation
+       =           Assignment of variable values
+       |           Absolute value of number
+
+VARIABLES AND CONSTANT
+       pi          Trigonometric constant
+       e           Euler's number
+       i           Imaginary unit
+       ins         Result of last calculation
+
+MISCELLANEOUS FUNCTIONS
+       abs         Absolute value of number
+       sgn         Mathematical signum function
+       round       Round to nearest integer number
+       trunc       Discard fraction part of number
+       floor       Mathematical floor function
+       ceil        Mathematical ceiling function
+       sqrt        Square root function (exp 1/2)
+       cbrt        Cube root function (exp 1/3)
+       lb          Binary logarithm function (base 2)
+       ln          Natural logarithm function (base e)
+       lg          Common logarithm function (base 10)
+
+TRIGONOMETRIC FUNCTIONS
+       sin         Trigonometric sine function
+       cos         Trigonometric cosine function
+       tan         Trigonometric tangent function
+       cot         Trigonometric cotangent function
+       sec         Trigonometric secant function
+       csc         Trigonometric cosecant function
+       crd         Trigonometric chord function
+       exsec       Trigonometric exsecant function
+       excsc       Trigonometric excosecant function
+       arcsin      Inverse trigonometric sine function
+       arccos      Inverse trigonometric cosine function
+       arctan      Inverse trigonometric tangent function
+       arccot      Inverse trigonometric cotangent function
+       arcsec      Inverse trigonometric secant function
+       arccsc      Inverse trigonometric cosecant function
+       arccrd      Inverse trigonometric chord function
+       arcexsec    Inverse trigonometric exsecant function
+       arcexcsc    Inverse trigonometric excosecant function
+
+HYPERBOLIC FUNCTIONS
+       sinh        Hyperbolic sine function
+       cosh        Hyperbolic cosine function
+       tanh        Hyperbolic tangent function
+       coth        Hyperbolic cotangent function
+       sech        Hyperbolic secant function
+       csch        Hyperbolic cosecant function
+       arcsinh     Inverse hyperbolic sine function
+       arccosh     Inverse hyperbolic cosine function
+       arctanh     Inverse hyperbolic tangent function
+       arccoth     Inverse hyperbolic cotangent function
+       arcsech     Inverse hyperbolic secant function
+       arccsch     Inverse hyperbolic cosecant function
+
+EARLY TRIGONOMETRIC FUNCTIONS
+       ver         Versed sine function
+       vcs         Versed cosine function
+       cvs         Coversed sine function
+       cvc         Coversed cosine function
+       hv          Haversed sine function
+       hvc         Haversed cosine function
+       hcv         Hacoversed sine function
+       hcc         Hacoversed cosine function
+       arcver      Inverse versed sine function
+       arcvcs      Inverse versed cosine function
+       arccvs      Inverse coversed sine function
+       arccvc      Inverse coversed cosine function
+       archv       Inverse haversed sine function
+       archvc      Inverse haversed cosine function
+       archcv      Inverse hacoversed sine function
+       archcc      Inverse hacoversed cosine function
+
+STATEMENTS
+       about       Show about text
+       clear       Clear console window
+       def         Define function
+       delete      Delete variable or function
+       digits      Set number of significant digits
+       eval        Evaluate arithmetic expression
+       execute     Execute statements in a file
+       functions   Show list of user defined functions
+       input       Change numeral input system
+       help        Show basic help text
+       output      Change numeral output system
+       list        Show content of a directory
+       show        Show content of a file
+       load        Load variable and functions from file
+       save        Save variable and functions to file
+       variables   Show list of variables
+       version     Show version string
+       license     Show copyright and license texts
+       memory      Show internal memory usage
+       exit        Exit program
+
+EXIT STATUS
+       amath exits 0 on success and >0 if an error occurs.
+
+EXAMPLES
+       Add two numbers:
+              $ amath 1.3 + 2.6
+
+       Find cosine of pi/2:
+              $ amath "cos(pi/2)"
+
+       Find square root of minus 25:
+              $ amath "sqrt(-25)"
+
+       Show only 5 digits in the result of a division:
+              $ amath "digits 5;34/11"
+
+       Script block with functions:
+              round(1.5461);round(-1.5461);
+              ceil(43.5461);ceil(-43.5461);
+              floor(39.9531);floor(-39.9531);
+              trunc(23.827);trunc(-23.827);
+              sqrt(100);sqrt(52.23);
+
+       Script block with user defined functions:
+              f(x)=x*2+1;
+              g(y)=y^2+y*1.5+2;
+              a=2;b=3;c=a+b;
+              f(2.2);c+1.1;
+
+BUGS
+         Please report any other bugs that you encounter via:
+         https://gitlab.com/rnger/amath/issues.
+
+HOMEPAGE
+       https://amath.innolan.net/
+
+AUTHORS
+       Written by Carsten Sonne Larsen <cs@innolan.net>. Floating point to
+       string conversion is based on software written by Ryan Juckett. The
+       code in complex calculations is derived from software written by
+       Stephen L. Moshier. The code in MemSet and MemCopy is derived from
+       software contributed to Berkeley by Mike Hibler and Chris Torek.
+
+January 11 2021                  Version 1.9.0

bin/amath.readme

@@ -0,0 +1,41 @@
+Short:        Simple command line calculator
+Author:       Carsten Larsen
+Uploader:     carsten.larsen@mail.com
+Type:         misc/math
+Version:      1.9.0
+Architecture: m68k-amigaos >= 2.04
+URL:          https://amath.innolan.net
+
+Features
+========
+
+- Case sensitive command line interface
+- Native IEEE 754 with 15 significant digits
+- Calculations with real and complex numbers
+- Variables and user defined functions
+- Logarithmic and exponential functions
+- Trigonometric and hyperbolic functions
+- Mathematical constants and rounding functions
+- Disk functions to load, save and view content
+- Comprehensive and easy to use builtin help
+- Optimized 68000, 68020 and 68030 versions
+- Unlimited number of ARexx interfaces
+- Freely distributable sources (BSD license)
+
+Usage
+=====
+
+Open amath in its own window:
+> amath
+
+Do a calculation in shell:
+> amath 1.2+1.4
+
+Get an interactive prompt in shell:
+> amath shell
+
+Show version string:
+> amath version
+
+Run regression tests:
+> amath --test

build/doc

@@ -0,0 +1,32 @@
+#! /bin/sh
+
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
+
+# Tell groff not to emit SGR escape sequences (ANSI color escapes).
+GROFF_NO_SGR=1
+export GROFF_NO_SGR
+
+echo ".am TH
+.hy 0
+.na
+..
+.rm }H
+.rm }F" | nroff -man - ${1+"$@"} | perl -ne '
+	binmode STDIN, '\'':encoding(utf8)'\'';
+	binmode STDOUT, '\'':encoding(utf8)'\'';
+	chomp;
+	s/.\010//g;
+	s/\s*$//;
+	if (/^$/) {
+		$sawblank = 1;
+		next;
+	} else {
+		if ($sawblank && $didprint) {
+			print "\n";
+			$sawblank = 0;
+		}
+		print "$_\n";
+		$didprint = 1;
+	}
+'

builddeb

@@ -0,0 +1,141 @@
+#!/bin/sh
+#
+# Copyright {c} 2014-2021 Carsten Sonne Larsen  <cs@innolan.net>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES {INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION}
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT {INCLUDING NEGLIGENCE OR OTHERWISE} ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# Project homepage:
+# https://amath.innolan.net
+#
+
+set -e
+
+version="1.9.0"
+
+build_package () {
+
+rm -Rf amath
+rm -f amath-${version}_$1.deb
+sh configure CFLAGS=$2
+make clean
+
+echo "Building $3 bit package of amath ${version} for Debian ..."
+make static
+mv amath amath.tmp
+
+# Create filesystem layout
+mkdir -m 755 amath
+mkdir -m 755 amath/DEBIAN
+mkdir -m 755 amath/usr/
+mkdir -m 755 amath/usr/bin
+mkdir -m 755 amath/usr/share
+mkdir -m 755 amath/usr/share/amath
+mkdir -m 755 amath/usr/share/man
+mkdir -m 755 amath/usr/share/man/man1
+mkdir -m 755 amath/usr/share/man/man3
+mkdir -m 755 amath/usr/share/doc
+mkdir -m 755 amath/usr/share/doc/amath
+
+# Copy binaries
+mv amath.tmp amath/usr/bin/amath
+chmod 0755 amath/usr/bin/amath
+
+# Copy documentation
+cp HISTORY amath/usr/share/doc/amath/changelog
+gzip --best -n amath/usr/share/doc/amath/changelog
+cp README amath/usr/share/doc/amath/
+gzip --best -n amath/usr/share/doc/amath/README
+chmod 644 amath/usr/share/doc/amath/*
+
+# Copy man pages
+cat amath.1 | sed '/SEE ALSO/,+1 d' > amath/usr/share/man/man1/amath.1
+gzip --best -n amath/usr/share/man/man1/amath.1
+chmod 644 amath/usr/share/man/man1/*
+
+# Copy scripts
+cp script/* amath/usr/share/amath/
+chmod 644 amath/usr/share/amath/*
+
+# Create control file
+{
+echo "Package: amath"
+echo "Version: ${version}"
+echo "Architecture: $1"
+echo "Maintainer: Carsten Sonne Larsen <cs@innolan.net>"
+echo "Installed-Size: $4"
+echo "Depends: libc6"
+echo "Section: math"
+echo "Priority: optional"
+echo "Homepage: https://amath.innolan.net"
+echo "Built-Using: gcc-7.3"
+echo "Description: Simple command line calculator"
+echo " Features a case sensitive command line interface, internal IEEE 754"
+echo " calculations with 15 significant digits, calculations with real and"
+echo " complex numbers, variables and user defined functions, logarithmic"
+echo " and exponential functions, trigonometric and hyperbolic function"
+echo " and selected mathematical constants and rounding functions."
+} >amath/DEBIAN/control
+chmod 0755 amath/DEBIAN/control
+
+# Create copyright file
+# Refer to https://www.debian.org/doc/debian-policy/ch-docs.html#s-copyrightfile
+{
+echo "Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/"
+echo "Upstream-Name: amath"
+echo "Source: https://amath.innolan.net"
+echo
+echo "Files:     *"
+echo "Copyright: 2014-2021 Carsten Sonne Larsen <cs@innolan.net>"
+echo "           2007 The NetBSD Foundation, Inc."
+echo "           1990, 1993 The Regents of the University of California."
+echo "License:   BSD-2-Clause"
+echo " Redistribution and use in source and binary forms, with or without"
+echo " modification, are permitted provided that the following conditions are met:"
+echo " ."
+echo " Redistributions of source code must retain the above copyright notice, this"
+echo " list of conditions and the following disclaimer."
+echo " ."
+echo " Redistributions in binary form must reproduce the above copyright notice,"
+echo " this list of conditions and the following disclaimer in the documentation"
+echo " and/or other materials provided with the distribution."
+echo " ."
+echo " THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\""
+echo " AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE"
+echo " IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE"
+echo " DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE"
+echo " FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL"
+echo " DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR"
+echo " SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER"
+echo " CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,"
+echo " OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE"
+echo " OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+} >amath/usr/share/doc/amath/copyright
+chmod 644 amath/usr/share/doc/amath/*
+
+fakeroot dpkg-deb --build amath
+mv amath.deb amath-${version}_$1.deb
+rm -Rf amath
+}
+
+build_package 'amd64' '' 64 320
+build_package 'i386' '-m32' 32 322

builddebdev

@@ -1,13 +1,44 @@
 #!/bin/sh
+#
+# Copyright {c} 2014-2021 Carsten Sonne Larsen  <cs@innolan.net>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES {INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION}
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT {INCLUDING NEGLIGENCE OR OTHERWISE} ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# Project homepage:
+# https://amath.innolan.net
+#
+
+# THIS SCRIPT IS NOT READY FOR PRODUCTION !
 
 set -e
 
-version="1.8.0"
+version="1.9.0"
 
 build_package () {
 
 rm -Rf amath
-rm -f amath-${version}_$1.deb
+rm -f amath.deb
+rm -f amath-dev-${version}_$1.deb
 sh configure CFLAGS=$2
 make clean
 
@@ -29,7 +60,7 @@ mkdir -m 755 amath/usr/share/man
 mkdir -m 755 amath/usr/share/man/man1
 mkdir -m 755 amath/usr/share/man/man3
 mkdir -m 755 amath/usr/share/doc
-mkdir -m 755 amath/usr/share/doc/amath
+mkdir -m 755 amath/usr/share/doc/amath-dev
 
 # Copy binaries
 mv amath.tmp amath/usr/bin/amath
@@ -62,15 +93,16 @@ chmod 644 amath/usr/lib/pkgconfig/*
 cp src/amath.h amath/usr/include/amath.h
 cp src/amathc.h amath/usr/include/amathc.h
 cp src/amatht.h amath/usr/include/amatht.h
-cp src/complex.h amath/usr/include/amathi.h
+cp src/mathi.h amath/usr/include/amathi.h
+cp src/mathr.h amath/usr/include/amathr.h
 chmod 644 amath/usr/include/*
 
 # Copy documentation
-cp HISTORY amath/usr/share/doc/amath/
-gzip --best -n amath/usr/share/doc/amath/HISTORY
-cp README amath/usr/share/doc/amath/
-gzip --best -n amath/usr/share/doc/amath/README
-chmod 644 amath/usr/share/doc/amath/*
+cp HISTORY amath/usr/share/doc/amath-dev/changelog
+gzip --best -n amath/usr/share/doc/amath-dev/changelog
+cp README amath/usr/share/doc/amath-dev/
+gzip --best -n amath/usr/share/doc/amath-dev/README
+chmod 644 amath/usr/share/doc/amath-dev/*
 
 # Copy man pages
 cp amath.1 amath/usr/share/man/man1/amath.1
@@ -94,12 +126,12 @@ chmod 644 amath/usr/share/amath/*
 echo "Package: amath-dev"
 echo "Version: ${version}"
 echo "Architecture: $1"
-echo "Maintainer: Carsten Larsen <cs@innolan.net>"
+echo "Maintainer: Carsten Sonne Larsen <cs@innolan.net>"
 echo "Installed-Size: $4"
 echo "Depends: libc6"
 echo "Section: math"
 echo "Priority: optional"
-echo "Homepage: http://amath.innolan.net"
+echo "Homepage: https://amath.innolan.net"
 echo "Built-Using: gcc-5.4"
 echo "Description: Simple command line calculator"
 echo " Features a case sensitive command line interface, internal IEEE 754"
@@ -114,10 +146,10 @@ chmod 0755 amath/DEBIAN/control
 {
 echo "Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/"
 echo "Upstream-Name: amath-dev"
-echo "Source: http://amath.innolan.net"
-echo 
+echo "Source: https://amath.innolan.net"
+echo
 echo "Files:     *"
-echo "Copyright: 2014-2017 Carsten Sonne Larsen <cs@innolan.net>"
+echo "Copyright: 2014-2021 Carsten Sonne Larsen <cs@innolan.net>"
 echo "           2007 The NetBSD Foundation, Inc."
 echo "           1990, 1993 The Regents of the University of California."
 echo "License:   BSD-2-Clause"
@@ -141,20 +173,8 @@ echo " SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVE
 echo " CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,"
 echo " OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE"
 echo " OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-} >amath/DEBIAN/copyright
-gzip --best -n amath/DEBIAN/copyright
-chmod 0755 amath/DEBIAN/copyright.gz
-
-# Create change log
-{
-echo "amath (${version}) unstable; urgency=low"
-echo
-echo "  * Initial Debian Release."
-echo
-echo " -- Carsten Larsen <cs@innolan.net> Sat, 04 Mar 2017 19:49:07 +0100"
-} >amath/DEBIAN/changelog.Debian
-gzip --best -n amath/DEBIAN/changelog.Debian
-chmod 0755 amath/DEBIAN/changelog.Debian.gz
+} >amath/usr/share/doc/amath-dev/copyright
+chmod 644 amath/usr/share/doc/amath-dev/copyright
 
 {
 echo "libamath ${version}"

builddist

@@ -1,63 +1,128 @@
 #!/bin/sh
+#
+# Build Classic AmigaOS distribtion package
+# This file is public domain
+#
+# Project homepage:
+# https://amath.innolan.net
+#
+
+# Add compiler path before invoking. Fx:
+# export PATH="/opt/m68k-amigaos/bin/:$PATH"
 
 set -e
 
-rm -f amath.lha
-rm -Rf amath
-rm -Rf dist
-mkdir dist
+distdir="dist"
+builddir="tmp"
+bindir="bin"
+stamp="202101120000"
+
+rm -Rf ${distdir}
+rm -Rf ${builddir}
+mkdir -p ${builddir}
 
-./configure --disable-test --cross-compile="m68k-amigaos" CFLAGS="-m68000 -noixemul"
+# Build binaries
+./configure --disable-test --disable-pic --cross-compile="m68k-amigaos" CFLAGS="-m68000 -noixemul"
 make clean
 make static
-mv amath dist/amath.000
+mv amath ${builddir}/amath
 make clean
-./configure --disable-test --cross-compile="m68k-amigaos" CFLAGS="-m68020 -noixemul"
+./configure --disable-test --disable-pic --cross-compile="m68k-amigaos" CFLAGS="-m68020 -noixemul"
 make static
-mv amath dist/amath.020
+mv amath ${builddir}/amath.020
 make clean
-./configure --disable-test --cross-compile="m68k-amigaos" CFLAGS="-m68030 -noixemul"
+./configure --disable-test --disable-pic --cross-compile="m68k-amigaos" CFLAGS="-m68030 -noixemul"
 make static
-mv amath dist/amath.030
+mv amath ${builddir}/amath.030
 make clean
 
-./configure --enable-test --cross-compile="m68k-amigaos" CFLAGS="-m68000 -noixemul"
+# Build test binaries
+./configure --enable-test --disable-pic --cross-compile="m68k-amigaos" CFLAGS="-m68000 -noixemul"
 make static
-mv amath dist/amath-test.000
+mv amath ${builddir}/amath-test
 make clean
-./configure --enable-test --cross-compile="m68k-amigaos" CFLAGS="-m68020 -noixemul"
+./configure --enable-test --disable-pic --cross-compile="m68k-amigaos" CFLAGS="-m68020 -noixemul"
 make static
-mv amath dist/amath-test.020
+mv amath ${builddir}/amath-test.020
 make clean
-./configure --enable-test --cross-compile="m68k-amigaos" CFLAGS="-m68030 -noixemul"
+./configure --enable-test --disable-pic --cross-compile="m68k-amigaos" CFLAGS="-m68030 -noixemul"
 make static
-mv amath dist/amath-test.030
+mv amath ${builddir}/amath-test.030
 make clean
 
-cd dist
+# Build catalogs
+make catalogs
+make clean
+
+# Build documentation
+#./build/doc >${builddir}/amath.doc amath.1
+groff >${builddir}/amath.html amath.1 -mandoc -Thtml
+
+# Generate hashkeys
+cd ${builddir}
 touch hashkeys
-sha1sum amath.000 >>hashkeys
+sha1sum amath >>hashkeys
 sha1sum amath.020 >>hashkeys
 sha1sum amath.030 >>hashkeys
-sha1sum amath-test.000 >>hashkeys
+sha1sum amath-test >>hashkeys
 sha1sum amath-test.020 >>hashkeys
 sha1sum amath-test.030 >>hashkeys
-sha256sum amath.000 >>hashkeys
+sha256sum amath >>hashkeys
 sha256sum amath.020 >>hashkeys
 sha256sum amath.030 >>hashkeys
-sha256sum amath-test.000 >>hashkeys
+sha256sum amath-test >>hashkeys
 sha256sum amath-test.020 >>hashkeys
 sha256sum amath-test.030 >>hashkeys
 cd ..
 
-make catalogs
-cp LICENSE dist/
-cp HISTORY dist/
+# Build distribution directory structure
+mkdir -m 775 ${distdir}
+mkdir -m 775 ${distdir}/amath
+mkdir -m 775 ${distdir}/amath/ARexx
+mkdir -m 775 ${distdir}/amath/Catalog
+mkdir -m 775 ${distdir}/amath/Catalog/english
+mkdir -m 775 ${distdir}/amath/Script
+mkdir -m 775 ${distdir}/amath/Test
+
+# Install icons
+install -m 664 ${bindir}/root/*.info ${distdir}/
+install -m 664 ${bindir}/prog/*.info ${distdir}/amath/
+install -m 664 ${bindir}/catalog/*.info ${distdir}/amath/Catalog/
+install -m 664 ${bindir}/script/*.info ${distdir}/amath/Script/
+
+# Install documentation
+install -m 664 HISTORY ${distdir}/amath/
+install -m 664 LICENSE ${distdir}/amath/
+install -m 664 ${builddir}/hashkeys ${distdir}/amath/
+install -m 664 ${builddir}/amath.html ${distdir}/amath/
+install -m 664 ${bindir}/amath.doc ${distdir}/amath/
+install -m 664 ${bindir}/amath.readme ${distdir}/amath/
+
+# Install scripts
+install -m 755 arexx/* ${distdir}/amath/ARexx/
+install -m 755 script/* ${distdir}/amath/Script/
+
+# Install binaries
+install -m 755 ${builddir}/amath ${distdir}/amath/
+install -m 755 ${builddir}/amath.020 ${distdir}/amath/
+install -m 755 ${builddir}/amath.030 ${distdir}/amath/
+install -m 755 ${builddir}/amath-test ${distdir}/amath/Test/
+install -m 755 ${builddir}/amath-test.020 ${distdir}/amath/Test/
+install -m 755 ${builddir}/amath-test.030 ${distdir}/amath/Test/
+
+# Install catalogs
+install -m 755 distcat/catalog/english/*.catalog ${distdir}/amath/Catalog/english/
+
+# Sign build with date
+date -Ru >${distdir}/amath/build_date
+#uname -srmo >${distdir}/amath/build_host
+
+for f in $(find ${distdir} -name '*'); do touch -amt ${stamp}.00 $f; done
 
-mkdir dist/script
-cp script/* dist/script/
-date -Ru >dist/build_date
-#uname -srmo >dist/build_host
+# Cleanup
+rm -Rf distcat
+rm -Rf ${builddir}
 
-mv dist amath
-#lha-ac a amath.lha amath
+# Install source
+./buildsrc
+mv amath-1.9.0 ${distdir}/

buildsrc

@@ -1,16 +1,21 @@
-#! /bin/sh
+#!/bin/sh
+#
+# Build source distribtion package
+# This file is public domain
+#
+# Project homepage:
+# https://amath.innolan.net
+#
 
 # DO NOT USE THIS SCRIPT UNLESS YOU KNOW WHAT YOU ARE DOING !
 
-version='1.8.0'
-stamp="201704130000"
-#stamp="201704110000"
-srcdir="amath-rc"
+version='1.9.0'
+stamp="202101120000"
+srcdir="."
 distdir="amath-${version}"
-cd ..
 
 rm -f amath-${version}.tar.gz
-rm -Rf amath-${version}
+rm -Rf ${distdir}
 
 mkdir -m 775 ${distdir}
 mkdir -m 775 ${distdir}/src/
@@ -51,6 +56,7 @@ install -m 664 ${srcdir}/LICENSE ${distdir}/
 install -m 664 ${srcdir}/README ${distdir}/
 install -m 664 ${srcdir}/amath.1 ${distdir}/
 install -m 775 ${srcdir}/configure ${distdir}/
+install -m 775 ${srcdir}/builddeb ${distdir}/
 install -m 775 ${srcdir}/builddist ${distdir}/
 install -m 775 ${srcdir}/buildwin ${distdir}/
 

buildwin

@@ -1,8 +1,14 @@
 #!/bin/sh
+#
+# This file is public domain
+#
+# Project homepage:
+# https://amath.innolan.net
+#
 
 set -e
 
-version="1.8.0"
+version="1.9.0"
 
 echo "Building amath ${version} for Windows ..."
 

catalog/english/amath-help.ct

@@ -2,19 +2,19 @@
 ## language english
 ## codeset 0
 ; #############################################################################
-; Copyright (c) 2014-2017 Carsten Sonne Larsen <cs@innolan.net>
+; Copyright (c) 2014-2021 Carsten Sonne Larsen <cs@innolan.net>
 ; All rights reserved.
-; 
+;
 ; Redistribution and use in source and binary forms, with or without
 ; modification, are permitted provided that the following conditions are met:
-; 
+;
 ; * Redistributions of source code must retain the above copyright notice, this
 ;   list of conditions and the following disclaimer.
-; 
+;
 ; * Redistributions in binary form must reproduce the above copyright notice,
 ;   this list of conditions and the following disclaimer in the documentation
 ;   and/or other materials provided with the distribution.
-; 
+;
 ; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 ; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 ; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

catalog/english/amath-ident.ct

@@ -31,38 +31,42 @@ No help is available for this function.#NEWLINE#
 cbr
 No help is available for this function.#NEWLINE#
 lb
-No help is available for this function.#NEWLINE#
+Binary logarithm function.#NEWLINE#
 ln
-No help is available for this function.#NEWLINE#
+Natural logarithm function.#NEWLINE#
 lg
-No help is available for this function.#NEWLINE#
+Common logarithm function.#NEWLINE#
 ; Partly from https://wikipedia.org/wiki/Sine
 sin
 Sine is the trigonometric function that for an acute angle is the#NEWLINE#ratio between the leg opposite the angle when it is considered#NEWLINE#part of a right triangle and the hypotenuse.#NEWLINE#
 ; Partly from https://wikipedia.org/wiki/Trigonometric_functions
 cos
-Cosine is the trigonometric function that for an acute angle is the#NEWLINE#ratio between the leg adjacent to the angle when it is considered#NEWLINE#part of a right triangle and the hypotenuse#NEWLINE#
+Cosine is the trigonometric function that for an acute angle is the#NEWLINE#ratio between the leg adjacent to the angle when it is considered#NEWLINE#part of a right triangle and the hypotenuse.#NEWLINE#
 ; Partly from https://wikipedia.org/wiki/Trigonometric_functions