X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftic.c;h=b08f30f63b5452c793e0f1f76cf9e64d7e42ec66;hp=2f3b5877b1557f464d5bf6328d0a9726fd7000a2;hb=6830dca51a4e50d41e7bd114bdbaa857b42a46f4;hpb=97cb42f22c43eb31a4bf11475bd73ab0e0b10923 diff --git a/progs/tic.c b/progs/tic.c index 2f3b5877..b08f30f6 100644 --- a/progs/tic.c +++ b/progs/tic.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * + * 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 * * copy of this software and associated documentation files (the * @@ -48,7 +49,7 @@ #include #include -MODULE_ID("$Id: tic.c,v 1.278 2019/07/27 22:44:21 tom Exp $") +MODULE_ID("$Id: tic.c,v 1.293 2021/03/20 20:51:01 tom Exp $") #define STDIN_NAME "" @@ -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); @@ -1701,6 +1711,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 @@ -1718,10 +1729,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) { @@ -1736,10 +1752,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 { @@ -1833,7 +1853,6 @@ expected_params(const char *name) DATA( "wingo", 1 ), }; /* *INDENT-ON* */ - #undef DATA unsigned n; @@ -1908,7 +1927,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 +1936,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) { @@ -2078,7 +2097,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; @@ -2098,20 +2116,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') { @@ -2171,6 +2186,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 +2200,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 +2217,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 +2243,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); @@ -2337,14 +2378,13 @@ check_infotocap(TERMTYPE2 *tp, int i, const char *value) ? parametrized[i] : ((*value == 'k') ? 0 - : has_params(value))); - int to_char = 0; - char *ti_value; + : has_params(value, FALSE))); + char *ti_value = NULL; char *tc_value; bool embedded; assert(SIZEOF(parametrized) == STRCOUNT); - if ((ti_value = _nc_tic_expand(value, TRUE, to_char)) == ABSENT_STRING) { + if (!VALID_STRING(value) || (ti_value = strdup(value)) == NULL) { _nc_warning("tic-expansion of %s failed", name); } else if ((tc_value = _nc_infotocap(name, ti_value, params)) == ABSENT_STRING) { _nc_warning("tic-conversion of %s failed", name); @@ -2367,12 +2407,14 @@ check_infotocap(TERMTYPE2 *tp, int i, const char *value) if (strcmp(ti_check, tc_check)) { if (first) { fprintf(stderr, "check_infotocap(%s)\n", name); - fprintf(stderr, "...ti '%s'\n", ti_value); - fprintf(stderr, "...tc '%s'\n", tc_value); + fprintf(stderr, "...ti '%s'\n", _nc_visbuf2(0, ti_value)); + fprintf(stderr, "...tc '%s'\n", _nc_visbuf2(0, tc_value)); first = FALSE; } _nc_warning("tparm-conversion of %s(%d) differs between\n\tterminfo %s\n\ttermcap %s", - name, count, ti_check, tc_check); + name, count, + _nc_visbuf2(0, ti_check), + _nc_visbuf2(1, tc_check)); } free(ti_check); free(tc_check); @@ -2385,6 +2427,7 @@ check_infotocap(TERMTYPE2 *tp, int i, const char *value) name, ti_value, tc_value); } } + free(ti_value); } static char * @@ -2507,22 +2550,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 +2587,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 +2742,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 +2986,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 +3019,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 +3102,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"); }