ncurses 5.6 - patch 20061223

+ modify configure script to omit the tic (terminfo compiler) support
  from ncurses library if --without-progs option is given.
+ modify install rule for ncurses5-config to do this via "install.libs"
+ modify shared-library rules to allow FreeBSD 3.x to use rpath.
+ update config.guess, config.sub

diff --git a/MANIFEST b/MANIFEST
index 97faa3813c026d9687466c6d44765cf437314939..e5b0b47afce10e7de85b0b7cb41e88ec77eaf050 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -824,6 +824,7 @@
 ./ncurses/tinfo/comp_scan.c
 ./ncurses/tinfo/db_iterator.c
 ./ncurses/tinfo/doalloc.c
+./ncurses/tinfo/entries.c
 ./ncurses/tinfo/free_ttype.c
 ./ncurses/tinfo/getenv_num.c
 ./ncurses/tinfo/hashed_db.c

diff --git a/NEWS b/NEWS
index 6286091697f45425dc455a3346dd66c951aa81b4..0905f9eb6f014d8224b001f4fc0ad7046f26ca6a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1056 2006/12/17 20:36:26 tom Exp $
+-- $Id: NEWS,v 1.1058 2006/12/24 00:50:10 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20061223 
+       + modify configure script to omit the tic (terminfo compiler) support
+         from ncurses library if --without-progs option is given.
+       + modify install rule for ncurses5-config to do this via "install.libs"
+       + modify shared-library rules to allow FreeBSD 3.x to use rpath.
+       + update config.guess, config.sub
+
 20061217 5.6 release for upload to ftp.gnu.org
 
 20061217 

diff --git a/aclocal.m4 b/aclocal.m4
index b57ec00d18a0e6e5a77119d33c0b087e6d467bc7..9aae06153c2f7849a183aa5d1dd58d06fc7f3cc5 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.407 2006/12/17 16:12:38 tom Exp $
+dnl $Id: aclocal.m4,v 1.408 2006/12/23 23:07:35 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -1852,7 +1852,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 40 updated: 2006/10/14 15:23:15
+dnl CF_LIB_RULES version: 41 updated: 2006/12/23 18:04:51
 dnl ------------
 dnl Append definitions and rules for the given models to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
@@ -2103,8 +2103,8 @@ done
 
 cat >> Makefile <<CF_EOF
 
-install.data \\
-uninstall.data ::
+install.libs uninstall.libs \\
+install.data uninstall.data ::
 $MAKE_TERMINFO cd misc && \${MAKE} \${CF_MFLAGS} \[$]@
 
 install.man \\
@@ -3680,7 +3680,7 @@ $1=`echo "$2" | \
                -e 's/-[[UD]]$3\(=[[^   ]]*\)\?[$]//g'`
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 41 updated: 2006/12/09 12:32:00
+dnl CF_SHARED_OPTS version: 42 updated: 2006/12/23 18:04:51
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -3818,11 +3818,11 @@ AC_DEFUN([CF_SHARED_OPTS],
                CF_SHARED_SONAME
                MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,-lc -o $[@]'
                ;;
-       openbsd2*)
+       openbsd[[2-9]].*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                MK_SHARED_LIB='${LD} -Bshareable -soname,`basename $[@].${ABI_VERSION}` -o $[@]'
                ;;
-       openbsd*|freebsd[[23]]*)
+       openbsd*|freebsd[[12]].*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel

diff --git a/c++/modules b/c++/modules
index 0709805847d2070e77f0507350a123814ce3d05c..bc4fae5992511d1f1844f8653d2ebab5eb7f747d 100644 (file)
--- a/c++/modules
+++ b/c++/modules
@@ -1,7 +1,7 @@
 # Program modules
-# $Id: modules,v 1.6 1999/07/31 09:46:54 juergen Exp $
+# $Id: modules,v 1.7 2006/12/24 00:53:08 tom Exp $
 ##############################################################################
-# Copyright (c) 1998 Free Software Foundation, Inc.                          #
+# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -28,7 +28,7 @@
 # authorization.                                                             #
 ##############################################################################
 #
-# Author: Thomas E. Dickey <dickey@clark.net> 1995,1997
+# Author: Thomas E. Dickey     1995-on
 #
 
 @ base
@@ -41,3 +41,5 @@ cursslk               c++             $(srcdir)       $(cursslk_h) $(cursesapp_h)
 cursesapp      c++             $(srcdir)       $(cursesapp_h)
 cursesmain     c++             $(srcdir)       $(cursesapp_h)
 demo           c++             $(srcdir)       $(cursesf_h) $(cursesm_h) $(cursesapp_h)
+
+# vile:makemode

diff --git a/config.guess b/config.guess
index 396482d6cb50b24a598700992f65d340165591d6..1a695461e6ad2a06bb67e588347c42bfc3935ea6 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-07-02'
+timestamp='2006-12-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
            arm*) machine=arm-unknown ;;
            sh3el) machine=shl-unknown ;;
            sh3eb) machine=sh-unknown ;;
+           sh5el) machine=sh5le-unknown ;;
            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
        esac
        # The Operating System including object format, if it has switched
@@ -780,7 +781,7 @@ EOF
     i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-pc-cygwin
        exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
        exit ;;
     i*:windows32*:*)
@@ -793,7 +794,7 @@ EOF
     x86:Interix*:[3456]*)
        echo i586-pc-interix${UNAME_RELEASE}
        exit ;;
-    EM64T:Interix*:[3456]*)
+    EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*)
        echo x86_64-unknown-interix${UNAME_RELEASE}
        exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -950,6 +951,9 @@ EOF
     x86_64:Linux:*:*)
        echo x86_64-unknown-linux-gnu
        exit ;;
+    xtensa:Linux:*:*)
+       echo xtensa-unknown-linux-gnu
+       exit ;;
     i*86:Linux:*:*)
        # The BFD linker knows what the default object file format is, so
        # first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1212,12 @@ EOF
     SX-6:SUPER-UX:*:*)
        echo sx6-nec-superux${UNAME_RELEASE}
        exit ;;
+    SX-7:SUPER-UX:*:*)
+       echo sx7-nec-superux${UNAME_RELEASE}
+       exit ;;
+    SX-8:SUPER-UX:*:*)
+       echo sx8-nec-superux${UNAME_RELEASE}
+       exit ;;
     Power*:Rhapsody:*:*)
        echo powerpc-apple-rhapsody${UNAME_RELEASE}
        exit ;;

diff --git a/config.sub b/config.sub
index 53954dbe90a9beaeccc055275f0d45a425e55d11..4b8cc7b41e77812052f481a0fc3dccc1346d1288 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-08-14'
+timestamp='2006-12-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -245,7 +245,7 @@ case $basic_machine in
        | bfin \
        | c4x | clipper \
        | d10v | d30v | dlx | dsp16xx \
-       | fr30 | frv \
+       | fido | fr30 | frv \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
        | ip2k | iq2000 \
@@ -276,6 +276,7 @@ case $basic_machine in
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
+       | score \
        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
        | sh64 | sh64le \
        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -323,7 +324,7 @@ case $basic_machine in
        | clipper-* | craynv-* | cydra-* \
        | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
-       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+       | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
@@ -924,6 +925,9 @@ case $basic_machine in
                basic_machine=sh-hitachi
                os=-hms
                ;;
+       sh5el)
+               basic_machine=sh5le-unknown
+               ;;
        sh64)
                basic_machine=sh64-unknown
                ;;
@@ -1370,6 +1374,9 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+               os=-elf
+               ;;
         spu-*)
                os=-elf
                ;;

diff --git a/configure b/configure
index f46dcb6d248d56a1ec7defffa5c5e39739e3f44e..fc8ed5f53e6a8d36656ca7f9fb50898b7e9303cf 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.383 .
+# From configure.in Revision: 1.384 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20061216.
 #
@@ -5021,11 +5021,11 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
 
                MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,-lc -o $@'
                ;;
-       openbsd2*)
+       openbsd[2-9].*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                MK_SHARED_LIB='${LD} -Bshareable -soname,`basename $@.${ABI_VERSION}` -o $@'
                ;;
-       openbsd*|freebsd[23]*)
+       openbsd*|freebsd[12].*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                MK_SHARED_LIB='${LD} -Bshareable -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
@@ -14982,15 +14982,17 @@ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 if test "$with_termlib" != no ; then
        LIB_SUBSETS="termlib"
        test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
+       test "$cf_with_progs"  = yes && LIB_SUBSETS="${LIB_SUBSETS}+programs"
        LIB_SUBSETS="${LIB_SUBSETS} "
 else
        LIB_SUBSETS="termlib+"
        test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}ext_tinfo+"
+       test "$cf_with_progs"  = yes && LIB_SUBSETS="${LIB_SUBSETS}programs+"
 fi
 LIB_SUBSETS="${LIB_SUBSETS}base"
 test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
-echo "$as_me:14993: result: $LIB_SUBSETS" >&5
+echo "$as_me:14995: result: $LIB_SUBSETS" >&5
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
@@ -15028,7 +15030,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:15031: checking default library suffix" >&5
+echo "$as_me:15033: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
        case $DFT_LWR_MODEL in
@@ -15039,10 +15041,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
        shared)  DFT_ARG_SUFFIX=''   ;;
        esac
        test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:15042: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:15044: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:15045: checking default library-dependency suffix" >&5
+echo "$as_me:15047: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
        case $DFT_LWR_MODEL in
@@ -15071,10 +15073,10 @@ if test $DFT_LWR_MODEL = shared ; then
                ;;
        esac
 fi
-echo "$as_me:15074: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:15076: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:15077: checking default object directory" >&5
+echo "$as_me:15079: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
        case $DFT_LWR_MODEL in
@@ -15090,12 +15092,12 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
                        DFT_OBJ_SUBDIR='obj_s' ;;
                esac
        esac
-echo "$as_me:15093: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:15095: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 # libtool thinks it can make c++ shared libraries (perhaps only g++)
 if test "$cf_with_cxx" = yes ; then
-echo "$as_me:15098: checking c++ library-dependency suffix" >&5
+echo "$as_me:15100: checking c++ library-dependency suffix" >&5
 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
 if test "$with_libtool" != "no"; then
        CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
@@ -15121,7 +15123,7 @@ else
        esac
        test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
 fi
-echo "$as_me:15124: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:15126: result: $CXX_LIB_SUFFIX" >&5
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
@@ -15160,12 +15162,12 @@ fi
 # needed for Ada95
 TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`
 
-echo "$as_me:15163: checking where we will install curses.h" >&5
+echo "$as_me:15165: checking where we will install curses.h" >&5
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 test "$with_overwrite" = no && \
 test "x$includedir" = 'x${prefix}/include' && \
        includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
-echo "$as_me:15168: result: $includedir" >&5
+echo "$as_me:15170: result: $includedir" >&5
 echo "${ECHO_T}$includedir" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
@@ -15173,7 +15175,7 @@ echo "${ECHO_T}$includedir" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
        NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-       { echo "$as_me:15176: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+       { echo "$as_me:15178: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
 fi
 fi
@@ -15186,7 +15188,7 @@ EOF
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
-echo "$as_me:15189: checking for src modules" >&5
+echo "$as_me:15191: checking for src modules" >&5
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
@@ -15249,7 +15251,7 @@ EOF
                fi
        fi
 done
-echo "$as_me:15252: result: $cf_cv_src_modules" >&5
+echo "$as_me:15254: result: $cf_cv_src_modules" >&5
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -15495,7 +15497,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:15498: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:15500: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -15671,7 +15673,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:15674: error: ambiguous option: $1
+    { { echo "$as_me:15676: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -15690,7 +15692,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:15693: error: unrecognized option: $1
+  -*) { { echo "$as_me:15695: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -15780,7 +15782,7 @@ do
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
-  *) { { echo "$as_me:15783: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:15785: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -16146,7 +16148,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:16149: creating $ac_file" >&5
+    { echo "$as_me:16151: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -16164,7 +16166,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:16167: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:16169: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -16177,7 +16179,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:16180: error: cannot find input file: $f" >&5
+           { { echo "$as_me:16182: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -16243,7 +16245,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:16246: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:16248: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -16254,7 +16256,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:16257: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:16259: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -16267,7 +16269,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:16270: error: cannot find input file: $f" >&5
+           { { echo "$as_me:16272: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -16325,7 +16327,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:16328: $ac_file is unchanged" >&5
+      { echo "$as_me:16330: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -16681,8 +16683,8 @@ done
 
 cat >> Makefile <<CF_EOF
 
-install.data \\
-uninstall.data ::
+install.libs uninstall.libs \\
+install.data uninstall.data ::
 $MAKE_TERMINFO cd misc && \${MAKE} \${CF_MFLAGS} \$@
 
 install.man \\

diff --git a/configure.in b/configure.in
index 34b5c0a191e53b14d16a8ce93f57b82fbaf7e5d8..691f20929c1dad655b268e5d71b4fa96296803f7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,14 +28,14 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.383 2006/12/17 01:26:06 tom Exp $
+dnl $Id: configure.in,v 1.384 2006/12/23 23:33:52 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl See http://invisible-island.net/autoconf/ for additional information.
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.13.20020210)
-AC_REVISION($Revision: 1.383 $)
+AC_REVISION($Revision: 1.384 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1377,10 +1377,12 @@ AC_MSG_CHECKING(for library subsets)
 if test "$with_termlib" != no ; then
        LIB_SUBSETS="termlib"
        test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
+       test "$cf_with_progs"  = yes && LIB_SUBSETS="${LIB_SUBSETS}+programs"
        LIB_SUBSETS="${LIB_SUBSETS} "
 else
        LIB_SUBSETS="termlib+"
        test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}ext_tinfo+"
+       test "$cf_with_progs"  = yes && LIB_SUBSETS="${LIB_SUBSETS}programs+"
 fi
 LIB_SUBSETS="${LIB_SUBSETS}base"
 test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"

diff --git a/dist.mk b/dist.mk
index 49d8ac4d61d2473809da75f36a86cbce1dc4f918..f9798c84eea01fa70b145e3105adf8be4c36d055 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.567 2006/12/17 19:58:35 tom Exp $
+# $Id: dist.mk,v 1.568 2006/12/23 18:06:51 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 6
-NCURSES_PATCH = 20061217
+NCURSES_PATCH = 20061223
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/form/modules b/form/modules
index a11dade0ba5598e0065ad42d6b56638d1cadb731..89f9f9f543466353d3cca7fb4b84469145c0a3ba 100644 (file)
--- a/form/modules
+++ b/form/modules
@@ -1,6 +1,6 @@
-# $Id: modules,v 1.14 2004/12/25 23:29:22 tom Exp $
+# $Id: modules,v 1.15 2006/12/24 00:52:58 tom Exp $
 ##############################################################################
-# Copyright (c) 1998,2004 Free Software Foundation, Inc.                     #
+# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -27,7 +27,7 @@
 # authorization.                                                             #
 ##############################################################################
 #
-# Author: Thomas E. Dickey
+# Author: Thomas E. Dickey     1995-on
 #
 
 @ base
@@ -72,3 +72,5 @@ fty_int               lib             $(srcdir)       $(FORM_PRIV_H)
 fty_ipv4       lib             $(srcdir)       $(FORM_PRIV_H)
 fty_num                lib             $(srcdir)       $(FORM_PRIV_H)
 fty_regex      lib             $(srcdir)       $(FORM_PRIV_H)
+
+# vile:makemode

diff --git a/menu/modules b/menu/modules
index c78178a13cc60964a1caf3f609462f596d26d0be..abc4cf0afa4992dd1ebceb5e93b84416dcdfab63 100644 (file)
--- a/menu/modules
+++ b/menu/modules
@@ -1,6 +1,6 @@
-# $Id: modules,v 1.16 2004/12/25 22:06:33 tom Exp $
+# $Id: modules,v 1.17 2006/12/24 00:52:39 tom Exp $
 ##############################################################################
-# Copyright (c) 1998,2004 Free Software Foundation, Inc.                     #
+# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -27,7 +27,7 @@
 # authorization.                                                             #
 ##############################################################################
 #
-# Author: Thomas E. Dickey <dickey@clark.net> 1996,1997
+# Author: Thomas E. Dickey     1996-on
 #
 
 @ base
@@ -59,3 +59,5 @@ m_sub         lib             $(srcdir)       $(MENU_PRIV_H)
 m_trace                lib             $(srcdir)       $(MENU_PRIV_H)
 m_userptr      lib             $(srcdir)       $(MENU_PRIV_H)
 m_win          lib             $(srcdir)       $(MENU_PRIV_H)
+
+# vile:makemode

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 95c22ab398a4d0c172b816076016631328002ce6..ccb05449a7ecdbe5f582530a010ad2622e6a15b6 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.40 2006/10/21 13:28:03 tom Exp $
+# $Id: Makefile.in,v 1.41 2006/12/23 22:16:53 tom Exp $
 ##############################################################################
 # Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -76,7 +76,7 @@ depend :
 
 sources :
 
-install : install.data install.scripts
+install : install.data install.libs
 
 install.data : terminfo.tmp \
                $(DESTDIR)$(libdir) \
@@ -103,7 +103,7 @@ install.data :      terminfo.tmp \
 
 NCURSES_CONFIG = ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config
 
-install.scripts :      ncurses-config
+install.libs : ncurses-config
        $(INSTALL_PROG) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
 
 terminfo.tmp : run_tic.sed $(source)
@@ -120,14 +120,14 @@ $(DESTDIR)$(datadir) \
 $(DESTDIR)$(tabsetdir) :
        $(SHELL) $(top_srcdir)/mkinstalldirs $@
 
-uninstall : uninstall.data uninstall.scripts
+uninstall : uninstall.data uninstall.libs
 
 uninstall.data :
        -test -d $(DESTDIR)$(tabsetdir) && rm -rf $(DESTDIR)$(tabsetdir)
        -test -d $(DESTDIR)$(ticdir) && rm -rf $(DESTDIR)$(ticdir)
        -test -f $(DESTDIR)$(ticfile) && rm -f $(DESTDIR)$(ticfile)
 
-uninstall.scripts :
+uninstall.libs :
        -rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
 
 tags :

diff --git a/mk-1st.awk b/mk-1st.awk
index 371042ccce99dc7e0d22caf9e8b06212e64c4fac..0332cbfe0a672f3540317778035d48aa1b37fd42 100644 (file)
--- a/mk-1st.awk
+++ b/mk-1st.awk
@@ -1,4 +1,4 @@
-# $Id: mk-1st.awk,v 1.68 2006/10/08 00:14:08 tom Exp $
+# $Id: mk-1st.awk,v 1.69 2006/12/24 00:12:23 tom Exp $
 ##############################################################################
 # Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -37,7 +37,7 @@
 #      model             (directory into which we compile, e.g., "obj")
 #      prefix            (e.g., "lib", for Unix-style libraries)
 #      suffix            (e.g., "_g.a", for debug libraries)
-#      subset            ("none", "base", "base+ext_funcs" or "termlib")
+#      subset            ("none", "base", "base+ext_funcs" or "termlib", etc.)
 #      ShlibVer          ("rel", "abi" or "auto", to augment DoLinks variable)
 #      ShlibVerInfix ("yes" or "no", determines location of version #)
 #      DoLinks           ("yes", "reverse" or "no", flag to add symbolic links)
@@ -52,6 +52,9 @@
 #      Mixed-case variable names are ok.
 #      HP/UX requires shared libraries to have executable permissions.
 #
+function is_termlib() {
+               return ( subset ~ /^termlib(\+(ext_tinfo|programs))*$/ );
+       }
 function symlink(src,dst) {
                if ( src != dst ) {
                        printf "rm -f %s; ", dst
@@ -64,19 +67,19 @@ function rmlink(directory, dst) {
 function removelinks(directory) {
                rmlink(directory, end_name);
                if ( DoLinks == "reverse" ) {
-                               if ( ShlibVer == "rel" ) {
-                                       rmlink(directory, abi_name);
-                                       rmlink(directory, rel_name);
-                               } else if ( ShlibVer == "abi" ) {
-                                       rmlink(directory, abi_name);
-                               }
+                       if ( ShlibVer == "rel" ) {
+                               rmlink(directory, abi_name);
+                               rmlink(directory, rel_name);
+                       } else if ( ShlibVer == "abi" ) {
+                               rmlink(directory, abi_name);
+                       }
                } else {
-                               if ( ShlibVer == "rel" ) {
-                                       rmlink(directory, abi_name);
-                                       rmlink(directory, lib_name);
-                               } else if ( ShlibVer == "abi" ) {
-                                       rmlink(directory, lib_name);
-                               }
+                       if ( ShlibVer == "rel" ) {
+                               rmlink(directory, abi_name);
+                               rmlink(directory, lib_name);
+                       } else if ( ShlibVer == "abi" ) {
+                               rmlink(directory, lib_name);
+                       }
                }
        }
 function make_shlib(objs, shlib_list) {
@@ -105,17 +108,17 @@ function sharedlinks(directory) {
        }
 function shlib_rule(directory) {
                if ( ShlibVer == "cygdll" ) {
-                               dst_libs = sprintf("%s/$(SHARED_LIB) %s/$(IMPORT_LIB)", directory, directory);
+                       dst_libs = sprintf("%s/$(SHARED_LIB) %s/$(IMPORT_LIB)", directory, directory);
                } else {
-                               dst_libs = sprintf("%s/%s", directory, end_name);
+                       dst_libs = sprintf("%s/%s", directory, end_name);
                }
                printf "%s : %s $(%s_OBJS)\n", dst_libs, directory, OBJS
                printf "\t@echo linking $@\n"
                print "\t-@rm -f %s", dst_libs;
-               if ( subset == "termlib" || subset == "termlib+ext_tinfo" ) {
-                               make_shlib(OBJS, "TINFO_LIST")
+               if ( is_termlib() ) {
+                       make_shlib(OBJS, "TINFO_LIST")
                } else {
-                               make_shlib(OBJS, "SHLIB_LIST")
+                       make_shlib(OBJS, "SHLIB_LIST")
                }
                sharedlinks(directory)
        }
@@ -163,7 +166,7 @@ BEGIN       {
                                }
                                using = 1
                        }
-                       if ( subset == "termlib" || subset == "termlib+ext_tinfo" ) {
+                       if ( is_termlib() ) {
                                OBJS  = MODEL "_T"
                        } else {
                                OBJS  = MODEL
@@ -393,3 +396,4 @@ END {
                        }
                }
        }
+# vile:ts=4 sw=4

diff --git a/ncurses/modules b/ncurses/modules
index 2e863dad0c38330ff2d85aa8215b7c59b31344ac..38e18d423a4e06bc29fcc1c404bd279739407e87 100644 (file)
--- a/ncurses/modules
+++ b/ncurses/modules
@@ -1,4 +1,4 @@
-# $Id: modules,v 1.107 2006/08/12 14:19:44 tom Exp $
+# $Id: modules,v 1.108 2006/12/24 00:38:10 tom Exp $
 ##############################################################################
 # Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -157,18 +157,12 @@ wresize           lib             $(base)         ../include/term.h
 @ termlib
 access         lib             $(tinfo)
 add_tries      lib             $(tinfo)
-alloc_entry    lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
 alloc_ttype    lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-captoinfo      lib             $(tinfo)        $(INCDIR)/tic.h
 codes          lib             .
-comp_captab    lib             .               $(INCDIR)/tic.h ../include/term.h ../include/hashsize.h
 comp_error     lib             $(tinfo)        $(INCDIR)/tic.h
-comp_expand    lib             $(tinfo)        $(INCDIR)/tic.h
-comp_hash      lib             $(tinfo)        ../include/term.h $(INCDIR)/tic.h ../include/hashsize.h
-comp_parse     lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-comp_scan      lib             $(tinfo)        $(INCDIR)/tic.h
 db_iterator    lib             $(tinfo)        $(INCDIR)/tic.h
 doalloc                lib             $(tinfo)
+entries                lib             $(tinfo)        ../include/term.h $(INCDIR)/tic.h
 fallback       lib             .               ../include/term.h $(INCDIR)/tic.h
 free_ttype     lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
 getenv_num     lib             $(tinfo)
@@ -200,7 +194,6 @@ lib_ttyflags        lib             $(tinfo)        ../include/term.h
 lib_twait      lib             $(serial)
 name_match     lib             $(tinfo)        ../include/term.h $(INCDIR)/tic.h
 names          lib             .
-parse_entry    lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h ../include/parametrized.h $(INCDIR)/capdefaults.c
 read_entry     lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
 read_termcap   lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
 setbuf         lib             $(tinfo)
@@ -211,6 +204,17 @@ tries              lib             $(base)
 trim_sgr0      lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
 unctrl         lib             .
 visbuf         lib             $(trace)        $(INCDIR)/tic.h
+
+# Modules used only for tic, other programs using internal interfaces
+@ programs
+alloc_entry    lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
+captoinfo      lib             $(tinfo)        $(INCDIR)/tic.h
+comp_captab    lib             .               $(INCDIR)/tic.h ../include/term.h ../include/hashsize.h
+comp_expand    lib             $(tinfo)        $(INCDIR)/tic.h
+comp_hash      lib             $(tinfo)        ../include/term.h $(INCDIR)/tic.h ../include/hashsize.h
+comp_parse     lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
+comp_scan      lib             $(tinfo)        $(INCDIR)/tic.h
+parse_entry    lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h ../include/parametrized.h $(INCDIR)/capdefaults.c
 write_entry    lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
 
 # Extensions to the termlib library
@@ -221,3 +225,5 @@ key_defined lib             $(base)
 keybound       lib             $(base)
 keyok          lib             $(base)
 version                lib             $(base)
+
+# vile:makemode

diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index 667b3257f25a4a806571263ad0c2c8a6f1c198b2..3334b1f762776f021e17237b0bb09e7ab1584411 100644 (file)
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -53,7 +53,7 @@
 #include <tic.h>
 #include <term_entry.h>
 
-MODULE_ID("$Id: comp_parse.c,v 1.63 2006/07/08 18:55:14 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.64 2006/12/24 00:45:20 tom Exp $")
 
 static void sanity_check2(TERMTYPE *, bool);
 NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2;
@@ -62,30 +62,6 @@ NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanit
 static void sanity_check(TERMTYPE *);
 NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype) (TERMTYPE *) = sanity_check;
 
-/****************************************************************************
- *
- * Entry queue handling
- *
- ****************************************************************************/
-/*
- *  The entry list is a doubly linked list with NULLs terminating the lists:
- *
- *       ---------   ---------   ---------
- *       |       |   |       |   |       |   offset
- *        |-------|   |-------|   |-------|
- *       |   ----+-->|   ----+-->|  NULL |   next
- *       |-------|   |-------|   |-------|
- *       |  NULL |<--+----   |<--+----   |   last
- *       ---------   ---------   ---------
- *           ^                       ^
- *           |                       |
- *           |                       |
- *        _nc_head                _nc_tail
- */
-
-NCURSES_EXPORT_VAR(ENTRY *) _nc_head = 0;
-NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = 0;
-
 static void
 enqueue(ENTRY * ep)
 /* add an entry to the in-core list */
@@ -103,51 +79,6 @@ enqueue(ENTRY * ep)
        newp->last->next = newp;
 }
 
-NCURSES_EXPORT(void)
-_nc_free_entries(ENTRY * headp)
-/* free the allocated storage consumed by list entries */
-{
-    (void) headp;              /* unused - _nc_head is altered here! */
-
-    while (_nc_head != 0) {
-       _nc_free_termtype(&(_nc_head->tterm));
-    }
-}
-
-NCURSES_EXPORT(ENTRY *)
-_nc_delink_entry(ENTRY * headp, TERMTYPE *tterm)
-/* delink the allocated storage for the given list entry */
-{
-    ENTRY *ep, *last;
-
-    for (last = 0, ep = headp; ep != 0; last = ep, ep = ep->next) {
-       if (&(ep->tterm) == tterm) {
-           if (last != 0) {
-               last->next = ep->next;
-           }
-           if (ep == _nc_head) {
-               _nc_head = ep->next;
-           }
-           if (ep == _nc_tail) {
-               _nc_tail = last;
-           }
-           break;
-       }
-    }
-    return ep;
-}
-
-NCURSES_EXPORT(void)
-_nc_free_entry(ENTRY * headp, TERMTYPE *tterm)
-/* free the allocated storage consumed by the given list entry */
-{
-    ENTRY *ep;
-
-    if ((ep = _nc_delink_entry(headp, tterm)) != 0) {
-       free(ep);
-    }
-}
-
 static char *
 force_bar(char *dst, char *src)
 {

diff --git a/ncurses/tinfo/entries.c b/ncurses/tinfo/entries.c
new file mode 100644 (file)
index 0000000..9cf2cde
--- /dev/null
+++ b/ncurses/tinfo/entries.c
@@ -0,0 +1,109 @@
+/****************************************************************************
+ * Copyright (c) 2006 Free Software Foundation, Inc.                        *
+ *                                                                          *
+ * Permission is hereby granted, free of charge, to any person obtaining a  *
+ * copy of this software and associated documentation files (the            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
+
+/****************************************************************************
+ *  Author: Thomas E. Dickey                                                *
+ ****************************************************************************/
+
+#include <curses.priv.h>
+
+#include <ctype.h>
+
+#include <tic.h>
+#include <term_entry.h>
+
+MODULE_ID("$Id: entries.c,v 1.2 2006/12/24 00:58:33 tom Exp $")
+
+/****************************************************************************
+ *
+ * Entry queue handling
+ *
+ ****************************************************************************/
+/*
+ *  The entry list is a doubly linked list with NULLs terminating the lists:
+ *
+ *       ---------   ---------   ---------
+ *       |       |   |       |   |       |   offset
+ *        |-------|   |-------|   |-------|
+ *       |   ----+-->|   ----+-->|  NULL |   next
+ *       |-------|   |-------|   |-------|
+ *       |  NULL |<--+----   |<--+----   |   last
+ *       ---------   ---------   ---------
+ *           ^                       ^
+ *           |                       |
+ *           |                       |
+ *        _nc_head                _nc_tail
+ */
+
+NCURSES_EXPORT_VAR(ENTRY *) _nc_head = 0;
+NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = 0;
+
+NCURSES_EXPORT(void)
+_nc_free_entry(ENTRY * headp, TERMTYPE *tterm)
+/* free the allocated storage consumed by the given list entry */
+{
+    ENTRY *ep;
+
+    if ((ep = _nc_delink_entry(headp, tterm)) != 0) {
+       free(ep);
+    }
+}
+
+NCURSES_EXPORT(void)
+_nc_free_entries(ENTRY * headp)
+/* free the allocated storage consumed by list entries */
+{
+    (void) headp;              /* unused - _nc_head is altered here! */
+
+    while (_nc_head != 0) {
+       _nc_free_termtype(&(_nc_head->tterm));
+    }
+}
+
+NCURSES_EXPORT(ENTRY *)
+_nc_delink_entry(ENTRY * headp, TERMTYPE *tterm)
+/* delink the allocated storage for the given list entry */
+{
+    ENTRY *ep, *last;
+
+    for (last = 0, ep = headp; ep != 0; last = ep, ep = ep->next) {
+       if (&(ep->tterm) == tterm) {
+           if (last != 0) {
+               last->next = ep->next;
+           }
+           if (ep == _nc_head) {
+               _nc_head = ep->next;
+           }
+           if (ep == _nc_tail) {
+               _nc_tail = last;
+           }
+           break;
+       }
+    }
+    return ep;
+}

diff --git a/panel/modules b/panel/modules
index ed51d2c12a90583223103953c42ebca51d607d01..d0f7a796678ff81208ffc263e9a06ae7ff259b4f 100644 (file)
--- a/panel/modules
+++ b/panel/modules
@@ -1,5 +1,6 @@
+# $Id: modules,v 1.9 2006/12/24 00:53:17 tom Exp $
 ##############################################################################
-# Copyright (c) 1998 Free Software Foundation, Inc.                          #
+# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -26,7 +27,7 @@
 # authorization.                                                             #
 ##############################################################################
 #
-# Author: Thomas E. Dickey <dickey@clark.net> 1995,1997
+# Author: Thomas E. Dickey     1995-on
 #
 
 @ base
@@ -47,3 +48,4 @@ p_update      lib             $(srcdir)       $(PANEL_PRIV_H)
 p_user         lib             $(srcdir)       $(PANEL_PRIV_H)
 p_win          lib             $(srcdir)       $(PANEL_PRIV_H)
 
+# vile:makemode

diff --git a/progs/modules b/progs/modules
index f8224649b201df946052433b5492c6e76b40a70b..3b4f3b602369611af89401bdafa95c37fbe6786b 100644 (file)
--- a/progs/modules
+++ b/progs/modules
@@ -1,7 +1,7 @@
-# $Id: modules,v 1.12 2005/09/25 00:54:22 tom Exp $
+# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $
 # Program modules (some are in ncurses lib!)
 ##############################################################################
-# Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -28,7 +28,7 @@
 # authorization.                                                             #
 ##############################################################################
 #
-# Author: Thomas E. Dickey <dickey@clark.net> 1995,1997
+# Author: Thomas E. Dickey     1995-on
 #
 
 @ base
@@ -39,3 +39,5 @@ dump_entry    progs           $(srcdir)       $(HEADER_DEPS)             $(srcdir)/dump_entry.h ..
 infocmp                progs           $(srcdir)       $(HEADER_DEPS)             $(srcdir)/dump_entry.h
 tput           progs           $(srcdir)       $(HEADER_DEPS) transform.h termsort.c
 tset           progs           $(srcdir)       $(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h ../include/termcap.h
+
+# vile:makemode

diff --git a/tack/modules b/tack/modules
index 14a8209266c9f6bd05cc0c277e3d78b03639f7ac..1e3b020308e80123abbe36257f774e63627380e1 100644 (file)
--- a/tack/modules
+++ b/tack/modules
@@ -1,3 +1,4 @@
+# $Id: modules,v 1.6 2006/12/24 00:53:44 tom Exp $
 ##############################################################################
 # Copyright (c) 1998-1999,2006 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -25,7 +26,9 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: modules,v 1.5 2006/04/22 22:37:18 tom Exp $
+#
+# Author: Thomas E. Dickey     1997-on
+#
 @ base
 ansi      progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
 charset   progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
@@ -43,3 +46,5 @@ scan      progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
 sync      progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
 sysdep    progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
 tack      progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
+
+# vile:makemode

diff --git a/test/modules b/test/modules
index 859fc8c9b68e421530cb3665784a071bd518c7cb..f9c438483e97f7a7fdd88b8810723a57d0cb9d3c 100644 (file)
--- a/test/modules
+++ b/test/modules
@@ -1,5 +1,4 @@
-# Test-Program modules
-# $Id: modules,v 1.28 2006/11/04 18:56:08 tom Exp $
+# $Id: modules,v 1.29 2006/12/24 00:53:52 tom Exp $
 ##############################################################################
 # Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -28,8 +27,9 @@
 # authorization.                                                             #
 ##############################################################################
 #
-# Author: Thomas E. Dickey 1997-on
+# Author: Thomas E. Dickey     1997-on
 #
+# Test-Program modules
 
 @ base
 background     progs           $(srcdir)       $(HEADER_DEPS)
@@ -75,3 +75,5 @@ testscanw     progs           $(srcdir)       $(HEADER_DEPS)
 view           progs           $(srcdir)       $(HEADER_DEPS)
 worm           progs           $(srcdir)       $(HEADER_DEPS)
 xmas           progs           $(srcdir)       $(HEADER_DEPS)
+
+# vile:makemode