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

diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 16f05ae0..e90a5467 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.196 2018/09/08 20:14:26 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));