From: Thomas E. Dickey <dickey@invisible-island.net>
Date: Sat, 24 Sep 2011 23:55:13 +0000 (+0000)
Subject: ncurses 5.9 - patch 20110925
X-Git-Tag: v6.0~187
X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=b9cd971c38eeeb2394d3da08edfd3c5dfc71694e

ncurses 5.9 - patch 20110925

+ add a missing "else" in changes to _nc_read_tic_entry().
---

diff --git a/NEWS b/NEWS
index ff9b6def..0d066dd3 100644
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1788 2011/09/24 20:18:22 tom Exp $
+-- $Id: NEWS,v 1.1789 2011/09/24 23:49:30 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,9 @@ 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.
 
+20110925
+	+ add a missing "else" in changes to _nc_read_tic_entry().
+
 20110924
 	+ modify _nc_read_tic_entry() so that hashed-database is checked before
 	  filesystem.
diff --git a/dist.mk b/dist.mk
index 262f814f..76e8469f 100644
--- 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.835 2011/09/24 14:14:47 tom Exp $
+# $Id: dist.mk,v 1.836 2011/09/24 23:48:26 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 = 9
-NCURSES_PATCH = 20110924
+NCURSES_PATCH = 20110925
 
 # 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/db_iterator.c b/ncurses/tinfo/db_iterator.c
index 82665cb5..eec2d4f8 100644
--- a/ncurses/tinfo/db_iterator.c
+++ b/ncurses/tinfo/db_iterator.c
@@ -38,7 +38,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: db_iterator.c,v 1.9 2010/12/25 23:00:25 tom Exp $")
+MODULE_ID("$Id: db_iterator.c,v 1.10 2011/09/24 23:44:58 tom Exp $")
 
 #define HaveTicDirectory _nc_globals.have_tic_directory
 #define KeepTicDirectory _nc_globals.keep_tic_directory
@@ -210,6 +210,7 @@ _nc_next_db(DBDIRS * state, int *offset)
 	    _nc_last_db();
 	}
 	if (result != 0) {
+	    T(("_nc_next_db %d %s", *state, result));
 	    return result;
 	}
     }
diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index 4ff8cc48..a46917d8 100644
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -41,7 +41,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: read_entry.c,v 1.111 2011/09/24 20:15:12 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.112 2011/09/24 23:47:45 tom Exp $")
 
 #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
 
@@ -515,7 +515,7 @@ _nc_read_tic_entry(char *filename,
 	code = _nc_read_file_entry(filename, tp);
     }
 #if USE_TERMCAP
-    if (code != TGETENT_YES) {
+    else if (code != TGETENT_YES) {
 	code = _nc_read_termcap_entry(name, tp);
 	sprintf(filename, "%.*s", PATH_MAX - 1, _nc_get_source());
     }