X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Fparse_entry.c;h=87e424f7eca7551c8106be016cf25873c25affbd;hp=1aff562d0dd681d2aa7564c08cfd1b8d436705b7;hb=46722468f47c2b77b3987729b4bcf2321cccfd01;hpb=b1f61d9f3aa244512045a6b02e759825d7049d34 diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c index 1aff562d..87e424f7 100644 --- a/ncurses/tinfo/parse_entry.c +++ b/ncurses/tinfo/parse_entry.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. * + * Copyright (c) 1998-2001,2002 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 * @@ -40,14 +40,14 @@ * from the input stream. */ +#define __INTERNAL_CAPS_VISIBLE #include #include #include -#define __INTERNAL_CAPS_VISIBLE #include -MODULE_ID("$Id: parse_entry.c,v 1.44 2000/04/30 00:17:42 tom Exp $") +MODULE_ID("$Id: parse_entry.c,v 1.57 2002/08/31 17:02:02 tom Exp $") #ifdef LINT static short const parametrized[] = @@ -195,14 +195,15 @@ _nc_extend_names(ENTRY * entryp, char *name, int token_type) * push back token */ -int -_nc_parse_entry(struct entry *entryp, int literal, bool silent) +NCURSES_EXPORT(int) +_nc_parse_entry +(struct entry *entryp, int literal, bool silent) { int token_type; struct name_table_entry const *entry_ptr; - char *ptr, namecpy[MAX_NAME_SIZE + 1]; + char *ptr, *base; - token_type = _nc_get_token(); + token_type = _nc_get_token(silent); if (token_type == EOF) return (EOF); @@ -235,22 +236,22 @@ _nc_parse_entry(struct entry *entryp, int literal, bool silent) _nc_set_type(_nc_first_name(entryp->tterm.term_names)); /* check for overly-long names and aliases */ - (void) strncpy(namecpy, entryp->tterm.term_names, MAX_NAME_SIZE); - namecpy[MAX_NAME_SIZE] = '\0'; - if ((ptr = strrchr(namecpy, '|')) != (char *) 0) - *ptr = '\0'; - ptr = strtok(namecpy, "|"); - if (strlen(ptr) > MAX_ALIAS) - _nc_warning("primary name may be too long"); - while ((ptr = strtok((char *) 0, "|")) != (char *) 0) - if (strlen(ptr) > MAX_ALIAS) - _nc_warning("alias `%s' may be too long", ptr); + for (base = entryp->tterm.term_names; (ptr = strchr(base, '|')) != 0; + base = ptr + 1) { + if (ptr - base > MAX_ALIAS) { + _nc_warning("%s `%.*s' may be too long", + (base == entryp->tterm.term_names) + ? "primary name" + : "alias", + (int) (ptr - base), base); + } + } entryp->nuses = 0; - for (token_type = _nc_get_token(); - token_type != EOF && token_type != NAMES; - token_type = _nc_get_token()) { + for (token_type = _nc_get_token(silent); + token_type != EOF && token_type != NAMES; + token_type = _nc_get_token(silent)) { if (strcmp(_nc_curr_token.tk_name, "use") == 0 || strcmp(_nc_curr_token.tk_name, "tc") == 0) { entryp->uses[entryp->nuses].name = _nc_save_str(_nc_curr_token.tk_valstring); @@ -259,7 +260,7 @@ _nc_parse_entry(struct entry *entryp, int literal, bool silent) } else { /* normal token lookup */ entry_ptr = _nc_find_entry(_nc_curr_token.tk_name, - _nc_syntax ? _nc_cap_hash_table : _nc_info_hash_table); + _nc_syntax ? _nc_cap_hash_table : _nc_info_hash_table); /* * Our kluge to handle aliasing. The reason it's done @@ -277,14 +278,14 @@ _nc_parse_entry(struct entry *entryp, int literal, bool silent) if (strcmp(ap->from, _nc_curr_token.tk_name) == 0) { if (ap->to == (char *) 0) { _nc_warning("%s (%s termcap extension) ignored", - ap->from, ap->source); + ap->from, ap->source); goto nexttok; } entry_ptr = _nc_find_entry(ap->to, _nc_cap_hash_table); if (entry_ptr && !silent) _nc_warning("%s (%s termcap extension) aliased to %s", - ap->from, ap->source, ap->to); + ap->from, ap->source, ap->to); break; } } else { /* if (_nc_syntax == SYN_TERMINFO) */ @@ -292,14 +293,14 @@ _nc_parse_entry(struct entry *entryp, int literal, bool silent) if (strcmp(ap->from, _nc_curr_token.tk_name) == 0) { if (ap->to == (char *) 0) { _nc_warning("%s (%s terminfo extension) ignored", - ap->from, ap->source); + ap->from, ap->source); goto nexttok; } entry_ptr = _nc_find_entry(ap->to, _nc_info_hash_table); if (entry_ptr && !silent) _nc_warning("%s (%s terminfo extension) aliased to %s", - ap->from, ap->source, ap->to); + ap->from, ap->source, ap->to); break; } @@ -316,7 +317,8 @@ _nc_parse_entry(struct entry *entryp, int literal, bool silent) if (entry_ptr == NOTFOUND && _nc_user_definable && (entry_ptr = _nc_extend_names(entryp, - _nc_curr_token.tk_name, token_type)) != 0) { + _nc_curr_token.tk_name, + token_type)) != 0) { if (_nc_tracing >= DEBUG_LEVEL(1)) _nc_warning("extended capability '%s'", _nc_curr_token.tk_name); } @@ -326,7 +328,7 @@ _nc_parse_entry(struct entry *entryp, int literal, bool silent) if (entry_ptr == NOTFOUND) { if (!silent) _nc_warning("unknown capability '%s'", - _nc_curr_token.tk_name); + _nc_curr_token.tk_name); continue; } @@ -345,12 +347,14 @@ _nc_parse_entry(struct entry *entryp, int literal, bool silent) /* tell max_attributes from arrow_key_map */ if (token_type == NUMBER && !strcmp("ma", _nc_curr_token.tk_name)) entry_ptr = _nc_find_type_entry("ma", NUMBER, - _nc_get_table(_nc_syntax != 0)); + _nc_get_table(_nc_syntax + != 0)); /* map terminfo's string MT to MT */ else if (token_type == STRING && !strcmp("MT", _nc_curr_token.tk_name)) entry_ptr = _nc_find_type_entry("MT", STRING, - _nc_get_table(_nc_syntax != 0)); + _nc_get_table(_nc_syntax + != 0)); /* treat strings without following "=" as empty strings */ else if (token_type == BOOLEAN && entry_ptr->nte_type == STRING) @@ -374,7 +378,7 @@ _nc_parse_entry(struct entry *entryp, int literal, bool silent) break; } _nc_warning("wrong type used for %s capability '%s'", - type_name, _nc_curr_token.tk_name); + type_name, _nc_curr_token.tk_name); } continue; } @@ -411,8 +415,8 @@ _nc_parse_entry(struct entry *entryp, int literal, bool silent) ptr = _nc_curr_token.tk_valstring; if (_nc_syntax == SYN_TERMCAP) ptr = _nc_captoinfo(_nc_curr_token.tk_name, - ptr, - parametrized[entry_ptr->nte_index]); + ptr, + parametrized[entry_ptr->nte_index]); entryp->tterm.Strings[entry_ptr->nte_index] = _nc_save_str(ptr); break; @@ -461,12 +465,12 @@ _nc_parse_entry(struct entry *entryp, int literal, bool silent) } else postprocess_terminfo(&entryp->tterm); } - _nc_wrap_entry(entryp); + _nc_wrap_entry(entryp, FALSE); return (OK); } -int +NCURSES_EXPORT(int) _nc_capcmp(const char *s, const char *t) /* compare two string capabilities, stripping out padding */ { @@ -478,15 +482,21 @@ _nc_capcmp(const char *s, const char *t) for (;;) { if (s[0] == '$' && s[1] == '<') { for (s += 2;; s++) - if (!(isdigit(*s) || *s == '.' || *s == '*' || *s == '/' || - *s == '>')) + if (!(isdigit(UChar(*s)) + || *s == '.' + || *s == '*' + || *s == '/' + || *s == '>')) break; } if (t[0] == '$' && t[1] == '<') { for (t += 2;; t++) - if (!(isdigit(*t) || *t == '.' || *t == '*' || *t == '/' || - *t == '>')) + if (!(isdigit(UChar(*t)) + || *t == '.' + || *t == '*' + || *t == '/' + || *t == '>')) break; } @@ -503,6 +513,26 @@ _nc_capcmp(const char *s, const char *t) } } +static void +append_acs0(string_desc * dst, int code, int src) +{ + if (src != 0) { + char temp[3]; + temp[0] = code; + temp[1] = src; + temp[2] = 0; + _nc_safe_strcat(dst, temp); + } +} + +static void +append_acs(string_desc * dst, int code, char *src) +{ + if (src != 0 && strlen(src) == 1) { + append_acs0(dst, code, *src); + } +} + /* * The ko capability, if present, consists of a comma-separated capability * list. For each capability, we may assume there is a keycap that sends the @@ -563,11 +593,11 @@ static const char C_HT[] = "\t"; #undef CUR #define CUR tp-> -static -void +static void postprocess_termcap(TERMTYPE * tp, bool has_base) { char buf[MAX_LINE * 2 + 2]; + string_desc result; /* * TERMCAP DEFAULTS AND OBSOLETE-CAPABILITY TRANSLATIONS @@ -632,17 +662,15 @@ postprocess_termcap(TERMTYPE * tp, bool has_base) } else newline = _nc_save_str(C_LF); } else if (PRESENT(carriage_return) && PRESENT(scroll_forward)) { - strncpy(buf, carriage_return, MAX_LINE - 2); - buf[MAX_LINE - 1] = '\0'; - strncat(buf, scroll_forward, MAX_LINE - strlen(buf) - 1); - buf[MAX_LINE] = '\0'; - newline = _nc_save_str(buf); + _nc_str_init(&result, buf, sizeof(buf)); + if (_nc_safe_strcat(&result, carriage_return) + && _nc_safe_strcat(&result, scroll_forward)) + newline = _nc_save_str(buf); } else if (PRESENT(carriage_return) && PRESENT(cursor_down)) { - strncpy(buf, carriage_return, MAX_LINE - 2); - buf[MAX_LINE - 1] = '\0'; - strncat(buf, cursor_down, MAX_LINE - strlen(buf) - 1); - buf[MAX_LINE] = '\0'; - newline = _nc_save_str(buf); + _nc_str_init(&result, buf, sizeof(buf)); + if (_nc_safe_strcat(&result, carriage_return) + && _nc_safe_strcat(&result, cursor_down)) + newline = _nc_save_str(buf); } } } @@ -695,7 +723,7 @@ postprocess_termcap(TERMTYPE * tp, bool has_base) else { if (tab && _nc_capcmp(tab, C_HT)) _nc_warning("hardware tabs with a non-^I tab string %s", - _nc_visbuf(tab)); + _nc_visbuf(tab)); else { if (WANTED(tab)) tab = _nc_save_str(C_HT); @@ -708,7 +736,8 @@ postprocess_termcap(TERMTYPE * tp, bool has_base) * isn't from mytinfo... */ if (PRESENT(other_non_function_keys)) { - char *dp, *cp = strtok(other_non_function_keys, ","); + char *base = other_non_function_keys; + char *bp, *cp, *dp; struct name_table_entry const *from_ptr; struct name_table_entry const *to_ptr; assoc const *ap; @@ -717,15 +746,21 @@ postprocess_termcap(TERMTYPE * tp, bool has_base) /* we're going to use this for a special case later */ dp = strchr(other_non_function_keys, 'i'); - foundim = dp && dp[1] == 'm'; + foundim = (dp != 0) && (dp[1] == 'm'); /* look at each comma-separated capability in the ko string... */ - do { + for (base = other_non_function_keys; + (cp = strchr(base, ',')) != 0; + base = cp + 1) { + size_t len = cp - base; + for (ap = ko_xlate; ap->from; ap++) - if (strcmp(ap->from, cp) == 0) + if (len == strlen(ap->from) + && strncmp(ap->from, base, len) == 0) break; if (!ap->to) { - _nc_warning("unknown capability `%s' in ko string", cp); + _nc_warning("unknown capability `%.*s' in ko string", + (int) len, base); continue; } else if (ap->to == CANCELLED_STRING) /* ignore it */ continue; @@ -748,11 +783,11 @@ postprocess_termcap(TERMTYPE * tp, bool has_base) * string; that's just an inefficiency. */ if (strcmp( - tp->Strings[from_ptr->nte_index], - tp->Strings[to_ptr->nte_index]) != 0) + tp->Strings[from_ptr->nte_index], + tp->Strings[to_ptr->nte_index]) != 0) _nc_warning("%s (%s) already has an explicit value %s, ignoring ko", - ap->to, ap->from, - _nc_visbuf(tp->Strings[to_ptr->nte_index])); + ap->to, ap->from, + _nc_visbuf(tp->Strings[to_ptr->nte_index])); continue; } @@ -760,22 +795,18 @@ postprocess_termcap(TERMTYPE * tp, bool has_base) * The magic moment -- copy the mapped key string over, * stripping out padding. */ - dp = buf2; - for (cp = tp->Strings[from_ptr->nte_index]; *cp; cp++) { - if (cp[0] == '$' && cp[1] == '<') { - while (*cp && *cp != '>') - if (!*cp) - break; - else - ++cp; + for (dp = buf2, bp = tp->Strings[from_ptr->nte_index]; *bp; bp++) { + if (bp[0] == '$' && bp[1] == '<') { + while (*bp && *bp != '>') { + ++bp; + } } else - *dp++ = *cp; + *dp++ = *bp; } *dp++ = '\0'; tp->Strings[to_ptr->nte_index] = _nc_save_str(buf2); - } while - ((cp = strtok((char *) 0, ",")) != 0); + } /* * Note: ko=im and ko=ic both want to grab the `Insert' @@ -789,13 +820,15 @@ postprocess_termcap(TERMTYPE * tp, bool has_base) } } - if (!hard_copy) { - if (WANTED(key_backspace)) - key_backspace = _nc_save_str(C_BS); - if (WANTED(key_left)) - key_left = _nc_save_str(C_BS); - if (WANTED(key_down)) - key_down = _nc_save_str(C_LF); + if (!has_base) { + if (!hard_copy) { + if (WANTED(key_backspace)) + key_backspace = _nc_save_str(C_BS); + if (WANTED(key_left)) + key_left = _nc_save_str(C_BS); + if (WANTED(key_down)) + key_down = _nc_save_str(C_LF); + } } /* @@ -812,74 +845,35 @@ postprocess_termcap(TERMTYPE * tp, bool has_base) PRESENT(acs_hline) || PRESENT(acs_vline) || PRESENT(acs_plus)) { - char buf2[MAX_TERMCAP_LENGTH], *bp = buf2; - - if (acs_chars) { - (void) strcpy(bp, acs_chars); - bp += strlen(bp); - } - - if (acs_ulcorner && acs_ulcorner[1] == '\0') { - *bp++ = 'l'; - *bp++ = *acs_ulcorner; - } - if (acs_llcorner && acs_llcorner[1] == '\0') { - *bp++ = 'm'; - *bp++ = *acs_llcorner; - } - if (acs_urcorner && acs_urcorner[1] == '\0') { - *bp++ = 'k'; - *bp++ = *acs_urcorner; - } - if (acs_lrcorner && acs_lrcorner[1] == '\0') { - *bp++ = 'j'; - *bp++ = *acs_lrcorner; - } - if (acs_ltee && acs_ltee[1] == '\0') { - *bp++ = 't'; - *bp++ = *acs_ltee; - } - if (acs_rtee && acs_rtee[1] == '\0') { - *bp++ = 'u'; - *bp++ = *acs_rtee; - } - if (acs_btee && acs_btee[1] == '\0') { - *bp++ = 'v'; - *bp++ = *acs_btee; - } - if (acs_ttee && acs_ttee[1] == '\0') { - *bp++ = 'w'; - *bp++ = *acs_ttee; - } - if (acs_hline && acs_hline[1] == '\0') { - *bp++ = 'q'; - *bp++ = *acs_hline; - } - if (acs_vline && acs_vline[1] == '\0') { - *bp++ = 'x'; - *bp++ = *acs_vline; - } - if (acs_plus) { - *bp++ = 'n'; - strcpy(bp, acs_plus); - bp = buf2 + strlen(buf2); - } - - if (bp != buf2) { - *bp++ = '\0'; + char buf2[MAX_TERMCAP_LENGTH]; + + _nc_str_init(&result, buf2, sizeof(buf2)); + _nc_safe_strcat(&result, acs_chars); + + append_acs(&result, 'j', acs_lrcorner); + append_acs(&result, 'k', acs_urcorner); + append_acs(&result, 'l', acs_ulcorner); + append_acs(&result, 'm', acs_llcorner); + append_acs(&result, 'n', acs_plus); + append_acs(&result, 'q', acs_hline); + append_acs(&result, 't', acs_ltee); + append_acs(&result, 'u', acs_rtee); + append_acs(&result, 'v', acs_btee); + append_acs(&result, 'w', acs_ttee); + append_acs(&result, 'x', acs_vline); + + if (buf2[0]) { acs_chars = _nc_save_str(buf2); _nc_warning("acsc string synthesized from XENIX capabilities"); } } else if (acs_chars == 0 - && enter_alt_charset_mode != 0 - && exit_alt_charset_mode != 0) { - acs_chars = - _nc_save_str("``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~"); + && enter_alt_charset_mode != 0 + && exit_alt_charset_mode != 0) { + acs_chars = _nc_save_str(VT_ACSC); } } -static -void +static void postprocess_terminfo(TERMTYPE * tp) { /* @@ -891,60 +885,25 @@ postprocess_terminfo(TERMTYPE * tp) * Translate AIX forms characters. */ if (PRESENT(box_chars_1)) { - char buf2[MAX_TERMCAP_LENGTH], *bp = buf2; - - if (acs_chars) { - (void) strcpy(bp, acs_chars); - bp += strlen(bp); - } - - if (box_chars_1[0]) { /* ACS_ULCORNER */ - *bp++ = 'l'; - *bp++ = box_chars_1[0]; - } - if (box_chars_1[1]) { /* ACS_HLINE */ - *bp++ = 'q'; - *bp++ = box_chars_1[1]; - } - if (box_chars_1[2]) { /* ACS_URCORNER */ - *bp++ = 'k'; - *bp++ = box_chars_1[2]; - } - if (box_chars_1[3]) { /* ACS_VLINE */ - *bp++ = 'x'; - *bp++ = box_chars_1[3]; - } - if (box_chars_1[4]) { /* ACS_LRCORNER */ - *bp++ = 'j'; - *bp++ = box_chars_1[4]; - } - if (box_chars_1[5]) { /* ACS_LLCORNER */ - *bp++ = 'm'; - *bp++ = box_chars_1[5]; - } - if (box_chars_1[6]) { /* ACS_TTEE */ - *bp++ = 'w'; - *bp++ = box_chars_1[6]; - } - if (box_chars_1[7]) { /* ACS_RTEE */ - *bp++ = 'u'; - *bp++ = box_chars_1[7]; - } - if (box_chars_1[8]) { /* ACS_BTEE */ - *bp++ = 'v'; - *bp++ = box_chars_1[8]; - } - if (box_chars_1[9]) { /* ACS_LTEE */ - *bp++ = 't'; - *bp++ = box_chars_1[9]; - } - if (box_chars_1[10]) { /* ACS_PLUS */ - *bp++ = 'n'; - *bp++ = box_chars_1[10]; - } - - if (bp != buf2) { - *bp++ = '\0'; + char buf2[MAX_TERMCAP_LENGTH]; + string_desc result; + + _nc_str_init(&result, buf2, sizeof(buf2)); + _nc_safe_strcat(&result, acs_chars); + + append_acs0(&result, 'l', box_chars_1[0]); /* ACS_ULCORNER */ + append_acs0(&result, 'q', box_chars_1[1]); /* ACS_HLINE */ + append_acs0(&result, 'k', box_chars_1[2]); /* ACS_URCORNER */ + append_acs0(&result, 'x', box_chars_1[3]); /* ACS_VLINE */ + append_acs0(&result, 'j', box_chars_1[4]); /* ACS_LRCORNER */ + append_acs0(&result, 'm', box_chars_1[5]); /* ACS_LLCORNER */ + append_acs0(&result, 'w', box_chars_1[6]); /* ACS_TTEE */ + append_acs0(&result, 'u', box_chars_1[7]); /* ACS_RTEE */ + append_acs0(&result, 'v', box_chars_1[8]); /* ACS_BTEE */ + append_acs0(&result, 't', box_chars_1[9]); /* ACS_LTEE */ + append_acs0(&result, 'n', box_chars_1[10]); /* ACS_PLUS */ + + if (buf2[0]) { acs_chars = _nc_save_str(buf2); _nc_warning("acsc string synthesized from AIX capabilities"); box_chars_1 = ABSENT_STRING; @@ -963,8 +922,7 @@ postprocess_terminfo(TERMTYPE * tp) * up in _nc_info_table, which is organized so that the nte_index fields are * sorted, but the nte_type fields are not necessarily grouped together. */ -static -struct name_table_entry const * +static struct name_table_entry const * lookup_fullname(const char *find) { int state = -1; @@ -991,7 +949,7 @@ lookup_fullname(const char *find) if (!strcmp(names[count], find)) { struct name_table_entry const *entry_ptr = _nc_get_table(FALSE); while (entry_ptr->nte_type != state - || entry_ptr->nte_index != count) + || entry_ptr->nte_index != count) entry_ptr++; return entry_ptr; }