Release calc version 2.11.0t9.4.2

Makefile

@@ -273,6 +273,18 @@ HAVE_URANDOM=
 HAVE_GETRUSAGE=
 #HAVE_GETRUSAGE= -DHAVE_NO_GETRUSAGE
 
+# Determine if we have strdup()
+#
+# If HAVE_STRDUP is empty, this makefile will run the have_memmv program
+# to determine if strdup() is supported.  If HAVE_STRDUP is set to
+# -DHAVE_NO_STRDUP, then calc will use internal functions to simulate
+# the memory move function that does correct overlapping memory modes.
+#
+# If in doubt, leave HAVE_STRDUP empty and this Makefile will figure it out.
+#
+HAVE_STRDUP=
+#HAVE_STRDUP= -DHAVE_NO_STRDUP
+
 # Some architectures such as Sparc do not allow one to access 32 bit values
 # that are not alligned on a 32 bit boundary.
 #
@@ -762,7 +774,7 @@ CC= ${PURIFY} ${LCC}
 #
 ###
 #
-# RS6000 set
+# AIX RS/6000 set
 #
 #CCWARN=
 #CCOPT= ${DEBUG} ${NO_SHARED}
@@ -932,7 +944,8 @@ BUILD_H_SRC= align32.h args.h calcerr.h conf.h endian_calc.h \
 	have_stdlib.h have_string.h have_times.h have_uid_t.h \
 	have_unistd.h longbits.h longlong.h terminal.h calc_errno.h \
 	have_ustat.h have_getsid.h have_getpgid.h \
-	have_gettime.h have_getprid.h have_urandom.h have_rusage.h
+	have_gettime.h have_getprid.h have_urandom.h have_rusage.h \
+	have_strdup.h
 
 # we build these .c files during the make
 #
@@ -946,7 +959,7 @@ UTIL_C_SRC= align32.c endian.c longbits.c have_newstr.c have_uid_t.c \
 	have_const.c have_stdvs.c have_varvs.c fposval.c have_fpos.c \
 	longlong.c have_offscl.c have_posscl.c have_memmv.c calc_errno.c \
 	have_ustat.c have_getsid.c have_getpgid.c \
-	have_gettime.c have_getprid.c have_rusage.c
+	have_gettime.c have_getprid.c have_rusage.c have_strdup.c
 
 # these awk and sed tools are used in the process of building BUILD_H_SRC
 # and BUILD_C_SRC
@@ -962,20 +975,20 @@ UTIL_OBJS= endian.o longbits.o have_newstr.o have_uid_t.o \
 	have_const.o fposval.o have_fpos.o longlong.o try_strarg.o \
 	have_stdvs.o have_varvs.o have_posscl.o have_memmv.o calc_errno.o \
 	have_ustat.o have_getsid.o have_getpgid.o \
-	have_gettime.o have_getprid.o ver_calc.o have_rusage.o
+	have_gettime.o have_getprid.o ver_calc.o have_rusage.o have_strdup.o
 
 # these temp files may be created (and removed) during the build of BUILD_C_SRC
 #
 UTIL_TMP= ll_tmp fpos_tmp fposv_tmp const_tmp uid_tmp newstr_tmp vs_tmp \
 	calc_errno_tmp memmv_tmp offscl_tmp posscl_tmp newstr_tmp \
-	getsid_tmp gettime_tmp getprid_tmp rusage_tmp
+	getsid_tmp gettime_tmp getprid_tmp rusage_tmp strdup_tmp
 
 # these utility progs may be used in the process of building BUILD_H_SRC
 #
 UTIL_PROGS= align32 fposval have_uid_t longlong have_const \
 	endian longbits have_newstr have_stdvs have_varvs calc_errno \
 	have_ustat have_getsid have_getpgid \
-	have_gettime have_getprid ver_calc
+	have_gettime have_getprid ver_calc have_strdup
 
 # These files are required by the regress.cal regression test.
 #
@@ -1128,13 +1141,14 @@ calc.1: calc.man ${MAKE_FILE}
 ##
 
 calc.o: calc.c ${MAKE_FILE}
-	${CC} ${CFLAGS} ${CCOPT} ${ALLOW_CUSTOM} -c calc.c
+	${CC} ${CFLAGS} ${ALLOW_CUSTOM} -c calc.c
 
 custom.o: custom.c ${MAKE_FILE}
 	${CC} ${CFLAGS} ${ALLOW_CUSTOM} -c custom.c
 
 hist.o: hist.c ${MAKE_FILE}
-	${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} -c hist.c
+	${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} \
+	    -c hist.c
 
 func.o: func.c ${MAKE_FILE}
 	${CC} ${CFLAGS} ${ALLOW_CUSTOM} -c func.c
@@ -1535,6 +1549,8 @@ longlong.h: longlong.c have_stdlib.h have_string.h ${MAKE_FILE}
 	else \
 	    echo '#undef HAVE_LONGLONG' >> longlong.h; \
 	    echo '#define LONGLONG_BITS 0  /* no */' >> longlong.h; \
+	    echo '#undef LL_FORMAT' >> longlong.h; \
+	    echo '#undef L_FORMAT' >> longlong.h; \
 	fi
 	${Q}echo '' >> longlong.h
 	${Q}echo '' >> longlong.h
@@ -2174,6 +2190,45 @@ have_rusage.h: have_rusage.c ${MAKE_FILE}
 	    true; \
 	fi
 
+have_strdup.h: have_strdup.c ${MAKE_FILE}
+	-${Q}rm -f have_strdup have_strdup.o strdup_tmp have_strdup.h
+	${Q}echo 'forming have_strdup.h'
+	${Q}echo '/*' > have_strdup.h
+	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_strdup.h
+	${Q}echo ' */' >> have_strdup.h
+	${Q}echo '' >> have_strdup.h
+	${Q}echo '' >> have_strdup.h
+	${Q}echo '#if !defined(__HAVE_RUSAGE_H__)' >> have_strdup.h
+	${Q}echo '#define __HAVE_RUSAGE_H__' >> have_strdup.h
+	${Q}echo '' >> have_strdup.h
+	${Q}echo '' >> have_strdup.h
+	${Q}echo '/* do we have or want getstrdup()? */' >> have_strdup.h
+	-${Q}rm -f have_strdup.o have_strdup
+	-${Q}${LCC} ${ICFLAGS} ${HAVE_STRDUP} have_strdup.c -c 2>/dev/null; \
+	     true
+	-${Q}${LCC} ${ILDFLAGS} have_strdup.o -o have_strdup 2>/dev/null; true
+	-${Q}${SHELL} -c "./have_strdup > strdup_tmp 2>/dev/null" \
+	    >/dev/null 2>&1; true
+	-${Q}if [ -s strdup_tmp ]; then \
+	    cat strdup_tmp >> have_strdup.h; \
+	else \
+	    echo '#undef HAVE_STRDUP /* no */' >> have_strdup.h; \
+	fi
+	${Q}echo '' >> have_strdup.h
+	${Q}echo '' >> have_strdup.h
+	${Q}echo '#endif /* !__HAVE_RUSAGE_H__ */' >> have_strdup.h
+	-${Q}rm -f have_strdup have_strdup.o strdup_tmp
+	${Q}echo 'have_strdup.h formed'
+	-@if [ -z "${Q}" ]; then \
+	    echo ''; \
+	    echo '=-=-= start of $@ =-=-='; \
+	    cat $@; \
+	    echo '=-=-= end of $@ =-=-='; \
+	    echo ''; \
+	else \
+	    true; \
+	fi
+
 args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h have_string.h
 	-${Q}rm -f args.h have_args
 	${Q}echo 'forming args.h'
@@ -3048,6 +3103,7 @@ addop.o: config.h
 addop.o: endian_calc.h
 addop.o: func.h
 addop.o: hash.h
+addop.o: have_const.h
 addop.o: have_malloc.h
 addop.o: have_memmv.h
 addop.o: have_newstr.h
@@ -3104,6 +3160,7 @@ blkcpy.o: config.h
 blkcpy.o: endian_calc.h
 blkcpy.o: file.h
 blkcpy.o: hash.h
+blkcpy.o: have_const.h
 blkcpy.o: have_fpos.h
 blkcpy.o: have_malloc.h
 blkcpy.o: have_memmv.h
@@ -3208,6 +3265,7 @@ codegen.o: config.h
 codegen.o: endian_calc.h
 codegen.o: func.h
 codegen.o: hash.h
+codegen.o: have_const.h
 codegen.o: have_malloc.h
 codegen.o: have_memmv.h
 codegen.o: have_newstr.h
@@ -3292,6 +3350,7 @@ const.o: config.h
 const.o: const.c
 const.o: endian_calc.h
 const.o: hash.h
+const.o: have_const.h
 const.o: have_malloc.h
 const.o: have_memmv.h
 const.o: have_newstr.h
@@ -3346,6 +3405,7 @@ file.o: file.c
 file.o: file.h
 file.o: fposval.h
 file.o: hash.h
+file.o: have_const.h
 file.o: have_fpos.h
 file.o: have_malloc.h
 file.o: have_memmv.h
@@ -3447,6 +3507,7 @@ have_rusage.o: have_rusage.c
 have_stdvs.o: have_stdvs.c
 have_stdvs.o: have_string.h
 have_stdvs.o: have_unistd.h
+have_strdup.o: have_strdup.c
 have_uid_t.o: have_uid_t.c
 have_uid_t.o: have_unistd.h
 have_ustat.o: have_ustat.c
@@ -3463,6 +3524,7 @@ help.o: conf.h
 help.o: config.h
 help.o: endian_calc.h
 help.o: hash.h
+help.o: have_const.h
 help.o: have_malloc.h
 help.o: have_memmv.h
 help.o: have_newstr.h
@@ -3488,10 +3550,12 @@ hist.o: cmath.h
 hist.o: config.h
 hist.o: endian_calc.h
 hist.o: hash.h
+hist.o: have_const.h
 hist.o: have_malloc.h
 hist.o: have_memmv.h
 hist.o: have_newstr.h
 hist.o: have_stdlib.h
+hist.o: have_strdup.h
 hist.o: have_string.h
 hist.o: have_unistd.h
 hist.o: hist.c
@@ -3516,6 +3580,7 @@ input.o: conf.h
 input.o: config.h
 input.o: endian_calc.h
 input.o: hash.h
+input.o: have_const.h
 input.o: have_malloc.h
 input.o: have_memmv.h
 input.o: have_newstr.h
@@ -3546,6 +3611,7 @@ label.o: config.h
 label.o: endian_calc.h
 label.o: func.h
 label.o: hash.h
+label.o: have_const.h
 label.o: have_malloc.h
 label.o: have_memmv.h
 label.o: have_newstr.h
@@ -3580,6 +3646,7 @@ lib_calc.o: have_malloc.h
 lib_calc.o: have_memmv.h
 lib_calc.o: have_newstr.h
 lib_calc.o: have_stdlib.h
+lib_calc.o: have_strdup.h
 lib_calc.o: have_string.h
 lib_calc.o: have_unistd.h
 lib_calc.o: label.h
@@ -3675,6 +3742,7 @@ math_error.o: cmath.h
 math_error.o: config.h
 math_error.o: endian_calc.h
 math_error.o: hash.h
+math_error.o: have_const.h
 math_error.o: have_malloc.h
 math_error.o: have_memmv.h
 math_error.o: have_newstr.h
@@ -3725,6 +3793,7 @@ obj.o: config.h
 obj.o: endian_calc.h
 obj.o: func.h
 obj.o: hash.h
+obj.o: have_const.h
 obj.o: have_malloc.h
 obj.o: have_memmv.h
 obj.o: have_newstr.h
@@ -4030,6 +4099,7 @@ string.o: cmath.h
 string.o: config.h
 string.o: endian_calc.h
 string.o: hash.h
+string.o: have_const.h
 string.o: have_malloc.h
 string.o: have_memmv.h
 string.o: have_newstr.h
@@ -4055,6 +4125,7 @@ symbol.o: config.h
 symbol.o: endian_calc.h
 symbol.o: func.h
 symbol.o: hash.h
+symbol.o: have_const.h
 symbol.o: have_malloc.h
 symbol.o: have_memmv.h
 symbol.o: have_newstr.h
@@ -4084,6 +4155,7 @@ token.o: cmath.h
 token.o: config.h
 token.o: endian_calc.h
 token.o: hash.h
+token.o: have_const.h
 token.o: have_malloc.h
 token.o: have_memmv.h
 token.o: have_newstr.h
@@ -4143,6 +4215,7 @@ version.o: cmath.h
 version.o: config.h
 version.o: endian_calc.h
 version.o: hash.h
+version.o: have_const.h
 version.o: have_malloc.h
 version.o: have_memmv.h
 version.o: have_newstr.h