X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Ftinfo%2Flib_setup.c;h=b43aa9528a1e8bee44f93a7c46801506eaa8a716;hb=4496a3f032d219fc5f622e9d82b0cd749e36fa0e;hp=16f05ae0b1a201d586cbc0986a1b4e002cfbae58;hpb=30393be892025f03322b7907a04cc05cc08e8760;p=ncurses.git

diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 16f05ae0..b43aa952 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -48,7 +48,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.195 2018/09/01 21:16:23 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.197 2018/11/24 22:13:16 tom Exp $")
 
 /****************************************************************************
  *
@@ -715,12 +715,20 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 		       "Not enough memory to create terminal structure.\n");
 	}
 #if HAVE_SYSCONF
+	{
+	    long limit;
 #ifdef LINE_MAX
-	_nc_globals.getstr_limit = LINE_MAX;
+	    limit = LINE_MAX;
+#else
+	    limit = _nc_globals.getstr_limit;
 #endif
 #ifdef _SC_LINE_MAX
-	_nc_globals.getstr_limit = sysconf(_SC_LINE_MAX);
+	    if (limit < sysconf(_SC_LINE_MAX))
+		limit = sysconf(_SC_LINE_MAX);
 #endif
+	    if (_nc_globals.getstr_limit < (int) limit)
+		_nc_globals.getstr_limit = (int) limit;
+	}
 #endif /* HAVE_SYSCONF */
 	T(("using %d for getstr limit", _nc_globals.getstr_limit));
 
@@ -738,7 +746,9 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 #else
 #if NCURSES_USE_DATABASE || NCURSES_USE_TERMCAP
 	status = _nc_setup_tinfo(tname, &TerminalType(termp));
+	T(("_nc_setup_tinfo returns %d", status));
 #else
+	T(("no database available"));
 	status = TGETENT_NO;
 #endif
 
@@ -747,6 +757,7 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 	    const TERMTYPE2 *fallback = _nc_fallback2(tname);
 
 	    if (fallback) {
+		T(("found fallback entry"));
 		TerminalType(termp) = *fallback;
 		status = TGETENT_YES;
 	    }