-
-/***************************************************************************
-* COPYRIGHT NOTICE *
-****************************************************************************
-* ncurses is copyright (C) 1992-1995 *
-* Zeyd M. Ben-Halim *
-* zmbenhal@netcom.com *
-* Eric S. Raymond *
-* esr@snark.thyrsus.com *
-* *
-* Permission is hereby granted to reproduce and distribute ncurses *
-* by any means and for any fee, whether alone or as part of a *
-* larger distribution, in source or in binary form, PROVIDED *
-* this notice is included with any such distribution, and is not *
-* removed from any of its header files. Mention of ncurses in any *
-* applications linked with it is highly appreciated. *
-* *
-* ncurses comes AS IS with no warranty, implied or expressed. *
-* *
-***************************************************************************/
+/****************************************************************************
+ * Copyright (c) 1998-2008,2010 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 *
+ * "Software"), to deal in the Software without restriction, including *
+ * without limitation the rights to use, copy, modify, merge, publish, *
+ * distribute, distribute with modifications, sublicense, and/or sell *
+ * copies of the Software, and to permit persons to whom the Software is *
+ * furnished to do so, subject to the following conditions: *
+ * *
+ * The above copyright notice and this permission notice shall be included *
+ * in all copies or substantial portions of the Software. *
+ * *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
+ * *
+ * Except as contained in this notice, the name(s) of the above copyright *
+ * holders shall not be used in advertising or otherwise to promote the *
+ * sale, use or other dealings in this Software without prior written *
+ * authorization. *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
+ * and: Eric S. Raymond <esr@snark.thyrsus.com> *
+ * and: Thomas E. Dickey 1996 on *
+ ****************************************************************************/
#define __INTERNAL_CAPS_VISIBLE
#include <progs.priv.h>
-#include <ctype.h>
#include "dump_entry.h"
#include "termsort.c" /* this C file is generated */
-#include "parametrized.h" /* so is this */
+#include <parametrized.h> /* so is this */
-MODULE_ID("$Id: dump_entry.c,v 1.17 1997/05/10 17:35:30 tom Exp $")
+MODULE_ID("$Id: dump_entry.c,v 1.89 2010/05/01 22:04:08 tom Exp $")
#define INDENT 8
+#define DISCARD(string) string = ABSENT_STRING
+#define PRINTF (void) printf
+
+#define OkIndex(index,array) ((int)(index) >= 0 && (int)(index) < (int) SIZEOF(array))
+
+typedef struct {
+ char *text;
+ size_t used;
+ size_t size;
+} DYNBUF;
static int tversion; /* terminfo version */
static int outform; /* output format to use */
static int width = 60; /* max line width for listings */
static int column; /* current column, limited by 'width' */
static int oldcol; /* last value of column before wrap */
-static int tracelevel; /* level of debug output */
+static bool pretty; /* true if we format if-then-else strings */
+
+static char *save_sgr;
-static char *outbuf; /* the output-buffer */
-static size_t out_used; /* ...its current length */
-static size_t out_size; /* ...and its allocated length */
+static DYNBUF outbuf;
+static DYNBUF tmpbuf;
/* indirection pointers for implementing sort and display modes */
-static const int *bool_indirect, *num_indirect, *str_indirect;
-static char * const *bool_names, * const *num_names, * const *str_names;
+static const PredIdx *bool_indirect, *num_indirect, *str_indirect;
+static NCURSES_CONST char *const *bool_names;
+static NCURSES_CONST char *const *num_names;
+static NCURSES_CONST char *const *str_names;
static const char *separator, *trailer;
#define V_AIX 3 /* AIX */
#define V_BSD 4 /* BSD */
+#if NCURSES_XNAMES
+#define OBSOLETE(n) (!_nc_user_definable && (n[0] == 'O' && n[1] == 'T'))
+#else
#define OBSOLETE(n) (n[0] == 'O' && n[1] == 'T')
+#endif
+
+#define isObsolete(f,n) ((f == F_TERMINFO || f == F_VARIABLE) && OBSOLETE(n))
+
+#if NCURSES_XNAMES
+#define BoolIndirect(j) ((j >= BOOLCOUNT) ? (j) : ((sortmode == S_NOSORT) ? j : bool_indirect[j]))
+#define NumIndirect(j) ((j >= NUMCOUNT) ? (j) : ((sortmode == S_NOSORT) ? j : num_indirect[j]))
+#define StrIndirect(j) ((j >= STRCOUNT) ? (j) : ((sortmode == S_NOSORT) ? j : str_indirect[j]))
+#else
+#define BoolIndirect(j) ((sortmode == S_NOSORT) ? (j) : bool_indirect[j])
+#define NumIndirect(j) ((sortmode == S_NOSORT) ? (j) : num_indirect[j])
+#define StrIndirect(j) ((sortmode == S_NOSORT) ? (j) : str_indirect[j])
+#endif
+
+static void
+strncpy_DYN(DYNBUF * dst, const char *src, size_t need)
+{
+ size_t want = need + dst->used + 1;
+ if (want > dst->size) {
+ dst->size += (want + 1024); /* be generous */
+ dst->text = typeRealloc(char, dst->size, dst->text);
+ }
+ (void) strncpy(dst->text + dst->used, src, need);
+ dst->used += need;
+ dst->text[dst->used] = 0;
+}
+
+static void
+strcpy_DYN(DYNBUF * dst, const char *src)
+{
+ if (src == 0) {
+ dst->used = 0;
+ strcpy_DYN(dst, "");
+ } else {
+ strncpy_DYN(dst, src, strlen(src));
+ }
+}
#if NO_LEAKS
-void _nc_leaks_dump_entry(void)
+static void
+free_DYN(DYNBUF * p)
{
- if (outbuf != 0) {
- free(outbuf);
- outbuf = 0;
- }
+ if (p->text != 0)
+ free(p->text);
+ p->text = 0;
+ p->size = 0;
+ p->used = 0;
+}
+
+void
+_nc_leaks_dump_entry(void)
+{
+ free_DYN(&outbuf);
+ free_DYN(&tmpbuf);
}
#endif
-char *nametrans(const char *name)
+#define NameTrans(check,result) \
+ if (OkIndex(np->nte_index, check) \
+ && check[np->nte_index]) \
+ return (result[np->nte_index])
+
+NCURSES_CONST char *
+nametrans(const char *name)
/* translate a capability name from termcap to terminfo */
{
- const struct name_table_entry *np;
+ const struct name_table_entry *np;
- if ((np = _nc_find_entry(name, _nc_info_hash_table)) != NULL)
- switch(np->nte_type)
- {
+ if ((np = _nc_find_entry(name, _nc_get_hash_table(0))) != 0)
+ switch (np->nte_type) {
case BOOLEAN:
- if (bool_from_termcap[np->nte_index])
- return(boolcodes[np->nte_index]);
+ NameTrans(bool_from_termcap, boolcodes);
break;
case NUMBER:
- if (num_from_termcap[np->nte_index])
- return(numcodes[np->nte_index]);
+ NameTrans(num_from_termcap, numcodes);
break;
case STRING:
- if (str_from_termcap[np->nte_index])
- return(strcodes[np->nte_index]);
+ NameTrans(str_from_termcap, strcodes);
break;
}
- return((char *)NULL);
+ return (0);
}
-void dump_init(const char *version, int mode, int sort, int twidth, int traceval)
+void
+dump_init(const char *version, int mode, int sort, int twidth, int traceval,
+ bool formatted)
/* set up for entry display */
{
width = twidth;
- tracelevel = traceval;
+ pretty = formatted;
/* versions */
- if (version == (char *)NULL)
+ if (version == 0)
tversion = V_ALLCAPS;
else if (!strcmp(version, "SVr1") || !strcmp(version, "SVR1")
- || !strcmp(version, "Ultrix"))
+ || !strcmp(version, "Ultrix"))
tversion = V_SVR1;
else if (!strcmp(version, "HP"))
tversion = V_HPUX;
tversion = V_ALLCAPS;
/* implement display modes */
- switch (outform = mode)
- {
+ switch (outform = mode) {
case F_LITERAL:
case F_TERMINFO:
bool_names = boolnames;
}
/* implement sort modes */
- switch(sortmode = sort)
- {
+ switch (sortmode = sort) {
case S_NOSORT:
if (traceval)
(void) fprintf(stderr,
_nc_progname, width, tversion, outform);
}
-static int trailing_spaces(const char *src)
-{
- while (*src == ' ')
- src++;
- return *src == 0;
-}
-
-/* this deals with differences over whether 0x7f and 0x80..0x9f are controls */
-#define CHAR_OF(s) (*(unsigned const char *)(s))
-#define REALCTL(s) (CHAR_OF(s) < 127 && iscntrl(CHAR_OF(s)))
-#define REALPRINT(s) (CHAR_OF(s) < 127 && isprint(CHAR_OF(s)))
+static TERMTYPE *cur_type;
-char *expand(char *srcp)
-{
-static char buffer[1024];
-int bufp;
-const char *ptr, *str = (srcp == ABSENT_STRING
- || srcp == CANCELLED_STRING) ? "" : srcp;
-bool islong = (strlen(str) > 3);
-
- bufp = 0;
- ptr = str;
- while (*str) {
- if (*str == '%' && REALPRINT(str+1)) {
- buffer[bufp++] = *str++;
- buffer[bufp++] = *str;
- }
- else if (*str == '\033') {
- buffer[bufp++] = '\\';
- buffer[bufp++] = 'E';
- }
- else if (*str == '\\' && (outform==F_TERMINFO) && (str == srcp || str[-1] != '^')) {
- buffer[bufp++] = '\\';
- buffer[bufp++] = '\\';
- }
- else if (*str == ' ' && (outform==F_TERMINFO) && (str == srcp || trailing_spaces(str))) {
- buffer[bufp++] = '\\';
- buffer[bufp++] = 's';
- }
- else if ((*str == ',' || *str == ':' || *str == '^') && (outform==F_TERMINFO)) {
- buffer[bufp++] = '\\';
- buffer[bufp++] = *str;
- }
- else if (REALPRINT(str) && (*str != ',' && *str != ':' && !(*str == '!' && outform!=F_TERMINFO) && *str != '^'))
- buffer[bufp++] = *str;
-#if 0 /* FIXME: this would be more readable */
- else if (*str == '\b') {
- buffer[bufp++] = '\\';
- buffer[bufp++] = 'b';
- }
- else if (*str == '\f') {
- buffer[bufp++] = '\\';
- buffer[bufp++] = 'f';
- }
- else if (*str == '\t' && islong) {
- buffer[bufp++] = '\\';
- buffer[bufp++] = 't';
- }
-#endif
- else if (*str == '\r' && (islong || (strlen(srcp) > 2 && str[1] == '\0'))) {
- buffer[bufp++] = '\\';
- buffer[bufp++] = 'r';
- }
- else if (*str == '\n' && islong) {
- buffer[bufp++] = '\\';
- buffer[bufp++] = 'n';
- }
-#define UnCtl(c) ((0xff & (c)) + '@')
- else if (REALCTL(str) && *str != '\\' && (!islong || isdigit(str[1])))
- {
- (void) sprintf(&buffer[bufp], "^%c", UnCtl(*str));
- bufp += 2;
- }
- else
- {
- (void) sprintf(&buffer[bufp], "\\%03o", 0xff & *str);
- bufp += 4;
- }
-
- str++;
- }
-
- buffer[bufp] = '\0';
- return(buffer);
-}
-
-static TERMTYPE *cur_type;
-
-static int dump_predicate(int type, int idx)
+static int
+dump_predicate(PredType type, PredIdx idx)
/* predicate function to use for ordinary decompilation */
{
- switch(type) {
- case BOOLEAN:
- return (cur_type->Booleans[idx] == FALSE)
- ? FAIL : cur_type->Booleans[idx];
-
- case NUMBER:
- return (cur_type->Numbers[idx] == ABSENT_NUMERIC)
- ? FAIL : cur_type->Numbers[idx];
-
- case STRING:
- return (cur_type->Strings[idx] != ABSENT_STRING)
- ? (int)TRUE : FAIL;
- }
+ switch (type) {
+ case BOOLEAN:
+ return (cur_type->Booleans[idx] == FALSE)
+ ? FAIL : cur_type->Booleans[idx];
+
+ case NUMBER:
+ return (cur_type->Numbers[idx] == ABSENT_NUMERIC)
+ ? FAIL : cur_type->Numbers[idx];
+
+ case STRING:
+ return (cur_type->Strings[idx] != ABSENT_STRING)
+ ? (int) TRUE : FAIL;
+ }
- return(FALSE); /* pacify compiler */
+ return (FALSE); /* pacify compiler */
}
static void set_obsolete_termcaps(TERMTYPE *tp);
/* is this the index of a function key string? */
#define FNKEY(i) (((i)<= 65 && (i)>= 75) || ((i)<= 216 && (i)>= 268))
-static bool version_filter(int type, int idx)
+/*
+ * If we configure with a different Caps file, the offsets into the arrays
+ * will change. So we use an address expression.
+ */
+#define BOOL_IDX(name) (PredType) (&(name) - &(CUR Booleans[0]))
+#define NUM_IDX(name) (PredType) (&(name) - &(CUR Numbers[0]))
+#define STR_IDX(name) (PredType) (&(name) - &(CUR Strings[0]))
+
+static bool
+version_filter(PredType type, PredIdx idx)
/* filter out capabilities we may want to suppress */
{
- switch (tversion)
- {
- case V_ALLCAPS: /* SVr4, XSI Curses */
- return(TRUE);
-
- case V_SVR1: /* System V Release 1, Ultrix */
- switch (type)
- {
+ switch (tversion) {
+ case V_ALLCAPS: /* SVr4, XSI Curses */
+ return (TRUE);
+
+ case V_SVR1: /* System V Release 1, Ultrix */
+ switch (type) {
case BOOLEAN:
- return (idx <= 20); /* below and including xon_xoff */
+ return ((idx <= BOOL_IDX(xon_xoff)) ? TRUE : FALSE);
case NUMBER:
- return (idx <= 7); /* below and including width_status_line */
+ return ((idx <= NUM_IDX(width_status_line)) ? TRUE : FALSE);
case STRING:
- return (idx <= 144); /* below and including prtr_non */
+ return ((idx <= STR_IDX(prtr_non)) ? TRUE : FALSE);
}
break;
case V_HPUX: /* Hewlett-Packard */
- switch (type)
- {
+ switch (type) {
case BOOLEAN:
- return (idx <= 20); /* below and including xon_xoff */
+ return ((idx <= BOOL_IDX(xon_xoff)) ? TRUE : FALSE);
case NUMBER:
- return (idx <= 10); /* below and including label_width */
+ return ((idx <= NUM_IDX(label_width)) ? TRUE : FALSE);
case STRING:
- if (idx <= 144) /* below and including prtr_non */
- return(TRUE);
+ if (idx <= STR_IDX(prtr_non))
+ return (TRUE);
else if (FNKEY(idx)) /* function keys */
- return(TRUE);
- else if (idx==147||idx==156||idx==157) /* plab_norm,label_on,label_off */
- return(TRUE);
+ return (TRUE);
+ else if (idx == STR_IDX(plab_norm)
+ || idx == STR_IDX(label_on)
+ || idx == STR_IDX(label_off))
+ return (TRUE);
else
- return(FALSE);
+ return (FALSE);
}
break;
case V_AIX: /* AIX */
- switch (type)
- {
+ switch (type) {
case BOOLEAN:
- return (idx <= 20); /* below and including xon_xoff */
+ return ((idx <= BOOL_IDX(xon_xoff)) ? TRUE : FALSE);
case NUMBER:
- return (idx <= 7); /* below and including width_status_line */
+ return ((idx <= NUM_IDX(width_status_line)) ? TRUE : FALSE);
case STRING:
- if (idx <= 144) /* below and including prtr_non */
- return(TRUE);
+ if (idx <= STR_IDX(prtr_non))
+ return (TRUE);
else if (FNKEY(idx)) /* function keys */
- return(TRUE);
+ return (TRUE);
else
- return(FALSE);
+ return (FALSE);
}
break;
+#define is_termcap(type) (OkIndex(idx, type##_from_termcap) && \
+ type##_from_termcap[idx])
+
case V_BSD: /* BSD */
- switch (type)
- {
+ switch (type) {
case BOOLEAN:
- return bool_from_termcap[idx];
+ return is_termcap(bool);
case NUMBER:
- return num_from_termcap[idx];
+ return is_termcap(num);
case STRING:
- return str_from_termcap[idx];
+ return is_termcap(str);
}
break;
}
- return(FALSE); /* pacify the compiler */
+ return (FALSE); /* pacify the compiler */
}
-static
-void append_output (const char *src)
+static void
+trim_trailing(void)
{
- if (src == 0) {
- out_used = 0;
- append_output("");
- } else {
- size_t need = strlen(src);
- size_t want = need + out_used + 1;
- if (want > out_size) {
- out_size += want; /* be generous */
- if (outbuf == 0)
- outbuf = malloc(out_size);
- else
- outbuf = realloc(outbuf, out_size);
- }
- (void)strcpy(outbuf + out_used, src);
- out_used += need;
- }
+ while (outbuf.used > 0 && outbuf.text[outbuf.used - 1] == ' ')
+ outbuf.text[--outbuf.used] = '\0';
}
-static
-void force_wrap(void)
+static void
+force_wrap(void)
{
- oldcol = column;
- append_output(trailer);
- column = INDENT;
+ oldcol = column;
+ trim_trailing();
+ strcpy_DYN(&outbuf, trailer);
+ column = INDENT;
}
-static
-void wrap_concat(const char *src)
+static void
+wrap_concat(const char *src)
{
- int need = strlen(src);
- int want = strlen(separator) + need;
+ unsigned need = strlen(src);
+ unsigned want = strlen(separator) + need;
- if (column > INDENT
- && column + want > width) {
- force_wrap();
- }
- append_output(src);
- append_output(separator);
- column += need;
+ if (column > INDENT
+ && column + (int) want > width) {
+ force_wrap();
+ }
+ strcpy_DYN(&outbuf, src);
+ strcpy_DYN(&outbuf, separator);
+ column += (int) need;
}
#define IGNORE_SEP_TRAIL(first,last,sep_trail) \
if ((size_t)(last - first) > sizeof(sep_trail)-1 \
&& !strncmp(first, sep_trail, sizeof(sep_trail)-1)) \
- first += sizeof(sep_trail)-2
+ first += sizeof(sep_trail)-2
/* Returns the nominal length of the buffer assuming it is termcap format,
* i.e., the continuation sequence is treated as a single character ":".
* of the best fixed-buffer implementation; the worst case may be much worse.
*/
#ifdef TEST_TERMCAP_LENGTH
-static int termcap_length(const char *src)
+static int
+termcap_length(const char *src)
{
- static const char pattern[] = ":\\\n\t:";
+ static const char pattern[] = ":\\\n\t:";
- int len = 0;
- const char *const t = src + strlen(src);
+ int len = 0;
+ const char *const t = src + strlen(src);
- while (*src != '\0') {
- IGNORE_SEP_TRAIL(src, t, pattern);
- src++;
- len++;
- }
- return len;
+ while (*src != '\0') {
+ IGNORE_SEP_TRAIL(src, t, pattern);
+ src++;
+ len++;
+ }
+ return len;
}
#else
#define termcap_length(src) strlen(src)
#endif
-int fmt_entry(TERMTYPE *tterm,
- int (*pred)(int type, int idx),
- bool suppress_untranslatable,
- bool infodump)
+static void
+indent_DYN(DYNBUF * buffer, int level)
{
-int i, j;
-char buffer[MAX_TERMINFO_LENGTH];
-int predval, len;
-int num_bools = 0;
-int num_values = 0;
-int num_strings = 0;
-bool outcount = 0;
+ int n;
+
+ for (n = 0; n < level; n++)
+ strncpy_DYN(buffer, "\t", 1);
+}
+
+static bool
+has_params(const char *src)
+{
+ bool result = FALSE;
+ int len = (int) strlen(src);
+ int n;
+ bool ifthen = FALSE;
+ bool params = FALSE;
+
+ for (n = 0; n < len - 1; ++n) {
+ if (!strncmp(src + n, "%p", 2)) {
+ params = TRUE;
+ } else if (!strncmp(src + n, "%;", 2)) {
+ ifthen = TRUE;
+ result = params;
+ break;
+ }
+ }
+ if (!ifthen) {
+ result = ((len > 50) && params);
+ }
+ return result;
+}
+
+static char *
+fmt_complex(char *src, int level)
+{
+ bool percent = FALSE;
+ bool params = has_params(src);
+
+ while (*src != '\0') {
+ switch (*src) {
+ case '\\':
+ percent = FALSE;
+ strncpy_DYN(&tmpbuf, src++, 1);
+ break;
+ case '%':
+ percent = TRUE;
+ break;
+ case '?': /* "if" */
+ case 't': /* "then" */
+ case 'e': /* "else" */
+ if (percent) {
+ percent = FALSE;
+ tmpbuf.text[tmpbuf.used - 1] = '\n';
+ /* treat a "%e" as else-if, on the same level */
+ if (*src == 'e') {
+ indent_DYN(&tmpbuf, level);
+ strncpy_DYN(&tmpbuf, "%", 1);
+ strncpy_DYN(&tmpbuf, src, 1);
+ src++;
+ params = has_params(src);
+ if (!params && *src != '\0' && *src != '%') {
+ strncpy_DYN(&tmpbuf, "\n", 1);
+ indent_DYN(&tmpbuf, level + 1);
+ }
+ } else {
+ indent_DYN(&tmpbuf, level + 1);
+ strncpy_DYN(&tmpbuf, "%", 1);
+ strncpy_DYN(&tmpbuf, src, 1);
+ if (*src++ == '?') {
+ src = fmt_complex(src, level + 1);
+ if (*src != '\0' && *src != '%') {
+ strncpy_DYN(&tmpbuf, "\n", 1);
+ indent_DYN(&tmpbuf, level + 1);
+ }
+ } else if (level == 1) {
+ _nc_warning("%%%c without %%?", *src);
+ }
+ }
+ continue;
+ }
+ break;
+ case ';': /* "endif" */
+ if (percent) {
+ percent = FALSE;
+ if (level > 1) {
+ tmpbuf.text[tmpbuf.used - 1] = '\n';
+ indent_DYN(&tmpbuf, level);
+ strncpy_DYN(&tmpbuf, "%", 1);
+ strncpy_DYN(&tmpbuf, src++, 1);
+ return src;
+ }
+ _nc_warning("%%; without %%?");
+ }
+ break;
+ case 'p':
+ if (percent && params) {
+ tmpbuf.text[tmpbuf.used - 1] = '\n';
+ indent_DYN(&tmpbuf, level + 1);
+ strncpy_DYN(&tmpbuf, "%", 1);
+ }
+ params = FALSE;
+ percent = FALSE;
+ break;
+ case ' ':
+ strncpy_DYN(&tmpbuf, "\\s", 2);
+ ++src;
+ continue;
+ default:
+ percent = FALSE;
+ break;
+ }
+ strncpy_DYN(&tmpbuf, src++, 1);
+ }
+ return src;
+}
+
+#define SAME_CAP(n,cap) (&tterm->Strings[n] == &cap)
+#define EXTRA_CAP 20
+
+int
+fmt_entry(TERMTYPE *tterm,
+ PredFunc pred,
+ bool content_only,
+ bool suppress_untranslatable,
+ bool infodump,
+ int numbers)
+{
+ PredIdx i, j;
+ char buffer[MAX_TERMINFO_LENGTH + EXTRA_CAP];
+ char *capability;
+ NCURSES_CONST char *name;
+ int predval, len;
+ PredIdx num_bools = 0;
+ PredIdx num_values = 0;
+ PredIdx num_strings = 0;
+ bool outcount = 0;
#define WRAP_CONCAT \
wrap_concat(buffer); \
len = 12; /* terminfo file-header */
- if (pred == NULL) {
+ if (pred == 0) {
cur_type = tterm;
pred = dump_predicate;
}
- append_output(NULL);
- append_output(tterm->term_names);
- append_output(separator);
- column = out_used;
- force_wrap();
+ strcpy_DYN(&outbuf, 0);
+ if (content_only) {
+ column = INDENT; /* FIXME: workaround to prevent empty lines */
+ } else {
+ strcpy_DYN(&outbuf, tterm->term_names);
+ strcpy_DYN(&outbuf, separator);
+ column = (int) outbuf.used;
+ force_wrap();
+ }
- for (j=0; j < BOOLCOUNT; j++) {
- if (sortmode == S_NOSORT)
- i = j;
- else
- i = bool_indirect[j];
+ for_each_boolean(j, tterm) {
+ i = BoolIndirect(j);
+ name = ExtBoolname(tterm, i, bool_names);
+ assert(strlen(name) < sizeof(buffer) - EXTRA_CAP);
if (!version_filter(BOOLEAN, i))
continue;
- else if ((outform == F_LITERAL || outform == F_TERMINFO || outform == F_VARIABLE)
- && (OBSOLETE(bool_names[i]) && outform != F_LITERAL))
+ else if (isObsolete(outform, name))
continue;
predval = pred(BOOLEAN, i);
if (predval != FAIL) {
- (void) strcpy(buffer, bool_names[i]);
+ (void) strcpy(buffer, name);
if (predval <= 0)
(void) strcat(buffer, "@");
else if (i + 1 > num_bools)
if (column != INDENT)
force_wrap();
- for (j=0; j < NUMCOUNT; j++) {
- if (sortmode == S_NOSORT)
- i = j;
- else
- i = num_indirect[j];
+ for_each_number(j, tterm) {
+ i = NumIndirect(j);
+ name = ExtNumname(tterm, i, num_names);
+ assert(strlen(name) < sizeof(buffer) - EXTRA_CAP);
if (!version_filter(NUMBER, i))
continue;
- else if ((outform == F_LITERAL || outform == F_TERMINFO || outform == F_VARIABLE)
- && (OBSOLETE(num_names[i]) && outform != F_LITERAL))
+ else if (isObsolete(outform, name))
continue;
predval = pred(NUMBER, i);
if (predval != FAIL) {
if (tterm->Numbers[i] < 0) {
- sprintf(buffer, "%s@", num_names[i]);
+ sprintf(buffer, "%s@", name);
} else {
- sprintf(buffer, "%s#%d", num_names[i], tterm->Numbers[i]);
+ sprintf(buffer, "%s#%d", name, tterm->Numbers[i]);
if (i + 1 > num_values)
num_values = i + 1;
}
if (column != INDENT)
force_wrap();
- len += num_bools
- + num_values * 2
- + strlen(tterm->term_names) + 1;
+ len += (int) (num_bools
+ + num_values * 2
+ + strlen(tterm->term_names) + 1);
if (len & 1)
- len++;
+ len++;
+
+#undef CUR
+#define CUR tterm->
+ if (outform == F_TERMCAP) {
+ if (termcap_reset != ABSENT_STRING) {
+ if (init_3string != ABSENT_STRING
+ && !strcmp(init_3string, termcap_reset))
+ DISCARD(init_3string);
+
+ if (reset_2string != ABSENT_STRING
+ && !strcmp(reset_2string, termcap_reset))
+ DISCARD(reset_2string);
+ }
+ }
- for (j=0; j < STRCOUNT; j++) {
- if (sortmode == S_NOSORT)
- i = j;
- else
- i = str_indirect[j];
+ for_each_string(j, tterm) {
+ i = StrIndirect(j);
+ name = ExtStrname(tterm, i, str_names);
+ assert(strlen(name) < sizeof(buffer) - EXTRA_CAP);
+
+ capability = tterm->Strings[i];
if (!version_filter(STRING, i))
continue;
- else if ((outform == F_LITERAL || outform == F_TERMINFO || outform == F_VARIABLE)
- && (OBSOLETE(str_names[i]) && outform != F_LITERAL))
+ else if (isObsolete(outform, name))
continue;
+#if NCURSES_XNAMES
/*
- * Some older versions of vi want rmir/smir to be defined
- * for ich/ich1 to work. If they're not defined, force
- * them to be output as defined and empty.
+ * Extended names can be longer than 2 characters, but termcap programs
+ * cannot read those (filter them out).
*/
- if (outform==F_TERMCAP)
-#undef CUR
-#define CUR tterm->
- if (insert_character || parm_ich)
- {
- if (&tterm->Strings[i] == &enter_insert_mode
- && enter_insert_mode == ABSENT_STRING)
- {
+ if (outform == F_TERMCAP && (strlen(name) > 2))
+ continue;
+#endif
+
+ if (outform == F_TERMCAP) {
+ /*
+ * Some older versions of vi want rmir/smir to be defined
+ * for ich/ich1 to work. If they're not defined, force
+ * them to be output as defined and empty.
+ */
+ if (PRESENT(insert_character) || PRESENT(parm_ich)) {
+ if (SAME_CAP(i, enter_insert_mode)
+ && enter_insert_mode == ABSENT_STRING) {
(void) strcpy(buffer, "im=");
- goto catenate;
+ WRAP_CONCAT;
+ continue;
}
- if (&tterm->Strings[i] == &exit_insert_mode
- && exit_insert_mode == ABSENT_STRING)
- {
+ if (SAME_CAP(i, exit_insert_mode)
+ && exit_insert_mode == ABSENT_STRING) {
(void) strcpy(buffer, "ei=");
- goto catenate;
+ WRAP_CONCAT;
+ continue;
}
}
+ /*
+ * termcap applications such as screen will be confused if sgr0
+ * is translated to a string containing rmacs. Filter that out.
+ */
+ if (PRESENT(exit_attribute_mode)) {
+ if (SAME_CAP(i, exit_attribute_mode)) {
+ char *trimmed_sgr0;
+ char *my_sgr = set_attributes;
+
+ set_attributes = save_sgr;
+
+ trimmed_sgr0 = _nc_trim_sgr0(tterm);
+ if (strcmp(capability, trimmed_sgr0))
+ capability = trimmed_sgr0;
+
+ set_attributes = my_sgr;
+ }
+ }
+ }
predval = pred(STRING, i);
buffer[0] = '\0';
+
if (predval != FAIL) {
- if (tterm->Strings[i] != ABSENT_STRING
- && i + 1 > num_strings)
+ if (capability != ABSENT_STRING
+ && i + 1 > num_strings)
num_strings = i + 1;
- if (tterm->Strings[i] == ABSENT_STRING
- || tterm->Strings[i] == CANCELLED_STRING)
- sprintf(buffer, "%s@", str_names[i]);
- else if (outform == F_TERMCAP || outform == F_TCONVERR)
- {
- char *srccap = expand(tterm->Strings[i]);
- char *cv = _nc_infotocap(str_names[i], srccap,parametrized[i]);
-
- if (cv == (char *)NULL)
- {
- if (outform == F_TCONVERR)
- sprintf(buffer, "%s=!!! %s WILL NOT CONVERT !!!", str_names[i], srccap);
- else if (suppress_untranslatable)
+
+ if (!VALID_STRING(capability)) {
+ sprintf(buffer, "%s@", name);
+ WRAP_CONCAT;
+ } else if (outform == F_TERMCAP || outform == F_TCONVERR) {
+ int params = ((i < (int) SIZEOF(parametrized))
+ ? parametrized[i]
+ : 0);
+ char *srccap = _nc_tic_expand(capability, TRUE, numbers);
+ char *cv = _nc_infotocap(name, srccap, params);
+
+ if (cv == 0) {
+ if (outform == F_TCONVERR) {
+ sprintf(buffer, "%s=!!! %s WILL NOT CONVERT !!!",
+ name, srccap);
+ } else if (suppress_untranslatable) {
continue;
- else
- sprintf(buffer, "..%s=%s", str_names[i], srccap);
+ } else {
+ char *s = srccap, *d = buffer;
+ sprintf(d, "..%s=", name);
+ d += strlen(d);
+ while ((*d = *s++) != 0) {
+ if (*d == ':') {
+ *d++ = '\\';
+ *d = ':';
+ } else if (*d == '\\') {
+ *++d = *s++;
+ }
+ d++;
+ }
+ }
+ } else {
+ sprintf(buffer, "%s=%s", name, cv);
}
- else
- sprintf(buffer, "%s=%s", str_names[i], cv);
- len += strlen(tterm->Strings[i]) + 1;
- }
- else
- {
- sprintf(buffer,"%s=%s",str_names[i],expand(tterm->Strings[i]));
- len += strlen(tterm->Strings[i]) + 1;
+ len += (int) strlen(capability) + 1;
+ WRAP_CONCAT;
+ } else {
+ char *src = _nc_tic_expand(capability,
+ outform == F_TERMINFO, numbers);
+
+ strcpy_DYN(&tmpbuf, 0);
+ strcpy_DYN(&tmpbuf, name);
+ strcpy_DYN(&tmpbuf, "=");
+ if (pretty
+ && (outform == F_TERMINFO
+ || outform == F_VARIABLE)) {
+ fmt_complex(src, 1);
+ } else {
+ strcpy_DYN(&tmpbuf, src);
+ }
+ len += (int) strlen(capability) + 1;
+ wrap_concat(tmpbuf.text);
+ outcount = TRUE;
}
-
- catenate:
- WRAP_CONCAT;
}
+ /* e.g., trimmed_sgr0 */
+ if (capability != tterm->Strings[i])
+ free(capability);
}
- len += num_strings * 2;
+ len += (int) (num_strings * 2);
/*
* This piece of code should be an effective inverse of the functions
- * postprocess_terminfo and postprocess_terminfo in parse_entry.c.
+ * postprocess_terminfo() and postprocess_terminfo() in parse_entry.c.
* Much more work should be done on this to support dumping termcaps.
*/
- if (tversion == V_HPUX)
- {
- if (memory_lock)
- {
+ if (tversion == V_HPUX) {
+ if (VALID_STRING(memory_lock)) {
(void) sprintf(buffer, "meml=%s", memory_lock);
WRAP_CONCAT;
}
- if (memory_unlock)
- {
+ if (VALID_STRING(memory_unlock)) {
(void) sprintf(buffer, "memu=%s", memory_unlock);
WRAP_CONCAT;
}
- }
- else if (tversion == V_AIX)
- {
- if (acs_chars)
- {
- bool box_ok = TRUE;
- const char *acstrans = "lqkxjmwuvtn";
- const char *cp;
- char *tp, *sp, boxchars[11];
+ } else if (tversion == V_AIX) {
+ if (VALID_STRING(acs_chars)) {
+ bool box_ok = TRUE;
+ const char *acstrans = "lqkxjmwuvtn";
+ const char *cp;
+ char *tp, *sp, boxchars[11];
tp = boxchars;
- for (cp = acstrans; *cp; cp++)
- {
+ for (cp = acstrans; *cp; cp++) {
sp = strchr(acs_chars, *cp);
if (sp)
*tp++ = sp[1];
- else
- {
+ else {
box_ok = FALSE;
break;
}
}
tp[0] = '\0';
- if (box_ok)
- {
+ if (box_ok) {
(void) strcpy(buffer, "box1=");
- (void) strcat(buffer, expand(boxchars));
+ (void) strcat(buffer, _nc_tic_expand(boxchars,
+ outform == F_TERMINFO, numbers));
WRAP_CONCAT;
}
}
* kludge: trim off trailer to avoid an extra blank line
* in infocmp -u output when there are no string differences
*/
- if (outcount)
- {
- j = out_used;
+ if (outcount) {
+ bool trimmed = FALSE;
+ j = outbuf.used;
if (j >= 2
- && outbuf[j-1] == '\t'
- && outbuf[j-2] == '\n') {
- out_used -= 2;
+ && outbuf.text[j - 1] == '\t'
+ && outbuf.text[j - 2] == '\n') {
+ outbuf.used -= 2;
+ trimmed = TRUE;
} else if (j >= 4
- && outbuf[j-1] == ':'
- && outbuf[j-2] == '\t'
- && outbuf[j-3] == '\n'
- && outbuf[j-4] == '\\') {
- out_used -= 4;
+ && outbuf.text[j - 1] == ':'
+ && outbuf.text[j - 2] == '\t'
+ && outbuf.text[j - 3] == '\n'
+ && outbuf.text[j - 4] == '\\') {
+ outbuf.used -= 4;
+ trimmed = TRUE;
+ }
+ if (trimmed) {
+ outbuf.text[outbuf.used] = '\0';
+ column = oldcol;
+ strcpy_DYN(&outbuf, " ");
}
- outbuf[out_used] = '\0';
- column = oldcol;
}
-
#if 0
fprintf(stderr, "num_bools = %d\n", num_bools);
fprintf(stderr, "num_values = %d\n", num_values);
fprintf(stderr, "num_strings = %d\n", num_strings);
fprintf(stderr, "term_names=%s, len=%d, strlen(outbuf)=%d, outbuf=%s\n",
- tterm->term_names, len, out_used, outbuf);
+ tterm->term_names, len, outbuf.used, outbuf.text);
#endif
/*
* Here's where we use infodump to trigger a more stringent length check
* It gives an idea of which entries are deadly to even *scan past*,
* as opposed to *use*.
*/
- return(infodump ? len : termcap_length(outbuf));
+ return (infodump ? len : (int) termcap_length(outbuf.text));
}
-int dump_entry(TERMTYPE *tterm, bool limited, int (*pred)(int type, int idx))
-/* dump a single entry */
+static bool
+kill_string(TERMTYPE *tterm, char *cap)
{
- int len, critlen;
- const char *legend;
- bool infodump;
+ unsigned n;
+ for (n = 0; n < NUM_STRINGS(tterm); ++n) {
+ if (cap == tterm->Strings[n]) {
+ tterm->Strings[n] = ABSENT_STRING;
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
+static char *
+find_string(TERMTYPE *tterm, char *name)
+{
+ PredIdx n;
+ for (n = 0; n < NUM_STRINGS(tterm); ++n) {
+ if (version_filter(STRING, n)
+ && !strcmp(name, strnames[n])) {
+ char *cap = tterm->Strings[n];
+ if (VALID_STRING(cap)) {
+ return cap;
+ }
+ break;
+ }
+ }
+ return ABSENT_STRING;
+}
+
+/*
+ * This is used to remove function-key labels from a termcap entry to
+ * make it smaller.
+ */
+static int
+kill_labels(TERMTYPE *tterm, int target)
+{
+ int n;
+ int result = 0;
+ char *cap;
+ char name[10];
+
+ for (n = 0; n <= 10; ++n) {
+ sprintf(name, "lf%d", n);
+ if ((cap = find_string(tterm, name)) != ABSENT_STRING
+ && kill_string(tterm, cap)) {
+ target -= (int) (strlen(cap) + 5);
+ ++result;
+ if (target < 0)
+ break;
+ }
+ }
+ return result;
+}
+
+/*
+ * This is used to remove function-key definitions from a termcap entry to
+ * make it smaller.
+ */
+static int
+kill_fkeys(TERMTYPE *tterm, int target)
+{
+ int n;
+ int result = 0;
+ char *cap;
+ char name[10];
+
+ for (n = 60; n >= 0; --n) {
+ sprintf(name, "kf%d", n);
+ if ((cap = find_string(tterm, name)) != ABSENT_STRING
+ && kill_string(tterm, cap)) {
+ target -= (int) (strlen(cap) + 5);
+ ++result;
+ if (target < 0)
+ break;
+ }
+ }
+ return result;
+}
+
+/*
+ * Check if the given acsc string is a 1-1 mapping, i.e., just-like-vt100.
+ * Also, since this is for termcap, we only care about the line-drawing map.
+ */
+#define isLine(c) (strchr("lmkjtuvwqxn", c) != 0)
+
+static bool
+one_one_mapping(const char *mapping)
+{
+ bool result = TRUE;
+
+ if (mapping != ABSENT_STRING) {
+ int n = 0;
+ while (mapping[n] != '\0') {
+ if (isLine(mapping[n]) &&
+ mapping[n] != mapping[n + 1]) {
+ result = FALSE;
+ break;
+ }
+ n += 2;
+ }
+ }
+ return result;
+}
- if (outform==F_TERMCAP || outform==F_TCONVERR)
- {
+#define FMT_ENTRY() \
+ fmt_entry(tterm, pred, \
+ 0, \
+ suppress_untranslatable, \
+ infodump, numbers)
+
+#define SHOW_WHY PRINTF
+
+static bool
+purged_acs(TERMTYPE *tterm)
+{
+ bool result = FALSE;
+
+ if (VALID_STRING(acs_chars)) {
+ if (!one_one_mapping(acs_chars)) {
+ enter_alt_charset_mode = ABSENT_STRING;
+ exit_alt_charset_mode = ABSENT_STRING;
+ SHOW_WHY("# (rmacs/smacs removed for consistency)\n");
+ }
+ result = TRUE;
+ }
+ return result;
+}
+
+/*
+ * Dump a single entry.
+ */
+void
+dump_entry(TERMTYPE *tterm,
+ bool suppress_untranslatable,
+ bool limited,
+ int numbers,
+ PredFunc pred)
+{
+ TERMTYPE save_tterm;
+ int len, critlen;
+ const char *legend;
+ bool infodump;
+
+ if (outform == F_TERMCAP || outform == F_TCONVERR) {
critlen = MAX_TERMCAP_LENGTH;
legend = "older termcap";
infodump = FALSE;
set_obsolete_termcaps(tterm);
- }
- else
- {
+ } else {
critlen = MAX_TERMINFO_LENGTH;
legend = "terminfo";
infodump = TRUE;
}
- if (((len = fmt_entry(tterm, pred, FALSE, infodump)) > critlen) && limited)
- {
- (void) printf("# (untranslatable capabilities removed to fit entry within %d bytes)\n",
- critlen);
- if ((len = fmt_entry(tterm, pred, TRUE, infodump)) > critlen)
- {
+ save_sgr = set_attributes;
+
+ if ((FMT_ENTRY() > critlen)
+ && limited) {
+
+ save_tterm = *tterm;
+ if (!suppress_untranslatable) {
+ SHOW_WHY("# (untranslatable capabilities removed to fit entry within %d bytes)\n",
+ critlen);
+ suppress_untranslatable = TRUE;
+ }
+ if (FMT_ENTRY() > critlen) {
/*
* We pick on sgr because it's a nice long string capability that
- * is really just an optimization hack.
+ * is really just an optimization hack. Another good candidate is
+ * acsc since it is both long and unused by BSD termcap.
+ */
+ bool changed = FALSE;
+
+#if NCURSES_XNAMES
+ /*
+ * Extended names are most likely function-key definitions. Drop
+ * those first.
*/
- char *oldsgr = set_attributes;
- set_attributes = ABSENT_STRING;
- (void) printf("# (sgr removed to fit entry within %d bytes)\n",
- critlen);
- if ((len = fmt_entry(tterm, pred, TRUE, infodump)) > critlen)
- {
+ unsigned n;
+ for (n = STRCOUNT; n < NUM_STRINGS(tterm); n++) {
+ const char *name = ExtStrname(tterm, n, strnames);
+
+ if (VALID_STRING(tterm->Strings[n])) {
+ set_attributes = ABSENT_STRING;
+ /* we remove long names anyway - only report the short */
+ if (strlen(name) <= 2) {
+ SHOW_WHY("# (%s removed to fit entry within %d bytes)\n",
+ name,
+ critlen);
+ }
+ changed = TRUE;
+ if (FMT_ENTRY() <= critlen)
+ break;
+ }
+ }
+#endif
+ if (VALID_STRING(set_attributes)) {
+ set_attributes = ABSENT_STRING;
+ SHOW_WHY("# (sgr removed to fit entry within %d bytes)\n",
+ critlen);
+ changed = TRUE;
+ }
+ if (!changed || (FMT_ENTRY() > critlen)) {
+ if (purged_acs(tterm)) {
+ acs_chars = ABSENT_STRING;
+ SHOW_WHY("# (acsc removed to fit entry within %d bytes)\n",
+ critlen);
+ changed = TRUE;
+ }
+ }
+ if (!changed || (FMT_ENTRY() > critlen)) {
int oldversion = tversion;
tversion = V_BSD;
- (void) printf("# (terminfo-only capabilities suppressed to fit entry within %d bytes)\n",
- critlen);
-
- if ((len = fmt_entry(tterm, pred, TRUE, infodump)) > critlen)
- {
+ SHOW_WHY("# (terminfo-only capabilities suppressed to fit entry within %d bytes)\n",
+ critlen);
+
+ len = FMT_ENTRY();
+ if (len > critlen
+ && kill_labels(tterm, len - critlen)) {
+ SHOW_WHY("# (some labels capabilities suppressed to fit entry within %d bytes)\n",
+ critlen);
+ len = FMT_ENTRY();
+ }
+ if (len > critlen
+ && kill_fkeys(tterm, len - critlen)) {
+ SHOW_WHY("# (some function-key capabilities suppressed to fit entry within %d bytes)\n",
+ critlen);
+ len = FMT_ENTRY();
+ }
+ if (len > critlen) {
(void) fprintf(stderr,
- "warning: %s entry is %d bytes long\n",
- _nc_first_name(tterm->term_names),
- len);
- (void) printf(
- "# WARNING: this entry, %d bytes long, may core-dump %s libraries!\n",
- len, legend);
+ "warning: %s entry is %d bytes long\n",
+ _nc_first_name(tterm->term_names),
+ len);
+ SHOW_WHY("# WARNING: this entry, %d bytes long, may core-dump %s libraries!\n",
+ len, legend);
}
tversion = oldversion;
}
- set_attributes = oldsgr;
+ set_attributes = save_sgr;
+ *tterm = save_tterm;
+ }
+ } else if (!version_filter(STRING, STR_IDX(acs_chars))) {
+ save_tterm = *tterm;
+ if (purged_acs(tterm)) {
+ (void) FMT_ENTRY();
}
+ *tterm = save_tterm;
}
-
- (void) fputs(outbuf, stdout);
- return len;
}
-int dump_uses(const char *name, bool infodump)
+void
+dump_uses(const char *name, bool infodump)
/* dump "use=" clauses in the appropriate format */
{
char buffer[MAX_TERMINFO_LENGTH];
- append_output(NULL);
- (void)sprintf(buffer, "%s%s", infodump ? "use=" : "tc=", name);
+ if (outform == F_TERMCAP || outform == F_TCONVERR)
+ trim_trailing();
+ (void) sprintf(buffer, "%s%s", infodump ? "use=" : "tc=", name);
wrap_concat(buffer);
- (void) fputs(outbuf, stdout);
- return out_used;
}
-void compare_entry(void (*hook)(int t, int i, const char *name))
+int
+show_entry(void)
+{
+ trim_trailing();
+ (void) fputs(outbuf.text, stdout);
+ putchar('\n');
+ return (int) outbuf.used;
+}
+
+void
+compare_entry(void (*hook) (PredType t, PredIdx i, const char *name),
+ TERMTYPE *tp GCC_UNUSED,
+ bool quiet)
/* compare two entries */
{
- int i, j;
-
- (void) fputs(" comparing booleans.\n", stdout);
- for (j=0; j < BOOLCOUNT; j++)
- {
- if (sortmode == S_NOSORT)
- i = j;
- else
- i = bool_indirect[j];
-
- if ((outform == F_LITERAL || outform == F_TERMINFO || outform == F_VARIABLE)
- && (OBSOLETE(bool_names[i]) && outform != F_LITERAL))
+ PredIdx i, j;
+ NCURSES_CONST char *name;
+
+ if (!quiet)
+ fputs(" comparing booleans.\n", stdout);
+ for_each_boolean(j, tp) {
+ i = BoolIndirect(j);
+ name = ExtBoolname(tp, i, bool_names);
+
+ if (isObsolete(outform, name))
continue;
- (*hook)(BOOLEAN, i, bool_names[i]);
+ (*hook) (CMP_BOOLEAN, i, name);
}
- (void) fputs(" comparing numbers.\n", stdout);
- for (j=0; j < NUMCOUNT; j++)
- {
- if (sortmode == S_NOSORT)
- i = j;
- else
- i = num_indirect[j];
+ if (!quiet)
+ fputs(" comparing numbers.\n", stdout);
+ for_each_number(j, tp) {
+ i = NumIndirect(j);
+ name = ExtNumname(tp, i, num_names);
- if ((outform==F_LITERAL || outform==F_TERMINFO || outform==F_VARIABLE)
- && (OBSOLETE(num_names[i]) && outform != F_LITERAL))
+ if (isObsolete(outform, name))
continue;
- (*hook)(NUMBER, i, num_names[i]);
+ (*hook) (CMP_NUMBER, i, name);
}
- (void) fputs(" comparing strings.\n", stdout);
- for (j=0; j < STRCOUNT; j++)
- {
- if (sortmode == S_NOSORT)
- i = j;
- else
- i = str_indirect[j];
+ if (!quiet)
+ fputs(" comparing strings.\n", stdout);
+ for_each_string(j, tp) {
+ i = StrIndirect(j);
+ name = ExtStrname(tp, i, str_names);
- if ((outform==F_LITERAL || outform==F_TERMINFO || outform==F_VARIABLE)
- && (OBSOLETE(str_names[i]) && outform != F_LITERAL))
+ if (isObsolete(outform, name))
continue;
- (*hook)(STRING, i, str_names[i]);
+ (*hook) (CMP_STRING, i, name);
}
+
+ /* (void) fputs(" comparing use entries.\n", stdout); */
+ (*hook) (CMP_USE, 0, "use");
+
}
-#define NOTSET(s) ((s) == (char *)NULL)
+#define NOTSET(s) ((s) == 0)
/*
* This bit of legerdemain turns all the terminfo variable names into
#undef CUR
#define CUR tp->
-static void set_obsolete_termcaps(TERMTYPE *tp)
+static void
+set_obsolete_termcaps(TERMTYPE *tp)
{
#include "capdefaults.c"
}
+
+/*
+ * Convert an alternate-character-set string to canonical form: sorted and
+ * unique.
+ */
+void
+repair_acsc(TERMTYPE *tp)
+{
+ if (VALID_STRING(acs_chars)) {
+ size_t n, m;
+ char mapped[256];
+ char extra = 0;
+ unsigned source;
+ unsigned target;
+ bool fix_needed = FALSE;
+
+ for (n = 0, source = 0; acs_chars[n] != 0; n++) {
+ target = UChar(acs_chars[n]);
+ if (source >= target) {
+ fix_needed = TRUE;
+ break;
+ }
+ source = target;
+ if (acs_chars[n + 1])
+ n++;
+ }
+ if (fix_needed) {
+ memset(mapped, 0, sizeof(mapped));
+ for (n = 0; acs_chars[n] != 0; n++) {
+ source = UChar(acs_chars[n]);
+ if ((target = (unsigned char) acs_chars[n + 1]) != 0) {
+ mapped[source] = (char) target;
+ n++;
+ } else {
+ extra = (char) source;
+ }
+ }
+ for (n = m = 0; n < sizeof(mapped); n++) {
+ if (mapped[n]) {
+ acs_chars[m++] = (char) n;
+ acs_chars[m++] = mapped[n];
+ }
+ }
+ if (extra)
+ acs_chars[m++] = extra; /* garbage in, garbage out */
+ acs_chars[m] = 0;
+ }
+ }
+}
projects / ncurses.git / blobdiff