diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcurses/curses.h | 4 | ||||
| -rw-r--r-- | lib/libcurses/tinfo/lib_setup.c | 10 | ||||
| -rw-r--r-- | lib/libcurses/trace/lib_tracebits.c | 12 |
3 files changed, 20 insertions, 6 deletions
diff --git a/lib/libcurses/curses.h b/lib/libcurses/curses.h index 8aa397b63f1..c345065b627 100644 --- a/lib/libcurses/curses.h +++ b/lib/libcurses/curses.h @@ -1,4 +1,4 @@ -/* $OpenBSD: curses.h,v 1.36 1999/08/15 11:41:04 millert Exp $ */ +/* $OpenBSD: curses.h,v 1.37 1999/08/22 17:42:44 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -50,7 +50,7 @@ /* These are defined only in curses.h, and are used for conditional compiles */ #define NCURSES_VERSION_MAJOR 5 #define NCURSES_VERSION_MINOR 0 -#define NCURSES_VERSION_PATCH 990814 +#define NCURSES_VERSION_PATCH 990821 /* This is defined in more than one ncurses header, for identification */ #undef NCURSES_VERSION diff --git a/lib/libcurses/tinfo/lib_setup.c b/lib/libcurses/tinfo/lib_setup.c index 1248094d301..1facd522cba 100644 --- a/lib/libcurses/tinfo/lib_setup.c +++ b/lib/libcurses/tinfo/lib_setup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lib_setup.c,v 1.5 1999/07/04 12:43:16 millert Exp $ */ +/* $OpenBSD: lib_setup.c,v 1.6 1999/08/22 17:42:37 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -51,7 +51,7 @@ #include <term.h> /* lines, columns, cur_term */ -MODULE_ID("$From: lib_setup.c,v 1.54 1999/07/04 01:37:32 tom Exp $") +MODULE_ID("$From: lib_setup.c,v 1.55 1999/08/21 23:06:08 tom Exp $") /**************************************************************************** * @@ -243,6 +243,12 @@ static int grab_entry(const char *const tn, TERMTYPE *const tp) char filename[PATH_MAX]; int status; + /* + * $TERM shouldn't contain pathname delimiters. + */ + if (strchr(tn, '/')) + return 0; + if ((status = _nc_read_entry(tn, filename, tp)) != 1) { #ifndef PURE_TERMINFO diff --git a/lib/libcurses/trace/lib_tracebits.c b/lib/libcurses/trace/lib_tracebits.c index c9363e7445f..5469470e1fe 100644 --- a/lib/libcurses/trace/lib_tracebits.c +++ b/lib/libcurses/trace/lib_tracebits.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lib_tracebits.c,v 1.2 1999/03/15 19:12:23 millert Exp $ */ +/* $OpenBSD: lib_tracebits.c,v 1.3 1999/08/22 17:42:37 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -36,7 +36,7 @@ #include <curses.priv.h> #include <term.h> /* cur_term */ -MODULE_ID("$From: lib_tracebits.c,v 1.2 1999/03/14 12:27:03 tom Exp $") +MODULE_ID("$From: lib_tracebits.c,v 1.3 1999/08/21 21:43:48 tom Exp $") #if defined(SVR4_TERMIO) && !defined(_POSIX_SOURCE) #define _POSIX_SOURCE @@ -158,10 +158,18 @@ lflags[] = #if defined(CS5) && defined(CS8) switch (cur_term->Nttyb.c_cflag & CSIZE) { +#if defined(CS5) && (CS5 != 0) case CS5: strcat(buf, "CS5 "); break; +#endif +#if defined(CS6) && (CS6 != 0) case CS6: strcat(buf, "CS6 "); break; +#endif +#if defined(CS7) && (CS7 != 0) case CS7: strcat(buf, "CS7 "); break; +#endif +#if defined(CS8) && (CS8 != 0) case CS8: strcat(buf, "CS8 "); break; +#endif default: strcat(buf, "CSIZE? "); break; } #endif |