From e555a718c023605cc473cdaa6ed27ad117946f25 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Sun, 4 Mar 2018 11:09:09 -0800 Subject: [PATCH] Released calc 2.12.6.7 with help and input fixes Fixed errors in various help files such as: mat randbit seed srandom types Removed the MAXSTRING symbol because it was no longer used by calc. Increased HIST_SIZE (depth of the history stack) from 10k to 32k. Increased TTYSIZE (reallocation size for terminal buffers) from 100 to 8191. Increased MAXDEPTH (maximum depth of input stack) from 10 to 255. Increased interactive input buffer size from 1024 to 256k. This has the effect of increasing the maximum length of an input line from a tty. This helps with an interactive bug that was reported by Ruslan Kabatsayev (b7 dot 10110111 at gmail dot com). k --- CHANGES | 17 +++++++++++++++++ Makefile.ship | 2 +- calc.h | 1 - custom/Makefile | 2 +- custom/Makefile.head | 2 +- custom/c_sysinfo.c | 2 -- hist.h | 2 +- input.c | 6 +++--- version.c | 2 +- 9 files changed, 25 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 56c468d..f39545b 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,23 @@ The following are the changes from calc version 2.12.6.6 to date: Added work around for a gcc warning bug, thanks to a report by Mike . + Fixed errors in various help files such as: + + mat randbit seed srandom types + + Removed the MAXSTRING symbol because it was no longer used by calc. + + Increased HIST_SIZE (depth of the history stack) from 10k to 32k. + + Increased TTYSIZE (reallocation size for terminal buffers) from 100 to 8191. + + Increased MAXDEPTH (maximum depth of input stack) from 10 to 255. + + Increased interactive input buffer size from 1024 to 256k. This has the + effect of increasing the maximum length of an input line from a tty. + This helps with an interactive bug that was reported by Ruslan Kabatsayev + (b7 dot 10110111 at gmail dot com). + The following are the changes from calc version 2.12.6.4 to 2.12.6.5: diff --git a/Makefile.ship b/Makefile.ship index 5be48ba..16c203f 100644 --- a/Makefile.ship +++ b/Makefile.ship @@ -1054,7 +1054,7 @@ EXT= # The default calc versions # -VERSION= 2.12.6.6 +VERSION= 2.12.6.7 # Names of shared libraries with versions # diff --git a/calc.h b/calc.h index 0166658..3165f13 100644 --- a/calc.h +++ b/calc.h @@ -65,7 +65,6 @@ #define SYMBOLSIZE 256 /* maximum symbol name size */ #define MAXLABELS 100 /* maximum number of user labels in function */ -#define MAXSTRING 1024 /* maximum size of string constant */ #define MAXSTACK 2048 /* maximum depth of evaluation stack */ #define MAXFILES 20 /* maximum number of opened files */ #define PROMPT1 "> " /* default normal prompt*/ diff --git a/custom/Makefile b/custom/Makefile index 6102660..dda093d 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -348,7 +348,7 @@ EXT= # The default calc versions # -VERSION= 2.12.6.6 +VERSION= 2.12.6.7 # Names of shared libraries with versions # diff --git a/custom/Makefile.head b/custom/Makefile.head index b87ff5f..0e0aa04 100644 --- a/custom/Makefile.head +++ b/custom/Makefile.head @@ -348,7 +348,7 @@ EXT= # The default calc versions # -VERSION= 2.12.6.6 +VERSION= 2.12.6.7 # Names of shared libraries with versions # diff --git a/custom/c_sysinfo.c b/custom/c_sysinfo.c index 5272e70..67d35ee 100644 --- a/custom/c_sysinfo.c +++ b/custom/c_sysinfo.c @@ -173,8 +173,6 @@ STATIC struct infoname sys_info[] = { (FULL)MAXSCANCOUNT}, {"MAXSTACK", "max depth of evaluation stack", NULL, (FULL)MAXSTACK}, - {"MAXSTRING", "max size of string constant", NULL, - (FULL)MAXSTRING}, {"MAXUFULL", "largest FULL value", NULL, (FULL)MAXUFULL}, {"MAXULONG", "largest unsigned long val", NULL, diff --git a/hist.h b/hist.h index 0e9319c..68eabdf 100644 --- a/hist.h +++ b/hist.h @@ -36,7 +36,7 @@ #endif #ifndef HIST_SIZE -#define HIST_SIZE (1024*10) +#define HIST_SIZE (1024*32) #endif diff --git a/input.c b/input.c index 166bab7..235fae5 100644 --- a/input.c +++ b/input.c @@ -59,8 +59,8 @@ E_FUNC FILE *f_open(char *name, char *mode); E_FUNC FILE *curstream(void); -#define TTYSIZE 100 /* reallocation size for terminal buffers */ -#define MAXDEPTH 10 /* maximum depth of input */ +#define TTYSIZE 8191 /* reallocation size for terminal buffers */ +#define MAXDEPTH 255 /* maximum depth of input */ #define IS_READ 1 /* reading normally */ #define IS_REREAD 2 /* reread current character */ #define chartoint(ch) ((ch) & 0xff) /* make sure char is not negative */ @@ -789,7 +789,7 @@ ttychar(void) { int ch; /* current char */ int len; /* length of current command */ - STATIC char charbuf[1024]; + STATIC char charbuf[256*1024]; /* * If we have more to read from the saved command line, then do that. diff --git a/version.c b/version.c index 6d81f0b..6811f43 100644 --- a/version.c +++ b/version.c @@ -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 6 /* minor software level or 0 if not patched */ +#define MINOR_PATCH 7 /* minor software level or 0 if not patched */ /*