X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=progs%2Ftic.c;h=c98cda606ff8c6b6dc18b99d1efd520e570f1063;hb=a28e782d7794ddeec23e7cb212dc455f0d93dc22;hp=705cac6caf9f731af9b25012c1f218178dd8a5e6;hpb=344194b55bff15ccedd626246a547de476b4d83c;p=ncurses.git diff --git a/progs/tic.c b/progs/tic.c index 705cac6c..c98cda60 100644 --- 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 #include -MODULE_ID("$Id: tic.c,v 1.268 2019/02/23 21:49:28 tom Exp $") +MODULE_ID("$Id: tic.c,v 1.290 2020/11/14 18:16:33 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; @@ -1024,10 +1026,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 +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) { @@ -1183,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); @@ -1200,6 +1214,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 +1264,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 @@ -1666,6 +1691,7 @@ check_printer(TERMTYPE2 *tp) #endif } +#if NCURSES_XNAMES static bool uses_SGR_39_49(const char *value) { @@ -1679,7 +1705,6 @@ uses_SGR_39_49(const char *value) static void check_screen(TERMTYPE2 *tp) { -#if NCURSES_XNAMES if (_nc_user_definable) { int have_XT = tigetflag("XT"); int have_XM = tigetflag("XM"); @@ -1735,8 +1760,10 @@ check_screen(TERMTYPE2 *tp) } } } -#endif } +#else +#define check_screen(tp) /* nothing */ +#endif /* * Returns the expected number of parameters for the given capability. @@ -1816,7 +1843,6 @@ expected_params(const char *name) DATA( "wingo", 1 ), }; /* *INDENT-ON* */ - #undef DATA unsigned n; @@ -1832,59 +1858,21 @@ expected_params(const char *name) return result; } -typedef struct { - const char *name; - int n_type; - int n_parms; -} USERCAPS; - /* - * These are user-capabilities that happen to be used in ncurses' terminal + * Check for user-capabilities that happen to be used in ncurses' terminal * database. */ -static USERCAPS * +#if NCURSES_XNAMES +static struct user_table_entry const * lookup_user_capability(const char *name) { - /* *INDENT-OFF* */ -#define DATA(name,type,parms) { name, type, parms } - static USERCAPS table[] = { - DATA( "AX", BOOLEAN, 0 ), - DATA( "Cr", STRING, 0 ), - DATA( "Cs", STRING, 1 ), - DATA( "E0", STRING, 0 ), - DATA( "E3", STRING, 0 ), - DATA( "G0", BOOLEAN, 0 ), - DATA( "Ms", STRING, 2 ), - DATA( "RGB", BOOLEAN, 0 ), /* FIXME can be number or string */ - DATA( "S0", STRING, 1 ), - DATA( "Se", STRING, 0 ), - DATA( "Smulx", STRING, 1 ), - DATA( "Ss", STRING, 1 ), - DATA( "TS", STRING, 0 ), - DATA( "U8", NUMBER, 0 ), - DATA( "XM", STRING, 1 ), - DATA( "XT", BOOLEAN, 0 ), - DATA( "grbom", STRING, 0 ), - DATA( "gsbom", STRING, 0 ), - DATA( "rmxx", STRING, 0 ), - DATA( "smxx", STRING, 0 ), - DATA( "xm", STRING, 9 ), - }; -#undef DATA - /* *INDENT-ON* */ - - size_t n; - USERCAPS *result = 0; + struct user_table_entry const *result = 0; if (*name != 'k') { - for (n = 0; n < SIZEOF(table); ++n) { - if (!strcmp(name, table[n].name)) { - result = &table[n]; - break; - } - } + result = _nc_find_user_entry(name); } return result; } +#endif /* * If a given name is likely to be a user-capability, return the number of @@ -1906,12 +1894,15 @@ is_user_capability(const char *name) (name[1] >= '0' && name[1] <= '9') && name[2] == '\0') { result = (name[1] == '6') ? 2 : 0; - } else if (using_extensions) { - USERCAPS *p = lookup_user_capability(name); + } +#if NCURSES_XNAMES + else if (using_extensions) { + struct user_table_entry const *p = lookup_user_capability(name); if (p != 0) { - result = p->n_parms; + result = (int) p->ute_argc; } } +#endif return result; } @@ -1926,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 @@ -1935,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) { @@ -1958,9 +1949,10 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended) s++; } +#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) { @@ -1969,6 +1961,9 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended) } expected = actual; } +#else + (void) extended; +#endif if (params[0]) { _nc_warning("%s refers to parameter 0 (%%p0), which is not allowed", name); @@ -1997,13 +1992,16 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended) analyzed = popcount; } if (actual != analyzed && expected != analyzed) { +#if NCURSES_XNAMES int user_cap = is_user_capability(name); if ((user_cap == analyzed) && using_extensions) { ; /* ignore */ } else if (user_cap >= 0) { _nc_warning("tparm will use %d parameters for %s, expected %d", analyzed, name, user_cap); - } else { + } else +#endif + { _nc_warning("tparm analyzed %d parameters for %s, expected %d", analyzed, name, actual); } @@ -2182,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++) { @@ -2193,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; @@ -2201,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), @@ -2214,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); @@ -2344,18 +2368,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; + : has_params(value, FALSE))); char *ti_value; 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); @@ -2378,12 +2401,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); @@ -2518,22 +2543,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)) { @@ -2548,8 +2580,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; } @@ -2704,7 +2735,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 @@ -2845,6 +2875,7 @@ check_sgr_param(TERMTYPE2 *tp, int code, const char *name, char *value) } } +#if NCURSES_XNAMES static int standard_type(const char *name) { @@ -2878,20 +2909,12 @@ name_of_type(int type) static void check_user_capability_type(const char *name, int actual) { - USERCAPS *p = lookup_user_capability(name); - if (p != 0) { - if (p->n_type != actual) - _nc_warning("expected %s to be %s, but actually %s", - name, - name_of_type(p->n_type), - name_of_type(actual) - ); - } else { + if (lookup_user_capability(name) == 0) { int expected = standard_type(name); if (expected >= 0) { _nc_warning("expected %s to be %s, but actually %s", name, - name_of_type(p->n_type), + name_of_type(actual), name_of_type(expected) ); } else if (*name != 'k') { @@ -2901,6 +2924,7 @@ check_user_capability_type(const char *name, int actual) } } } +#endif /* other sanity-checks (things that we don't want in the normal * logic that reads a terminfo entry) @@ -2951,6 +2975,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. @@ -2982,10 +3012,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); @@ -3066,7 +3095,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"); }