summaryrefslogtreecommitdiff
path: root/lib/libcurses/lib_ti.c
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1998-10-31 06:30:32 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1998-10-31 06:30:32 +0000
commit6b2a1c68ae261f9418c63985441e14381a10cd12 (patch)
tree4ae6e697e6a9c43cbe1974319f6b1f7854838e02 /lib/libcurses/lib_ti.c
parent774a90a035f055fa6dcf304c080c05bf13a095ca (diff)
update to ncurses 4.2-981017
Diffstat (limited to 'lib/libcurses/lib_ti.c')
-rw-r--r--lib/libcurses/lib_ti.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/libcurses/lib_ti.c b/lib/libcurses/lib_ti.c
index da472a9297d..ddb80607aaf 100644
--- a/lib/libcurses/lib_ti.c
+++ b/lib/libcurses/lib_ti.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lib_ti.c,v 1.1 1998/07/23 21:19:37 millert Exp $ */
+/* $OpenBSD: lib_ti.c,v 1.2 1998/10/31 06:30:30 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998 Free Software Foundation, Inc. *
@@ -39,7 +39,7 @@
#include <term.h>
#include <tic.h>
-MODULE_ID("$From: lib_ti.c,v 1.11 1998/07/18 02:14:05 tom Exp $")
+MODULE_ID("$From: lib_ti.c,v 1.12 1998/09/26 12:26:38 tom Exp $")
int tigetflag(NCURSES_CONST char *str)
{
@@ -50,8 +50,7 @@ int i;
if (cur_term != 0) {
for (i = 0; i < BOOLCOUNT; i++) {
if (!strcmp(str, boolnames[i])) {
- if (!VALID_BOOLEAN(cur_term->type.Booleans[i]))
- return 0;
+ /* setupterm forces invalid booleans to false */
return cur_term->type.Booleans[i];
}
}
@@ -88,8 +87,7 @@ int i;
if (cur_term != 0) {
for (i = 0; i < STRCOUNT; i++) {
if (!strcmp(str, strnames[i])) {
- if (!VALID_STRING(cur_term->type.Strings[i]))
- return 0;
+ /* setupterm forces cancelled strings to null */
return cur_term->type.Strings[i];
}
}