diff --git a/CHANGES b/CHANGES index 94e17f3..8267932 100644 --- a/CHANGES +++ b/CHANGES @@ -19,9 +19,6 @@ The following are the changes from calc version 2.11.0t10 to date: The 'unused value ignored' messages now start with Line 999: instead of just 999:. - Fixed some typos in the help files as reported by Klaus Alexander - Seistrup . - Fixed the long standing issue first reported by Saber-C in the domul() function in zmil.c thanks to a patch by Ernest Bowen . @@ -40,6 +37,15 @@ The following are the changes from calc version 2.11.0t10 to date: Fixed a number of insure warnings as reported by Michel van der List . + Fixed a number of help file typos discovered by Klaus Alexander + Seistrup . + + Removed REGRESS_CAL as a Makefile variable. + + Added calcliblist and calcliblistfmt utility Makefile rules to allow + one to print the list of distribution files that are used (but not + built) to form a .a calc library. + The following are the changes from calc version 2.11.0t8.9.1 to 2.11.0t9.4.5: diff --git a/Makefile b/Makefile index ebc65fa..315ad4c 100644 --- a/Makefile +++ b/Makefile @@ -957,15 +957,6 @@ UTIL_PROGS= align32 fposval have_uid_t longlong have_const \ have_ustat have_getsid have_getpgid \ have_gettime have_getprid ver_calc have_strdup -# These files are required by the regress.cal regression test. -# -REGRESS_CAL= ./lib/lucas_chk.cal ./lib/natnumset.cal ./lib/surd.cal \ - ./lib/test1700.cal ./lib/test2300.cal ./lib/test2600.cal \ - ./lib/test2700.cal ./lib/test3100.cal ./lib/test3300.cal \ - ./lib/test3400.cal ./lib/test3500.cal ./lib/test4000.cal \ - ./lib/test4100.cal ./lib/test4600.cal ./lib/test5100.cal \ - ./lib/test5200.cal - # The complete list of makefile vars passed down to custom/Makefile. # CUSTOM_PASSDOWN= Q="${Q}" \ @@ -1057,7 +1048,12 @@ C_SRC= ${LIBSRC} ${CALCSRC} ${UTIL_C_SRC} # These files are found (but not built) in the distribution # DISTLIST= ${C_SRC} ${H_SRC} ${MAKE_FILE} BUGS CHANGES LIBRARY README \ - calc.man lint.sed HOWTO.INSTALL ${UTIL_MISC_SRC} + calc.man lint.sed HOWTO.INSTALL ${UTIL_MISC_SRC} + +# These files are used to make (but not built) a calc .a library +# +CALCLIBLIST= ${LIBSRC} ${UTIL_C_SRC} ${LIB_H_SRC} ${MAKE_FILE} \ + ${UTIL_MISC_SRC} BUGS CHANGES LIBRARY # complete list of .o files # @@ -1074,7 +1070,7 @@ PROGS= calc ${UTIL_PROGS} # complete list of targets # TARGETS= ${CALC_LIBS} custom/.all calc sample/sample \ - lib/.all help/.all help/builtin calc.1 + lib/.all help/.all help/builtin calc.1 ### @@ -2559,17 +2555,29 @@ distlist: ${DISTLIST} ${Q}(for i in ${DISTLIST}; do \ echo $$i; \ done; \ - (cd help; ${MAKE} ${HELP_PASSDOWN} distlist); \ - (cd lib; ${MAKE} ${LIB_PASSDOWN} distlist); \ - (cd custom; ${MAKE} ${CUSTOM_PASSDOWN} distlist); \ - (cd sample; ${MAKE} ${SAMPLE_PASSDOWN} distlist)) | ${SORT} + (cd help; ${MAKE} ${HELP_PASSDOWN} $@); \ + (cd lib; ${MAKE} ${LIB_PASSDOWN} $@); \ + (cd custom; ${MAKE} ${CUSTOM_PASSDOWN} $@); \ + (cd sample; ${MAKE} ${SAMPLE_PASSDOWN} $@)) | ${SORT} distdir: ${Q}(echo .; \ - (cd help; ${MAKE} ${HELP_PASSDOWN} distdir); \ - (cd lib; ${MAKE} ${LIB_PASSDOWN} distdir); \ - (cd custom; ${MAKE} ${CUSTOM_PASSDOWN} distdir); \ - (cd sample; ${MAKE} ${SAMPLE_PASSDOWN} distdir)) | ${SORT} + (cd help; ${MAKE} ${HELP_PASSDOWN} $@); \ + (cd lib; ${MAKE} ${LIB_PASSDOWN} $@); \ + (cd custom; ${MAKE} ${CUSTOM_PASSDOWN} $@); \ + (cd sample; ${MAKE} ${SAMPLE_PASSDOWN} $@)) | ${SORT} + +calcliblist: + ${Q}(for i in ${CALCLIBLIST}; do \ + echo $$i; \ + done; \ + (cd help; ${MAKE} ${HELP_PASSDOWN} $@); \ + (cd lib; ${MAKE} ${LIB_PASSDOWN} $@); \ + (cd custom; ${MAKE} ${CUSTOM_PASSDOWN} $@); \ + (cd sample; ${MAKE} ${SAMPLE_PASSDOWN} $@)) | ${SORT} + +calcliblistfmt: + ${Q}${MAKE} calcliblist | ${FMT} -64 | ${SED} -e 's/^/ /' ## # @@ -2583,10 +2591,10 @@ distdir: # ## -check: all ./lib/regress.cal ${REGRESS_CAL} +check: all ./lib/regress.cal ${CALC_ENV} ./calc -d -q read regress -chk: ./lib/regress.cal ${REGRESS_CAL} +chk: ./lib/regress.cal ${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-=' ${CALC_ENV} ./calc -d -q read regress 2>&1 | ${AWK} -f check.awk ${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-=' @@ -2690,7 +2698,6 @@ env: @echo "UTIL_TMP=${UTIL_TMP}"; echo "" @echo "UTIL_PROGS=${UTIL_PROGS}"; echo "" @echo "LIB_H_SRC=${LIB_H_SRC}"; echo "" - @echo "REGRESS_CAL=${REGRESS_CAL}"; echo "" @echo "CUSTOM_PASSDOWN=${CUSTOM_PASSDOWN}"; echo "" @echo "SAMPLE_PASSDOWN=${SAMPLE_PASSDOWN}"; echo "" @echo "HELP_PASSDOWN=${HELP_PASSDOWN}"; echo "" diff --git a/custom/Makefile b/custom/Makefile index 04ae883..3910013 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -285,6 +285,10 @@ H_SRC= ${CUSTOM_H_SRC} DISTLIST= ${CUSTCALC_SRC} ${CUSTOM_CALC_FILES} ${CUSTOM_HELP} \ ${INSTALL_H_SRC} CUSTOM_CAL HOW_TO_ADD ${MAKE_FILE} +# These files are used to make (but not built) a calc .a library +# +CALCLIBLIST= ${CUSTCALC_SRC} ${INSTALL_H_SRC} ${MAKE_FILE} HOW_TO_ADD + # complete list of targets # TARGETS= libcustcalc.a ${CUSTCALC_OBJ} @@ -352,6 +356,13 @@ distlist: ${DISTLIST} distdir: ${Q}echo custom +calcliblist: ${CALCLIBLIST} + ${Q}for i in ${CALCLIBLIST} /dev/null; do \ + if [ X"$$i" != X"/dev/null" ]; then \ + echo custom/$$i; \ + fi; \ + done + ## # # Home grown make dependency rules. Your system make not support diff --git a/help/Makefile b/help/Makefile index 0d25c65..6d5bd86 100644 --- a/help/Makefile +++ b/help/Makefile @@ -147,6 +147,10 @@ DISTLIST= ${STD_HELP_FILES} ${DETAIL_HELP} ${MAKE_FILE} \ obj.file builtin.top builtin.end funclist.sed \ errorcodes.hdr errorcodes.sed +# These files are used to make (but not built) a calc .a library +# +CALCLIBLIST= + all: ${FULL_HELP_FILES} full ${DETAIL_HELP} ${DETAIL_CLONE} \ ${SINGULAR_FILES} calc .all @@ -395,6 +399,13 @@ distlist: ${DISTLIST} distdir: ${Q}echo help +calcliblist: + ${Q}for i in ${CALCLIBLIST} /dev/null; do \ + if [ X"$$i" != X"/dev/null" ]; then \ + echo help/$$i; \ + fi; \ + done + # The BSDI cdrom makefile expects all help files to be pre-built. This rule # creats these fils so that the release can be shipped off to BSDI. You can # ignore this rule. diff --git a/help/blk b/help/blk index 7b83eb8..47bd3e8 100644 --- a/help/blk +++ b/help/blk @@ -74,7 +74,7 @@ DESCRIPTION chunksize is created by C = blk(B, newlen, newchunk), only the first min(len, newlen) octets being copied from B; later octets are assigned zero value. If omitted, newlen and newchunk default to - the current datalen and chunk-size for B. The curent datalen, + the current datalen and chunk-size for B. The current datalen, chunksize and number of allocated octets for B may be changed by: B = blk(B, newlen, newchunk). diff --git a/help/fclose b/help/fclose index 5379660..177201f 100644 --- a/help/fclose +++ b/help/fclose @@ -20,7 +20,7 @@ DESCRIPTION Standard input, standard output and standard error are always opened and cannot be closed. - The truth value of an closed file is FALSE. + The truth value of a closed file is FALSE. The fclose function returns the numeric value of errno if there had been an error using the file, or the null value if diff --git a/help/ferror b/help/ferror index bcb792a..32b5d05 100644 --- a/help/ferror +++ b/help/ferror @@ -23,7 +23,7 @@ EXAMPLE 0 LIMITS - fd must be associaed with an open file + fd must be associated with an open file LIBRARY none diff --git a/help/fflush b/help/fflush index 985bcc7..cebc04f 100644 --- a/help/fflush +++ b/help/fflush @@ -10,7 +10,7 @@ TYPES return nil DESCRIPTION - This function forces and buffered output to the file associated with fd. + This function forces a buffered output to the file associated with fd. EXAMPLE > fd = fopen("/tmp/file", "w") @@ -18,7 +18,7 @@ EXAMPLE > fflush(fd) LIMITS - fd must be associaed with an open file + fd must be associated with an open file LIBRARY none diff --git a/help/fgetc b/help/fgetc index 89c2276..cad480a 100644 --- a/help/fgetc +++ b/help/fgetc @@ -25,7 +25,7 @@ EXAMPLE "c" LIMITS - fd must be associaed with an open file + fd must be associated with an open file LIBRARY none diff --git a/help/fgetline b/help/fgetline index 28cad8c..9eac634 100644 --- a/help/fgetline +++ b/help/fgetline @@ -41,7 +41,7 @@ EXAMPLE 123 LIMITS - fd must be associaed with an open file + fd must be associated with an open file LIBRARY none diff --git a/help/fgets b/help/fgets index bacad48..938547a 100644 --- a/help/fgets +++ b/help/fgets @@ -14,7 +14,7 @@ DESCRIPTION the open file associated with fd. Unlike fgetline, the trailing newline is included in the return string. - If a line is read, is returned, otherwise (EOF or ERROR) nil is returned. + If a line is read, it is returned, otherwise (EOF or ERROR) nil is returned. EXAMPLE > fd = fopen("/tmp/newfile", "w") @@ -30,7 +30,7 @@ EXAMPLE "chongo was here" LIMITS - fd must be associaed with an open file + fd must be associated with an open file LIBRARY none diff --git a/help/fgetstr b/help/fgetstr index b64bda3..2d3ed58 100644 --- a/help/fgetstr +++ b/help/fgetstr @@ -14,7 +14,7 @@ DESCRIPTION If the stream cannot be read, an error value is returned. - Otherwise the function retrurns the string of characters from the + Otherwise the function returns the string of characters from the current file position to the first null character ('\0') (the file position for further reading then being immediately after the '\0'), or if no null character is encountered, the string of characters to diff --git a/help/files b/help/files index bda5270..86066ae 100644 --- a/help/files +++ b/help/files @@ -10,7 +10,7 @@ TYPES return files, int or null DESCRIPTION - This function, then given the argument fnum, will use it as an + This function, when given the argument fnum, will use it as an index into an internal table of open file and return a file value. If that entry in the table is not in use, then the null value is returned instead. When no args are given, the maximum number of diff --git a/help/fopen b/help/fopen index 698d115..a60fb57 100644 --- a/help/fopen +++ b/help/fopen @@ -13,7 +13,7 @@ TYPES DESCRIPTION This function opens the file named filename. A file can be opened for either reading, writing, or appending. The mode - is controlled by the mode flag as folllows: + is controlled by the mode flag as follows: "r" reading "w" writing diff --git a/help/forall b/help/forall index 08fab1e..15f2c98 100644 --- a/help/forall +++ b/help/forall @@ -11,7 +11,7 @@ TYPES return null value DESCRIPTION - In forall(x,y), y is to the the name of a function; that function + In forall(x,y), y is the name of a function; that function is performed in succession for all elements of x. This is similar to modify(x, y) but x is not changed. diff --git a/help/fputc b/help/fputc index 739498d..e64dfd9 100644 --- a/help/fputc +++ b/help/fputc @@ -22,7 +22,7 @@ EXAMPLE "c" LIMITS - fd must be associaed with an open file + fd must be associated with an open file LIBRARY none diff --git a/help/freeglobals b/help/freeglobals index 871e515..514811d 100644 --- a/help/freeglobals +++ b/help/freeglobals @@ -1,5 +1,5 @@ NAME - freeglobals - free memory used for values of global variabls + freeglobals - free memory used for values of global variables SYNOPSIS freeglobals() diff --git a/help/fscanf b/help/fscanf index e96024e..9b4f56b 100644 --- a/help/fscanf +++ b/help/fscanf @@ -16,7 +16,7 @@ DESCRIPTION Otherwise, until the terminating null character of fmt is encountered or end-of-file for fs is reached, characters other than '%' and white - space are read from fmt and compared with the corresponding chracters + space are read from fmt and compared with the corresponding characters read from fs. If the characters match, the reading continues. If they do not match, an integer value is returned and the file position for fs is the position of the non-matching character. If white space @@ -72,7 +72,7 @@ DESCRIPTION might be taken to suggest a number like +2345; 'r' might suggest a representation like -27/49; 'e' might suggest a representation like 1.24e-7; 'f' might suggest a representation like 27.145. However, there - is no test that the the result conforms to the specifier. Whatever + is no test that the result conforms to the specifier. Whatever the specifier in these cases, the result depends on the characters read until a space or other exceptional character is read. The characters read may include one or more occurrences of +, -, * as diff --git a/help/fsize b/help/fsize index 4feb859..e500f31 100644 --- a/help/fsize +++ b/help/fsize @@ -20,7 +20,7 @@ EXAMPLE 784 LIMITS - fd must be associaed with an open file + fd must be associated with an open file LIBRARY none diff --git a/lib/Makefile b/lib/Makefile index 3d94123..577f02c 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -51,6 +51,10 @@ CALC_FILES= README bigprime.cal deg.cal ellip.cal lucas.cal lucas_chk.cal \ # DISTLIST= ${CALC_FILES} ${MAKE_FILE} +# These files are used to make (but not built) a calc .a library +# +CALCLIBLIST= + all: ${CALC_FILES} ${MAKE_FILE} .all # used by the upper level Makefile to determine of we have done all @@ -80,6 +84,13 @@ distlist: ${DISTLIST} distdir: ${Q}echo lib +calcliblist: + ${Q}for i in ${CALCLIBLIST} /dev/null; do \ + if [ X"$$i" != X"/dev/null" ]; then \ + echo lib/$$i; \ + fi; \ + done + clean: clobber: diff --git a/sample/Makefile b/sample/Makefile index b2d887c..ac46348 100644 --- a/sample/Makefile +++ b/sample/Makefile @@ -263,6 +263,10 @@ H_SRC= ${SAMPLE_H_SRC} # DISTLIST= ${C_SRC} ${H_SRC} ${MAKE_FILE} README_SAMPLE +# These files are used to make (but not built) a calc .a library +# +CALCLIBLIST= ${C_SRC} ${H_SRC} ${MAKE_FILE} README_SAMPLE + # complete list of targets # TARGETS= many_random test_random @@ -327,6 +331,13 @@ distlist: ${DISTLIST} distdir: ${Q}echo sample +calcliblist: + ${Q}for i in ${CALCLIBLIST} /dev/null; do \ + if [ X"$$i" != X"/dev/null" ]; then \ + echo sample/$$i; \ + fi; \ + done + ## # # Home grown make dependency rules. Your system make not support diff --git a/version.c b/version.c index 3fd4ad7..d0ff249 100644 --- a/version.c +++ b/version.c @@ -18,7 +18,7 @@ static char *program; #define MAJOR_VER 2 /* major version */ #define MINOR_VER 11 /* minor version */ #define MAJOR_PATCH 0 /* patch level or 0 if no patch */ -#define MINOR_PATCH "10.3" /* test number or empty string if no patch */ +#define MINOR_PATCH "10.3.1" /* test number or empty string if no patch */ /* * calc version constants