ncurses 6.2 - patch 20210418

[ncurses.git] / progs / tic.c

diff --git a/progs/tic.c b/progs/tic.c
index b74d1ce585e4b6373fc0064206083544eeafa5eb..775889d688ed1d6ade1f9aa433d937a41a33b94a 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2020,2021 Thomas E. Dickey                                *
  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -49,7 +49,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.289 2020/10/31 22:15:55 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.295 2021/04/17 15:18:02 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -116,8 +116,6 @@ free_namelist(char **src)
 static void
 cleanup(void)
 {
-    int rc;
-
 #if NO_LEAKS
     free_namelist(namelst);
     _nc_leaks_dump_entry();
@@ -125,6 +123,8 @@ cleanup(void)
     if (tmp_fp != 0)
        fclose(tmp_fp);
     if (to_remove != 0) {
+       int rc;
+
 #if HAVE_REMOVE
        rc = remove(to_remove);
 #else
@@ -304,10 +304,12 @@ put_translate(int c)
 /* emit a comment char, translating terminfo names to termcap names */
 {
     static bool in_name = FALSE;
-    static size_t have, used;
-    static char *namebuf, *suffix;
+    static size_t used;
 
     if (in_name) {
+       static size_t have;
+       static char *namebuf, *suffix;
+
        if (used + 1 >= have) {
            have += 132;
            if ((namebuf = typeRealloc(char, have, namebuf)) == 0)
@@ -371,12 +373,10 @@ stripped(char *src)
        src++;
 
     if (*src != '\0') {
-       size_t len;
-
        if ((dst = strdup(src)) == NULL) {
            failed("strdup");
        } else {
-           len = strlen(dst);
+           size_t len = strlen(dst);
            while (--len != 0 && isspace(UChar(dst[len])))
                dst[len] = '\0';
        }
@@ -410,7 +410,7 @@ copy_input(FILE *source, const char *filename, char *alt_file)
 {
     char my_altfile[PATH_MAX];
     FILE *result = 0;
-    FILE *target = 0;
+    FILE *target;
     int ch;
 
     if (alt_file == 0)
@@ -554,9 +554,10 @@ matches(char **needle, const char *haystack)
 /* does entry in needle list match |-separated field in haystack? */
 {
     bool code = FALSE;
-    size_t n;
 
     if (needle != 0) {
+       size_t n;
+
        for (n = 0; needle[n] != 0; n++) {
            if (_nc_name_match(haystack, needle[n], "|")) {
                code = TRUE;
@@ -1306,13 +1307,12 @@ keypad_final(const char *string)
 static long
 keypad_index(const char *string)
 {
-    char *test;
-    const char *list = "PQRSwxymtuvlqrsPpn";   /* app-keypad except "Enter" */
     int ch;
     long result = -1;
 
     if ((ch = keypad_final(string)) != '\0') {
-       test = (strchr) (list, ch);
+       const char *list = "PQRSwxymtuvlqrsPpn";        /* app-keypad except "Enter" */
+       char *test = (strchr) (list, ch);
        if (test != 0)
            result = (long) (test - list);
     }
@@ -1329,8 +1329,6 @@ static void
 check_ansi_cursor(char *list[4])
 {
     int j, k;
-    int want;
-    size_t suffix;
     bool skip[4];
     bool repeated = FALSE;
 
@@ -1348,6 +1346,7 @@ check_ansi_cursor(char *list[4])
     if (!repeated) {
        char *up = list[1];
        size_t prefix = (size_t) csi_length(up);
+       size_t suffix;
 
        if (prefix) {
            suffix = prefix;
@@ -1362,6 +1361,8 @@ check_ansi_cursor(char *list[4])
                skip[2] = TRUE;
 
            for (j = 0; j < 4; ++j) {
+               int want;
+
                if (skip[j] || strlen(list[j]) == 1)
                    continue;
                if (memcmp(list[j], up, prefix)) {
@@ -1533,9 +1534,7 @@ check_keypad(TERMTYPE2 *tp)
        char final[MAX_KP + 1];
        long list[MAX_KP];
        int increase = 0;
-       int j, k, kk;
-       long last;
-       long test;
+       int j;
 
        final[0] = keypad_final(key_a1);
        final[1] = keypad_final(key_a3);
@@ -1568,10 +1567,17 @@ check_keypad(TERMTYPE2 *tp)
                ++increase;
            }
        }
+
        if (increase != (MAX_KP - 1)) {
+           long last;
+
            show[0] = '\0';
 
            for (j = 0, last = -1; j < MAX_KP; ++j) {
+               int k;
+               int kk;
+               long test;
+
                for (k = 0, kk = -1, test = 100; k < 5; ++k) {
                    if (list[k] > last &&
                        list[k] < test) {
@@ -1711,6 +1717,7 @@ check_screen(TERMTYPE2 *tp)
        int have_bce = back_color_erase;
        bool have_kmouse = FALSE;
        bool use_sgr_39_49 = FALSE;
+       const char *name_39_49 = "orig_pair or orig_colors";
        char *name = _nc_first_name(tp->term_names);
        bool is_screen = !strncmp(name, "screen", 6);
        bool screen_base = (is_screen
@@ -1728,10 +1735,15 @@ check_screen(TERMTYPE2 *tp)
        if (VALID_STRING(key_mouse)) {
            have_kmouse = !strcmp("\033[M", key_mouse);
        }
-       if (VALID_STRING(orig_colors)) {
-           use_sgr_39_49 = uses_SGR_39_49(orig_colors);
-       } else if (VALID_STRING(orig_pair)) {
-           use_sgr_39_49 = uses_SGR_39_49(orig_pair);
+       if (have_bce) {
+           if (VALID_STRING(orig_pair)) {
+               name_39_49 = "orig_pair";
+               use_sgr_39_49 = uses_SGR_39_49(orig_pair);
+           }
+           if (!use_sgr_39_49 && VALID_STRING(orig_colors)) {
+               name_39_49 = "orig_colors";
+               use_sgr_39_49 = uses_SGR_39_49(orig_colors);
+           }
        }
 
        if (have_XM && have_XT) {
@@ -1746,10 +1758,14 @@ check_screen(TERMTYPE2 *tp)
                    _nc_warning("expected kmous capability with XT");
                }
            }
-           if (!have_bce && max_colors > 0)
-               _nc_warning("expected bce capability with XT");
-           if (!use_sgr_39_49 && have_bce && max_colors > 0)
-               _nc_warning("expected orig_colors capability with XT to have 39/49 parameters");
+           if (max_colors > 0) {
+               if (!have_bce) {
+                   _nc_warning("expected bce capability with XT");
+               } else if (!use_sgr_39_49) {
+                   _nc_warning("expected %s capability with XT "
+                               "to have 39/49 parameters", name_39_49);
+               }
+           }
            if (VALID_STRING(to_status_line))
                _nc_warning("\"tsl\" capability is redundant, given XT");
        } else {
@@ -2087,7 +2103,6 @@ check_delays(TERMTYPE2 *tp, const char *name, const char *value)
        if (p[0] == '$' && p[1] == '<') {
            const char *base = p + 2;
            const char *mark = 0;
-           bool maybe = TRUE;
            bool mixed = FALSE;
            int proportional = 0;
            int mandatory = 0;
@@ -2107,20 +2122,17 @@ check_delays(TERMTYPE2 *tp, const char *name, const char *value)
                    if (mark == 0)
                        mark = q;
                } else if (!(isalnum(UChar(*q)) || strchr("+-.", *q) != 0)) {
-                   maybe = FALSE;
                    break;
                } else if (proportional || mandatory) {
                    mixed = TRUE;
                }
            }
            last = *q ? (q + 1) : q;
-           if (*q == '\0') {
-               maybe = FALSE;  /* just an isolated "$<" */
-           } else if (maybe) {
+           if (*q != '\0') {
                float check_f;
                char check_c;
                int rc = sscanf(base, "%f%c", &check_f, &check_c);
-               if ((rc != 2) || (check_c != *mark) || mixed) {
+               if ((rc != 2) || (mark != NULL && (check_c != *mark)) || mixed) {
                    _nc_warning("syntax error in %s delay '%.*s'", name,
                                (int) (q - base), base);
                } else if (*name == 'k') {
@@ -2161,7 +2173,7 @@ check_delays(TERMTYPE2 *tp, const char *name, const char *value)
             */
            if ((p = skip_DECSCNM(value, &flag)) != 0 &&
                flag > 0 &&
-               (q = skip_DECSCNM(p, &flag)) != 0 &&
+               skip_DECSCNM(p, &flag) != 0 &&
                flag == 0) {
                _nc_warning("expected a delay in %s", name);
            }
@@ -2372,8 +2384,8 @@ check_infotocap(TERMTYPE2 *tp, int i, const char *value)
                  ? parametrized[i]
                  : ((*value == 'k')
                     ? 0
-                    : has_params(value)));
-    char *ti_value;
+                    : has_params(value, FALSE)));
+    char *ti_value = NULL;
     char *tc_value;
     bool embedded;
 
@@ -2421,6 +2433,7 @@ check_infotocap(TERMTYPE2 *tp, int i, const char *value)
                        name, ti_value, tc_value);
        }
     }
+    free(ti_value);
 }
 
 static char *
@@ -2670,11 +2683,11 @@ static void
 check_conflict(TERMTYPE2 *tp)
 {
     bool conflict = FALSE;
-    unsigned j, k;
 
     if (!(_nc_syntax == SYN_TERMCAP && capdump)) {
        char *check = calloc((size_t) (NUM_STRINGS(tp) + 1), sizeof(char));
        NAME_VALUE *given = get_fkey_list(tp);
+       unsigned j, k;
 
        if (check == 0)
            failed("check_conflict");