X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftic.c;h=2f3b5877b1557f464d5bf6328d0a9726fd7000a2;hp=713fc11abda8ef2d5e9a024d097553e30f0a4e09;hb=f8f67d02e909c4d165fbed2ba2810c94f2862548;hpb=cb4427a16794d98049b4d790b810d62217501f9f

diff --git a/progs/tic.c b/progs/tic.c
index 713fc11a..2f3b5877 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.271 2019/03/17 00:46:55 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.278 2019/07/27 22:44:21 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -1024,10 +1024,14 @@ main(int argc, char *argv[])
 		    if (!quiet) {
 			(void) fseek(tmp_fp, qp->cstart, SEEK_SET);
 			while (j-- > 0) {
-			    if (infodump)
-				(void) putchar(fgetc(tmp_fp));
-			    else
-				put_translate(fgetc(tmp_fp));
+			    int ch = fgetc(tmp_fp);
+			    if (ch == EOF || ferror(tmp_fp)) {
+				break;
+			    } else if (infodump) {
+				(void) putchar(ch);
+			    } else {
+				put_translate(ch);
+			    }
 			}
 		    }
 
@@ -1200,6 +1204,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 +1254,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
@@ -1666,6 +1681,7 @@ check_printer(TERMTYPE2 *tp)
 #endif
 }
 
+#if NCURSES_XNAMES
 static bool
 uses_SGR_39_49(const char *value)
 {
@@ -1679,7 +1695,6 @@ uses_SGR_39_49(const char *value)
 static void
 check_screen(TERMTYPE2 *tp)
 {
-#if NCURSES_XNAMES
     if (_nc_user_definable) {
 	int have_XT = tigetflag("XT");
 	int have_XM = tigetflag("XM");
@@ -1735,8 +1750,10 @@ check_screen(TERMTYPE2 *tp)
 	    }
 	}
     }
-#endif
 }
+#else
+#define check_screen(tp)	/* nothing */
+#endif
 
 /*
  * Returns the expected number of parameters for the given capability.
@@ -1836,6 +1853,7 @@ expected_params(const char *name)
  * Check for user-capabilities that happen to be used in ncurses' terminal
  * database.
  */
+#if NCURSES_XNAMES
 static struct user_table_entry const *
 lookup_user_capability(const char *name)
 {
@@ -1845,6 +1863,7 @@ lookup_user_capability(const char *name)
     }
     return result;
 }
+#endif
 
 /*
  * If a given name is likely to be a user-capability, return the number of
@@ -1866,12 +1885,15 @@ is_user_capability(const char *name)
 	(name[1] >= '0' && name[1] <= '9') &&
 	name[2] == '\0') {
 	result = (name[1] == '6') ? 2 : 0;
-    } else if (using_extensions) {
+    }
+#if NCURSES_XNAMES
+    else if (using_extensions) {
 	struct user_table_entry const *p = lookup_user_capability(name);
 	if (p != 0) {
 	    result = (int) p->ute_argc;
 	}
     }
+#endif
     return result;
 }
 
@@ -1918,9 +1940,10 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended)
 	s++;
     }
 
+#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) {
@@ -1929,6 +1952,9 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended)
 	}
 	expected = actual;
     }
+#else
+    (void) extended;
+#endif
 
     if (params[0]) {
 	_nc_warning("%s refers to parameter 0 (%%p0), which is not allowed", name);
@@ -1957,13 +1983,16 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended)
 	    analyzed = popcount;
 	}
 	if (actual != analyzed && expected != analyzed) {
+#if NCURSES_XNAMES
 	    int user_cap = is_user_capability(name);
 	    if ((user_cap == analyzed) && using_extensions) {
 		;		/* ignore */
 	    } else if (user_cap >= 0) {
 		_nc_warning("tparm will use %d parameters for %s, expected %d",
 			    analyzed, name, user_cap);
-	    } else {
+	    } else
+#endif
+	    {
 		_nc_warning("tparm analyzed %d parameters for %s, expected %d",
 			    analyzed, name, actual);
 	    }
@@ -2304,8 +2333,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
@@ -2315,6 +2343,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) {
@@ -2805,6 +2834,7 @@ check_sgr_param(TERMTYPE2 *tp, int code, const char *name, char *value)
     }
 }
 
+#if NCURSES_XNAMES
 static int
 standard_type(const char *name)
 {
@@ -2853,6 +2883,7 @@ check_user_capability_type(const char *name, int actual)
 	}
     }
 }
+#endif
 
 /* other sanity-checks (things that we don't want in the normal
  * logic that reads a terminfo entry)
@@ -2903,6 +2934,11 @@ check_termtype(TERMTYPE2 *tp, bool literal)
     check_printer(tp);
     check_screen(tp);
 
+    /*
+     * These are probably both or none.
+     */
+    PAIRED(parm_index, parm_rindex);
+
     /*
      * These may be mismatched because the terminal description relies on
      * restoring the cursor visibility by resetting it.