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
+.SH OPTIONS
-.nf
+.TP
-clear       Clear console window
+.BR \-\-noansi
-def         Define function
+Disable output of ANSI escape codes. Default is enable.
-delete      Delete variable or function
+.TP
-digits      Set number of significant digits
+.BR \-\-shell
-eval        Evaluate arithmetic expression
+Open an interactive shell.
-execute     Execute statements in a file
+.SH OPERATORS
-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
 .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
+.RE
-.nf
+.SH BUGS
-cos(1+2i);
+.IP \[bu] 2
-sin(1+2i);
+If \fBamath\fP is linked with system libraries (-lm) sometimes the real part
-tan(1+2i);
+of a result of arccosh of a complex number, is negative instead of positive.
-coth(1+2i);
+.IP \[bu]
-sech(1+2i);
+coth() with complex numbers is inaccurate on the 14th digit.
-csch(1+2i);
+.sp
-.fi
+Please report any other bugs that you encounter via:
-.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>
 .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/
+cp HISTORY amath/usr/share/doc/amath-dev/changelog
-gzip --best -n amath/usr/share/doc/amath/HISTORY
+gzip --best -n amath/usr/share/doc/amath-dev/changelog
-cp README amath/usr/share/doc/amath/
+cp README amath/usr/share/doc/amath-dev/
-gzip --best -n amath/usr/share/doc/amath/README
+gzip --best -n amath/usr/share/doc/amath-dev/README
-chmod 644 amath/usr/share/doc/amath/*
+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 "Source: https://amath.innolan.net"
-echo 
+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
+} >amath/usr/share/doc/amath-dev/copyright
-gzip --best -n amath/DEBIAN/copyright
+chmod 644 amath/usr/share/doc/amath-dev/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
 
 {
 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
+distdir="dist"
-rm -Rf amath
+builddir="tmp"
-rm -Rf dist
+bindir="bin"
-mkdir dist
+stamp="202101120000"
 
-./configure --disable-test --cross-compile="m68k-amigaos" CFLAGS="-m68000 -noixemul"
+rm -Rf ${distdir}
+rm -Rf ${builddir}
+mkdir -p ${builddir}
+
+# 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
+# Build distribution directory structure
-cp LICENSE dist/
+mkdir -m 775 ${distdir}
-cp HISTORY dist/
+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
 
-mkdir dist/script
+# Install icons
-cp script/* dist/script/
+install -m 664 ${bindir}/root/*.info ${distdir}/
-date -Ru >dist/build_date
+install -m 664 ${bindir}/prog/*.info ${distdir}/amath/
-#uname -srmo >dist/build_host
+install -m 664 ${bindir}/catalog/*.info ${distdir}/amath/Catalog/
+install -m 664 ${bindir}/script/*.info ${distdir}/amath/Script/
 
-mv dist amath
+# Install documentation
-#lha-ac a amath.lha amath
+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
+
+# Cleanup
+rm -Rf distcat
+rm -Rf ${builddir}
+
+# 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'
+version='1.9.0'
-stamp="201704130000"
+stamp="202101120000"
-#stamp="201704110000"
+srcdir="."
-srcdir="amath-rc"
 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
 tan
 Tangent is one of the trigonometry functions. In a right triangle,#NEWLINE#the tangent of an angle is the opposite side over the adjacent side.#NEWLINE#
+; Partly from https://wikipedia.org/wiki/Trigonometric_functions
 cot
-No help is available for this function.#NEWLINE#
+The cotangent cot(x), ctg(x) or ctn(x), is the reciprocal of tan(x).#NEWLINE#The cotangent is the ratio of the length of the adjacent side to the length of the opposite side.#NEWLINE#
+; Partly from https://wikipedia.org/wiki/Trigonometric_functions
 sec
-No help is available for this function.#NEWLINE#
+The secant sec(x) is the reciprocal of cos(x).#NEWLINE#The secant is the ratio of the length of the hypotenuse to the length of the adjacent side.#NEWLINE#So called because it is the tangent of the complementary or co-angle.#NEWLINE#
+; Partly from https://wikipedia.org/wiki/Trigonometric_functions
 csc
-No help is available for this function.#NEWLINE#
+The cosecant csc(x) or cosec(x), is the reciprocal of sin(x).#NEWLINE#The cosecant is the ratio of the length of the hypotenuse to the length of the opposite side.#NEWLINE#So called because it is the secant of the complementary or co-angle.#NEWLINE#
+; Partly from https://wikipedia.org/wiki/Trigonometric_functions
 asin
-No help is available for this function.#NEWLINE#
+arc sine function.#NEWLINE#
 acos
-No help is available for this function.#NEWLINE#
+arc cosine function.#NEWLINE#
 atan
-No help is available for this function.#NEWLINE#
+arc tangent function of one variable.#NEWLINE#
 acot
-No help is available for this function.#NEWLINE#
+arc cotangent function.#NEWLINE#
 asec
-No help is available for this function.#NEWLINE#
+arc secant function.#NEWLINE#
 acsc
-No help is available for this function.#NEWLINE#
+arc cosecant function.#NEWLINE#
 sinh
 No help is available for this function.#NEWLINE#
 cosh
@@ -116,14 +120,14 @@ No help is available for this function.#NEWLINE#
 ahvc
 No help is available for this function.#NEWLINE#
 ahcv
-No help is available for this function.#NEWLINE#
+The inverse hacoversed sine is not implemented in this version of amath.#NEWLINE#
 ahcc
-No help is available for this function.#NEWLINE#
+The inverse hacoversed cosine is not implemented in this version of amath.#NEWLINE#
 exsec
-No help is available for this function.#NEWLINE#
+exsecant function.#NEWLINE#
 excsc
-No help is available for this function.#NEWLINE#
+excosecant function.#NEWLINE#
 aexsec
-No help is available for this function.#NEWLINE#
+inverse exsecant function.#NEWLINE#
 aexcsc
-No help is available for this function.#NEWLINE#
+inverse excosecant function.#NEWLINE#

catalog/english/amath-text.ct

@@ -1,20 +1,20 @@
-## version $VER: amath-text.catalog 1.70 (28.02.2017) English
+## version $VER: amath-text.catalog 1.84 (05.08.2018) English
 ## 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
@@ -33,6 +33,8 @@ INTROMSG
 #NORMALTEXT##BOLD##STARTMSG##NEWLINE##NORMALTEXT##COLOR02#Type help to show info.#NEWLINE#
 STATEMENTLINE
 ---------------------------------------------------------#NEWLINE#
+STATEMENTABOUT
+about      Show about text#NEWLINE#
 STATEMENTCLEAR
 clear      Clear console window.#NEWLINE#
 STATEMENTDEF
@@ -65,6 +67,8 @@ STATEMENTVARS
 variables  Show list of variables.#NEWLINE#
 STATEMENTVERSION
 version    Show version string.#NEWLINE#
+STATEMENTLICENSE
+license    Show copyright and license texts#NEWLINE#
 STATEMENTMEMORY
 memory     Show internal memory usage.#NEWLINE#
 STATEMENTEXIT

configure

@@ -1,8 +1,8 @@
 #!/bin/sh
-# 
+#
-# 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:
@@ -11,7 +11,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 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
@@ -23,11 +23,11 @@
 # 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.
-# 
+#
 
 set -e
 
-version="1.8.0"
+version="1.9.0"
 
 clang=false
 debugsym=false
@@ -36,6 +36,7 @@ openlibm=false
 stdlibm=false
 stdlibc=false
 useldconfig=false
+fpic=false
 
 prefix="/usr"
 pkgconfigdir="lib/pkgconfig"
@@ -45,6 +46,7 @@ cxxflags=""
 ldflags=""
 gcclib="-lstdc++"
 libm=""
+libc=""
 
 for arg in "$@"; do
 	unknown=true
@@ -64,6 +66,15 @@ for arg in "$@"; do
 		unknown=false
 		;;
 
+	--man-dir=*)
+		mandir=`echo $arg | sed 's/--mandir=//'`
+		unknown=false
+		;;
+
+	--doc-dir=*)
+		unknown=false
+		;;
+
 	--cross-compile=*)
 		crosscompile=`echo $arg | sed 's/--cross-compile=//'`
 		crosscompile="${crosscompile}-"
@@ -107,6 +118,17 @@ for arg in "$@"; do
 		useldconfig=false
 		unknown=false
 		;;
+
+	--enable-pic)
+		fpic=true
+		unknown=false
+		;;
+
+	--disable-pic)
+		fpic=false
+		unknown=false
+		;;
+
 	--enable-debug)
 		debugsym=true
 		unknown=false
@@ -180,10 +202,12 @@ for arg in "$@"; do
 		echo '  --disable-debug: do not include debug symbols'
 		echo '  --enable-test: build code with regression tests'
 		echo '  --disable-test: do not include regression test'
-		echo '  --enable-clang: build with clang compiler'
+		echo '  --enable-clang: build explicit with clang compiler'
-		echo '  --disable-clang: do not build with clang compiler'
+		echo '  --disable-clang: do not explicit build with clang compiler'
 		echo '  --enable-ldconfig: use ldconfig to registre libraries'
 		echo '  --disable-ldconfig: do not use ldconfig to registre libraries'
+		echo '  --enable-pic: build with Position Independent Code (-fPIC)'
+		echo '  --disable-pic: do not build static libraries with Position Independent Code'
 		echo '  --with-libm: link with libm library (-lm)'
 		echo '  --without-libm: do not link with libm library'
 		echo '  --with-openlibm: link with openlibm library (-lopenlibm)'
@@ -240,7 +264,7 @@ if $stdlibm; then
 	mflags="-DLIBM "
 	dlibm=true
 fi
-		
+
 if $openlibm; then
 	libm="-lopenlibm "
 	mflags="-DLIBM "
@@ -255,6 +279,13 @@ fi
 
 if $stdlibc; then
 	gcclib="${gcclib} -lc"
+	libc="-lc"
+fi
+
+if $fpic; then
+	fPIC=" -fPIC"
+else
+	fPIC=""
 fi
 
 cflags="${cflags}${debugflag}${mflags}"
@@ -275,16 +306,16 @@ values.cpp
 viewer.cpp
 '
 SYSSRCS='
+amiga_arexx.cpp
 console.cpp
 console_amiga.cpp
 console_stdc.cpp
-console_posix.cpp
+console_termios.cpp
 console_windows.cpp
 filesystem_amiga.cpp
 filesystem_stdc.cpp
 language.cpp
 language_amiga.cpp
-language_posix.cpp
 language_stdc.cpp
 preferences.cpp
 preferences_amiga.cpp
@@ -567,7 +598,7 @@ ldlibflags="-l${amathapp} ${libm}-l${amathcplex} ${libm}-l${amath} -l${amathc} $
 ############################ Main Application ###########################
 {
 echo "CXX      = ${crosscompile}${cxxcompiler}"
-echo "CXXFLAGS = ${appop}${options} ${cxxflags}-I. -I.. -Wall"
+echo "CXXFLAGS = ${appop}${options} ${cxxflags}${fPIC} -I. -I.. -Wall"
 echo "AR       = ${crosscompile}ar"
 echo "RANLIB   = ${crosscompile}ranlib"
 echo "DEL      = rm -f"
@@ -599,7 +630,7 @@ echo
 ########################### Functions Library ###########################
 {
 echo "CXX      = ${crosscompile}${cxxcompiler}"
-echo "CXXFLAGS = ${appop}${options} ${cxxflags}-I. -I../.. -Wall"
+echo "CXXFLAGS = ${appop}${options} ${cxxflags}${fPIC} -I. -I../.. -Wall"
 echo "AR       = ${crosscompile}ar"
 echo "RANLIB   = ${crosscompile}ranlib"
 echo "DEL      = rm -f"
@@ -631,7 +662,7 @@ echo
 ########################### Statement Library ###########################
 {
 echo "CXX      = ${crosscompile}${cxxcompiler}"
-echo "CXXFLAGS = ${appop}${options} ${cxxflags}-I. -I../.. -Wall"
+echo "CXXFLAGS = ${appop}${options} ${cxxflags}${fPIC} -I. -I../.. -Wall"
 echo "AR       = ${crosscompile}ar"
 echo "RANLIB   = ${crosscompile}ranlib"
 echo "DEL      = rm -f"
@@ -663,7 +694,7 @@ echo
 ############################ System Library #############################
 {
 echo "CXX      = ${crosscompile}${cxxcompiler}"
-echo "CXXFLAGS = ${appop}${options} ${cxxflags}-I. -I.. -Wall"
+echo "CXXFLAGS = ${appop}${options} ${cxxflags}${fPIC} -I. -I.. -Wall"
 echo "AR       = ${crosscompile}ar"
 echo "RANLIB   = ${crosscompile}ranlib"
 echo "DEL      = rm -f"
@@ -725,7 +756,7 @@ for f in ${LIBAPPSRCS}
 do
 	b=`basename $f .cpp`
 	echo "static/${b}.o:	${f}"
-	echo "	\${CXX} \${CXXFLAGS} -c ${f} -o static/${b}.o"
+	echo "	\${CXX} \${CXXFLAGS}${fPIC} -c ${f} -o static/${b}.o"
 	echo
 	echo "shared/${b}.o:	${f}"
 	echo "	\${CXX} \${CXXFLAGS} -fPIC -c ${f} -o shared/${b}.o"
@@ -836,7 +867,7 @@ for f in ${LIBC1SRCS}
 do
 	b=`basename $f .c`
 	echo "static/${b}.o:	${f}"
-	echo "	\${CC} \${CFLAGS} -fno-builtin -c ${f} -o static/${b}.o"
+	echo "	\${CC} \${CFLAGS}${fPIC} -fno-builtin -c ${f} -o static/${b}.o"
 	echo
 	echo "shared/${b}.o:	${f}"
 	echo "	\${CC} \${CFLAGS} -fPIC -fno-builtin -c ${f} -o shared/${b}.o"
@@ -851,7 +882,7 @@ echo "	\${MKDIR} static"
 echo "	\${MKDIR} shared"
 echo
 echo "\${solib}:	build ${libcs}"
-echo "	\${CC} \${CFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib}${soverion} -o \${solib} ${libcs} -lc"
+echo "	\${CC} \${CFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib}${soverion} -o \${solib} ${libcs}"
 echo
 echo "\${alib}:	build ${libc}"
 echo "	\${AR} rcs static/\${alib} ${libc}"
@@ -935,7 +966,7 @@ for f in ${LIBREALSRCS}
 do
 	b=`basename $f .c`
 	echo "static/${b}.o:	${f}"
-	echo "	\${CC} \${CFLAGS} -fno-builtin -c ${f} -o static/${b}.o"
+	echo "	\${CC} \${CFLAGS}${fPIC} -fno-builtin -c ${f} -o static/${b}.o"
 	echo
 	echo "shared/${b}.o:	${f}"
 	echo "	\${CC} \${CFLAGS} -fPIC -fno-builtin -c ${f} -o shared/${b}.o"
@@ -1032,7 +1063,7 @@ for f in ${LIBCPLEXSRCS}
 do
 	b=`basename $f .c`
 	echo "static/${b}.o:	${f}"
-	echo "	\${CC} \${CFLAGS} -fno-builtin -c ${f} -o static/${b}.o"
+	echo "	\${CC} \${CFLAGS}${fPIC} -fno-builtin -c ${f} -o static/${b}.o"
 	echo
 	echo "shared/${b}.o:	${f}"
 	echo "	\${CC} \${CFLAGS} -fPIC -fno-builtin -c ${f} -o shared/${b}.o"
@@ -1163,10 +1194,10 @@ echo "	cd src/cplex && \${MAKE} doc"
 echo
 echo "catalogs:"
 echo "	cd build/flexcat && \${MAKE}"
-echo "	\${MKDIR}  dist/catalog/english"
+echo "	\${MKDIR}  distcat/catalog/english"
-echo "	\${FLXCAT} text/help.cd catalog/english/amath-help.ct CATALOG dist/catalog/english/amath-help.catalog"
+echo "	\${FLXCAT} text/help.cd catalog/english/amath-help.ct CATALOG distcat/catalog/english/amath-help.catalog"
-echo "	\${FLXCAT} text/ident.cd catalog/english/amath-ident.ct CATALOG dist/catalog/english/amath-ident.catalog"
+echo "	\${FLXCAT} text/ident.cd catalog/english/amath-ident.ct CATALOG distcat/catalog/english/amath-ident.catalog"
-echo "	\${FLXCAT} text/text.cd catalog/english/amath-text.ct CATALOG dist/catalog/english/amath-text.catalog"
+echo "	\${FLXCAT} text/text.cd catalog/english/amath-text.ct CATALOG distcat/catalog/english/amath-text.catalog"
 echo
 echo "shared-libs:"
 echo "	cd src/lib && \${MAKE} shared"
@@ -1189,7 +1220,7 @@ echo
 echo ".PHONY: test"
 echo "test: amath"
 echo "	LD_LIBRARY_PATH=src/clib/:src/lib:src/cplex:scr/real"
-echo "	./amath test"
+echo "	./amath --test"
 echo
 echo ".PHONY: install"
 echo "install:"

src/amath.h

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,117 +23,135 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #ifndef AMATH_H
 #define AMATH_H
-/******************************************************************************/
+
-#ifdef  __AMIGA__
+/* Operating System */
-# ifndef AOS3
+#if defined(__MORPHOS__)
-# define AOS3
+# define SYS_NAME "MorphOS"
-# endif
-#endif
-/******************************************************************************/
-#ifdef  __AROS__
-# ifndef AROS
-# define AROS
-# endif
-#endif
-/******************************************************************************/
-#ifdef  __MORPHOS__
 # ifndef MORPHOS
 # define MORPHOS
 # endif
-#endif
+#elif defined(__amigaos4__)
-/******************************************************************************/
+# define SYS_NAME "AmigaOS 4"
-#ifdef  __amigaos4__
 # ifndef AOS4
 # define AOS4
 # endif
-#endif
+#elif defined(__AMIGA__) || defined(__amigaos3__)
-/******************************************************************************/
+# define SYS_NAME "AmigaOS 3"
-#ifdef __HAIKU__
+# ifndef AOS3
+# define AOS3
+# endif
+#elif defined(__AROS__)
+# define SYS_NAME "AROS"
+# ifndef AROS
+# define AROS
+# endif
+#elif defined(__HAIKU__)
+# define SYS_NAME "Haiku"
 # ifndef HAIKU
 # define HAIKU
 # endif
-#endif
+#elif defined(__APPLE__) && defined(__MACH__)
-/******************************************************************************/
+# define SYS_NAME "Apple"
-#ifdef __APPLE__
 # ifndef APPLE
 # define APPLE
 # endif
-#endif
+#elif defined(__FreeBSD__)
-/******************************************************************************/
+# define SYS_NAME "FreeBSD"
-#if defined(_WIN32) || defined(_WIN64)
+# ifndef FREEBSD
+# define FREEBSD
+# endif
+#elif defined(__NetBSD__)
+# define SYS_NAME "NetBSD"
+# ifndef NETBSD
+# define NETBSD
+# endif
+#elif defined(__OpenBSD__)
+# define SYS_NAME "OpenBSD"
+# ifndef OPENBSD
+# define OPENBSD
+# endif
+#elif defined(__DragonFly__)
+# define SYS_NAME "DragonFly BSD"
+# ifndef DRAGONFLY
+# define DRAGONFLY
+# endif
+#elif defined(__linux__)
+# define SYS_NAME "Linux"
+# ifndef LINUX
+# define LINUX
+# endif
+#elif defined(_WIN32)
+# define SYS_NAME "Windows"
+# ifndef WINDOWS
+# define WINDOWS
+# endif
+#elif defined(_WIN64)
+# define SYS_NAME "Windows 64 bit"
 # ifndef WINDOWS
 # define WINDOWS
 # endif
 #endif
-/******************************************************************************/
+
 #if defined(AOS3) || defined(AOS4) || defined(AROS) || defined (MORPHOS)
 # ifndef AMIGA
 # define AMIGA
 # endif
 #endif
-/******************************************************************************/
+
 #if defined(unix) || defined(__unix__) || defined(__unix)
 # ifndef UNIX
 # define UNIX
 # endif
-#endif
+# ifndef SYS_NAME
-/******************************************************************************/
+# define SYS_NAME "Unix variant"
-#if defined(HAIKU) || defined(UNIX) || defined(APPLE) || defined(_POSIX_VERSION)
-# ifndef POSIX
-# define POSIX
 # endif
 #endif
-/******************************************************************************/
+
-#if !defined(AMIGA) && !defined(POSIX) && !defined(WINDOWS)
+#if defined(HAIKU) || defined(UNIX) || defined(APPLE)
-# ifndef STDC_CONSOLE
+# ifndef TERMIOS
-# define STDC_CONSOLE
+# define TERMIOS
 # endif
-#endif
-/******************************************************************************/
-#if defined(POSIX)
 # include <stdint.h>
 # include <unistd.h>
-# include <dirent.h>
 #endif
-/******************************************************************************/
+
 #if defined(WINDOWS)
 # include <stdint.h>
 #endif
-/******************************************************************************/
+
+#if defined(AROS) || defined(MORPHOS) || defined(AOS4)
+# include <stdint.h>
+# include <sys/types.h>
+#endif
+
 #if defined(AOS3)
 # include <sys/types.h>
-# define IPTR      LONG*
 # define uintptr_t uint32_t
 typedef u_int8_t   uint8_t;
 typedef u_int16_t  uint16_t;
 typedef u_int32_t  uint32_t;
 typedef u_int64_t  uint64_t;
 #endif
-/******************************************************************************/
+
-#if defined(AROS) || defined(MORPHOS) || defined(AOS4) || defined(APPLE)
-# include <stdint.h>
-# include <sys/types.h>
-#endif
-/******************************************************************************/
 #if (__cplusplus <= 199711L && !defined(WINDOWS)) || !defined(__cplusplus)
-#ifndef nullptr
+# ifndef nullptr
-#define nullptr 0
+# define nullptr 0
-#endif
+# endif
 #elif (__cplusplus <= 199711L) && (defined(__GNUC__) || defined(__GNUG__))
-#ifndef nullptr
+# ifndef nullptr
-#define nullptr 0
+# define nullptr 0
+# endif
 #endif
-#endif
+
-/******************************************************************************/
 #define assert(x)
-/******************************************************************************/
+
-/* Compilers*/
+/* Compilers */
 #if defined(__clang__)
 /* Clang */
 # if defined(__apple_build_version__)
@@ -186,7 +204,9 @@ typedef u_int64_t  uint64_t;
 # elif (_MSC_VER == 1900)
 #  define COMP_VERS      "14.0"
 # elif (_MSC_VER > 1900)
-#  define COMP_VERS      "15.0+"
+#  define COMP_VERS      "15.x"
+# elif (_MSC_VER > 1920)
+#  define COMP_VERS      "16.0+"
 # else
 #  define str(x)         #x
 #  define MSC_VER_STR(x) str(x)
@@ -219,29 +239,29 @@ typedef u_int64_t  uint64_t;
 #  define COMP_VERS      GCC_VER_STR(__GNUC__) DOT GCC_VER_STR(__GNUC_MINOR__)
 # endif
 #endif
-/******************************************************************************/
+
 #define EMPTYSTRING ""
 #define SPACE       " "
 #define DOT         "."
-/******************************************************************************/
+
 #if defined(WINDOWS)
 #define NEWLINE     "\r\n"
 #elif defined(APPLE)
-#define NEWLINE     "\r"
+#define NEWLINE     "\n"
 #else
 #define NEWLINE     "\n"
 #endif
-/******************************************************************************/
+
 #ifndef __cplusplus
 typedef int bool;
 #define true  1
 #define false 0
 #endif
-/******************************************************************************/
+
 #define LONG_BIT    32
 #define wsize       sizeof(unsigned int)
 #define wmask       (wsize - 1)
-/******************************************************************************/
+
 #if defined(INTELCPU)  || defined(i386)    || defined(i486)  ||  \
     defined(intel)     || defined(x86)     || defined(i86pc) ||  \
     defined(__i386__)  || defined(_M_IX86)
@@ -253,18 +273,18 @@ typedef int bool;
 #if defined(__x86_64__) || defined(_M_AMD64)
 # define TXTCPU          "amd64"
 #endif
-/******************************************************************************/
+
 #if defined(__powerpc__) || defined(__powerpc64__)
 # define TXTCPU          "PowerPC"
 #endif
-/******************************************************************************/
+
 #if defined(__arm__) || defined(_M_ARM) || defined(__ARM_ARCH_6__)
 # define TXTCPU          "arm"
 #endif
 #if defined(__aarch64__) || defined(_M_ARM64)
 # define TXTCPU          "arm64"
 #endif
-/******************************************************************************/
+
 #if defined(m68060) || defined(mc68060)
 # define TXTCPU          "68060"
 #elif defined(m68040) || defined(mc68040)
@@ -278,47 +298,33 @@ typedef int bool;
 #elif defined(m68000) || defined(mc68000)
 # define TXTCPU          "68000+"
 #endif
-/******************************************************************************/
+
 #ifndef TXTCPU
 //#error what cpu is this ?!
 # define TXTCPU EMPTYSTRING
 #endif
-/******************************************************************************/
+
 #if defined(TXTCPU) && defined(__HAVE_68881__)
 # define TXTFPU SPACE    "FPU"
 #else
 # define TXTFPU EMPTYSTRING
 #endif
-/******************************************************************************/
+
 #define TXTARCH          TXTCPU TXTFPU
-#define RELDATESTAMP     "(13-04-2017)"
+#define RELDATESTAMP     "(11-01-2021)"
-#define TXTDOSVERSION    "\0$VER: amath 1.80" SPACE RELDATESTAMP SPACE TXTARCH
+#define TXTDOSVERSION    "\0$VER: amath 1.90" SPACE RELDATESTAMP SPACE TXTARCH
-#define TXTTITLE         "amath version 1.8.0"
+#define TXTTITLE         "amath version 1.9.0"
-#define TXTCOPYRIGHT     "(c) 2017 Carsten Sonne Larsen"
+#define TXTCOPYRIGHT     "(c) 2021 Carsten Sonne Larsen"
 #define TXTSTARTMSG      TXTTITLE SPACE TXTCOPYRIGHT
-/******************************************************************************/
+
 #define TXTVERSMSG       TXTTITLE SPACE RELDATESTAMP SPACE TXTARCH
 #define TXTCOMPMSG       "Compiled with " COMP_NAME SPACE COMP_VERS
-/******************************************************************************/
+
-#define CPROCNAME        "amath_console"
+#ifdef SYS_NAME
-/******************************************************************************/
+# define TXTSYSMSG       TXTCOMPMSG " for " SYS_NAME
-#if defined(AMIGA)
+# define SYSKNOWN        1
-#define AMIGADOS_NAME    "dos.library"
+#else
-#define AMIGADOS_REV     33L
+# define TXTSYSMSG       TXTCOMPMSG
-#define INTUITION_REV    37L
-#define INTUITION_NAME   "intuition.library"
-#define GRAPHICS_REV     37L
-#define GRAPHICS_NAME    "graphics.library"
-#define LOCALE_REV       38L
-#define LOCALE_NAME      "locale.library"
-#define DEVCONSOLE       "console.device"
-#define PORTCR           "RKM.console.read"
-#define PORTCW           "RKM.console.write"
-#define CATALOG_HELP     "amath-help.catalog"
-#define CATALOG_IDEN     "amath-ident.catalog"
-#define CATALOG_TEXT     "amath-text.catalog"
-#define CATALOG_KEYW     "amath-keyword.catalog"
-#define CATALOG_DEF      OC_BuiltInLanguage, "english"
 #endif
-/******************************************************************************/
+
 #endif

src/amathc.h

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #ifndef AMATHC_H

src/amatht.h

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #ifndef AMATHT_H

src/clib/alloccpy.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,13 +23,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "amathc.h"
 
-#ifdef AMIGA
+#if defined(AMIGA)
 #include <clib/exec_protos.h>
 #endif
 
@@ -58,7 +58,7 @@ unsigned int AllocAndCopy(char** destination, const char* source)
     *destination = AllocMemSafe(size);
     d = *destination;
 
-#ifdef AMIGA // Take advantage of exec
+#if defined(AMIGA) // Take advantage of exec
     CopyMem(s, d, n);
 #else
     while (n--)

src/clib/amathc.3

@@ -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,7 +20,7 @@
 .\" 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 "amathc.h" 3 "Version 1.8.0" "April 13 2017"
+.TH "amathc.h" 3 "Version 1.9.0" "January 11 2021"
 .SH NAME
 amathc.h \- C functions for manipulating strings and memory
 .SH SYNOPSIS
@@ -82,7 +82,7 @@ amathc.h \- C functions for manipulating strings and memory
 .PP
 .SS "unsigned int AllocAndCopy (char ** destination, const char * source)"
 .PP
-Allocate memory and copy a string into the array\&. 
+Allocate memory and copy a string into the array\&.
 .PP
 Definition at line 40 of file alloccpy\&.c\&.
 .PP
@@ -90,32 +90,32 @@ Definition at line 40 of file alloccpy\&.c\&.
 41 {
 42     char *i, *s, *d;
 43     unsigned int n, size;
-44 
+44
 45     if (source == nullptr)
 46     {
 47         *destination = nullptr;
 48         return 0;
 49     }
-50 
+50
 51     i = (char*)source;
 52     s = (char*)source;
 53     while (*i)
 54         i++;
-55 
+55
 56     n = (unsigned int)(i - s + 1);
 57     size = n;
 58     *destination = AllocMemSafe(size);
 59     d = *destination;
-60 
+60
 64     while (n--)
 65         *d++ = *s++;
-67 
+67
 68     return size;
 69 }
 .fi
 .SS "void* AllocMemSafe (size_t)"
 .PP
-Allocate memory and add it to the global memory list\&. 
+Allocate memory and add it to the global memory list\&.
 .PP
 Definition at line 86 of file mem\&.c\&.
 .PP
@@ -123,7 +123,7 @@ Definition at line 86 of file mem\&.c\&.
 87 {
 88     struct MemoryBlock* newblock;
 89     size_t allocsize;
-90 
+90
 91     if (list == nullptr)
 92     {
 93         list = (struct MemoryList*)ALLOC_MEM(sizeof(struct MemoryList));
@@ -132,13 +132,13 @@ Definition at line 86 of file mem\&.c\&.
 96             alloc_error("list", sizeof(struct MemoryList));
 97             return 0;
 98         }
-99 
+99
 100         list->first = nullptr;
 101         list->peak = 0;
 102         list->size = 0;
 103         list->count = 0;
 104     }
-105 
+105
 106 #ifdef P64BIT
 107     // Align to bytes of 8
 108     allocsize = (size + 7) & ~0x07;
@@ -146,14 +146,14 @@ Definition at line 86 of file mem\&.c\&.
 110     // Align to bytes of 4
 111     allocsize = (size + 3) & ~0x03;
 112 #endif
-113 
+113
 114     newblock = (struct MemoryBlock*)ALLOC_MEM(sizeof(struct MemoryBlock));
 115     if (!newblock)
 116     {
 117         alloc_error("block", sizeof(struct MemoryBlock));
 118         return 0;
 119     }
-120 
+120
 121     newblock->address = (struct MemoryBlock*)ALLOC_MEM(allocsize);
 122     if (!newblock->address)
 123     {
@@ -161,25 +161,25 @@ Definition at line 86 of file mem\&.c\&.
 125         alloc_error("memory", allocsize);
 126         return 0;
 127     }
-128 
+128
 129     newblock->size = allocsize;
 130     newblock->next = list->first;
 131     list->first = newblock;
 132     list->size += allocsize;
 133     list->count++;
-134 
+134
 135     if (list->size > list->peak)
 136     {
 137         list->peak = list->size;
 138     }
-139 
+139
 140     // Memory allocated
 141     return newblock->address;
 142 }
 .fi
 .SS "void DetachMemSafe (void * block)"
 .PP
-Detach an allocated memory from the global memory list\&. The memory block is only detached, not deallocated\&. 
+Detach an allocated memory from the global memory list\&. The memory block is only detached, not deallocated\&.
 .PP
 Definition at line 209 of file mem\&.c\&.
 .PP
@@ -190,19 +190,19 @@ Definition at line 209 of file mem\&.c\&.
 .fi
 .SS "void FreeAllSafe ()"
 .PP
-Deallocate all memory in the global memory list\&. 
+Deallocate all memory in the global memory list\&.
 .PP
 Definition at line 217 of file mem\&.c\&.
 .PP
 .nf
 218 {
 219     struct MemoryBlock *current, *next;
-220 
+220
 221     if (list == nullptr)
 222     {
 223         return;
 224     }
-225 
+225
 226     current = list->first;
 227     while (current != nullptr)
 228     {
@@ -211,14 +211,14 @@ Definition at line 217 of file mem\&.c\&.
 231         FREE_MEM(current);
 232         current = next;
 233     }
-234 
+234
 235     FREE_MEM(list);
 236     list = nullptr;
 237 }
 .fi
 .SS "void FreeMemSafe (void *)"
 .PP
-Deallocate memory from the global memory list\&. 
+Deallocate memory from the global memory list\&.
 .PP
 Definition at line 200 of file mem\&.c\&.
 .PP
@@ -229,7 +229,7 @@ Definition at line 200 of file mem\&.c\&.
 .fi
 .SS "void MemCopy (void * destination, const void * source, unsigned int length)"
 .PP
-Copy a block of memory, handling overlap\&. 
+Copy a block of memory, handling overlap\&.
 .PP
 Definition at line 75 of file memcpy\&.c\&.
 .PP
@@ -238,10 +238,10 @@ Definition at line 75 of file memcpy\&.c\&.
 77     char* dst = (char*) destination;
 78     const char* src = (const char*) source;
 79     unsigned int t;
-80 
+80
 81     if (length == 0 || dst == src) // nothing to do
 82         return;
-83 
+83
 84     if ((mem_ptr)dst < (mem_ptr)src)
 85     {
 86         // Copy forward
@@ -254,14 +254,14 @@ Definition at line 75 of file memcpy\&.c\&.
 96             else
 97                 t = wsize - (t & wmask);
 98             length -= t;
-99 
+99
 100             TLOOP1(*dst++ = *src++);
 101         }
-102 
+102
 103         // Copy whole words, then mop up any trailing bytes\&.
 104         t = length / wsize;
 105         TLOOP(*(word *)dst = *(word *)src; src += wsize; dst += wsize);
-106 
+106
 107         t = length & wmask;
 108         TLOOP(*dst++ = *src++);
 110     }
@@ -280,13 +280,13 @@ Definition at line 75 of file memcpy\&.c\&.
 123             else
 124                 t &= wmask;
 125             length -= t;
-126 
+126
 127             TLOOP1(*--dst = *--src);
 128         }
-129 
+129
 130         t = length / wsize;
 131         TLOOP(src -= wsize; dst -= wsize; *(word *)dst = *(word *)src);
-132 
+132
 133         t = length & wmask;
 134         TLOOP(*--dst = *--src);
 135     }
@@ -294,7 +294,7 @@ Definition at line 75 of file memcpy\&.c\&.
 .fi
 .SS "void MemSet (void * destination, int c0, unsigned int length)"
 .PP
-Fill block of memory with a constant value\&. 
+Fill block of memory with a constant value\&.
 .PP
 Definition at line 56 of file memset\&.c\&.
 .PP
@@ -303,7 +303,7 @@ Definition at line 56 of file memset\&.c\&.
 58     unsigned char* dst = (unsigned char*) dst0;
 59     unsigned int t;
 60     unsigned int c;
-61 
+61
 62     /*
 63      * If not enough words, just fill bytes\&.  A length >= 2 words
 64      * guarantees that at least one of them is `complete' after
@@ -325,7 +325,7 @@ Definition at line 56 of file memset\&.c\&.
 80             --length;
 81         }
 82     }
-83 
+83
 84     if ((c = (unsigned char)c0) != 0)
 85     { /* Fill the word\&. */
 86         c = (c << 8) | c; /* u_int is 16 bits\&. */
@@ -336,7 +336,7 @@ Definition at line 56 of file memset\&.c\&.
 91         c = (c << 32) | c;  /* u_int is 64 bits\&. */
 92 #endif
 93     }
-94 
+94
 95     /* Align destination by filling in bytes\&. */
 96     if ((t = (mem_ptr)dst & wmask) != 0)
 97     {
@@ -348,7 +348,7 @@ Definition at line 56 of file memset\&.c\&.
 103         }
 104         while (--t != 0);
 105     }
-106 
+106
 107     /* Fill words\&.  Length was >= 2*words so we know t >= 1 here\&. */
 108     t = length / wsize;
 109     do
@@ -357,7 +357,7 @@ Definition at line 56 of file memset\&.c\&.
 112         dst += wsize;
 113     }
 114     while (--t != 0);
-115 
+115
 116     /* Mop up trailing bytes, if any\&. */
 117     t = length & wmask;
 118     if (t != 0)
@@ -370,7 +370,7 @@ Definition at line 56 of file memset\&.c\&.
 .fi
 .SS "void MemUsage (long *, long *, long *)"
 .PP
-Get memory usage in the global memory list\&. 
+Get memory usage in the global memory list\&.
 .PP
 Definition at line 242 of file mem\&.c\&.
 .PP
@@ -383,26 +383,26 @@ Definition at line 242 of file mem\&.c\&.
 .fi
 .SS "bool StrIsEqual (const char * s1, const char * s2)"
 .PP
-Compare two null terminated strings to each other\&. 
+Compare two null terminated strings to each other\&.
 .PP
 Definition at line 50 of file strcmp\&.c\&.
 .PP
 .nf
 51 {
 52     int r;
-53 
+53
 54     while (*s1 == *s2++)
 55         if (*s1++ == '\0')
 56             return true;
-57 
+57
 58     r = (*(const unsigned char *)s1 - *(const unsigned char *)(s2 - 1));
-59 
+59
 60     return r == 0;
 61 }
 .fi
 .SS "int StrLen (const char * string)"
 .PP
-Get the length of a null terminated string\&. 
+Get the length of a null terminated string\&.
 .PP
 Definition at line 34 of file strlen\&.c\&.
 .PP
@@ -424,10 +424,10 @@ Definition at line 32 of file untag\&.c\&.
 34     const char *pos, *tmp, *tag;
 35     char* dest;
 36     int unsigned i, j, found;
-37 
+37
 38     pos = source;
 39     dest = destination;
-40 
+40
 41     while (*pos != '\0')
 42     {
 43         if (*pos != '#')
@@ -449,7 +449,7 @@ Definition at line 32 of file untag\&.c\&.
 59                     tag++;
 60                     j++;
 61                 }
-62 
+62
 63                 if (j > 1 && *(--tag) == '#')
 64                 {
 65                     // Tag found\&. Now replace\&.
@@ -461,7 +461,7 @@ Definition at line 32 of file untag\&.c\&.
 71                     break;
 72                 }
 73             }
-74 
+74
 75             if (!found)
 76             {
 77                 (*dest++ = *pos++);
@@ -472,14 +472,14 @@ Definition at line 32 of file untag\&.c\&.
 82 }
 .fi
 .SH HOMEPAGE
-http://amath.innolan.net/
+https://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.
 .SH COPYRIGHT
-Copyright (c) 2014-2017 Carsten Sonne Larsen <cs@innolan.net>
+Copyright (c) 2014-2021 Carsten Sonne Larsen <cs@innolan.net>
 .br
 Copyright (c) 2007 The NetBSD Foundation, Inc.
 .br

src/clib/amathc.dox

@@ -1,10 +1,10 @@
 
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "amathc"
-PROJECT_NUMBER         = "1.8.0"
+PROJECT_NUMBER         = "1.9.0"
 PROJECT_BRIEF          = "C functions for manipulating strings and memory"
 PROJECT_LOGO           =
-OUTPUT_DIRECTORY       = 
+OUTPUT_DIRECTORY       =
 CREATE_SUBDIRS         = NO
 ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English

src/clib/amathc.pc

@@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib
 
 Name: amath C library
 Description: C functions for manipulating strings and memory
-Version: 1.8.0
+Version: 1.9.0
 Cflags: -I${includedir}
 Libs: -L${libdir} -lamathc

src/clib/mem.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,30 +23,34 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "amathc.h"
 
-#ifdef AMIGA
+#if defined(AMIGA)
 #include <stddef.h>
 #include <exec/types.h>
 #include <exec/memory.h>
 #include <exec/semaphores.h>
 #include <clib/exec_protos.h>
-#define ALLOC_MEM(x) AllocVec(x, MEMF_ANY | MEMF_CLEAR)
+#define ALLOC_LIST(x) AllocVec(x, MEMF_ANY | MEMF_CLEAR)
-#define FREE_MEM(x) FreeVec(x)
+#define FREE_LIST(x) FreeVec(x)
-#define Debug(x,y,z)
+#define ALLOC_MEM(x, y) AllocPooledZero(x, y)
+#define FREE_MEM(x, y, z) FreePooled(x, y, z)
+#define Debug(x, y, z)
 #else
 #include <stdlib.h>
-#define ALLOC_MEM(x) calloc(1L,x)
+#define ALLOC_LIST(x) calloc(1L, x)
-#define FREE_MEM(x) free(x)
+#define FREE_LIST(x) free(x)
-#define Debug(x,y,z)
+#define ALLOC_MEM(x, y) calloc(1L, y)
+#define FREE_MEM(x, y, z) free(y)
+#define Debug(x, y, z)
 #endif
 
 #if defined(__x86_64__) || defined(__aarch64__) || \
-    defined(_M_AMD64)   || defined(_M_ARM64)    || \
+    defined(_M_AMD64) || defined(_M_ARM64) ||      \
     defined(__powerpc64__)
 #define P64BIT
 #endif
@@ -56,9 +60,9 @@
  */
 struct MemoryBlock
 {
-    struct MemoryBlock* next;
+    struct MemoryBlock *next;
     size_t size;
-    void* address;
+    void *address;
 };
 
 /**
@@ -66,7 +70,8 @@ struct MemoryBlock
  */
 struct MemoryList
 {
-    struct MemoryBlock* first;
+    struct MemoryBlock *first;
+    void *pool;
     size_t peak;
     size_t size;
     long count;
@@ -75,28 +80,56 @@ struct MemoryList
 /**
  * @brief Global list of allocated memory.
  */
-struct MemoryList* list = nullptr;
+struct MemoryList *list = nullptr;
 
-void alloc_error(char*, size_t);
+void alloc_error(char *, size_t);
-void dealloc_error(char*, void*);
+void dealloc_error(char *, void *);
+
+#if defined(AMIGA)
+
+static void MemZero(void *address, ULONG size)
+{
+    char *c = (char *)address;
+    int n = size;
+    do
+    {
+        *c++ = '\0';
+    } while (--n);
+}
+
+static void *AllocPooledZero(void *pool, size_t size)
+{
+    ULONG memSize = (ULONG)size;
+    void *memory = AllocPooled(pool, memSize);
+    if (memory != NULL)
+    {
+        MemZero(memory, memSize);
+    }
+    return memory;
+}
+
+#endif
 
 /**
  * @brief Allocate memory and add it to the global memory list.
  */
-void* AllocMemSafe(size_t size)
+void *AllocMemSafe(size_t size)
 {
-    struct MemoryBlock* newblock;
+    struct MemoryBlock *newblock;
     size_t allocsize;
 
     if (list == nullptr)
     {
-        list = (struct MemoryList*)ALLOC_MEM(sizeof(struct MemoryList));
+        list = (struct MemoryList *)ALLOC_LIST(sizeof(struct MemoryList));
         if (!list)
         {
             alloc_error("list", sizeof(struct MemoryList));
             return 0;
         }
 
+#if defined(AMIGA)
+        list->pool = CreatePool(MEMF_ANY, 4096, 512);
+#endif
         list->first = nullptr;
         list->peak = 0;
         list->size = 0;
@@ -104,24 +137,24 @@ void* AllocMemSafe(size_t size)
     }
 
 #ifdef P64BIT
-    // Align to bytes of 8
+    // Align to bytes of 8, remove 0 bytes allocations
-    allocsize = (size + 7) & ~0x07;
+    allocsize = (size + 8) & ~0x07;
 #else
-    // Align to bytes of 4
+    // Align to bytes of 4, remove 0 bytes allocations
-    allocsize = (size + 3) & ~0x03;
+    allocsize = (size + 4) & ~0x03;
 #endif
 
-    newblock = (struct MemoryBlock*)ALLOC_MEM(sizeof(struct MemoryBlock));
+    newblock = (struct MemoryBlock *)ALLOC_MEM(list->pool, sizeof(struct MemoryBlock));
-    if (!newblock)
+    if (newblock == NULL)
     {
         alloc_error("block", sizeof(struct MemoryBlock));
         return 0;
     }
 
-    newblock->address = (struct MemoryBlock*)ALLOC_MEM(allocsize);
+    newblock->address = (struct MemoryBlock *)ALLOC_MEM(list->pool, allocsize);
-    if (!newblock->address)
+    if (newblock->address == NULL)
     {
-        FREE_MEM(newblock);
+        FREE_MEM(list->pool, newblock, sizeof(struct MemoryBlock));
         alloc_error("memory", allocsize);
         return 0;
     }
@@ -141,7 +174,7 @@ void* AllocMemSafe(size_t size)
     return newblock->address;
 }
 
-void RemoveMemSafe(void* block, bool deallocate)
+void RemoveMemSafe(void *block, bool deallocate)
 {
     struct MemoryBlock *current, *previous;
 
@@ -185,19 +218,19 @@ void RemoveMemSafe(void* block, bool deallocate)
 
     if (deallocate)
     {
-        FREE_MEM(current->address);
+        FREE_MEM(list->pool, current->address, current->size);
     }
 
     current->address = nullptr;
     current->next = nullptr;
     current->size = 0;
-    FREE_MEM(current);
+    FREE_MEM(list->pool, current, sizeof(struct MemoryBlock));
 }
 
 /**
  * @brief Deallocate memory from the global memory list.
  */
-void FreeMemSafe(void* block)
+void FreeMemSafe(void *block)
 {
     RemoveMemSafe(block, true);
 }
@@ -206,7 +239,7 @@ void FreeMemSafe(void* block)
  * @brief   Detach an allocated memory from the global memory list.
  * @details The memory block is only detached, not deallocated.
  */
-void DetachMemSafe(void* block)
+void DetachMemSafe(void *block)
 {
     RemoveMemSafe(block, false);
 }
@@ -227,29 +260,34 @@ void FreeAllSafe()
     while (current != nullptr)
     {
         next = current->next;
-        FREE_MEM(current->address);
+        FREE_MEM(list->pool, current->address, current->size);
-        FREE_MEM(current);
+        FREE_MEM(list->pool, current, sizeof(struct MemoryBlock));
         current = next;
     }
 
-    FREE_MEM(list);
+#if defined(AMIGA)
+    DeletePool(list->pool);
+#endif
+
+    FREE_LIST(list);
     list = nullptr;
 }
 
 /**
  * @brief Get memory usage in the global memory list.
  */
-void MemUsage(long* blocks, long* size, long* peak)
+void MemUsage(long *blocks, long *size, long *peak)
 {
     *blocks = list->count;
     *size = (long)list->size;
-    *peak = (long)list->peak;;
+    *peak = (long)list->peak;
+    ;
 }
 
 /**
  * @brief Log a memory allocation error
  */
-void alloc_error(char* descr, size_t size)
+void alloc_error(char *descr, size_t size)
 {
     Debug("Memory allocation error (%s) with size (%d)\n", descr, size);
     //if (size == 0)
@@ -259,7 +297,7 @@ void alloc_error(char* descr, size_t size)
 /**
  * @brief Log a memory deallocation error
  */
-void dealloc_error(char* descr, void* p)
+void dealloc_error(char *descr, void *p)
 {
     Debug("Memory deallocation error (%s) address (%x)\n", descr, p);
 }

src/clib/memcpy.c

@@ -47,7 +47,7 @@
 #pragma GCC diagnostic ignored "-Wcast-align"
 #endif
 
-#ifdef AMIGA
+#if defined(AMIGA)
 #include <clib/exec_protos.h>
 #endif
 
@@ -84,7 +84,7 @@ void MemCopy(void* destination, const void* source, unsigned int length)
     if ((mem_ptr)dst < (mem_ptr)src)
     {
         // Copy forward
-#ifdef AMIGA // Take advantage of exec
+#if defined(AMIGA) // Take advantage of exec
         CopyMem((void*)source, destination, length);
 #else
         t = (mem_ptr)src; // only need low bits

src/clib/memset.c

@@ -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) 1990, 1993 The Regents of the University of California.
  * All rights reserved.
  *
@@ -27,8 +27,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 /**

src/clib/strcmp.c

@@ -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) 1990, 1993 The Regents of the University of California.
  * All rights reserved.
  *
@@ -27,8 +27,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 /**

src/clib/strlen.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 /**

src/clib/untag.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "amathc.h"

src/cplex/amathi.dox

@@ -1,10 +1,10 @@
 
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "amathi"
-PROJECT_NUMBER         = "1.8.0"
+PROJECT_NUMBER         = "1.9.0"
 PROJECT_BRIEF          = "Complex numbers math library"
 PROJECT_LOGO           =
-OUTPUT_DIRECTORY       = 
+OUTPUT_DIRECTORY       =
 CREATE_SUBDIRS         = NO
 ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English

src/cplex/amathi.pc

@@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib
 
 Name: amath complex library
 Description: Complex numbers math library
-Version: 1.8.0
+Version: 1.9.0
 Cflags: -I${includedir}
 Libs: -L${libdir} -lamathi

src/cplex/cacos.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/cacosh.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/cacot.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/cacoth.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/cacsc.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/cacsch.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/casec.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/casech.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/casin.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/casinh.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/catan.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/catanh.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/ccbrt.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/ccos.c

@@ -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.
  * All rights reserved.
  *
@@ -27,8 +27,8 @@
  * http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libm/complex/ccos.c?rev=1.1
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/ccosh.c

@@ -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.
  * All rights reserved.
  *
@@ -30,8 +30,8 @@
  * http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libm/complex/ccosh.c?rev=1.1
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/ccot.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/ccoth.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/ccsc.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/ccsch.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/cexp.c

@@ -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.
  * All rights reserved.
  *
@@ -30,8 +30,8 @@
  * http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libm/complex/cexp.c?rev=1.1
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/clog.c

@@ -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.
  * All rights reserved.
  *
@@ -30,8 +30,8 @@
  * http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libm/complex/clog.c?rev=1.1
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/clog10.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/clogb.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/cpow.c

@@ -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.
  * All rights reserved.
  *
@@ -30,8 +30,8 @@
  * http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libm/complex/cpow.c?rev=1.1
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/csec.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/csech.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/csgn.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/csin.c

@@ -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.
  * All rights reserved.
  *
@@ -30,8 +30,8 @@
  * http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libm/complex/csin.c?rev=1.1
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/csinh.c

@@ -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.
  * All rights reserved.
  *
@@ -30,8 +30,8 @@
  * http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libm/complex/csinh.c?rev=1.1
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/csqrt.c

@@ -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.
  * All rights reserved.
  *
@@ -30,8 +30,8 @@
  * http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libm/complex/csqrt.c?rev=1.1
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/ctan.c

@@ -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.
  * All rights reserved.
  *
@@ -30,8 +30,8 @@
  * http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libm/complex/ctan.c?rev=1.1
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/ctanh.c

@@ -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.
  * All rights reserved.
  *
@@ -30,8 +30,8 @@
  * http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libm/complex/ctanh.c?rev=1.1
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/prim.c

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "prim.h"

src/cplex/prim.h

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #ifndef AMATH_LIB_COMPLEX_PRIM_H

src/lib/aengine.cpp

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #include "amath.h"
@@ -190,7 +190,7 @@ const char* AnsiConoleEngine::ProcessChar(const unsigned char character)
             }
             else
             {
-                out->Append(DELETE1CHARASC);                
+                out->Append(DELETE1CHARASC);
             }
             endpos--;
             linebuf->ptr = endpos;
@@ -234,7 +234,7 @@ const char* AnsiConoleEngine::ProcessChar(const unsigned char character)
         }
         else
         {
-            out->Append(DELETE1CHARASC);                
+            out->Append(DELETE1CHARASC);
         }
         cursor--;
         endpos--;

src/lib/aengine.h

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 #ifndef AMATH_ANSI_CONSOLE_ENGINE

src/lib/amatha.pc

@@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib
 
 Name: amath application library
 Description: C++ library for handling numbers
-Version: 1.8.0
+Version: 1.9.0
 Cflags: -I${includedir}
 Libs: -L${libdir} -lamathapp -lamathr -lamathi -lamathc

src/lib/bigint.cpp

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 /*

src/lib/bigint.h

@@ -1,5 +1,5 @@
 /*-
- * 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
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Project homepage:
- * http://amath.innolan.net
+ * https://amath.innolan.net
- * 
+ *
  */
 
 /*