diff options
Diffstat (limited to 'contrib/ncurses')
| -rw-r--r-- | contrib/ncurses/ncurses/tinfo/comp_scan.c | 4 | ||||
| -rw-r--r-- | contrib/ncurses/ncurses/tinfo/lib_baudrate.c | 4 | ||||
| -rw-r--r-- | contrib/ncurses/ncurses/tinfo/lib_raw.c | 2 | ||||
| -rw-r--r-- | contrib/ncurses/ncurses/tinfo/lib_termcap.c | 18 |
4 files changed, 27 insertions, 1 deletions
diff --git a/contrib/ncurses/ncurses/tinfo/comp_scan.c b/contrib/ncurses/ncurses/tinfo/comp_scan.c index 52fb13a..7e08fc0 100644 --- a/contrib/ncurses/ncurses/tinfo/comp_scan.c +++ b/contrib/ncurses/ncurses/tinfo/comp_scan.c @@ -31,6 +31,8 @@ * and: Eric S. Raymond <esr@snark.thyrsus.com> * ****************************************************************************/ +/* $FreeBSD$ */ + /* * comp_scan.c --- Lexical scanner for terminfo compiler. * @@ -295,8 +297,10 @@ _nc_get_token(bool silent) if (!silent && desc) { if (*desc == '\0') _nc_warning("empty longname field"); +#ifndef FREEBSD_NATIVE else if (strchr(desc, ' ') == (char *) NULL) _nc_warning("older tic versions may treat the description field as an alias"); +#endif } if (!desc) desc = buffer + strlen(buffer); diff --git a/contrib/ncurses/ncurses/tinfo/lib_baudrate.c b/contrib/ncurses/ncurses/tinfo/lib_baudrate.c index 5238924..15ba3bb 100644 --- a/contrib/ncurses/ncurses/tinfo/lib_baudrate.c +++ b/contrib/ncurses/ncurses/tinfo/lib_baudrate.c @@ -31,6 +31,8 @@ * and: Eric S. Raymond <esr@snark.thyrsus.com> * ****************************************************************************/ +/* $FreeBSD$ */ + /* * lib_baudrate.c * @@ -46,7 +48,7 @@ * of the indices up to B115200 fit nicely in a 'short', allowing us to retain * ospeed's type for compatibility. */ -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) #undef B0 #undef B50 #undef B75 diff --git a/contrib/ncurses/ncurses/tinfo/lib_raw.c b/contrib/ncurses/ncurses/tinfo/lib_raw.c index 97cf0cb..2269b5b 100644 --- a/contrib/ncurses/ncurses/tinfo/lib_raw.c +++ b/contrib/ncurses/ncurses/tinfo/lib_raw.c @@ -31,6 +31,8 @@ * and: Eric S. Raymond <esr@snark.thyrsus.com> * ****************************************************************************/ +/* $FreeBSD$ */ + /* * raw.c * diff --git a/contrib/ncurses/ncurses/tinfo/lib_termcap.c b/contrib/ncurses/ncurses/tinfo/lib_termcap.c index c03a601..911f89c 100644 --- a/contrib/ncurses/ncurses/tinfo/lib_termcap.c +++ b/contrib/ncurses/ncurses/tinfo/lib_termcap.c @@ -34,6 +34,8 @@ * Magnus Bengtsson, d6mbeng@dtek.chalmers.se (Nov'93) * ****************************************************************************/ +/* $FreeBSD$ */ + #define __INTERNAL_CAPS_VISIBLE #include <curses.priv.h> @@ -53,6 +55,12 @@ MODULE_ID("$Id: lib_termcap.c,v 1.43 2002/05/25 12:24:13 tom Exp $") NCURSES_EXPORT_VAR(char *) UP = 0; NCURSES_EXPORT_VAR(char *) BC = 0; +#ifdef FREEBSD_NATIVE +#undef GCC_UNUSED +#define GCC_UNUSED +extern char _nc_termcap[]; /* buffer to copy out */ +#endif + static char *fix_me = 0; static char * @@ -218,6 +226,16 @@ tgetent(char *bufp GCC_UNUSED, const char *name) #endif*/ } + +#ifdef FREEBSD_NATIVE + /* + * This is a REALLY UGLY hack. Basically, if we originate with + * a termcap source, try and copy it out. + */ + if (bufp && _nc_termcap[0]) + strncpy(bufp, _nc_termcap, 1024); +#endif + returnCode(errcode); } |
