Release 2.12.6.9

Experimental changes for macOS builds.

CHANGES

@@ -1,4 +1,43 @@
-The following are the changes from calc version 2.12.6.6 to date:
+The following are the changes from calc version 2.12.6.9 to date:
+
+    Fixed a number of core dump bugs related to the calculation of
+    tan(), cot(), sec(), csc(), tanh(), coth(), sech(), and csch(),
+    asin(), acos(), asinh(), acosh(), where when a call to an
+    underlying function produced an invalid value.  Thanks goes to
+    github user wuxiuheng for reporting this problem.
+
+    A number of trigonometric and hyperbolic functions that incorrectly
+    returned E_LOGINF, now return a new error code that is more
+    specific to the trigonometric or hyperbolic function.  The
+    following is a list of these new error codes: E_TAN3 E_TAN4
+    E_COT3 E_COT4 E_SEC3 E_CSC3 E_TANH3 E_TANH4 E_COTH3 E_COTH4
+    E_SECH3 E_CSCH3 E_ASIN3 E_ACOS3 E_ASINH3 E_ACOSH3 E_ATAN3 E_ACOT3
+    E_ASEC3 E_ACSC3 E_ATANH3 E_ACOTH3 E_ASECH3 E_ACSCH3.
+
+    Added regression tests 3729 thru 3732 to test E_TAN3, E_COT3,
+    E_SEC3 and E_CSC3 respectively.
+
+    Added experimential %g printf (and strprintf) format implementation
+    based on pull request from github user 10110111.
+
+    Made exterimental changes to macOS builds to not require use of
+    /usr/include.  The INCDIR for macOS uses:
+
+	INCDIR= $(shell xcrun --show-sdk-path --sdk macosx)/usr/include
+
+    to determine the upper path of the /usr/include directory for macOS.
+    The Darwin target seems to not automatically detected.  For now,
+    under macOS, declare the target as darwin:
+
+	# for macOS users only, force the target to be darwin
+	#
+	make target=Darwin clobber
+	make target=Darwin all
+	make target=Darwin chk
+	make target=Darwin install
+
+
+The following are the changes from calc version 2.12.6.6 to 2.12.6.8:
 
     For historical purposes, in lucas.cal, gen_v1(1, n) always returns 4.
 
@@ -25,6 +64,20 @@ The following are the changes from calc version 2.12.6.6 to date:
     This helps with an interactive bug that was reported by Ruslan Kabatsayev
     (b7 dot 10110111 at gmail dot com).
 
+    The calc man page indicates that -d also disables the printing of the
+    leading tilde.
+
+    Added information to "help command" about how to silence messages
+    while reading calc resource files.
+
+    Fixed an error message buffer overflow thanks to a report by
+    Frank Peters <nlp at northernlightsphoto dot biz>.
+
+    Replaced all use of the C funcion sprintf() with snprintf().
+    Replaced all use of the C funcion vsprintf() with vsnprintf().
+    Replaced all DONT_HAVE_VSPRINTF with DONT_HAVE_VSNPRINTF.
+    Replaced all Makefile var ${HAVE_VSPRINTF} with ${HAVE_VSNPRINTF}.
+
 
 The following are the changes from calc version 2.12.6.4 to 2.12.6.5:
 

HOWTO.INSTALL

@@ -32,6 +32,16 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:
 	targets, the default make is sufficent.  On FreeBSD for example,
 	one must use gmake instead of make.
 
+	Some report that under macOS, one has to declare the target
+	to be darwin.  So for macOS, one might have to do:
+
+	    # for macOS users only, force the target to be darwin
+	    #
+	    make target=Darwin clobber
+	    make target=Darwin all
+	    make target=Darwin chk
+	    make target=Darwin install
+
 	If your target system does not have GNU Make (or equivalent), then
 	you should try using the Makefile.simple and custom/Makefile.simple
 	files:

Makefile.ship

@@ -90,29 +90,29 @@ TERMCONTROL=
 #TERMCONTROL= -DUSE_SGTTY
 #TERMCONTROL= -DUSE_WIN32
 
-# If your system does not have a vsprintf() function, you could be in trouble.
+# If your system does not have a vsnprintf() function, you could be in trouble.
 #
-#	vsprintf(string, format, ap)
+#	vsnprintf(string, size, format, ap)
 #
-# This function works like sprintf except that the 3rd arg is a va_list
-# strarg (or varargs) list.  Some old systems do not have vsprintf().
-# If you do not have vsprintf(), then calc will try sprintf() and hope
+# This function works like spnrintf except that the 4th arg is a va_list
+# strarg (or varargs) list.  Some old systems do not have vsnprintf().
+# If you do not have vsnprintf(), then calc will try snprintf() and hope
 # for the best.
 #
 # A similar problem occurs if your system does not have a vsnprintf()
-# function.  This function is like the vsprintf() function except that
+# function.  This function is like the vsnprintf() function except that
 # there is an extra second argument that controls the maximum size
 # string that is produced.
 #
-# If HAVE_VSPRINTF is empty, this Makefile will run the have_stdvs.c and/or
-# have_varvs.c program to determine if vsprintf() is supported.  If
-# HAVE_VSPRINTF is set to -DDONT_HAVE_VSPRINTF then calc will hope that
-# sprintf() will work.
+# If HAVE_VSNPRINTF is empty, this Makefile will run the have_stdvs.c and/or
+# have_varvs.c program to determine if vsnprintf() is supported.  If
+# HAVE_VSNPRINTF is set to -DDONT_HAVE_VSNPRINTF then calc will hope that
+# snprintf() will work.
 #
-# If in doubt, leave HAVE_VSPRINTF empty.
+# If in doubt, leave HAVE_VSNPRINTF empty.
 #
-HAVE_VSPRINTF=
-#HAVE_VSPRINTF= -DDONT_HAVE_VSPRINTF
+HAVE_VSNPRINTF=
+#HAVE_VSNPRINTF= -DDONT_HAVE_VSNPRINTF
 
 # Determine the byte order of your machine
 #
@@ -575,7 +575,7 @@ HAVE_UNUSED=
 ifeq ($(target),Darwin)
 
 # default INCDIR for macOS
-INCDIR= /usr/local/include
+INCDIR= $(shell xcrun --show-sdk-path --sdk macosx)/usr/include
 
 else
 #endif	/* end of skip for non-Gnu makefiles */
@@ -1054,7 +1054,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.12.6.7
+VERSION= 2.12.6.9
 
 # Names of shared libraries with versions
 #
@@ -2179,7 +2179,7 @@ TARGETS= ${EARLY_TARGETS} ${BLD_TYPE} ${LATE_TARGETS}
 all: check_include ${BLD_TYPE} CHANGES
 
 check_include:
-	$(Q) if [ ! -d /usr/include ]; then \
+	$(Q) if [ ! -d ${INCDIR} ]; then \
 	    echo "ERROR: critical directory missing: /usr/include" 1>&2; \
 	    echo "Without this critical directory, we cannot compile." 1>&2; \
 	    echo 1>&2; \
@@ -2191,7 +2191,7 @@ check_include:
 	    echo 1>&2; \
 	    exit 1; \
 	fi
-	$(Q) if [ ! -f /usr/include/stdio.h ]; then \
+	$(Q) if [ ! -f ${INCDIR}/stdio.h ]; then \
 	    echo "ERROR: critical include files are missing" 1>&2; \
 	    echo "Without this critical directory, we cannot compile." 1>&2; \
 	    echo 1>&2; \
@@ -3545,7 +3545,7 @@ args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h have_string.h
 	${Q} echo '' >> args.h
 	${Q} echo '' >> args.h
 	${Q} ${RM} -f have_stdvs.o have_stdvs${EXT}
-	-${Q} ${LCC} ${ICFLAGS} ${HAVE_VSPRINTF} have_stdvs.c -c \
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_VSNPRINTF} have_stdvs.c -c \
 		>/dev/null 2>&1; ${TRUE}
 	-${Q} ${LCC} ${ILDFLAGS} have_stdvs.o -o have_stdvs${EXT} \
 	    >/dev/null 2>&1; ${TRUE}
@@ -3554,10 +3554,10 @@ args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h have_string.h
 	else \
 	    ${TRUE}; \
 	fi
-	-${Q} if [ ! -f have_args.sh ] && [ X"${HAVE_VSPRINTF}" = X ]; then \
+	-${Q} if [ ! -f have_args.sh ] && [ X"${HAVE_VSNPRINTF}" = X ]; then \
 	    ${RM} -f have_stdvs.o have_stdvs${EXT} have_varvs.o; \
 	    ${RM} -f have_varvs${EXT}; \
-	    ${LCC} ${ICFLAGS} ${HAVE_VSPRINTF} have_varvs.c -c \
+	    ${LCC} ${ICFLAGS} ${HAVE_VSNPRINTF} have_varvs.c -c \
 		    2>/dev/null; \
 	    ${LCC} ${ILDFLAGS} have_varvs.o -o have_varvs${EXT} 2>/dev/null; \
 	    if ./have_varvs${EXT} >>args.h 2>/dev/null; then \
@@ -3573,8 +3573,8 @@ args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h have_string.h
 	else \
 	    echo 'exit 1' > have_args.sh; \
 	    echo "Unable to determine what type of variable args and"; \
-	    echo "what type of vsprintf() should be used.  Set or change"; \
-	    echo "the Makefile variable HAVE_VSPRINTF."; \
+	    echo "what type of vsnprintf() should be used.  Set or change"; \
+	    echo "the Makefile variable HAVE_VSNPRINTF."; \
 	fi
 	${Q} sh ./have_args.sh
 	${Q} echo '' >> args.h
@@ -4160,7 +4160,7 @@ env:
 	@echo 'HAVE_UNUSED=${HAVE_UNUSED}'; echo ''
 	@echo 'HAVE_URANDOM_H=${HAVE_URANDOM_H}'; echo ''
 	@echo 'HAVE_USTAT=${HAVE_USTAT}'; echo ''
-	@echo 'HAVE_VSPRINTF=${HAVE_VSPRINTF}'; echo ''
+	@echo 'HAVE_VSNPRINTF=${HAVE_VSNPRINTF}'; echo ''
 	@echo 'HELPDIR=${HELPDIR}'; echo ''
 	@echo 'HELP_PASSDOWN=${HELP_PASSDOWN}'; echo ''
 	@echo 'H_SRC=${H_SRC}'; echo ''

cal/regress.cal

@@ -3227,9 +3227,9 @@ define test_error()
 
 	print '3600: Beginning test_error';
 
-	/* bump ecnt up by 148 */
-	ecnt += 148;
-	print				'3601: ecnt += 148';
+	/* bump ecnt up by 156 */
+	ecnt += 156;
+	print				'3601: ecnt += 156';
 
 	strx = "x";
 	print				'3602: strx = "x"';
@@ -3418,11 +3418,15 @@ define test_error()
 	n = 8191;
 	print				'3727: n = 8191';
 	/* test 3728 removed due to non-portable strerror() output */
+	vrfy(tan(2e9i) == error(10435),	'3729: tan(2e9i) == error(10435)');
+	vrfy(cot(2e9i) == error(10437),	'3730: cot(2e9i) == error(10437)');
+	vrfy(sec(2e9i) == error(10439),	'3731: sec(2e9i) == error(10439)');
+	vrfy(csc(2e9i) == error(10440),	'3732: csc(2e9i) == error(10440)');
 
 	/* errmax and errcount should be bumped up the 148 errors above */
-	vrfy(errcount() == ecnt,	'3729: errcount() == ecnt');
+	vrfy(errcount() == ecnt,	'3733: errcount() == ecnt');
 
-	print '3730: Ending test_error';
+	print '3734: Ending test_error';
 }
 print '054: parsed test_error()';
 
@@ -4102,38 +4106,46 @@ define test_strprintf()
 			'4821: strprintf("%b", 27/29) == "0b11011/0b11101"');
 	vrfy(strprintf("%e", 12345) == "~1.23e4",
 			'4822: strprintf("%e", 12345) == "~1.23e4"');
+	vrfy(strprintf("%g", .385) == "~.38",
+			'4823: strprintf("%g", .385) == "~.38"');
+	vrfy(strprintf("%g", 385) == "~3.8e2",
+			'4824: strprintf("%g", 385) == "~3.8e2"');
 
 	/* mode tests with tilde == 0 */
 	c = config("tilde", 0);
-	print		'4823: c = config("tilde", 0)';
+	print		'4825: c = config("tilde", 0)';
 	vrfy(strprintf("%e", 12345) == "1.23e4",
-			'4824: strprintf("%e", 12345) == "1.23e4"');
+			'4826: strprintf("%e", 12345) == "1.23e4"');
 	vrfy(strprintf("%.3e", 12345) == "1.234e4",
-			'4825: strprintf("%.3e", 12345) == "1.234e4"');
+			'4827: strprintf("%.3e", 12345) == "1.234e4"');
 	vrfy(strprintf("%e", .00012345) == "1.23e-4",
-			'4826: strprintf("%e", .00012345) == "1.23e-4"');
+			'4828: strprintf("%e", .00012345) == "1.23e-4"');
 	vrfy(strprintf("%d %d", 27) == "27 ",
-			'4827: strprintf("%d %d", 27) == "27 "');
+			'4829: strprintf("%d %d", 27) == "27 "');
 	vrfy(strprintf("%d", 27, 29) == "27",
-			'4828: strprintf("%d", 27, 29) == "27"');
+			'4830: strprintf("%d", 27, 29) == "27"');
 	vrfy(strprintf("%r = %f", 27/29, 27/29) == "27/29 = .93",
-		'4829: strprintf("%r = %f", 27/29, 27/29) == "27/29 = .93"');
+		'4831: strprintf("%r = %f", 27/29, 27/29) == "27/29 = .93"');
 	vrfy(strprintf("%s", "abc") == "abc",
-		'4830: strprintf("%s", "abc") == "abc"');
+		'4832: strprintf("%s", "abc") == "abc"');
 	vrfy(strprintf("%f", "abc") == "abc",
-		'4831: strprintf("%f", "abc") == "abc"');
+		'4833: strprintf("%f", "abc") == "abc"');
 	vrfy(strprintf("%e", "abc") == "abc",
-		'4832: strprintf("%e", "abc") == "abc"');
+		'4834: strprintf("%e", "abc") == "abc"');
 	vrfy(strprintf("%5s", "abc") == "  abc",
-		'4833: strprintf("%5s", "abc") == "  abc"');
+		'4835: strprintf("%5s", "abc") == "  abc"');
 	vrfy(strprintf("%-5s", "abc") == "abc  ",
-		'4834: strprintf("%-5s", "abc") == "abc	 "');
+		'4836: strprintf("%-5s", "abc") == "abc	 "');
+	vrfy(strprintf("%g", .385) == ".38",
+			'4837: strprintf("%g", .385) == ".38"');
+	vrfy(strprintf("%g", 385) == "3.8e2",
+			'4838: strprintf("%g", 385) == "3.8e2"');
 
 	/* restore config */
 	c = config("all", callcfg);
-	print				    '4835: c = config("all", callcfg)';
+	print				    '4839: c = config("all", callcfg)';
 
-	print '4836: Ending test_strprintf';
+	print '4840: Ending test_strprintf';
 }
 print '088: parsed test_fileop()';
 
@@ -7932,8 +7944,8 @@ print '8901: read -once "test8900"';
 read -once "test8900";
 print '8902: about to run test8900(1,,8903)';
 testnum = test8900(1,,8903);
-print '8999: ecnt = 203;'
-ecnt = 203;
+print '8999: ecnt = 211;'
+ecnt = 211;
 /* 89xx: test calc resource functions by Christoph Zurnieden */
 
 

calc.c

@@ -775,7 +775,7 @@ calc_interrupt(char *fmt, ...)
 	va_start(ap, fmt);
 	vsnprintf(calc_err_msg, MAXERROR, fmt, ap);
 	va_end(ap);
-	calc_err_msg[MAXERROR] = '\0';
+	calc_err_msg[MAXERROR] = '\0';	/* paranoia */
 	fprintf(stderr, "%s\n\n", calc_err_msg);
 	funcname = NULL;
 	if (calc_use_scanerr_jmpbuf != 0) {

calc.man

@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (C) 1999-2007,2014	Landon Curt Noll
+.\" Copyright (C) 1999-2007,2014,2018	Landon Curt Noll
 .\"
 .\" Calc is open software; you can redistribute it and/or modify it under
 .\" the terms of the version 2.1 of the GNU Lesser General Public License
@@ -138,7 +138,7 @@ calc -d "read qtime; qtime(2)"
 .fi
 .in -5n
 .sp 1
-will just say:
+will just print:
 .sp 1
 .in +5n
 .nf
@@ -148,6 +148,41 @@ It's nearly ten past six.
 .sp 1
 This flag disables the reporting of missing calc
 startup resource files.
+.sp 1
+
+This flag also disables the printing the leading tilde. For example:
+.sp 1
+.in +5n
+.nf
+calc 2/3
+.fi
+.in -5n
+.sp 1
+will print:
+.sp 1
+.in +5n
+.nf
+~0.66666666666666666667
+.fi
+.in -5n
+.sp 1
+.sp 1
+whereas:
+.sp 1
+.in +5n
+.nf
+calc -d 2/3
+.fi
+.in -5n
+.sp 1
+will just print:
+.sp 1
+.in +5n
+.nf
+0.66666666666666666667
+.fi
+.in -5n
+.sp 1
 
 .TP
 .BR -D " calc_debug[:resource_debug[:user_debug]]"

calcerr.tbl

@@ -451,6 +451,7 @@ E_FPATHOPEN1	Non-string arguments for fpathopen
 E_FPATHOPEN2	Unrecognized mode for fpathopen
 E_LOG1		Bad epsilon argument for log
 E_LOG2		Non-numeric first argument for log
+E_LOG3		Cannot calculate log for this value
 E_FGETFILE1	Non-file argument for fgetfile
 E_FGETFILE2	File argument for fgetfile not open for reading
 E_FGETFILE3	Unable to set file position in fgetfile
@@ -471,3 +472,27 @@ E_ISSPACE	Bad argument for isspace
 E_ISXDIGIT	Bad argument for isxdigit
 E_STRTOUPPER    Bad argument type for strtoupper
 E_STRTOLOWER    Bad argument type for strtolower
+E_TAN3		Invalid value for calculating the sin numerator for tan
+E_TAN4		Invalid value for calculating the cos denominator for tan
+E_COT3		Invalid value for calculating the sin numerator for cot
+E_COT4		Invalid value for calculating the cos denominator for cot
+E_SEC3		Invalid value for calculating the cos reciprocal for sec
+E_CSC3		Invalid value for calculating the sin reciprocal for csc
+E_TANH3		Invalid value for calculating the sinh numerator for tanh
+E_TANH4		Invalid value for calculating the cosh denominator for tanh
+E_COTH3		Invalid value for calculating the sinh numerator for coth
+E_COTH4		Invalid value for calculating the cosh denominator for coth
+E_SECH3		Invalid value for calculating the cosh reciprocal for sech
+E_CSCH3		Invalid value for calculating the sinh reciprocal for csch
+E_ASIN3		Invalid value for calculating asin
+E_ACOS3		Invalid value for calculating acos
+E_ASINH3	Invalid value for calculating asinh
+E_ACOSH3	Invalid value for calculating acosn
+E_ATAN3		Invalid value for calculating atan
+E_ACOT3		Invalid value for calculating acot
+E_ASEC3		Invalid value for calculating asec
+E_ACSC3		Invalid value for calculating acsc
+E_ATANH3	Invalid value for calculating atan
+E_ACOTH3	Invalid value for calculating acot
+E_ASECH3	Invalid value for calculating asec
+E_ACSCH3	Invalid value for calculating acsc

config.c

@@ -274,6 +274,7 @@ STATIC NAMETYPE modes[] = {
 	{"oct",		MODE_OCTAL},
 	{"binary",	MODE_BINARY},
 	{"bin",		MODE_BINARY},
+	{"float-auto",	MODE_REAL_AUTO},
 	{"off",		MODE2_OFF},
 	{NULL,		0}
 };

custom.c

@@ -1,7 +1,7 @@
 /*
  * custom - interface for custom software and hardware interfaces
  *
- * Copyright (C) 1999-2006  Landon Curt Noll
+ * Copyright (C) 1999-2006,2018  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -180,6 +180,7 @@ customhelp(char *name)
 #if defined(CUSTOM)
 
 	char *customname;	/* a string of the form: custom/name */
+	size_t snprintf_len;	/* malloced snprintf buffer length */
 
 	/*
 	 * firewall
@@ -191,12 +192,14 @@ customhelp(char *name)
 	/*
 	 * form the custom help name
 	 */
-	customname = (char *)malloc(sizeof("custhelp")+1+strlen(name)+1);
+	snprintf_len = sizeof("custhelp")+1+strlen(name)+1;
+	customname = (char *)malloc(snprintf_len+1);
 	if (customname == NULL) {
 		math_error("bad malloc of customname");
 		/*NOTREACHED*/
 	}
-	sprintf(customname, "custhelp/%s", name);
+	snprintf(customname, snprintf_len, "custhelp/%s", name);
+	customname[snprintf_len] = '\0';	/* paranoia */
 
 	/*
 	 * give help directly to the custom file

custom/Makefile

@@ -2,7 +2,7 @@
 #
 # custom - makefile for calc custom routines
 #
-# Copyright (C) 1999-2006,2014,2017  Landon Curt Noll
+# Copyright (C) 1999-2006,2014,2017-2018  Landon Curt Noll
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -348,7 +348,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.12.6.7
+VERSION= 2.12.6.9
 
 # Names of shared libraries with versions
 #

custom/Makefile.head

@@ -2,7 +2,7 @@
 #
 # custom - makefile for calc custom routines
 #
-# Copyright (C) 1999-2006,2014,2017  Landon Curt Noll
+# Copyright (C) 1999-2006,2014,2017-2018  Landon Curt Noll
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of the version 2.1 of the GNU Lesser General Public License
@@ -348,7 +348,7 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.12.6.7
+VERSION= 2.12.6.9
 
 # Names of shared libraries with versions
 #

file.c

@@ -1,7 +1,7 @@
 /*
  * file - file I/O routines callable by users
  *
- * Copyright (C) 1999-2007  David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999-2007,2018  David I. Bell and Landon Curt Noll
  *
  * Primary author:  David I. Bell
  *
@@ -143,6 +143,7 @@ file_init(void)
 		 * stat the descriptor to see what we have
 		 */
 		if (fstat(i, &sbuf) >= 0) {
+			size_t snprintf_len;	/* malloced snprintf length */
 			fp = (FILE *) fdopen(i,"r+");	/*guess mode*/
 			if (fp) {
 				strcpy(files[idnum].mode, "r+");
@@ -161,12 +162,15 @@ file_init(void)
 						continue;
 				}
 			}
-			tname = (char *)malloc(sizeof("descriptor[19]"));
+			snprintf_len =
+			  sizeof("descriptor[12345678901234567890]") + 1;
+			tname = (char *)malloc(snprintf_len+1);
 			if (tname == NULL) {
 				math_error("Out of memory for init_file");
 				/*NOTREACHED*/
 			}
-			sprintf(tname, "descriptor[%d]", i);
+			snprintf(tname, snprintf_len, "descriptor[%d]", i);
+			tname[snprintf_len] = '\0';	/* paranoia */
 			files[idnum].name = tname;
 			files[idnum].id = idnum;
 			files[idnum].fp = fp;
@@ -1027,6 +1031,9 @@ idprintf(FILEID id, char *fmt, int count, VALUE **vals)
 		case 'e':
 			newmode = MODE_EXP;
 			break;
+		case 'g':
+			newmode = MODE_REAL_AUTO;
+			break;
 		case 'r':
 			newmode = MODE_FRAC;
 			break;

func.c

@@ -1,7 +1,7 @@
 /*
  * func - built-in functions implemented here
  *
- * Copyright (C) 1999-2007  David I. Bell, Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2007,2018  David I. Bell, Landon Curt Noll & Ernest Bowen
  *
  * Primary author:  David I. Bell
  *
@@ -2122,6 +2122,9 @@ f_log(int count, VALUE **vals)
 		default:
 			return error_value(E_LOG2);
 	}
+	if (c == NULL) {
+		return error_value(E_LOG3);
+	}
 	result.v_type = V_COM;
 	result.v_com = c;
 	if (cisreal(c)) {
@@ -2239,8 +2242,15 @@ f_tan(int count, VALUE **vals)
 		case V_COM:
 			tmp1.v_type = V_COM;
 			tmp1.v_com = c_sin(vals[0]->v_com, err);
+			if (tmp1.v_com == NULL) {
+				return error_value(E_TAN3);
+			}
 			tmp2.v_type = V_COM;
 			tmp2.v_com = c_cos(vals[0]->v_com, err);
+			if (tmp2.v_com == NULL) {
+				comfree(tmp1.v_com);
+				return error_value(E_TAN4);
+			}
 			divvalue(&tmp1, &tmp2, &result);
 			comfree(tmp1.v_com);
 			comfree(tmp2.v_com);
@@ -2276,6 +2286,9 @@ f_sec(int count, VALUE **vals)
 		case V_COM:
 			tmp.v_type = V_COM;
 			tmp.v_com = c_cos(vals[0]->v_com, err);
+			if (tmp.v_com == NULL) {
+				return error_value(E_SEC3);
+			}
 			invertvalue(&tmp, &result);
 			comfree(tmp.v_com);
 			break;
@@ -2314,8 +2327,15 @@ f_cot(int count, VALUE **vals)
 		case V_COM:
 			tmp1.v_type = V_COM;
 			tmp1.v_com = c_cos(vals[0]->v_com, err);
+			if (tmp1.v_com == NULL) {
+				return error_value(E_COT3);
+			}
 			tmp2.v_type = V_COM;
 			tmp2.v_com = c_sin(vals[0]->v_com, err);
+			if (tmp2.v_com == NULL) {
+				comfree(tmp1.v_com);
+				return error_value(E_COT4);
+			}
 			divvalue(&tmp1, &tmp2, &result);
 			comfree(tmp1.v_com);
 			comfree(tmp2.v_com);
@@ -2354,6 +2374,9 @@ f_csc(int count, VALUE **vals)
 		case V_COM:
 			tmp.v_type = V_COM;
 			tmp.v_com = c_sin(vals[0]->v_com, err);
+			if (tmp.v_com == NULL) {
+				return error_value(E_CSC3);
+			}
 			invertvalue(&tmp, &result);
 			comfree(tmp.v_com);
 			break;
@@ -2476,8 +2499,15 @@ f_tanh(int count, VALUE **vals)
 		case V_COM:
 			tmp1.v_type = V_COM;
 			tmp1.v_com = c_sinh(vals[0]->v_com, err);
+			if (tmp1.v_com == NULL) {
+				return error_value(E_TANH3);
+			}
 			tmp2.v_type = V_COM;
 			tmp2.v_com = c_cosh(vals[0]->v_com, err);
+			if (tmp2.v_com == NULL) {
+				comfree(tmp1.v_com);
+				return error_value(E_TANH4);
+			}
 			divvalue(&tmp1, &tmp2, &result);
 			comfree(tmp1.v_com);
 			comfree(tmp2.v_com);
@@ -2517,8 +2547,15 @@ f_coth(int count, VALUE **vals)
 		case V_COM:
 			tmp1.v_type = V_COM;
 			tmp1.v_com = c_cosh(vals[0]->v_com, err);
+			if (tmp1.v_com == NULL) {
+				return error_value(E_COTH3);
+			}
 			tmp2.v_type = V_COM;
 			tmp2.v_com = c_sinh(vals[0]->v_com, err);
+			if (tmp2.v_com == NULL) {
+				comfree(tmp1.v_com);
+				return error_value(E_COTH4);
+			}
 			divvalue(&tmp1, &tmp2, &result);
 			comfree(tmp1.v_com);
 			comfree(tmp2.v_com);
@@ -2555,6 +2592,9 @@ f_sech(int count, VALUE **vals)
 		case V_COM:
 			tmp.v_type = V_COM;
 			tmp.v_com = c_cosh(vals[0]->v_com, err);
+			if (tmp.v_com == NULL) {
+				return error_value(E_SECH3);
+			}
 			invertvalue(&tmp, &result);
 			comfree(tmp.v_com);
 			break;
@@ -2592,6 +2632,9 @@ f_csch(int count, VALUE **vals)
 		case V_COM:
 			tmp.v_type = V_COM;
 			tmp.v_com = c_sinh(vals[0]->v_com, err);
+			if (tmp.v_com == NULL) {
+				return error_value(E_CSCH3);
+			}
 			invertvalue(&tmp, &result);
 			comfree(tmp.v_com);
 			break;
@@ -2626,7 +2669,7 @@ f_atan(int count, VALUE **vals)
 		case V_COM:
 			tmp = c_atan(vals[0]->v_com, err);
 			if (tmp == NULL)
-				return error_value(E_LOGINF);
+				return error_value(E_ATAN3);
 			result.v_type = V_COM;
 			result.v_com = tmp;
 			if (cisreal(tmp)) {
@@ -2666,7 +2709,7 @@ f_acot(int count, VALUE **vals)
 		case V_COM:
 			tmp = c_acot(vals[0]->v_com, err);
 			if (tmp == NULL)
-				return error_value(E_LOGINF);
+				return error_value(E_ACOT3);
 			result.v_type = V_COM;
 			result.v_com = tmp;
 			if (cisreal(tmp)) {
@@ -2718,6 +2761,9 @@ f_asin(int count, VALUE **vals)
 		default:
 			return error_value(E_ASIN2);
 	}
+	if (result.v_com == NULL) {
+		return error_value(E_ASIN3);
+	}
 	if (result.v_type == V_COM && cisreal(result.v_com)) {
 		q = qlink(result.v_com->real);
 		comfree(result.v_com);
@@ -2764,6 +2810,9 @@ f_acos(int count, VALUE **vals)
 		default:
 			return error_value(E_ACOS2);
 	}
+	if (result.v_com == NULL) {
+		return error_value(E_ACOS3);
+	}
 	if (result.v_type == V_COM && cisreal(result.v_com)) {
 		q = qlink(result.v_com->real);
 		comfree(result.v_com);
@@ -2794,7 +2843,7 @@ f_asec(int count, VALUE **vals)
 	switch (vals[0]->v_type) {
 		case V_NUM:
 			if (qiszero(vals[0]->v_num))
-				return error_value(E_LOGINF);
+				return error_value(E_ASEC3);
 			result.v_num = qasec(vals[0]->v_num, err);
 			result.v_type = V_NUM;
 			if (result.v_num == NULL) {
@@ -2813,9 +2862,10 @@ f_asec(int count, VALUE **vals)
 		default:
 			return error_value(E_ASEC2);
 	}
+	if (result.v_com == NULL) {
+		return error_value(E_ASEC3);
+	}
 	if (result.v_type == V_COM) {
-		if (result.v_com == NULL)
-			return error_value(E_LOGINF);
 		if (cisreal(result.v_com)) {
 			q = qlink(result.v_com->real);
 			comfree(result.v_com);
@@ -2847,7 +2897,7 @@ f_acsc(int count, VALUE **vals)
 	switch (vals[0]->v_type) {
 		case V_NUM:
 			if (qiszero(vals[0]->v_num))
-				return error_value(E_LOGINF);
+				return error_value(E_ACSC3);
 			result.v_num = qacsc(vals[0]->v_num, err);
 			result.v_type = V_NUM;
 			if (result.v_num == NULL) {
@@ -2866,9 +2916,10 @@ f_acsc(int count, VALUE **vals)
 		default:
 			return error_value(E_ACSC2);
 	}
+	if (result.v_com == NULL) {
+		return error_value(E_ACSC3);
+	}
 	if (result.v_type == V_COM) {
-		if (result.v_com == NULL)
-			return error_value(E_LOGINF);
 		if (cisreal(result.v_com)) {
 			q = qlink(result.v_com->real);
 			comfree(result.v_com);
@@ -2903,6 +2954,9 @@ f_asinh(int count, VALUE **vals)
 			break;
 		case V_COM:
 			tmp = c_asinh(vals[0]->v_com, err);
+			if (tmp == NULL) {
+				return error_value(E_ASINH3);
+			}
 			result.v_type = V_COM;
 			result.v_com = tmp;
 			if (cisreal(tmp)) {
@@ -2955,6 +3009,9 @@ f_acosh(int count, VALUE **vals)
 		default:
 			return error_value(E_ACOSH2);
 	}
+	if (result.v_com == NULL) {
+		return error_value(E_ACOSH3);
+	}
 	if (result.v_type == V_COM && cisreal(result.v_com)) {
 		q = qlink(result.v_com->real);
 		comfree(result.v_com);
@@ -3002,9 +3059,10 @@ f_atanh(int count, VALUE **vals)
 		default:
 			return error_value(E_ATANH2);
 	}
+	if (result.v_com == NULL) {
+		return error_value(E_ATANH3);
+	}
 	if (result.v_type == V_COM) {
-		if (result.v_com == NULL)
-			return error_value(E_LOGINF);
 		if (cisreal(result.v_com)) {
 			q = qlink(result.v_com->real);
 			comfree(result.v_com);
@@ -3053,9 +3111,10 @@ f_acoth(int count, VALUE **vals)
 		default:
 			return error_value(E_ACOTH2);
 	}
+	if (result.v_com == NULL) {
+		return error_value(E_ACOTH3);
+	}
 	if (result.v_type == V_COM) {
-		if (result.v_com == NULL)
-			return error_value(E_LOGINF);
 		if (cisreal(result.v_com)) {
 			q = qlink(result.v_com->real);
 			comfree(result.v_com);
@@ -3087,7 +3146,7 @@ f_asech(int count, VALUE **vals)
 	switch (vals[0]->v_type) {
 		case V_NUM:
 			if (qiszero(vals[0]->v_num))
-				return error_value(E_LOGINF);
+				return error_value(E_ASECH3);
 			result.v_num = qasech(vals[0]->v_num, err);
 			result.v_type = V_NUM;
 			if (result.v_num == NULL) {
@@ -3106,9 +3165,10 @@ f_asech(int count, VALUE **vals)
 		default:
 			return error_value(E_ASECH2);
 	}
+	if (result.v_com == NULL) {
+		return error_value(E_ASECH3);
+	}
 	if (result.v_type == V_COM) {
-		if (result.v_com == NULL)
-			return error_value(E_LOGINF);
 		if (cisreal(result.v_com)) {
 			q = qlink(result.v_com->real);
 			comfree(result.v_com);
@@ -3140,7 +3200,7 @@ f_acsch(int count, VALUE **vals)
 	switch (vals[0]->v_type) {
 		case V_NUM:
 			if (qiszero(vals[0]->v_num))
-				return error_value(E_LOGINF);
+				return error_value(E_ACSCH3);
 			result.v_num = qacsch(vals[0]->v_num, err);
 			result.v_type = V_NUM;
 			if (result.v_num == NULL) {
@@ -3159,9 +3219,10 @@ f_acsch(int count, VALUE **vals)
 		default:
 			return error_value(E_ACSCH2);
 	}
+	if (result.v_com == NULL) {
+		return error_value(E_ACSCH3);
+	}
 	if (result.v_type == V_COM) {
-		if (result.v_com == NULL)
-			return error_value(E_LOGINF);
 		if (cisreal(result.v_com)) {
 			q = qlink(result.v_com->real);
 			comfree(result.v_com);
@@ -3260,7 +3321,7 @@ f_agd(int count, VALUE **vals)
 			return error_value(E_AGD2);
 	}
 	if (result.v_com == NULL)
-			return error_value(E_AGD3);
+		return error_value(E_AGD3);
 	if (cisreal(result.v_com)) {
 		q = qlink(result.v_com->real);
 		comfree(result.v_com);
@@ -6022,12 +6083,15 @@ f_strerror(int count, VALUE **vals)
 	/* firewall - return generic error string if it is not assigned */
 	if (i >= nexterrnum || (i > E__HIGHEST && i < E_USERDEF)
 			|| (i < E__BASE && strerror(i) == NULL)) {
-		cp = (char *) malloc(sizeof("Error 1234567890")+1);
+		size_t snprintf_len;	/* malloced snprintf buffer length */
+		snprintf_len = sizeof("Unknown error 12345678901234567890")+1;
+		cp = (char *) malloc(snprintf_len+1);
 		if (cp == NULL) {
 			math_error("Out of memory for strerror");
 			/*NOTREACHED*/
 		}
-		sprintf(cp, "Unknown error %ld", i);
+		snprintf(cp, snprintf_len, "Unknown error %ld", i);
+		cp[snprintf_len] = '\0';	/* paranoia */
 		result.v_str = makestring(cp);
 		return result;
 	}
@@ -7550,6 +7614,8 @@ f_putenv(int count, VALUE **vals)
 	 * parse args
 	 */
 	if (count == 2) {
+		size_t snprintf_len;	/* malloced snprintf buffer length */
+
 		/* firewall */
 		if (vals[0]->v_type != V_STR || vals[1]->v_type != V_STR) {
 			math_error("Non-string argument for putenv");
@@ -7557,14 +7623,17 @@ f_putenv(int count, VALUE **vals)
 		}
 
 		/* convert putenv("foo","bar") into putenv("foo=bar") */
-		putenv_str = (char *)malloc(vals[0]->v_str->s_len + 1 +
-			    vals[1]->v_str->s_len + 1);
+		snprintf_len = vals[0]->v_str->s_len + 1 +
+                               vals[1]->v_str->s_len + 1;
+		putenv_str = (char *)malloc(snprintf_len+1);
 		if (putenv_str == NULL) {
 			math_error("Cannot allocate string in putenv");
 			/*NOTREACHED*/
 		}
-		sprintf(putenv_str, "%s=%s", vals[0]->v_str->s_str,
+		snprintf(putenv_str, snprintf_len,
+			"%s=%s", vals[0]->v_str->s_str,
 			vals[1]->v_str->s_str);
+		putenv_str[snprintf_len] = '\0';	/* paranoia */
 
 
 	} else {

have_stdvs.c

@@ -1,7 +1,7 @@
 /*
- * have_stdvs - try <stdarg.h> to see if it really works with vsprintf()
+ * have_stdvs - try <stdarg.h> to see if it really works with vsnprintf()
  *
- * Copyright (C) 1999,2014  Landon Curt Noll
+ * Copyright (C) 1999,2014,2018  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -25,16 +25,16 @@
  */
 
 /*
- * On some systems that have both <stdarg.h> and <varargs.h>, vsprintf()
+ * On some systems that have both <stdarg.h> and <varargs.h>, vsnprintf()
  * does not work well under one type of include file.
  *
  * Some systems (such as UMIPS) have bugs in the <stdarg.h> implementation
- * that show up in vsprintf(), so we may have to try to use sprintf()
- * as if it were vsprintf() and hope for the best.
+ * that show up in vsnprintf(), so we may have to try to use snprintf()
+ * as if it were vsnprintf() and hope for the best.
  *
- * This program will output #defines and exits 0 if vsprintf() (or sprintf())
- * produces the results that we expect.	 This program exits 1 if vsprintf()
- * (or sprintf()) produces unexpected results while using the <stdarg.h>
+ * This program will output #defines and exits 0 if vsnprintf() (or snprintf())
+ * produces the results that we expect.	 This program exits 1 if vsnprintf()
+ * (or snprintf()) produces unexpected results while using the <stdarg.h>
  * include file.
  */
 
@@ -57,39 +57,24 @@
 # include <stdlib.h>
 #endif
 
-#undef VSPRINTF_SIZE_T
+#undef VSNPRINTF_SIZE_T
 #if defined(FORCE_STDC) || (defined(__STDC__) && __STDC__ != 0) || \
     defined(__cplusplus)
-# define VSPRINTF_SIZE_T size_t
+# define VSNPRINTF_SIZE_T size_t
 #else
-# define VSPRINTF_SIZE_T long
+# define VSNPRINTF_SIZE_T long
 #endif
 
-char buf[BUFSIZ];
+char buf[BUFSIZ+1];
 
 
 void
-try_this(char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-#if !defined(DONT_HAVE_VSPRINTF)
-	vsprintf(buf, fmt, ap);
-#else
-	sprintf(buf, fmt, ap);
-#endif
-	va_end(ap);
-}
-
-
-void
-try_nthis(char *fmt, VSPRINTF_SIZE_T size, ...)
+try_nthis(char *fmt, VSNPRINTF_SIZE_T size, ...)
 {
 	va_list ap;
 
 	va_start(ap, size);
-#if !defined(DONT_HAVE_VSPRINTF)
+#if !defined(DONT_HAVE_VSNPRINTF)
 	vsnprintf(buf, size, fmt, ap);
 #else
 	snprintf(buf, size, fmt, ap);
@@ -106,36 +91,12 @@ main(void)
 	 */
 	buf[0] = '\0';
 
-	/*
-	 * test variable args and vsprintf/sprintf
-	 */
-	try_this("@%d:%s:%d@", 1, "hi", 2);
-	if (strcmp(buf, "@1:hi:2@") != 0) {
-#if !defined(DONT_HAVE_VSPRINTF)
-	    /* <stdarg.h> with vsprintf() didn't work */
-#else
-	    /* <stdarg.h> with sprintf() simulating vsprintf() didn't work */
-#endif
-	    exit(1);
-	}
-	try_this("%s %d%s%d%d %s",
-	    "Landon Noll 1st coproved that", 2, "^", 21701, -1, "was prime");
-	if (strcmp(buf,
-		   "Landon Noll 1st coproved that 2^21701-1 was prime") != 0) {
-#if !defined(DONT_HAVE_VSPRINTF)
-	    /* <stdarg.h> with vsprintf() didn't work */
-#else
-	    /* <stdarg.h> with sprintf() simulating vsprintf() didn't work */
-#endif
-	    exit(1);
-	}
-
 	/*
 	 * test variable args and vsnprintf/snprintf
 	 */
 	try_nthis("@%d:%s:%d@", sizeof(buf)-1, 1, "hello", 5);
 	if (strcmp(buf, "@1:hello:5@") != 0) {
-#if !defined(DONT_HAVE_VSPRINTF)
+#if !defined(DONT_HAVE_VSNPRINTF)
 	    /* <stdarg.h> with vsnprintf() didn't work */
 #else
 	    /* <stdarg.h> with snprintf() simulating vsnprintf() didn't work */
@@ -146,7 +107,7 @@ main(void)
 	    "Landon Noll 1st proved that", 2, "^", 23209, -1, "was prime");
 	if (strcmp(buf,
 		   "Landon Noll 1st proved that 2^23209-1 was prime") != 0) {
-#if !defined(DONT_HAVE_VSPRINTF)
+#if !defined(DONT_HAVE_VSNPRINTF)
 	    /* <stdarg.h> with vsnprintf() didn't work */
 #else
 	    /* <stdarg.h> with snprintf() simulating vsnprintf() didn't work */
@@ -158,7 +119,7 @@ main(void)
 	 * report the result
 	 */
 	puts("/* what type of variable args do we have? */");
-#if defined(DONT_HAVE_VSPRINTF)
+#if defined(DONT_HAVE_VSNPRINTF)
 	puts("/*");
 	puts(" * SIMULATE_STDARG");
 	puts(" *");
@@ -179,22 +140,21 @@ main(void)
 	puts("#define STDARG /* use <stdarg.h> */");
 	puts("#include <stdarg.h>");
 #endif
-	puts("\n/* should we use vsprintf() and vsnprintf()? */");
-#if !defined(DONT_HAVE_VSPRINTF)
-	puts("#define HAVE_VSPRINTF /* yes */");
+	puts("\n/* should we use vsnprintf() and vsnprintf()? */");
+#if !defined(DONT_HAVE_VSNPRINTF)
+	puts("#define HAVE_VSNPRINTF /* yes */");
 #else
 	puts("/*");
 	puts(" * Hack aleart!!!");
 	puts(" *");
-	puts(" * Systems that do not have vsprintf() need something.  In some");
-	puts(" * cases the sprintf function will deal correctly with the");
-	puts(" * va_alist 3rd arg.  Same gors for a lack of an vsnprintf()");
+	puts(" * Systems that do not have vsnprintf() need something. In some");
+	puts(" * cases the snprintf function will deal correctly with the");
+	puts(" * va_alist 4th arg.  Same gors for a lack of an vsnprintf()");
 	puts(" * function.  In either case we use the #defines below and");
 	puts(" * hope for the best!");
 	puts(" */");
-	puts("#define vsprintf sprintf");
 	puts("#define vsnprintf snprintf");
-	puts("#undef HAVE_VSPRINTF");
+	puts("#undef HAVE_VSNPRINTF");
 #endif
 	/* exit(0); */
 	return 0;

have_varvs.c

@@ -1,7 +1,7 @@
 /*
- * have_varvs - try <varargs.h> to see if it really works with vsprintf()
+ * have_varvs - try <varargs.h> to see if it really works with vsnprintf()
  *
- * Copyright (C) 1999  Landon Curt Noll
+ * Copyright (C) 1999,2018  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -26,12 +26,12 @@
 
 /*
  * Some systems have bugs in the <varargs.h> implementation that show up in
- * vsprintf(), so we may have to try to use sprintf() as if it were vsprintf()
- * and hope for the best.
+ * vsnprintf(), so we may have to try to use snprintf() as if it were
+ * vsnprintf() and hope for the best.
  *
- * This program will output #defines and exits 0 if vsprintf() (or sprintf())
- * produces the results that we expect.	 This program exits 1 if vsprintf()
- * (or sprintf()) produces unexpected results while using the <stdarg.h>
+ * This program will output #defines and exits 0 if vsnprintf() (or snprintf())
+ * produces the results that we expect.	 This program exits 1 if vsnprintf()
+ * (or snprintf()) produces unexpected results while using the <stdarg.h>
  * include file.
  */
 
@@ -48,43 +48,27 @@
 # include <string.h>
 #endif
 
-#undef VSPRINTF_SIZE_T
+#undef VSNPRINTF_SIZE_T
 #if defined(FORCE_STDC) || (defined(__STDC__) && __STDC__ != 0) || \
     defined(__cplusplus)
-# define VSPRINTF_SIZE_T size_t
+# define VSNPRINTF_SIZE_T size_t
 #else
-# define VSPRINTF_SIZE_T long
+# define VSNPRINTF_SIZE_T long
 #endif
 
-char buf[BUFSIZ];
+char buf[BUFSIZ+1];
 
 #if !defined(STDARG) && !defined(SIMULATE_STDARG)
 #include <varargs.h>
 
 void
-try_this(char *fmt, ...)
+try_nthis(char *fmt, VSNPRINTF_SIZE_T size, ...)
 {
     va_list ap;
 
     va_start(ap);
 
-#if !defined(DONT_HAVE_VSPRINTF)
-    vsprintf(buf, fmt, ap);
-#else
-    sprintf(buf, fmt, ap);
-#endif
-
-    va_end(ap);
-}
-
-void
-try_nthis(char *fmt, VSPRINTF_SIZE_T size, ...)
-{
-    va_list ap;
-
-    va_start(ap);
-
-#if !defined(DONT_HAVE_VSPRINTF)
+#if !defined(DONT_HAVE_VSNPRINTF)
     vsnprintf(buf, size, fmt, ap);
 #else
     snprintf(buf, size, fmt, ap);
@@ -96,13 +80,7 @@ try_nthis(char *fmt, VSPRINTF_SIZE_T size, ...)
 #else
 
 void
-try_this(char *a, int b, char *c, int d)
-{
-    return;
-}
-
-void
-try_nthis(char *a, VSPRINTF_SIZE_T size, int b, char *c, int d)
+try_nthis(char *a, VSNPRINTF_SIZE_T size, int b, char *c, int d)
 {
     return;
 }
@@ -118,36 +96,12 @@ main(void)
 	 */
 	buf[0] = '\0';
 
-	/*
-	 * test variable args and vsprintf/sprintf
-	 */
-	try_this("@%d:%s:%d@", 1, "hi", 2);
-	if (strcmp(buf, "@1:hi:2@") != 0) {
-#if !defined(DONT_HAVE_VSPRINTF)
-	    /* <varargs.h> with vsprintf() didn't work */
-#else
-	    /* <varargs.h> with sprintf() simulating vsprintf() didn't work */
-#endif
-	    exit(1);
-	}
-	try_this("%s %d%s%d%d %s",
-	    "Landon Noll 1st proved that", 2, "^", 23209, -1, "was prime");
-	if (strcmp(buf,
-		   "Landon Noll 1st proved that 2^23209-1 was prime") != 0) {
-#if !defined(DONT_HAVE_VSPRINTF)
-	    /* <varargs.h> with vsprintf() didn't work */
-#else
-	    /* <varargs.h> with sprintf() simulating vsprintf() didn't work */
-#endif
-	    exit(1);
-	}
-
 	/*
 	 * test variable args and vsnprintf/snprintf
 	 */
 	try_nthis("@%d:%s:%d@", sizeof(buf)-1, 1, "hello", 5);
 	if (strcmp(buf, "@1:hello:5@") != 0) {
-#if !defined(DONT_HAVE_VSPRINTF)
+#if !defined(DONT_HAVE_VSNPRINTF)
 	    /* <varargs.h> with vsnprintf() didn't work */
 #else
 	    /* <varargs.h> with snprintf() simulating vsnprintf() didn't work */
@@ -158,7 +112,7 @@ main(void)
 	    "Landon Noll 1st proved that", 2, "^", 23209, -1, "was prime");
 	if (strcmp(buf,
 		   "Landon Noll 1st proved that 2^23209-1 was prime") != 0) {
-#if !defined(DONT_HAVE_VSPRINTF)
+#if !defined(DONT_HAVE_VSNPRINTF)
 	    /* <varargs.h> with vsnprintf() didn't work */
 #else
 	    /* <varargs.h> with snprintf() simulating vsnprintf() didn't work */
@@ -172,22 +126,21 @@ main(void)
 	puts("/* what type of variable args do we have? */");
 	puts("#define VARARGS /* use <varargs.h> */");
 	puts("#include <varargs.h>");
-	puts("\n/* should we use vsprintf() and vsnprintf()? */");
-#if !defined(DONT_HAVE_VSPRINTF)
-	puts("#define HAVE_VSPRINTF /* yes */");
+	puts("\n/* should we use vsnprintf() and vsnprintf()? */");
+#if !defined(DONT_HAVE_VSNPRINTF)
+	puts("#define HAVE_VSNPRINTF /* yes */");
 #else
 	puts("/*");
 	puts(" * Hack aleart!!!");
 	puts(" *");
-	puts(" * Systems that do not have vsprintf() need something.  In some");
-	puts(" * cases the sprintf function will deal correctly with the");
-	puts(" * va_alist 3rd arg.  Same gors for a lack of an vsnprintf()");
+	puts(" * Systems that do not have vsnprintf() need something. In some");
+	puts(" * cases the snprintf() function will deal correctly with the");
+	puts(" * va_alist 4th arg.  Same gors for a lack of an vsnprintf()");
 	puts(" * function.  In either case we use the #defines below and");
 	puts(" * hope for the best!");
 	puts(" */");
-	puts("#define vsprintf sprintf");
 	puts("#define vsnprintf snprintf");
-	puts("#undef HAVE_VSPRINTF");
+	puts("#undef HAVE_VSNPRINTF");
 #endif
 	/* exit(0); */
 	return 0;

help.c

@@ -1,7 +1,7 @@
 /*
  * help - display help for calc
  *
- * Copyright (C) 1999-2007,2014  Landon Curt Noll
+ * Copyright (C) 1999-2007,2014,2018  Landon Curt Noll
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -183,6 +183,7 @@ givehelp(char *type)
 	FILE *stream;		/* help file stream */
 	char *helppath;		/* path to the help file */
 	char *c;
+	size_t snprintf_len;	/* malloced snprintf buffer length */
 
 	/*
 	 * check permissions to see if we are allowed to help
@@ -247,18 +248,21 @@ givehelp(char *type)
 	 */
 #if defined(CUSTOM)
 	if (sizeof(CUSTOMHELPDIR) > sizeof(HELPDIR)) {
-		helppath = (char *)malloc(sizeof(CUSTOMHELPDIR)+1+strlen(type));
+		snprintf_len = sizeof(CUSTOMHELPDIR)+1+strlen(type) + 1;
 	} else {
-		helppath = (char *)malloc(sizeof(HELPDIR)+1+strlen(type));
+		snprintf_len = sizeof(HELPDIR)+1+strlen(type) + 1;
 	}
+	helppath = (char *)malloc(snprintf_len+1);
 #else /* CUSTOM */
-	helppath = (char *)malloc(sizeof(HELPDIR)+1+strlen(type));
+	snprintf_len = sizeof(HELPDIR)+1+strlen(type) + 1;
+	helppath = (char *)malloc(snprintf_len+1);
 #endif /* CUSTOM */
 	if (helppath == NULL) {
 		fprintf(stderr, "malloc failure in givehelp()\n");
 		return;
 	}
-	sprintf(helppath, "%s/%s", HELPDIR, type);
+	snprintf(helppath, snprintf_len, "%s/%s", HELPDIR, type);
+	helppath[snprintf_len] = '\0';	/* paranoia */
 	stream = fopen(helppath, "r");
 	if (stream != NULL) {
 
@@ -274,7 +278,8 @@ givehelp(char *type)
 	 */
 	} else {
 
-		sprintf(helppath, "%s/%s", CUSTOMHELPDIR, type);
+		snprintf(helppath, snprintf_len, "%s/%s", CUSTOMHELPDIR, type);
+		helppath[snprintf_len] = '\0';	/* paranoia */
 		stream = fopen(helppath, "r");
 		if (stream == NULL) {
 

help/command

@@ -88,6 +88,31 @@ Command sequence
 	If the -m mode disallows opening of files for reading,
 	this command will be disabled.
 
+	To read a calc resource file without printing various
+	messages about defined functions, the "resource_debug"
+	config should be set to zero.  For example:
+
+	    read lucas;
+
+	will, by default, print messages such as:
+
+	    lucas(h,n) defined
+	    gen_u2(h,n,v1) defined
+	    gen_u0(h,n,v1) defined
+	    rodseth_xhn(x,h,n) defined
+	    gen_v1(h,n) defined
+	    ldebug(funct,str) defined
+	    legacy_gen_v1(h,n) defined
+
+        When "resource_debug" is zero, such messages are silenced.
+
+	    config("resource_debug", 0),;
+	    read lucas;
+
+	To silence such messages on the calc command line, try:
+
+	    calc -p -D :0 'read -once lucas; lucas(1, 23209);'
+
 
     write calc commands
     -------------------
@@ -350,7 +375,7 @@ Command sequence
 	statement   flow control and declaration statements
 	usage	    how to invoke the calc command and calc -options
 
-## Copyright (C) 1999-2006  Landon Curt Noll
+## Copyright (C) 1999-2006,2018  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

help/printf

@@ -28,7 +28,7 @@ DESCRIPTION
 	    zero or more decimal digits
 	    an optional '. followed by zero or more decimal deigits
 	    an optional 'l'
-	    one of the letters: d, s, c, f, e, r, o, x, b,
+	    one of the letters: d, s, c, f, e, g, r, o, x, b,
 
     If any other character is read, the '%' and any characters
     between '%' and the character are ignored and no specifier is
@@ -51,26 +51,27 @@ DESCRIPTION
 	    d, s, c		current config("mode")
 	    f		real (decimal, floating point)
 	    e		exponential
+	    g		real or exponential depending on config("display")
 	    r		fractional
 	    o		octal
 	    x		hexadecimal
 	    b		binary
 
-    If the number of arguments after fmt is less than the
-    number of format specifiers in fmt, the "missing" arguments
-    may be taken to be null values - these contribute nothing to the
-    output; if a positive width w has been specified, the effect is
-    to produce w spaces, e.g. printf("abc%6dxyz") prints "abc	   xyz".
+    If the number of arguments after fmt is less than the number
+    of format specifiers in fmt, the "missing" arguments may be
+    taken to be null values - these contribute nothing to the output;
+    if a positive width w has been specified, the effect is to
+    produce w spaces, e.g., printf("abc%6dxyz") prints "abc      xyz".
 
-    If i <= the number of specifiers in fmt, the value of argument x_i
-    is printed in the format specified by the i-th specifier.
-    If a positive width w has been specified and normal printing of x_i
-    does not include a '\n' character, what is printed will if necessary
-    be padded with spaces so that the length of the printed output
-    is at least the w.	Note that control
-    characters like '\t', '\b' each count as one character.  If
-    the 'right-pad' flag has been set, the padding is on the right;
-    otherwise it is on the left.
+    If i <= the number of specifiers in fmt, the value of argument
+    x_i is printed in the format specified by the i-th specifier.
+    If a positive width w has been specified and normal printing
+    of x_i does not include a '\n' character, what is printed will
+    if necessary be padded with spaces so that the length of the
+    printed output is at least the w.  Note that control characters
+    like '\t', '\b' each count as one character.  If the 'right-pad'
+    flag has been set, the padding is on the right; otherwise it
+    is on the left.
 
     If i > the number of specifiers in fmt, the value of argument x_i
     does not contribute to the printing.  However, as all arguments
@@ -84,9 +85,9 @@ DESCRIPTION
     mode.
 
     In the case of floating-point (f) format the precision determines
-    the maximum number of decimal places to be
-    displayed.	Other aspects of this printing may be affected by the
-    configuration parameters "outround", "tilde", "fullzero", "leadzero".
+    the maximum number of decimal places to be displayed.  Other
+    aspects of this printing may be affected by the configuration
+    parameters "outround", "tilde", "fullzero", "leadzero".
 
 EXAMPLE
     ; c = config("epsilon", 1e-6); c = config("display", 6);
@@ -116,6 +117,11 @@ EXAMPLE
       [2] = "undefined"
       [3] = NULL
 
+    ; c = config("display", 50);
+    ; printf("%g %g\n%g %g\n", 1e5, 1e49, 1e50, 1e500);
+    100000 100000000000000000000000000000000000000000000000000
+    1e50 1e500
+
 
 LIMITS
     The number of arguments of printf() is not to exceed 1024.
@@ -126,7 +132,7 @@ LINK LIBRARY
 SEE ALSO
     fprintf, strprintf, print
 
-## Copyright (C) 1999-2006  Landon Curt Noll
+## Copyright (C) 1999-2006,2018  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

help/strprintf

@@ -27,6 +27,13 @@ EXAMPLE
 	    "1.732051,	1.732051,1.732051  ,   ~1.7320,~1.7320,~1.
     "
 
+    ; c = config("display", 50);
+    ; fmt2 = "%g %g\n%g %g\n"
+    ; strprintf(fmt2, 1e5, 1e49, 1e50, 1e500);
+	    "100000 100000000000000000000000000000000000000000000000000
+    1e50 1e500
+    "
+
 LIMITS
     The number of arguments of strprintf() is not to exceed 1024.
 
@@ -39,7 +46,7 @@ SEE ALSO
 
     printf, fprintf, print
 
-## Copyright (C) 1999-2006  Landon Curt Noll
+## Copyright (C) 1999-2006,2018  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License

input.c

@@ -1,7 +1,7 @@
 /*
  * input - nested input source file reader
  *
- * Copyright (C) 1999-2007,2014  David I. Bell
+ * Copyright (C) 1999-2007,2014,2018  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -410,6 +410,7 @@ homeexpand(char *name)
 	char *after;		/* after the ~user or ~ */
 	char *username;		/* extracted username */
 	size_t fullpath_len;	/* length of fullpath */
+	size_t snprintf_len;	/* malloced snprintf buffer length */
 
 	/* firewall */
 	if (name[0] != HOMECHAR)
@@ -466,11 +467,13 @@ homeexpand(char *name)
 	/*
 	 * build the fullpath given the home directory
 	 */
-	fullpath = (char *)malloc(strlen(home2)+strlen(after)+1);
+	snprintf_len = strlen(home2)+strlen(after) + 1;
+	fullpath = (char *)malloc(snprintf_len+1);
 	if (fullpath == NULL) {
 		return NULL;
 	}
-	sprintf(fullpath, "%s%s", home2, after);
+	snprintf(fullpath, snprintf_len, "%s%s", home2, after);
+	fullpath[snprintf_len] = '\0';	/* paranoia */
 	return fullpath;
 #endif /* Windoz free systems */
 }

math_error.c

@@ -83,7 +83,7 @@ math_error(char *fmt, ...)
 #endif
 	vsnprintf(calc_err_msg, MAXERROR, fmt, ap);
 	va_end(ap);
-	calc_err_msg[MAXERROR] = '\0';
+	calc_err_msg[MAXERROR] = '\0';	/* paranoia */
 
 	/*
 	 * if we should longjmp, so do

qio.c

@@ -97,6 +97,15 @@ qprintf(char *fmt, ...)
 			q = va_arg(ap, NUMBER *);
 			qprintfe(q, width, precision);
 			break;
+		case 'g':
+			q = va_arg(ap, NUMBER *);
+			/* XXX - we need a qprintfg function */
+#if 0	/* XXX - we need a qprintfg() function */
+			qprintfg(q, width, precision);
+#else	/* XXX - use qprintfe until we have a qprintfg() function */
+			qprintfe(q, width, precision);
+#endif	/* XXX - we need a qprintfg() function */
+			break;
 		case 'r':
 		case 'R':
 			q = va_arg(ap, NUMBER *);
@@ -233,6 +242,33 @@ qprintnum(NUMBER *q, int outmode)
 		PRINTF1("e%ld", exp);
 		break;
 
+	case MODE_REAL_AUTO:
+	{
+		/*
+		 * XXX - re-write to not modify conf->outdigits
+		 *
+		 * Modifying the configuration value could be dangerious
+		 * when a calculation is aborted within an opcode.
+		 * Better to use qprintfg() use inline code that
+		 * does not depend on changing conf->outdigits.
+		 */
+		const int P = conf->outdigits ? conf->outdigits : 1;
+		long olddigits;
+		tmpval = *q;
+		tmpval.num.sign = 0;
+		exp = qilog10(&tmpval);
+		olddigits = conf->outdigits;
+		if (P > exp && exp >= -P) {
+			conf->outdigits = P - 1 - exp;
+			qprintnum(q, MODE_REAL);
+		} else {
+			conf->outdigits = P - 1;
+			qprintnum(q, MODE_EXP);
+		}
+		conf->outdigits = olddigits;
+		break;
+	}
+
 	case MODE_HEX:
 		qprintfx(q, 0L);
 		break;

sha1.c

@@ -684,7 +684,7 @@ sha1_print(HASH *state)
 		 *	 the last full update or finalization.	Thus it
 		 *	 may NOT be the actual hash value.
 		 */
-		sprintf(buf,
+		snprintf(buf, DEBUG_SIZE,
 			"sha1: 0x%08x%08x%08x%08x%08x data: %d octets",
 			(int)state->h_union.h_sha1.digest[0],
 			(int)state->h_union.h_sha1.digest[1],
@@ -692,6 +692,7 @@ sha1_print(HASH *state)
 			(int)state->h_union.h_sha1.digest[3],
 			(int)state->h_union.h_sha1.digest[4],
 			(int)state->h_union.h_sha1.datalen);
+		buf[DEBUG_SIZE] = '\0';	/* paranoia */
 		math_str(buf);
 	} else {
 		math_str("sha1 hash state");

token.c

@@ -718,7 +718,7 @@ scanerror(int skip, char *fmt, ...)
 	if (name) {
 		snprintf(calc_err_msg, MAXERROR, "\"%s\", line %ld: ",
 			 name, linenumber());
-		calc_err_msg[MAXERROR] = '\0';	/* firewall */
+		calc_err_msg[MAXERROR] = '\0';	/* paranoia */
 		len = strlen(calc_err_msg);
 		if (len < MAXERROR) {
 			vsnprintf(calc_err_msg+len, MAXERROR-len, fmt, ap);
@@ -727,7 +727,7 @@ scanerror(int skip, char *fmt, ...)
 		vsnprintf(calc_err_msg, MAXERROR, fmt, ap);
 	}
 	va_end(ap);
-	calc_err_msg[MAXERROR] = '\0';
+	calc_err_msg[MAXERROR] = '\0';	/* paranoia */
 
 	/* print error message if allowed */
 	if (calc_print_scanerr_msg != 0) {
@@ -782,7 +782,7 @@ scanerror(int skip, char *fmt, ...)
 	default:
 		snprintf(calc_err_msg, MAXERROR,
 			 "Unknown skip token for scanerror\n");
-		calc_err_msg[MAXERROR] = '\0';
+		calc_err_msg[MAXERROR] = '\0';	/* paranoia */
 		if (calc_print_scanerr_msg != 0) {
 			fprintf(stderr, "%s\n\n", calc_err_msg);
 		}
@@ -823,7 +823,7 @@ warning(char *fmt, ...)
 	if (name) {
 		snprintf(calc_warn_msg, MAXERROR, "\"%s\", line %ld: ",
 			 name, linenumber());
-		calc_warn_msg[MAXERROR] = '\0';	/* firewall */
+		calc_warn_msg[MAXERROR] = '\0';	/* paranoia */
 		len = strlen(calc_warn_msg);
 		if (len < MAXERROR) {
 			vsnprintf(calc_warn_msg+len, MAXERROR-len, fmt, ap);
@@ -832,7 +832,7 @@ warning(char *fmt, ...)
 		vsnprintf(calc_warn_msg, MAXERROR, fmt, ap);
 	}
 	va_end(ap);
-	calc_warn_msg[MAXERROR] = '\0';
+	calc_warn_msg[MAXERROR] = '\0';	/* paranoia */
 
 	/* print the warning if allowed */
 	if (calc_print_scanwarn_msg != 0) {

version.c

@@ -1,7 +1,7 @@
 /*
  * version - determine the version of calc
  *
- * Copyright (C) 1999-2017  David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999-2018  David I. Bell and Landon Curt Noll
  *
  * Primary author:  David I. Bell
  *
@@ -45,7 +45,7 @@ static char *program;
 #define MAJOR_VER	2	/* major library version */
 #define MINOR_VER	12	/* minor library version */
 #define MAJOR_PATCH	6	/* major software level under library version */
-#define MINOR_PATCH	7	/* minor software level or 0 if not patched */
+#define MINOR_PATCH	9	/* minor software level or 0 if not patched */
 
 
 /*
@@ -120,6 +120,7 @@ version(void)
 	snprintf(verbuf, BUFSIZ,
 	    "%d.%d.%d.%d", calc_major_ver, calc_minor_ver,
 	     calc_major_patch, calc_minor_patch);
+	verbuf[BUFSIZ] = '\0';	/* paranoia */
 
 	/*
 	 * save the versions string into a newly malloced buffer

win32.mkdef

@@ -1,5 +1,5 @@
 TERMCONTROL=-DUSE_WIN32
-HAVE_VSPRINTF=-UDONT_HAVE_VSPRINTF
+HAVE_VSNPRINTF=-UDONT_HAVE_VSNPRINTF
 BYTE_ORDER=-DLITTLE_ENDIAN
 LONG_BITS=32
 HAVE_FPOS=-DHAVE_NO_FPOS

zio.c

@@ -177,7 +177,7 @@ math_fmt(char *fmt, ...)
 	va_start(ap, fmt);
 	vsnprintf(buf, BUFSIZ, fmt, ap);
 	va_end(ap);
-	buf[BUFSIZ] = '\0';
+	buf[BUFSIZ] = '\0';	/* paranoia */
 	math_str(buf);
 }
 

zmath.h

@@ -579,10 +579,16 @@ E_FUNC void zredcpower(REDC *rp, ZVALUE z1, ZVALUE z2, ZVALUE *res);
 #define MODE_HEX	5
 #define MODE_OCTAL	6
 #define MODE_BINARY	7
-#define MODE_MAX	7
+#define MODE_REAL_AUTO	8
+#define MODE_MAX	8
 #define MODE2_OFF	(MODE_MAX+1)
 
+/* XXX - perhaps we need the MODE_REAL_AUTO vs MODE_REAL as a config mode? */
+#if 0 	/* XXX - can we safely set MODE_INITIAL to MODE_REAL_AUTO ?? */
+#define MODE_INITIAL	MODE_REAL_AUTO
+#else
 #define MODE_INITIAL	MODE_REAL
+#endif
 #define MODE2_INITIAL	MODE2_OFF