Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2012-03-07 20:09:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2012-02-16 16:21:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ncurses.new/ncurses.changes 2012-03-07 20:09:49.000000000 +0100 @@ -1,0 +2,53 @@ +Mon Mar 5 11:33:17 UTC 2012 - [email protected] + +- Add tack patch 1.07.20120303 + + fix many compilerv warnings + + update auto configure + + update copyright date + + Update configure-script and makefile template to work with this + post-5.9 change, allowing build of tack within the ncurses + source-tree 20110924. The change is prompted by review of + OpenSUSE package by Werner Fink, using a patch from the rpm + source file: ncurses-5.9-tack-tinfo.dif (2011-11-18) + +------------------------------------------------------------------- +Mon Mar 5 10:36:49 UTC 2012 - [email protected] + +- Add ncurses patch 5.9.20120303 + + minor tidying of terminfo.tail, clarify reason for limitation + regarding mapping of \0 to \200 + + minor improvement to _nc_copy_termtype(), using memcpy to replace + loops. + + fix no-leaks checking in test/demo_termcap.c to account for multiple + calls to setupterm(). + + modified the libgpm change to show previous load as a problem in the + debug-trace. + > merge some patches from OpenSUSE rpm (Werner Fink): + + ncurses-5.7-printw.dif, fixes for varargs handling in lib_printw.c + + ncurses-5.7-gpm.dif, do not dlopen libgpm if already loaded by + runtime linker + + ncurses-5.6-fallback.dif, do not free arrays and strings from static + fallback entries + +------------------------------------------------------------------- +Thu Mar 1 14:02:05 UTC 2012 - [email protected] + +- Add ncurses patch 5.9.20120228 + + fix breakage in tic/infocmp from 20120225 (report by Werner Fink). + +------------------------------------------------------------------- +Mon Feb 27 12:14:14 UTC 2012 - [email protected] + +- Add ncurses patch 5.9.20120225 + + modify configure script to allow creating dll's for MinGW when + cross-compiling. + + add --enable-string-hacks option to control whether strlcat and + strlcpy may be used. The same issue applies to OpenBSD's warnings + about snprintf, noting that this function is weakly standardized. + + add configure checks for strlcat, strlcpy and snprintf, to help + reduce bogus warnings with OpenBSD builds. + + build-fix for OpenBSD 4.9 to supply consistent intptr_t declaration + (cf:20111231) + + update config.guess, config.sub + +------------------------------------------------------------------- Old: ---- ncurses-5.6-fallback.dif ncurses-5.7-gpm.dif ncurses-5.7-printw.dif ncurses-5.9-tack-tinfo.dif tack-1.07-20110626.tar.bz2 New: ---- ncurses-5.9-fortify.dif tack-1.07-20120303.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses.spec ++++++ --- /var/tmp/diff_new_pack.qGZhqd/_old 2012-03-07 20:09:50.000000000 +0100 +++ /var/tmp/diff_new_pack.qGZhqd/_new 2012-03-07 20:09:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ncurses # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: ncurses #!BuildIgnore: terminfo BuildRequires: gcc-c++ @@ -41,16 +43,13 @@ Source2: handle.linux Source3: README.devel Source4: ncurses-rpmlintrc -Source5: tack-1.07-20110626.tar.bz2 +Source5: tack-1.07-20120303.tar.bz2 Source6: edit.sed Source7: baselibs.conf Patch0: ncurses-%{version}.dif -Patch1: ncurses-5.7-printw.dif +Patch1: ncurses-5.9-fortify.dif Patch3: ncurses-5.9-overwrite.dif Patch4: ncurses-5.7-tack.dif -Patch5: ncurses-5.7-gpm.dif -Patch6: ncurses-5.6-fallback.dif -Patch7: ncurses-5.9-tack-tinfo.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -262,12 +261,9 @@ tar Oxfj %{S:1} | patch -p1 -s tar xfj %{S:5} mv tack-* tack -%patch -P 1 -p0 -b .va +%patch -P 1 -p0 -b .ovf %patch -P 3 -p0 -b .ow %patch -P 4 -p0 -b .hs -%patch -P 5 -p0 -b .gpm -%patch -P 6 -p0 -b .fb -%patch -P 7 -p0 -b .tc %patch -P 0 -p0 -b .p0 rm -vf include/ncurses_dll.h rm -vf mkdirs.sh @@ -404,6 +400,7 @@ --enable-weak-symbols \ --enable-wgetch-events \ --enable-pthreads-eintr \ + --enable-string-hacks \ --prefix=%{_prefix} \ --exec-prefix=%{_prefix}\ --libdir=%{_libdir} \ ++++++ ncurses-5.7-tack.dif ++++++ --- /var/tmp/diff_new_pack.qGZhqd/_old 2012-03-07 20:09:50.000000000 +0100 +++ /var/tmp/diff_new_pack.qGZhqd/_new 2012-03-07 20:09:50.000000000 +0100 @@ -1,11 +1,11 @@ --- tack/Makefile.in -+++ tack/Makefile.in 2008-08-14 13:57:00.930682483 +0200 ++++ tack/Makefile.in 2012-03-05 11:30:45.001933741 +0000 @@ -98,7 +98,7 @@ ABI_VERSION = @cf_cv_abi_version@ LOCAL_LIBDIR = @top_builddir@/lib LD = @LD@ -LINK = @LINK_PROGS@ $(LIBTOOL_LINK) +LINK = @LINK_PROGS@ $(CC) - LDFLAGS = @EXTRA_LDFLAGS@ \ - @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ + LDFLAGS = @EXTRA_LDFLAGS@ @TICS_LDFLAGS@ @TINFO_LDFLAGS@ \ + @LDFLAGS@ @LD_MODEL@ @TICS_LIBS@ @TINFO_LIBS@ @LIBS@ ++++++ ncurses-5.9-fortify.dif ++++++ --- progs/infocmp.c +++ progs/infocmp.c 2012-03-05 11:11:08.300796156 +0000 @@ -1089,9 +1089,10 @@ dump_initializers(TERMTYPE *term) if (VALID_STRING(term->Strings[n])) { tp = buf; +#define TP_LIMIT ((MAX_STRING - 4) - (size_t)(tp - buf)) *tp++ = '"'; for (sp = term->Strings[n]; - *sp != 0 && (tp - buf) < MAX_STRING - 6; + *sp != 0 && TP_LIMIT > 2; sp++) { if (isascii(UChar(*sp)) && isprint(UChar(*sp)) @@ -1099,7 +1100,7 @@ dump_initializers(TERMTYPE *term) && *sp != '"') *tp++ = *sp; else { - _nc_SPRINTF(tp, _nc_SLIMIT(MAX_STRING) "\\%03o", UChar(*sp)); + _nc_SPRINTF(tp, _nc_SLIMIT(TP_LIMIT) "\\%03o", UChar(*sp)); tp += 4; } } ++++++ ncurses-5.9-overwrite.dif ++++++ --- /var/tmp/diff_new_pack.qGZhqd/_old 2012-03-07 20:09:50.000000000 +0100 +++ /var/tmp/diff_new_pack.qGZhqd/_new 2012-03-07 20:09:50.000000000 +0100 @@ -10,11 +10,11 @@ AC_ARG_ENABLE(database, --- configure +++ configure 2012-01-30 16:19:43.071146239 +0000 -@@ -6336,6 +6336,7 @@ else +@@ -6368,6 +6368,7 @@ else fi; - echo "$as_me:6338: result: $with_overwrite" >&5 + echo "$as_me:6369: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 +WITH_OVERWRITE="$with_overwrite" - echo "$as_me:6341: checking if external terminfo-database is used" >&5 + echo "$as_me:6372: checking if external terminfo-database is used" >&5 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 ++++++ ncurses-5.9-patches.tar.bz2 ++++++ ++++ 34175 lines of diff (skipped) ++++++ ncurses-5.9.dif ++++++ --- /var/tmp/diff_new_pack.qGZhqd/_old 2012-03-07 20:09:51.000000000 +0100 +++ /var/tmp/diff_new_pack.qGZhqd/_new 2012-03-07 20:09:51.000000000 +0100 @@ -266,24 +266,6 @@ ;; esac done -@@ -18611,7 +18615,7 @@ else - #line 18610 "configure" - #include "confdefs.h" - --#include <stdlib.h> -+/* #include <stdlib.h> conflict with exit declaration */ - #include <stdio.h> - - #if defined(__cplusplus) -@@ -18973,7 +18977,7 @@ else - #line 18972 "configure" - #include "confdefs.h" - --#include <stdlib.h> -+/* #include <stdlib.h> conflict with exit declaration */ - #include <stdio.h> - - #if defined(__cplusplus) @@ -19924,6 +19928,7 @@ if test "$with_termlib" != no ; then TINFO_LDFLAGS="-L${LIB_DIR}" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" @@ -809,7 +791,7 @@ +# include <sys/fsuid.h> +#endif - MODULE_ID("$Id: access.c,v 1.20 2011/06/05 00:48:00 tom Exp $") + MODULE_ID("$Id: access.c,v 1.22 2012/02/22 22:34:31 tom Exp $") @@ -112,6 +115,30 @@ _nc_basename(char *path) return path + _nc_pathlast(path); ++++++ tack-1.07-20110626.tar.bz2 -> tack-1.07-20120303.tar.bz2 ++++++ ++++ 8930 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20110626/CHANGES new/tack-1.07-20120303/CHANGES --- old/tack-1.07-20110626/CHANGES 2011-06-27 00:13:57.000000000 +0200 +++ new/tack-1.07-20120303/CHANGES 2012-03-04 00:44:25.000000000 +0100 @@ -1,3 +1,117 @@ +2012-03-03 Thomas E. Dickey <[email protected]> + + * fun.c: gcc warning + + * configure: regen + + * configure.in: Solaris' "set" does not quote - fix with sed. + + * configure: regen + + * configure.in: + substitution for --disable-echo feature did not work with FreeBSD 7.2; + work around using output of shell's "set" command. Also remove CF_PRG_RULES + which is not needed. + + * aclocal.m4: remove CF_PRG_RULES - unused + + * sysdep.c, scan.c, output.c, ansi.c, edit.c, control.c, fun.c, sync.c, tack.h: + strict gcc 4.1.2 warnings with CentOS 5.7 64-bit + + * init.c, tack.c: + quiet unnecesary warning about ignoring return-value from system() + + * configure: + regen with ac252 20120303 to work with Intel 12.0.3 compiler + + * tack.h: + quiet unnecesary warning about ignoring return-value from system() + +2012-03-02 Thomas E. Dickey <[email protected]> + + * configure: regen + + * output.c: icc9 warning + + * configure.in: LIBS_CURSES_symbol is redundant - remove + + * package/debian/changelog, package/tack.spec, tack.h: bump-version + + * tack.h: quiet gcc -Wundef warnings + also quiet two no-return cases when configuring with no-leaks option. + + * configure.in: + Add CF_ERRNO, CF_LINK_DATAONLY checks with supporting macros to address + gcc -Wundef warnings about DECL_ERRNO and BROKEN_LINKER symbols. + + * configure.in: + add EXTRA_CFLAGS to CFLAGS/CPPFLAGS (report by Samuel Bronson) + + * aclocal.m4: + Add CF_ERRNO, CF_LINK_DATAONLY checks with supporting macros to address + gcc -Wundef warnings about DECL_ERRNO and BROKEN_LINKER symbols. + +2012-03-01 Thomas E. Dickey <[email protected]> + + * Makefile.in: copyright date + +2012-02-29 Werner.Fink + + * Makefile.in, configure.in: + Update configure-script and makefile template to work with this post-5.9 + change, allowing build of tack within the ncurses source-tree: + + 20110924 + + modify configure script and makefiles to split TIC_ARGS and + TINFO_ARGS into pieces corresponding to LDFLAGS and LIBS variables, + to help separate searches for tic- and tinfo-libraries (patch by Nick + Alcock aka "Nix"). + + The change is prompted by review of OpenSUSE package by Werner Fink, using + a patch from the rpm source file: + ncurses-5.9-tack-tinfo.dif (2011-11-18) + + and discarding + ncurses-5.7-tack.dif (2010-01-12) + + because the latter breaks builds with libtool -TD + +2012-02-26 Thomas E. Dickey <[email protected]> + + * configure: regen + + * configure.in: + add $ECHO_CC to AC_OUTPUT logic, overlooked in echo-fixes + + * tack.h, package/debian/changelog, package/tack.spec: bump + + * configure.in: + add configure check to determine if we have tinfo library, and further if + tack needs intermediate ncurses library to link. + + * configure.in: always check for _nc_tic_expand + + * configure.in: + use CF_DISABLE_ECHO (prompted by patch by Samuel Bronson). + + * aclocal.m4: add CF_DISABLE_ECHO macro + + * aclocal.m4: resync with-my-autoconf: + + add/use CF_ACVERSION_CHECK to support lookup with AC_CHECK_TOOLS vs + AC_PATH_PROGS for ncurses*-config script in CF_NCURSES_CONFIG + + modify CF_ANSI_CC_CHECK to check for environment variable $CC, which + conflicts with usage for curses applications. + + modify CF_CURSES_LIBS to check for OpenBSD "otermcap" library. + + new macro CF_TRY_XOPEN_SOURCE + + modify CF_XOPEN_SOURCE to omit Solaris-specific __EXTENSIONS__ definition + where possible. This led to adding workarounds for Darwin, IRIX64, MirBSD, + OpenBSD as well as configure check with CF_TRY_XOPEN_SOURCE. Also modify + version pattern for newer AIX systems, + +2012-02-25 Thomas E. Dickey <[email protected]> + + * config.guess, config.sub: update to 2012-02-10 + 2011-06-26 Thomas E. Dickey <[email protected]> * configure: regen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20110626/ansi.c new/tack-1.07-20120303/ansi.c --- old/tack-1.07-20110626/ansi.c 2011-06-26 19:34:30.000000000 +0200 +++ new/tack-1.07-20120303/ansi.c 2012-03-03 17:06:23.000000000 +0100 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991-2010,2011 Free Software Foundation, Inc. +** Copyright (C) 1991-2011,2012 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: ansi.c,v 1.14 2011/06/26 17:34:30 weaver Exp $") +MODULE_ID("$Id: ansi.c,v 1.15 2012/03/03 16:06:23 tom Exp $") /* * Standalone tests for ANSI terminals. Three entry points: @@ -384,7 +384,7 @@ ** print the mode display entry */ static void -mode_display(const char *p, int n, int c, char s, char r) +mode_display(const char *p, int n, int c, int s, int r) { int k; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20110626/configure.in new/tack-1.07-20120303/configure.in --- old/tack-1.07-20110626/configure.in 2011-05-01 23:53:26.000000000 +0200 +++ new/tack-1.07-20120303/configure.in 2012-03-03 22:39:39.000000000 +0100 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright (c) 2007,2011 Free Software Foundation, Inc. * +dnl Copyright (c) 2007-2011,2012 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * dnl copy of this software and associated documentation files (the * @@ -26,9 +26,9 @@ dnl authorization. * dnl*************************************************************************** dnl -dnl Author: Thomas E. Dickey 2007 +dnl Author: Thomas E. Dickey 2007-on dnl -dnl $Id: configure.in,v 1.8 2011/05/01 21:53:26 tom Exp $ +dnl $Id: configure.in,v 1.18 2012/03/03 21:39:39 tom Exp $ dnl This is a simple configuration-script for tack which makes it simpler to dnl build outside the ncurses tree (provided that ncurses was configured using dnl the --with-ticlib option). @@ -46,7 +46,6 @@ AC_PROG_MAKE_SET AC_PROG_CC AC_PROG_CPP -AC_PROG_AWK AC_PROG_LN_S CF_PROG_INSTALL @@ -60,7 +59,6 @@ DFT_DEP_SUFFIX="" AC_SUBST(DFT_DEP_SUFFIX) DFT_OBJ_SUBDIR=`pwd|sed -e's:.*/::'` AC_SUBST(DFT_OBJ_SUBDIR) DFT_UPR_MODEL="NORMAL" AC_SUBST(DFT_UPR_MODEL) -ECHO_LINK='@ echo linking $@ ... ;' AC_SUBST(ECHO_LINK) EXTRA_LDFLAGS="" AC_SUBST(EXTRA_LDFLAGS) LD="ld" AC_SUBST(LD) LDFLAGS_SHARED="" AC_SUBST(LDFLAGS_SHARED) @@ -75,27 +73,40 @@ LIB_UNINSTALL="" AC_SUBST(LIB_UNINSTALL) LINK_PROGS="" AC_SUBST(LINK_PROGS) LOCAL_LDFLAGS="" AC_SUBST(LOCAL_LDFLAGS) -TICS_ARGS="" AC_SUBST(TICS_ARGS) -TINFO_ARGS='$(LIBS_CURSES)' AC_SUBST(TINFO_ARGS) +TICS_LDFLAGS="" AC_SUBST(TICS_LDFLAGS) +TICS_LIBS="" AC_SUBST(TICS_LIBS) +TINFO_LDFLAGS="" AC_SUBST(TINFO_LDFLAGS) +TINFO_LIBS="" AC_SUBST(TINFO_LIBS) cf_cv_abi_version="" AC_SUBST(cf_cv_abi_version) cf_cv_rel_version="" AC_SUBST(cf_cv_rel_version) NCURSES_TREE="#" AC_SUBST(NCURSES_TREE) -cf_cv_screen=curses +cf_cv_screen=ncurses cf_cv_libtype= AC_EXEEXT AC_OBJEXT CF_ANSI_CC_REQD +CF_DISABLE_ECHO + +# ncurses uses a different symbol as of 2012/02/26 (workaround) +ECHO_LINK="$ECHO_LD" +AC_SUBST(ECHO_LINK) + CF_ENABLE_WARNINGS CF_GCC_ATTRIBUTES CF_XOPEN_SOURCE +### Checks for external-data +CF_ERRNO +CF_LINK_DATAONLY + dnl --------------------------------------------------------------------------- dnl NcursesW, installed in conventional location +AC_MSG_CHECKING(for ncurses/ncursesw flavor) AC_ARG_WITH(ncursesw, [ --with-ncursesw use wide ncurses-libraries (installed)], [cf_cv_screen=ncursesw],[ @@ -104,6 +115,7 @@ AC_ARG_WITH(ncurses, [ --with-ncurses use ncurses-libraries (installed)], [cf_cv_screen=ncurses])]) +AC_MSG_RESULT($cf_cv_screen) case $cf_cv_screen in ncurses) @@ -118,12 +130,52 @@ ;; esac -case $cf_cv_screen in -ncurses*) - AC_CHECK_FUNC(_nc_tic_expand,,[ - AC_CHECK_LIB(tic,_nc_tic_expand,[LIBS="-ltic $LIBS"])]) - ;; -esac +AC_CHECK_FUNC(_nc_tic_expand,,[ + AC_CHECK_LIB(tic,_nc_tic_expand,[LIBS="-ltic $LIBS"])]) + +# The CF_*CURSES_CONFIG stuff provides curses/ncurses, which may include tinfo. +# Check if (a) we have tinfo library and (b) if we need ncurses library too. + +cf_curses_lib=$cf_cv_screen$cf_cf_libtype +cf_tinfo_lib=tinfo$cf_cf_libtype + +# If we do not have and/or do not need tinfo, reset cf_tinfo_lib to empty. +AC_CHECK_FUNC(setupterm,[ + case "x$LIBS" in #(vi + *$cf_tinfo_lib*) #(vi + ;; + *) + AC_CHECK_LIB($cf_tinfo_lib,reset_shell_mode, + [LIBS="-l$cf_tinfo_lib $LIBS"], + [cf_tinfo_lib='']) + ;; + esac +],[ + AC_CHECK_LIB($cf_tinfo_lib, setupterm, + [LIBS="-l$cf_tinfo_lib $LIBS"], + [cf_tinfo_lib='']) +]) + +# If we have tinfo, check if we do not need intermediate ncurses library to +# link with tic library. +if test -n "$cf_tinfo_lib" +then + cf_save_libs="$LIBS" + LIBS=`echo "x$LIBS" | sed -e 's,^.,,' -e "s,-l$cf_curses_lib,,g"` + + AC_MSG_CHECKING(if tack would link without $cf_curses_lib library) +AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], +[ + int x = _nc_trans_string (0, 0); +],[cf_trim_ncurses=yes],[cf_trim_ncurses=no]) + AC_MSG_RESULT($cf_trim_ncurses) + + if test "$cf_trim_ncurses" = no + then + LIBS="$cf_save_libs" + fi + +fi CF_DISABLE_LEAKS @@ -160,13 +212,15 @@ CF_SYS_TIME_SELECT CF_SIG_ATOMIC_T -TICS_ARGS="$LIBS" +TICS_LIBS="$LIBS" LIBS= +### Now that we're done running tests, add the compiler-warnings, if any +CF_ADD_CFLAGS($EXTRA_CFLAGS) + dnl --------------------------------------------------------------------------- AC_OUTPUT(Makefile,[ -CF_PRG_RULES([$srcdir/mk-test.awk ECHO_LINK="$ECHO_LINK"], .) cat >>Makefile <<TEST_EOF # These rules are generated so we do not rely on suffix rules, which do not @@ -179,12 +233,13 @@ cat >>Makefile <<TEST_EOF \$(MODEL)/$N.o : $N.c \\ - tack.h \\ - ncurses_cfg.h - @echo compiling $N; \$(CC) -c \$(CFLAGS_DEFAULT) $N.c + tack.h \\ + ncurses_cfg.h + $SHOW_CC + $ECHO_CC\$(CC) -c \$(CFLAGS_DEFAULT) $N.c TEST_EOF done -],[ -AWK="$AWK" -],cat) +],[], +[set | sed -e s%=%=\'% -e s%\$%\'% -e s%\'\'%\'%g |fgrep _CC= >>$CONFIG_STATUS +cat]) # vi:ts=4 sw=4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20110626/control.c new/tack-1.07-20120303/control.c --- old/tack-1.07-20110626/control.c 2010-09-04 01:29:19.000000000 +0200 +++ new/tack-1.07-20120303/control.c 2012-03-03 17:03:17.000000000 +0100 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2010,2012 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -25,7 +25,7 @@ #include <sys/time.h> #endif -MODULE_ID("$Id: control.c,v 1.13 2010/09/03 23:29:19 tom Exp $") +MODULE_ID("$Id: control.c,v 1.14 2012/03/03 16:03:17 tom Exp $") /* terminfo test program control subroutines */ @@ -78,7 +78,7 @@ alloc_arrays(void) { if (pads == 0) { - pads = (struct test_results **) calloc(MAX_STRINGS, sizeof(struct test_results *)); + pads = (struct test_results **) calloc((size_t) MAX_STRINGS, sizeof(struct test_results *)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20110626/edit.c new/tack-1.07-20120303/edit.c --- old/tack-1.07-20110626/edit.c 2010-09-04 00:20:17.000000000 +0200 +++ new/tack-1.07-20120303/edit.c 2012-03-03 17:03:23.000000000 +0100 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1997 Free Software Foundation, Inc. +** Copyright (C) 1997-2010,2012 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -23,7 +23,7 @@ #include <time.h> #include <tic.h> -MODULE_ID("$Id: edit.c,v 1.16 2010/09/03 22:20:17 tom Exp $") +MODULE_ID("$Id: edit.c,v 1.17 2012/03/03 16:03:23 tom Exp $") /* * Terminfo edit features @@ -84,8 +84,8 @@ alloc_arrays(void) { if (flag_strings == 0) { - label_strings = (int *) calloc(MAX_STRINGS, sizeof(int)); - flag_strings = (char *) calloc(MAX_STRINGS, sizeof(char)); + label_strings = (int *) calloc((size_t) MAX_STRINGS, sizeof(int)); + flag_strings = (char *) calloc((size_t) MAX_STRINGS, sizeof(char)); } } @@ -277,7 +277,7 @@ char tmp[1024]; ptext("enter name: "); - read_string(buf, 80); + read_string(buf, (size_t) 80); if (buf[0] == '\0' || buf[1] == '\0') { *ch = buf[0]; return; @@ -541,19 +541,19 @@ if ((nt = _nc_find_entry(name, _nc_get_hash_table(FALSE)))) { switch (nt->nte_type) { case BOOLEAN: - flag_boolean[nt->nte_index] = (char) - (flag_boolean[nt->nte_index] - | flag); + flag_boolean[nt->nte_index] = ((char) + (flag_boolean[nt->nte_index] + | flag)); break; case STRING: - flag_strings[nt->nte_index] = (char) - (flag_strings[nt->nte_index] - | flag); + flag_strings[nt->nte_index] = ((char) + (flag_strings[nt->nte_index] + | flag)); break; case NUMBER: - flag_numerics[nt->nte_index] = (char) - (flag_numerics[nt->nte_index] - | flag); + flag_numerics[nt->nte_index] = ((char) + (flag_numerics[nt->nte_index] + | flag)); break; default: sprintf(temp, "unknown cap type (%s)", name); @@ -796,7 +796,7 @@ /* scan for labels */ for (i = lc = 0; i < MAX_STRINGS; i++) { original_term.Strings[i] = CUR Strings[i]; - if (strncmp(STR_NAME(i), "lf", 2) == 0) { + if (strncmp(STR_NAME(i), "lf", (size_t) 2) == 0) { flag_strings[i] |= FLAG_LABEL; if (CUR Strings[i]) { label_strings[lc++] = i; @@ -861,7 +861,7 @@ if (i == 255) { /* read the cap name from the user */ ptext("enter name: "); - read_string(pad, 32); + read_string(pad, (size_t) 32); if (pad[0] == '\0' || pad[1] == '\0') { *chp = pad[0]; return; @@ -899,7 +899,7 @@ _nc_tic_expand(current_string, TRUE, TRUE)); putln(buf); ptextln("Enter new pad. 0 for no pad. CR for no change."); - read_string(buf, 32); + read_string(buf, (size_t) 32); if (buf[0] == '\0' || (buf[1] == '\0' && isalpha(UChar(buf[0])))) { *chp = buf[0]; return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20110626/fun.c new/tack-1.07-20120303/fun.c --- old/tack-1.07-20110626/fun.c 2011-05-01 23:46:12.000000000 +0200 +++ new/tack-1.07-20120303/fun.c 2012-03-03 23:05:22.000000000 +0100 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2011,2012 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: fun.c,v 1.17 2011/05/01 21:46:12 tom Exp $") +MODULE_ID("$Id: fun.c,v 1.19 2012/03/03 22:05:22 tom Exp $") /* * Test the function keys on the terminal. The code for echo tests @@ -64,7 +64,7 @@ static int *fk_tested; static size_t num_strings = 0; -static unsigned fkmax = 1; /* length of longest key */ +static size_t fkmax = 1; /* length of longest key */ static int got_labels = 0; /* true if we have some labels */ static int key_count = 0; static int end_state; @@ -613,7 +613,7 @@ sprintf(temp, "Hit function key %d\n", fk); ptextln(temp); - memset(mm, 0, 4); + memset(mm, 0, (size_t) 4); for (i = 0; i < 4; ++i) { int cc = getchp(STRIP_PARITY); if (cc == EOF) @@ -850,22 +850,22 @@ } else { put_str(expand(&buf[i - 1])); } - if (!strncmp(&txt[sizeof(txt) - 7], "columns", 7)) { + if (!strncmp(&txt[sizeof(txt) - 7], "columns", (size_t) 7)) { column_pattern(); buf[i = 0] = '\0'; crp = 0; } - if (!strncmp(&txt[sizeof(txt) - 5], "lines", 5)) { + if (!strncmp(&txt[sizeof(txt) - 5], "lines", (size_t) 5)) { line_pattern(); buf[i = 0] = '\0'; crp = 0; } - if (!strncmp(&txt[sizeof(txt) - 5], "clear", 5)) { + if (!strncmp(&txt[sizeof(txt) - 5], "clear", (size_t) 5)) { put_clear(); buf[i = 0] = '\0'; crp = 0; } - if (!strncmp(&txt[sizeof(txt) - 4], "high", 4)) { + if (!strncmp(&txt[sizeof(txt) - 4], "high", (size_t) 4)) { high_bit ^= 0x80; if (high_bit) { ptextln("\nParity bit set"); @@ -873,11 +873,11 @@ ptextln("\nParity bit reset"); } } - if (!strncmp(&txt[sizeof(txt) - 4], "help", 4)) { + if (!strncmp(&txt[sizeof(txt) - 4], "help", (size_t) 4)) { put_crlf(); report_help(crx); } - if (!strncmp(&txt[sizeof(txt) - 4], "echo", 4)) { + if (!strncmp(&txt[sizeof(txt) - 4], "echo", (size_t) 4)) { /* display the last status report */ /* clear bypass condition on Tek terminals */ put_crlf(); @@ -887,13 +887,13 @@ put_str(expand(buf)); } if (save_scan_mode && - !strncmp(&txt[sizeof(txt) - 4], "scan", 4)) { + !strncmp(&txt[sizeof(txt) - 4], "scan", (size_t) 4)) { /* toggle scan mode */ scan_mode = !scan_mode; } - if (!strncmp(&txt[sizeof(txt) - 3], "end", 3)) + if (!strncmp(&txt[sizeof(txt) - 3], "end", (size_t) 3)) break; - if (!strncmp(&txt[sizeof(txt) - 3], "hex", 3)) { + if (!strncmp(&txt[sizeof(txt) - 3], "hex", (size_t) 3)) { if (crx) { /* display the last status report in hex */ /* clear bypass condition on Tek terminals */ @@ -906,11 +906,11 @@ hex_display = !hex_display; } } - if (!strncmp(&txt[sizeof(txt) - 3], "two", 3)) + if (!strncmp(&txt[sizeof(txt) - 3], "two", (size_t) 3)) crx = 2; - if (!strncmp(&txt[sizeof(txt) - 3], "one", 3)) + if (!strncmp(&txt[sizeof(txt) - 3], "one", (size_t) 3)) crx = 1; - if (!strncmp(&txt[sizeof(txt) - 3], "all", 3)) + if (!strncmp(&txt[sizeof(txt) - 3], "all", (size_t) 3)) crx = 0; } scan_mode = save_scan_mode; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20110626/init.c new/tack-1.07-20120303/init.c --- old/tack-1.07-20110626/init.c 2010-09-04 01:35:01.000000000 +0200 +++ new/tack-1.07-20120303/init.c 2012-03-03 16:15:32.000000000 +0100 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2010,2012 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -23,7 +23,7 @@ #include <tack.h> #include <tic.h> -MODULE_ID("$Id: init.c,v 1.13 2010/09/03 23:35:01 tom Exp $") +MODULE_ID("$Id: init.c,v 1.14 2012/03/03 15:15:32 tom Exp $") #if NCURSES_VERSION_MAJOR >= 5 || NCURSES_VERSION_PATCH >= 981219 #define _nc_get_curterm(p) _nc_get_tty_mode(p) @@ -130,7 +130,7 @@ } if (init_prog) { can_test("iprog", FLAG_TESTED); - (void) system(init_prog); + IGNORE_RC(system(init_prog)); } put_name(init_3string, " (is3)"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20110626/output.c new/tack-1.07-20120303/output.c --- old/tack-1.07-20110626/output.c 2011-05-01 23:46:26.000000000 +0200 +++ new/tack-1.07-20120303/output.c 2012-03-03 17:07:33.000000000 +0100 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2011,2012 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -23,7 +23,7 @@ #include <tack.h> #include <time.h> -MODULE_ID("$Id: output.c,v 1.18 2011/05/01 21:46:26 tom Exp $") +MODULE_ID("$Id: output.c,v 1.20 2012/03/03 16:07:33 tom Exp $") /* globals */ long char_sent; /* number of characters sent */ @@ -85,7 +85,7 @@ fflush(stdout); if (nodelay_read) { while (1) { - ch = (int) read(fileno(stdin), &buf, 1); + ch = (int) read(fileno(stdin), &buf, sizeof(buf)); if (ch == -1) return EOF; if (ch == 1) @@ -130,7 +130,7 @@ fprintf(log_fp, "<%s>", c0[ch]); log_count += 5; } else if (ch < 127) { - fprintf(log_fp, "%c", ch); + fprintf(log_fp, "%c", (char) ch); log_count += 1; } else { fprintf(log_fp, "<%02x>", ch); @@ -760,28 +760,32 @@ ** Read a string of characters from the input stream. */ void -read_string( - char *buf, - int length) +read_string(char *buf, + size_t length) { - int ch, i; + int ch; + size_t i; - for (i = 0; i < length - 1;) { - ch = getchp(STRIP_PARITY); - if (ch == '\r' || ch == '\n' || ch == EOF) { - break; - } - if (ch == '\b' || ch == 127) { - if (i) { - putchp('\b'); - putchp(' '); - putchp('\b'); - i--; + if (length > 1) { + for (i = 0; i < length - 1;) { + ch = getchp(STRIP_PARITY); + if (ch == '\r' || ch == '\n' || ch == EOF) { + break; + } + if (ch == '\b' || ch == 127) { + if (i) { + putchp('\b'); + putchp(' '); + putchp('\b'); + i--; + } + } else { + buf[i++] = (char) ch; + putchp(ch); } - } else { - buf[i++] = (char) ch; - putchp(ch); } + } else { + i = 0; } buf[i] = '\0'; put_crlf(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20110626/package/debian/changelog new/tack-1.07-20120303/package/debian/changelog --- old/tack-1.07-20110626/package/debian/changelog 2011-06-26 20:45:30.000000000 +0200 +++ new/tack-1.07-20120303/package/debian/changelog 2012-03-02 11:56:19.000000000 +0100 @@ -1,3 +1,15 @@ +tack (1.07-20120303) unstable; urgency=low + + * code cleanup + + -- Thomas E. Dickey <[email protected]> Fri, 02 Mar 2012 05:56:16 -0500 + +tack (1.07-20120226) unstable; urgency=low + + * improvements for configure script + + -- Thomas E. Dickey <[email protected]> Sun, 26 Feb 2012 20:01:01 -0500 + tack (1.07-20110626) unstable; urgency=low * minor fixes for character-set display, etc., from Daniel Weaver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20110626/package/tack.spec new/tack-1.07-20120303/package/tack.spec --- old/tack-1.07-20110626/package/tack.spec 2011-06-26 20:44:12.000000000 +0200 +++ new/tack-1.07-20120303/package/tack.spec 2012-03-02 11:55:45.000000000 +0100 @@ -1,8 +1,8 @@ Summary: tack - terminfo action checker %define AppProgram tack %define AppVersion 1.07 -%define AppRelease 20110626 -# $XTermId: tack.spec,v 1.3 2011/06/26 18:44:12 tom Exp $ +%define AppRelease 20120303 +# $XTermId: tack.spec,v 1.5 2012/03/02 10:55:45 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20110626/scan.c new/tack-1.07-20120303/scan.c --- old/tack-1.07-20110626/scan.c 2010-09-04 01:33:44.000000000 +0200 +++ new/tack-1.07-20120303/scan.c 2012-03-03 17:12:35.000000000 +0100 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2010,2012 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -22,11 +22,11 @@ #include <tack.h> -MODULE_ID("$Id: scan.c,v 1.10 2010/09/03 23:33:44 tom Exp $") +MODULE_ID("$Id: scan.c,v 1.11 2012/03/03 16:12:35 tom Exp $") -unsigned scan_max; /* length of longest scan code */ +size_t scan_max; /* length of longest scan code */ char **scan_up, **scan_down, **scan_name; -unsigned *scan_tested, *scan_length; +size_t *scan_tested, *scan_length; static unsigned *scan_value; static unsigned shift_state; @@ -98,13 +98,16 @@ return t; } +#define CHUNK 4096 +#define CHUNK_LO (CHUNK - 96) + void scan_init(char *fn) { /* read the scan mode key definitions */ char *s, *sl; FILE *fp; int ch, i, j; - unsigned len; + size_t len; char home[512]; if ((str = getenv("HOME"))) @@ -143,12 +146,12 @@ scan_up = (char **) malloc(sizeof(char *) * MAX_SCAN); scan_down = (char **) malloc(sizeof(char *) * MAX_SCAN); scan_name = (char **) malloc(sizeof(char *) * MAX_SCAN); - scan_tested = (unsigned *) malloc(sizeof(unsigned *) * MAX_SCAN); - scan_length = (unsigned *) malloc(sizeof(unsigned *) * MAX_SCAN); + scan_tested = (size_t *) malloc(sizeof(size_t *) * MAX_SCAN); + scan_length = (size_t *) malloc(sizeof(size_t *) * MAX_SCAN); scan_value = (unsigned *) malloc(sizeof(unsigned *) * MAX_SCAN); scan_up[0] = scan_down[0] = scan_name[0] = (char *) 0; - str = (char *) malloc(4096); /* buffer space */ - sl = str + 4000; /* an upper limit */ + str = (char *) malloc((size_t) CHUNK); /* buffer space */ + sl = str + CHUNK_LO; /* an upper limit */ scan_max = 1; for (i = 0;;) { for (s = str; (ch = getc(fp)) != EOF;) { @@ -167,8 +170,8 @@ scan_blanks(); scan_name[i] = str; - scan_length[i] = (unsigned) strlen(scan_down[i]); - len = (unsigned) strlen(scan_up[i]) + scan_length[i]; + scan_length[i] = strlen(scan_down[i]); + len = strlen(scan_up[i]) + scan_length[i]; if (len > scan_max) scan_max = len; @@ -183,8 +186,8 @@ i++; if (str > sl) { - str = (char *) malloc(4096); - sl = str + 4000; + str = (char *) malloc((size_t) CHUNK); + sl = str + CHUNK_LO; } else str = s; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20110626/sync.c new/tack-1.07-20120303/sync.c --- old/tack-1.07-20110626/sync.c 2010-09-04 01:35:21.000000000 +0200 +++ new/tack-1.07-20120303/sync.c 2012-03-03 17:03:04.000000000 +0100 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2010,2012 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -22,7 +22,7 @@ #include <tack.h> #include <time.h> -MODULE_ID("$Id: sync.c,v 1.12 2010/09/03 23:35:21 tom Exp $") +MODULE_ID("$Id: sync.c,v 1.13 2012/03/03 16:03:04 tom Exp $") /* terminal-synchronization and performance tests */ @@ -152,7 +152,7 @@ #endif tc_putp(tty_ENQ); event_start(TIME_SYNC); /* start the timer */ - read_key(tty_ACK, TTY_ACK_SIZE - 1); + read_key(tty_ACK, (size_t) (TTY_ACK_SIZE - 1)); if (event_time(TIME_SYNC) > 400000 || tty_ACK[0] == '\0') { /* These characters came from the user. Sigh. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20110626/sysdep.c new/tack-1.07-20120303/sysdep.c --- old/tack-1.07-20110626/sysdep.c 2010-09-04 01:39:36.000000000 +0200 +++ new/tack-1.07-20120303/sysdep.c 2012-03-03 17:22:56.000000000 +0100 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2010,2012 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -44,7 +44,7 @@ #endif #endif -MODULE_ID("$Id: sysdep.c,v 1.21 2010/09/03 23:39:36 tom Exp $") +MODULE_ID("$Id: sysdep.c,v 1.22 2012/03/03 16:22:56 tom Exp $") #if DECL_ERRNO extern int errno; @@ -388,7 +388,7 @@ ** A null character is converted to 0x80. */ void -read_key(char *buf, int max) +read_key(char *buf, size_t max) { int got, ask, i, l; char *s; @@ -397,19 +397,21 @@ s = buf; fflush(stdout); /* ATT unix may return 0 or 1, Berkeley Unix should be 1 */ - while (read(fileno(stdin), s, 1) == 0) ; + while (read(fileno(stdin), s, (size_t) 1) == 0) { + ; /* EMPTY */ + } ++s; --max; - while (max > 0 && (ask = char_ready())) { - if (ask > max) { - ask = max; + while ((int) max > 0 && (ask = char_ready()) > 0) { + if (ask > (int) max) { + ask = (int) max; } - if ((got = (int) read(fileno(stdin), s, (unsigned) ask))) { + if ((got = (int) read(fileno(stdin), s, (size_t) ask)) > 0) { s += got; } else { break; } - max -= got; + max -= (size_t) got; } *s = '\0'; l = (int) (s - buf); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20110626/tack.c new/tack-1.07-20120303/tack.c --- old/tack-1.07-20110626/tack.c 2010-09-04 16:40:30.000000000 +0200 +++ new/tack-1.07-20120303/tack.c 2012-03-03 16:15:20.000000000 +0100 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2010,2012 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: tack.c,v 1.12 2010/09/04 14:40:30 tom Exp $") +MODULE_ID("$Id: tack.c,v 1.13 2012/03/03 15:15:20 tom Exp $") /* This program is designed to test terminfo, not curses. Therefore @@ -56,6 +56,10 @@ int send_reset_init; /* Send the reset and initialization strings */ FILE *log_fp; /* Terminal logfile */ +#if defined(__GNUC__) && defined(_FORTIFY_SOURCE) +int ignore_unused; +#endif + /***************************************************************************** * * Menu definitions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20110626/tack.h new/tack-1.07-20120303/tack.h --- old/tack-1.07-20110626/tack.h 2011-06-26 20:43:57.000000000 +0200 +++ new/tack-1.07-20120303/tack.h 2012-03-03 17:02:55.000000000 +0100 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2011,2012 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -19,7 +19,7 @@ ** Boston, MA 02110-1301, USA */ -/* $Id: tack.h,v 1.27 2011/06/26 18:43:57 tom Exp $ */ +/* $Id: tack.h,v 1.32 2012/03/03 16:02:55 tom Exp $ */ #ifndef NCURSES_TACK_H_incl #define NCURSES_TACK_H_incl 1 @@ -28,19 +28,48 @@ #define MAJOR_VERSION 1 #define MINOR_VERSION 7 -#define PATCH_VERSION 20110626 +#define PATCH_VERSION 20120303 #ifdef HAVE_CONFIG_H #include <ncurses_cfg.h> #else #define RETSIGTYPE void #define GCC_UNUSED /*nothing */ +#define GCC_NORETURN /*nothing */ #define HAVE_GETTIMEOFDAY 1 #define HAVE_SELECT 1 #define HAVE_SYS_TIME_H 1 #define HAVE_SYS_TIME_SELECT 1 #endif +#ifndef BROKEN_LINKER +#define BROKEN_LINKER 0 +#endif + +#ifndef DECL_ERRNO +#define DECL_ERRNO 0 +#endif + +#ifndef HAVE_LONG_FILE_NAMES +#define HAVE_LONG_FILE_NAMES 0 +#endif + +#ifndef NO_LEAKS +#define NO_LEAKS 0 +#endif + +#ifndef USE_DATABASE +#define USE_DATABASE 0 +#endif + +#ifndef USE_TERMCAP +#define USE_TERMCAP 0 +#endif + +#ifndef USE_RCS_IDS +#define USE_RCS_IDS 0 +#endif + #include <sys/types.h> #include <stdlib.h> #include <unistd.h> @@ -58,16 +87,22 @@ #define MODULE_ID(id) /*nothing */ #endif +#if defined(__GNUC__) && defined(_FORTIFY_SOURCE) +#define IGNORE_RC(func) ignore_unused = (int) func +#else +#define IGNORE_RC(func) (void) func +#endif /* gcc workarounds */ + #if !HAVE_STRSTR extern char *_nc_strstr(const char *, const char *); #define strstr(h,n) _nc_strstr(h,n) #endif #if NO_LEAKS && defined(HAVE__NC_FREE_TIC) -extern void _nc_free_tic(int); +extern void _nc_free_tic(int) GCC_NORETURN; extern void tack_edit_leaks(void); extern void tack_fun_leaks(void); -extern void ExitProgram(int); +extern void ExitProgram(int) GCC_NORETURN; #else #define ExitProgram(code) exit(code) #undef NO_LEAKS @@ -89,6 +124,10 @@ extern char tty_basename[]; extern char tty_shortname[]; +#if defined(__GNUC__) && defined(_FORTIFY_SOURCE) +extern int ignore_unused; +#endif + #define SYNC_FAILED 0 #define SYNC_TESTED 1 #define SYNC_NOT_TESTED 2 @@ -321,7 +360,7 @@ extern void put_this(int); extern void putchp(int); extern void putln(const char *); -extern void read_string(char *, int); +extern void read_string(char *, size_t); extern void three_digit(char *, int); extern void tt_putp(const char *); extern void tt_putparm(NCURSES_CONST char *, int, int, int); @@ -398,15 +437,15 @@ /* scan.c */ extern char **scan_up, **scan_down, **scan_name; extern int scan_key(void); -extern unsigned scan_max; /* length of longest scan code */ -extern unsigned *scan_tested, *scan_length; +extern size_t scan_max; /* length of longest scan code */ +extern size_t *scan_tested, *scan_length; extern void scan_init(char *fn); /* sysdep.c */ extern int initial_stty_query(int); extern int stty_query(int); extern void ignoresig(void); -extern void read_key(char *, int); +extern void read_key(char *, size_t); extern void set_alarm_clock(int); extern void spin_flush(void); extern void tty_init(void); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
