ncurses 5.7 - patch 20090728

+ correct logic in tigetnum(), which caused tput program to treat all
  string capabilities as numeric (report by Rajeev V Pillai,
  cf: 20090711).

diff --git a/NEWS b/NEWS
index c3da4581331559c2a324eb46aada1e5e06f8164c..8de8c2c82bf55cfced508de6859833c4eade78b2 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.1410 2009/07/25 15:50:22 tom Exp $
+-- $Id: NEWS,v 1.1411 2009/07/28 22:22:43 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,11 @@ 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.
 
+20090728
+       + correct logic in tigetnum(), which caused tput program to treat all
+         string capabilities as numeric (report by Rajeev V Pillai,
+         cf: 20090711).
+
 20090725
        + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete).
 

diff --git a/dist.mk b/dist.mk
index f5a7b069352dc93460e08deb0670ed22efdc3287..2c5636db449a1070502e4d2a01215a5ac71bc10d 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.710 2009/07/25 15:38:47 tom Exp $
+# $Id: dist.mk,v 1.711 2009/07/28 21:17:07 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 = 7
-NCURSES_PATCH = 20090725
+NCURSES_PATCH = 20090728
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/ncurses/tinfo/lib_ti.c b/ncurses/tinfo/lib_ti.c
index 76001d2c11acb39b539aa31668ebee47a4a5d4a6..6c94772a481923b63f7f7ee99ce824aa98872e09 100644 (file)
--- a/ncurses/tinfo/lib_ti.c
+++ b/ncurses/tinfo/lib_ti.c
@@ -37,7 +37,7 @@
 #include <term_entry.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_ti.c,v 1.26 2009/07/11 18:14:21 tom Exp $")
+MODULE_ID("$Id: lib_ti.c,v 1.27 2009/07/28 22:03:36 tom Exp $")
 
 #if 0
 static bool
@@ -123,10 +123,12 @@ NCURSES_SP_NAME(tigetnum) (NCURSES_SP_DCLx NCURSES_CONST char *str)
            }
        }
 #endif
-       if (j >= 0 && VALID_NUMERIC(tp->Numbers[j]))
-           result = tp->Numbers[j];
-       else
-           result = ABSENT_NUMERIC;
+       if (j >= 0) {
+           if (VALID_NUMERIC(tp->Numbers[j]))
+               result = tp->Numbers[j];
+           else
+               result = ABSENT_NUMERIC;
+       }
     }
 
     returnCode(result);