drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-16 01:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Release calc version 2.12.5.6

Browse Source
This commit is contained in:
Landon Curt Noll
2017-05-21 15:03:29 -07:00
parent 8dd7a3cd2a
commit 40fc854006
8 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGES
View File

@@ -1,4 +1,12 @@
The following are the changes from calc version 2.12.5.4 to date: The following are the changes from calc version 2.12.5.6 to date:
Fixed a crash that showed up on Mac OS that was reported
by Richard Outerbridge <outer at interlog dot com> and
fixed by Stuart Henderson <stu at spacehopper dot org>.
Thanks goes to both!
The following are the changes from calc version 2.12.5.4 to 2.12.5.5:
Recompile to match current RHEL7.2 libc and friends. Recompile to match current RHEL7.2 libc and friends.

4
Makefile
View File

@@ -41,7 +41,7 @@
# #
MAKEFILE_REV= $$Revision: 30.88 $$ MAKEFILE_REV= $$Revision: 30.88 $$
# @(#) $Id: Makefile.ship,v 30.88 2017/05/21 01:26:42 chongo Exp $ # @(#) $Id: Makefile.ship,v 30.88 2017/05/21 01:26:42 chongo Exp $
# @(#) $Source: /usr/local/src/bin/calc-RHEL7/RCS/Makefile.ship,v $ # @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $
# #
# Under source code control: 1990/02/15 01:48:41 # Under source code control: 1990/02/15 01:48:41
# File existed as early as: before 1990 # File existed as early as: before 1990
@@ -992,7 +992,7 @@ EXT=
# The default calc versions # The default calc versions
# #
VERSION= 2.12.5.5 VERSION= 2.12.5.6
# Names of shared libraries with versions # Names of shared libraries with versions
# #

4
Makefile.simple
View File

@@ -41,7 +41,7 @@
# #
MAKEFILE_REV= $$Revision: 30.88 $$ MAKEFILE_REV= $$Revision: 30.88 $$
# @(#) $Id: Makefile.ship,v 30.88 2017/05/21 01:26:42 chongo Exp $ # @(#) $Id: Makefile.ship,v 30.88 2017/05/21 01:26:42 chongo Exp $
# @(#) $Source: /usr/local/src/bin/calc-RHEL7/RCS/Makefile.ship,v $ # @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $
# #
# Under source code control: 1990/02/15 01:48:41 # Under source code control: 1990/02/15 01:48:41
# File existed as early as: before 1990 # File existed as early as: before 1990
@@ -961,7 +961,7 @@ EXT=
# The default calc versions # The default calc versions
# #
VERSION= 2.12.5.5 VERSION= 2.12.5.6
# Names of shared libraries with versions # Names of shared libraries with versions
# #

2
custom/Makefile
View File

@@ -352,7 +352,7 @@ EXT=
# The default calc versions # The default calc versions
# #
VERSION= 2.12.5.5 VERSION= 2.12.5.6
# Names of shared libraries with versions # Names of shared libraries with versions
# #

2
custom/Makefile.head
View File

@@ -352,7 +352,7 @@ EXT=
# The default calc versions # The default calc versions
# #
VERSION= 2.12.5.5 VERSION= 2.12.5.6
# Names of shared libraries with versions # Names of shared libraries with versions
# #

2
custom/Makefile.simple
View File

@@ -337,7 +337,7 @@ EXT=
# The default calc versions # The default calc versions
# #
VERSION= 2.12.5.5 VERSION= 2.12.5.6
# Names of shared libraries with versions # Names of shared libraries with versions
# #

33
lib_calc.c
View File

@@ -259,9 +259,40 @@ libcalc_call_me_first(void)
* initialize old and new configuration values * initialize old and new configuration values
*/ */
newstd.epsilon = &_qonesqbase_; /* magic to fake early str2q() */ newstd.epsilon = &_qonesqbase_; /* magic to fake early str2q() */
if (program == NULL) {
fprintf(stderr, "libcalc_call_me_first: FATAL: "
"program is NULL\n");
exit(80);
}
newstd.program = strdup(program); newstd.program = strdup(program);
if (newstd.program == NULL) {
fprintf(stderr, "libcalc_call_me_first: FATAL: "
"cannot strdup program string\n");
exit(81);
}
if (base_name == NULL) {
fprintf(stderr, "libcalc_call_me_first: FATAL: "
"base_name is NULL\n");
exit(82);
}
newstd.base_name = strdup(base_name); newstd.base_name = strdup(base_name);
newstd.version = strdup(version()); if (newstd.base_name == NULL) {
fprintf(stderr, "libcalc_call_me_first: FATAL: "
"cannot strdup base_name string\n");
exit(83);
}
p = version();
if (p == NULL) {
fprintf(stderr, "libcalc_call_me_first: FATAL: "
"version() returned NULL\n");
exit(84);
}
newstd.version = strdup(p);
if (newstd.version == NULL) {
fprintf(stderr, "libcalc_call_me_first: FATAL: "
"cannot strdup return from version()\n");
exit(85);
}
conf = config_copy(&newstd); /* more magic to fake early str2q() */ conf = config_copy(&newstd); /* more magic to fake early str2q() */
conf->tab_ok = FALSE; conf->tab_ok = FALSE;
newstd.epsilon = str2q(EPSILON_DEFAULT); newstd.epsilon = str2q(EPSILON_DEFAULT);

4
version.c
View File

@@ -49,7 +49,7 @@ static char *program;
#define MAJOR_VER 2 /* major library version */ #define MAJOR_VER 2 /* major library version */
#define MINOR_VER 12 /* minor library version */ #define MINOR_VER 12 /* minor library version */
#define MAJOR_PATCH 5 /* major software level under library version */ #define MAJOR_PATCH 5 /* major software level under library version */
#define MINOR_PATCH 5 /* minor software level or 0 if not patched */ #define MINOR_PATCH 6 /* minor software level or 0 if not patched */
/* /*
@@ -134,7 +134,7 @@ version(void)
fprintf(stderr, "%s: cannot malloc version string\n", program); fprintf(stderr, "%s: cannot malloc version string\n", program);
exit(70); exit(70);
} }
strncpy(stored_version, verbuf, BUFSIZ); strncpy(stored_version, verbuf, len);
stored_version[len] = '\0'; /* paranoia */ stored_version[len] = '\0'; /* paranoia */
/* /*