ncurses 6.3 - patch 20220319

[ncurses.git] / progs / tic.c

diff --git a/progs/tic.c b/progs/tic.c
index dba2890b34c8fe953917a2fd226ca3a7d3621037..8eb7cf97d874bcb2026cb86b31ddd06672d9ad6b 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -49,7 +49,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.307 2021/10/05 08:07:05 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.309 2022/03/19 20:38:50 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -682,7 +682,6 @@ int
 main(int argc, char *argv[])
 {
     char my_tmpname[PATH_MAX];
-    char my_altfile[PATH_MAX];
     int v_opt = -1;
     int smart_defaults = TRUE;
     char *termcap;
@@ -933,6 +932,7 @@ main(int argc, char *argv[])
     }
 
     if (tmp_fp == NULL) {
+       char my_altfile[PATH_MAX];
        tmp_fp = open_input(source_file, my_altfile);
        if (!strcmp(source_file, "-")) {
            source_file = STDIN_NAME;
@@ -1741,6 +1741,8 @@ check_screen(TERMTYPE2 *tp)
        } else if (have_XT && screen_base) {
            _nc_warning("screen's \"screen\" entries should not have XT set");
        } else if (have_XT) {
+           char *s;
+
            if (!have_kmouse && is_screen) {
                if (VALID_STRING(key_mouse)) {
                    _nc_warning("value of kmous inconsistent with screen's usage");
@@ -1756,7 +1758,9 @@ check_screen(TERMTYPE2 *tp)
                                "to have 39/49 parameters", name_39_49);
                }
            }
-           if (VALID_STRING(to_status_line))
+           if (VALID_STRING(to_status_line)
+               && (s = strchr(to_status_line, ';')) != NULL
+               && *++s == '\0')
                _nc_warning("\"tsl\" capability is redundant, given XT");
        } else {
            if (have_kmouse
@@ -2717,12 +2721,11 @@ show_fkey_name(NAME_VALUE * data)
 static void
 check_conflict(TERMTYPE2 *tp)
 {
-    bool conflict = FALSE;
-
     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;
+       bool conflict = FALSE;
 
        if (check == NULL)
            failed("check_conflict");