X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftic.c;h=775889d688ed1d6ade1f9aa433d937a41a33b94a;hp=65b5fb75aea8d338dda6e2f1817b4a58d289311b;hb=7f4b9f390624835ceb0849965a7f6ff2dcb39d00;hpb=6b99a559185b3b8fad80b56bc2070b08101c33d1 diff --git a/progs/tic.c b/progs/tic.c index 65b5fb75..775889d6 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.272 2019/04/06 20:18:54 tom Exp $") +MODULE_ID("$Id: tic.c,v 1.295 2021/04/17 15:18:02 tom Exp $") #define STDIN_NAME "" @@ -115,8 +116,6 @@ free_namelist(char **src) static void cleanup(void) { - int rc; - #if NO_LEAKS free_namelist(namelst); _nc_leaks_dump_entry(); @@ -124,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 @@ -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; @@ -302,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) @@ -369,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'; } @@ -408,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) @@ -552,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; @@ -1024,10 +1027,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); + } } } @@ -1173,6 +1180,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) { @@ -1183,8 +1198,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); @@ -1200,6 +1215,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 +1265,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 @@ -1281,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); } @@ -1304,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; @@ -1323,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; @@ -1337,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)) { @@ -1508,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); @@ -1543,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) { @@ -1686,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 @@ -1703,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) { @@ -1721,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 { @@ -1818,7 +1859,6 @@ expected_params(const char *name) DATA( "wingo", 1 ), }; /* *INDENT-ON* */ - #undef DATA unsigned n; @@ -1893,7 +1933,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 @@ -1902,7 +1942,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) { @@ -1928,7 +1968,7 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended) #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) { @@ -1937,6 +1977,8 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended) } expected = actual; } +#else + (void) extended; #endif if (params[0]) { @@ -2061,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; @@ -2081,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') { @@ -2135,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); } @@ -2154,6 +2192,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++) { @@ -2165,7 +2206,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; @@ -2173,8 +2223,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), @@ -2186,6 +2249,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); @@ -2316,18 +2380,17 @@ 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 - : has_params(value))); - int to_char = 0; - char *ti_value; + : has_params(value, FALSE))); + char *ti_value = NULL; char *tc_value; bool embedded; - if ((ti_value = _nc_tic_expand(value, TRUE, to_char)) == ABSENT_STRING) { + assert(SIZEOF(parametrized) == STRCOUNT); + 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); @@ -2350,12 +2413,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); @@ -2368,6 +2433,7 @@ check_infotocap(TERMTYPE2 *tp, int i, const char *value) name, ti_value, tc_value); } } + free(ti_value); } static char * @@ -2490,22 +2556,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)) { @@ -2520,8 +2593,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; } @@ -2611,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"); @@ -2676,7 +2748,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 @@ -2917,6 +2988,12 @@ check_termtype(TERMTYPE2 *tp, bool literal) check_printer(tp); check_screen(tp); + /* + * 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 * restoring the cursor visibility by resetting it. @@ -2948,10 +3025,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); @@ -3032,7 +3108,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"); }