diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2000-04-04 16:50:00 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2000-04-04 16:50:00 +0000 |
| commit | cd4585dd9084ad0cd879289b1968f8a2a5c96143 (patch) | |
| tree | 815bcb27776ed8cfe64e0cdbf0585e8c2ad51e0d /lib/libcurses/tinfo | |
| parent | eb922e28e48261b2a0d7e98202d5b72426f0b73c (diff) | |
Update to ncurses-5.0-20000401:
o change unctrl() to render C1 characters (128-159) as ~@, ~A, etc.
o trace() function is provided only if TRACE is defined, e.g., in the debug
library. Modify related calls to _tracechar() to use unctrl() instead.
Diffstat (limited to 'lib/libcurses/tinfo')
| -rw-r--r-- | lib/libcurses/tinfo/captoinfo.c | 8 | ||||
| -rw-r--r-- | lib/libcurses/tinfo/comp_scan.c | 14 |
2 files changed, 10 insertions, 12 deletions
diff --git a/lib/libcurses/tinfo/captoinfo.c b/lib/libcurses/tinfo/captoinfo.c index 8d29df29720..2a797d038e5 100644 --- a/lib/libcurses/tinfo/captoinfo.c +++ b/lib/libcurses/tinfo/captoinfo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: captoinfo.c,v 1.7 2000/03/26 16:45:03 millert Exp $ */ +/* $OpenBSD: captoinfo.c,v 1.8 2000/04/04 16:49:59 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. * @@ -94,7 +94,7 @@ #include <ctype.h> #include <tic.h> -MODULE_ID("$From: captoinfo.c,v 1.36 2000/03/19 23:04:26 tom Exp $") +MODULE_ID("$From: captoinfo.c,v 1.37 2000/04/01 20:07:34 tom Exp $") #define MAX_PUSHED 16 /* max # args we can push onto the stack */ @@ -462,8 +462,8 @@ _nc_captoinfo( invalid: dp = save_char(dp, '%'); s--; - _nc_warning("unknown %% code %s in %s", - _tracechar(*s), cap); + _nc_warning("unknown %% code %s (%#x) in %s", + unctrl(*s), (*s) & 0xff, cap); break; } break; diff --git a/lib/libcurses/tinfo/comp_scan.c b/lib/libcurses/tinfo/comp_scan.c index 0b23157bc8b..d2b7b78ecb8 100644 --- a/lib/libcurses/tinfo/comp_scan.c +++ b/lib/libcurses/tinfo/comp_scan.c @@ -50,7 +50,7 @@ #include <term_entry.h> #include <tic.h> -MODULE_ID("$From: comp_scan.c,v 1.41 2000/03/25 17:25:33 tom Exp $") +MODULE_ID("$From: comp_scan.c,v 1.42 2000/04/01 19:08:36 tom Exp $") /* * Maximum length of string capability we'll accept before raising an error. @@ -196,7 +196,7 @@ _nc_get_token(void) #endif && !strchr(terminfo_punct, (char) ch)) { _nc_warning("Illegal character (expected alphanumeric or %s) - %s", - terminfo_punct, _tracechar((chtype) ch)); + terminfo_punct, unctrl(ch)); _nc_panic_mode(separator); goto start_token; } @@ -331,7 +331,7 @@ _nc_get_token(void) case '@': if ((ch = next_char()) != separator) _nc_warning("Missing separator after `%s', have %s", - buffer, _tracechar((chtype) ch)); + buffer, unctrl(ch)); _nc_curr_token.tk_name = buffer; type = CANCEL; break; @@ -369,8 +369,7 @@ _nc_get_token(void) default: /* just to get rid of the compiler warning */ type = UNDEF; - _nc_warning("Illegal character - %s", - _tracechar((chtype) ch)); + _nc_warning("Illegal character - %s", unctrl(ch)); } } /* end else (first_column == FALSE) */ } /* end else (ch != EOF) */ @@ -469,8 +468,7 @@ _nc_trans_string(char *ptr, char *last) _nc_err_abort("Premature EOF"); if (!(is7bits(ch) && isprint(ch))) { - _nc_warning("Illegal ^ character - %s", - _tracechar((unsigned char) ch)); + _nc_warning("Illegal ^ character - %s", unctrl(ch)); } if (ch == '?') { *(ptr++) = '\177'; @@ -564,7 +562,7 @@ _nc_trans_string(char *ptr, char *last) default: _nc_warning("Illegal character %s in \\ sequence", - _tracechar((unsigned char) ch)); + unctrl(ch)); *(ptr++) = (char) ch; } /* endswitch (ch) */ } /* endelse (ch < '0' || ch > '7') */ |