X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftic.c;h=1d4034622c335b51b59b41e79313558636bf27f2;hp=65b5fb75aea8d338dda6e2f1817b4a58d289311b;hb=b116355ab2af379e49fd0be31bdd440fc14fd902;hpb=6b99a559185b3b8fad80b56bc2070b08101c33d1

diff --git a/progs/tic.c b/progs/tic.c
index 65b5fb75..1d403462 100644
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -48,7 +48,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.272 2019/04/06 20:18:54 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.276 2019/05/10 21:00:25 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -1200,6 +1200,8 @@ same_color(NCURSES_CONST char *oldcap, NCURSES_CONST char *newcap, int limit)
 static void
 check_colors(TERMTYPE2 *tp)
 {
+    char *value;
+
     if ((max_colors > 0) != (max_pairs > 0)
 	|| ((max_colors > max_pairs) && (initialize_pair == 0)))
 	_nc_warning("inconsistent values for max_colors (%d) and max_pairs (%d)",
@@ -1248,6 +1250,15 @@ check_colors(TERMTYPE2 *tp)
 	    _nc_warning("expected ccc because initc is given");
 	}
     }
+    value = tigetstr("RGB");
+    if (VALID_STRING(value)) {
+	int r, g, b;
+	char bad;
+	int code = sscanf(value, "%d/%d/%d%c", &r, &g, &b, &bad);
+	if (code != 3 || r <= 0 || g <= 0 || b <= 0) {
+	    _nc_warning("unexpected value for RGB capability: %s", value);
+	}
+    }
 }
 
 static int
@@ -1928,7 +1939,7 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended)
 #if NCURSES_XNAMES
     if (extended) {
 	int check = is_user_capability(name);
-	if (check != actual) {
+	if (check != actual && (check >= 0 && actual >= 0)) {
 	    _nc_warning("extended %s capability has %d parameters, expected %d",
 			name, actual, check);
 	} else if (debug_level > 1) {
@@ -1937,6 +1948,8 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended)
 	}
 	expected = actual;
     }
+#else
+    (void) extended;
 #endif
 
     if (params[0]) {
@@ -2316,8 +2329,7 @@ static void
 check_infotocap(TERMTYPE2 *tp, int i, const char *value)
 {
     const char *name = ExtStrname(tp, i, strnames);
-    int params = (((i < (int) SIZEOF(parametrized)) &&
-		   (i < STRCOUNT))
+    int params = ((i < (int) SIZEOF(parametrized))
 		  ? parametrized[i]
 		  : ((*value == 'k')
 		     ? 0
@@ -2327,6 +2339,7 @@ check_infotocap(TERMTYPE2 *tp, int i, const char *value)
     char *tc_value;
     bool embedded;
 
+    assert(SIZEOF(parametrized) == STRCOUNT);
     if ((ti_value = _nc_tic_expand(value, TRUE, to_char)) == ABSENT_STRING) {
 	_nc_warning("tic-expansion of %s failed", name);
     } else if ((tc_value = _nc_infotocap(name, ti_value, params)) == ABSENT_STRING) {