ncurses 6.2 - patch 20201024

[ncurses.git] / progs / tic.c

diff --git a/progs/tic.c b/progs/tic.c
index 2f3b5877b1557f464d5bf6328d0a9726fd7000a2..9560788e8a17750e00986f9d7b5361490ae9e14f 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -48,7 +49,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.278 2019/07/27 22:44:21 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.288 2020/10/24 17:04:11 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -218,7 +219,8 @@ write_it(ENTRY * ep)
            while ((ch = *t++) != 0) {
                *d++ = (char) ch;
                if (ch == '\\') {
-                   *d++ = *t++;
+                   if ((*d++ = *t++) == '\0')
+                       break;
                } else if ((ch == '%')
                           && (*t == L_BRACE)) {
                    char *v = 0;
@@ -1177,6 +1179,14 @@ check_acs(TERMTYPE2 *tp)
     }
 }
 
+static char *
+safe_strdup(const char *value)
+{
+    if (value == NULL)
+       value = "";
+    return strdup(value);
+}
+
 static bool
 same_color(NCURSES_CONST char *oldcap, NCURSES_CONST char *newcap, int limit)
 {
@@ -1187,8 +1197,8 @@ same_color(NCURSES_CONST char *oldcap, NCURSES_CONST char *newcap, int limit)
        int n;
        int same;
        for (n = same = 0; n < limit; ++n) {
-           char *oldvalue = strdup(TPARM_1(oldcap, n));
-           char *newvalue = strdup(TPARM_1(newcap, n));
+           char *oldvalue = safe_strdup(TIPARM_1(oldcap, n));
+           char *newvalue = safe_strdup(TIPARM_1(newcap, n));
            same += !strcmp(oldvalue, newvalue);
            free(oldvalue);
            free(newvalue);
@@ -1833,7 +1843,6 @@ expected_params(const char *name)
        DATA( "wingo",          1 ),
     };
     /* *INDENT-ON* */
-
 #undef DATA
 
     unsigned n;
@@ -1908,7 +1917,7 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended)
     int expected = expected_params(name);
     int actual = 0;
     int n;
-    bool params[NUM_PARM];
+    bool params[1 + NUM_PARM];
     char *s = value;
 
 #ifdef set_top_margin_parm
@@ -1917,7 +1926,7 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended)
        expected = 2;
 #endif
 
-    for (n = 0; n < NUM_PARM; n++)
+    for (n = 0; n <= NUM_PARM; n++)
        params[n] = FALSE;
 
     while (*s != 0) {
@@ -2171,6 +2180,9 @@ check_1_infotocap(const char *name, NCURSES_CONST char *value, int count)
     char *result;
     char blob[NUM_PARM * 10];
     char *next = blob;
+    TParams expect;
+    TParams actual;
+    int nparam;
 
     *next++ = '\0';
     for (k = 1; k <= NUM_PARM; k++) {
@@ -2182,7 +2194,16 @@ check_1_infotocap(const char *name, NCURSES_CONST char *value, int count)
        next += strlen(next) + 1;
     }
 
-    switch (tparm_type(name)) {
+    expect = tparm_type(name);
+    nparam = _nc_tparm_analyze(value, p_is_s, &ignored);
+    actual = guess_tparm_type(nparam, p_is_s);
+
+    if (expect != actual) {
+       _nc_warning("%s has mismatched parameters", name);
+       actual = Other;
+    }
+
+    switch (actual) {
     case Num_Str:
        result = TPARM_2(value, numbers[1], strings[2]);
        break;
@@ -2190,8 +2211,21 @@ check_1_infotocap(const char *name, NCURSES_CONST char *value, int count)
        result = TPARM_3(value, numbers[1], strings[2], strings[3]);
        break;
     case Numbers:
+#define myParam(n) numbers[n]
+       result = TIPARM_9(value,
+                         myParam(1),
+                         myParam(2),
+                         myParam(3),
+                         myParam(4),
+                         myParam(5),
+                         myParam(6),
+                         myParam(7),
+                         myParam(8),
+                         myParam(9));
+#undef myParam
+       break;
+    case Other:
     default:
-       (void) _nc_tparm_analyze(value, p_is_s, &ignored);
 #define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n])
        result = TPARM_9(value,
                         myParam(1),
@@ -2203,6 +2237,7 @@ check_1_infotocap(const char *name, NCURSES_CONST char *value, int count)
                         myParam(7),
                         myParam(8),
                         myParam(9));
+#undef myParam
        break;
     }
     return strdup(result);
@@ -2507,22 +2542,29 @@ similar_sgr(int num, char *a, char *b)
     return ((num != 0) || (*a == 0));
 }
 
+static void
+check_tparm_err(int num)
+{
+    if (_nc_tparm_err)
+       _nc_warning("tparam error in sgr(%d): %s", num, sgr_names[num]);
+}
+
 static char *
 check_sgr(TERMTYPE2 *tp, char *zero, int num, char *cap, const char *name)
 {
     char *test;
 
     _nc_tparm_err = 0;
-    test = TPARM_9(set_attributes,
-                  num == 1,
-                  num == 2,
-                  num == 3,
-                  num == 4,
-                  num == 5,
-                  num == 6,
-                  num == 7,
-                  num == 8,
-                  num == 9);
+    test = TIPARM_9(set_attributes,
+                   num == 1,
+                   num == 2,
+                   num == 3,
+                   num == 4,
+                   num == 5,
+                   num == 6,
+                   num == 7,
+                   num == 8,
+                   num == 9);
     if (test != 0) {
        if (PRESENT(cap)) {
            if (!similar_sgr(num, test, cap)) {
@@ -2537,8 +2579,7 @@ check_sgr(TERMTYPE2 *tp, char *zero, int num, char *cap, const char *name)
     } else if (PRESENT(cap)) {
        _nc_warning("sgr(%d) missing, but %s present", num, name);
     }
-    if (_nc_tparm_err)
-       _nc_warning("stack error in sgr(%d) string", num);
+    check_tparm_err(num);
     return test;
 }
 
@@ -2693,7 +2734,6 @@ check_conflict(TERMTYPE2 *tp)
                { NULL,   NULL },
            };
            /* *INDENT-ON* */
-
            /*
             * SVr4 curses defines the "xcurses" names listed above except for
             * the special cases in the "shifted" column.  When using these
@@ -2938,6 +2978,7 @@ check_termtype(TERMTYPE2 *tp, bool literal)
      * These are probably both or none.
      */
     PAIRED(parm_index, parm_rindex);
+    PAIRED(parm_ich, parm_dch);
 
     /*
      * These may be mismatched because the terminal description relies on
@@ -2970,10 +3011,9 @@ check_termtype(TERMTYPE2 *tp, bool literal)
        if (PRESENT(exit_attribute_mode)) {
            zero = strdup(CHECK_SGR(0, exit_attribute_mode));
        } else {
-           zero = strdup(TPARM_9(set_attributes, 0, 0, 0, 0, 0, 0, 0, 0, 0));
+           zero = strdup(TIPARM_9(set_attributes, 0, 0, 0, 0, 0, 0, 0, 0, 0));
        }
-       if (_nc_tparm_err)
-           _nc_warning("stack error in sgr(0) string");
+       check_tparm_err(0);
 
        if (zero != 0) {
            CHECK_SGR(1, enter_standout_mode);
@@ -3054,7 +3094,7 @@ check_termtype(TERMTYPE2 *tp, bool literal)
      * ncurses handles it.
      */
     if ((PRESENT(enter_insert_mode) || PRESENT(exit_insert_mode))
-       && PRESENT(parm_ich)) {
+       && PRESENT(insert_character)) {
        _nc_warning("non-curses applications may be confused by ich1 with smir/rmir");
     }