CVS commit: src/lib/libterminfo

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Fri Sep 16 18:51:44 UTC 2011

Modified Files:
        src/lib/libterminfo: termcap.c

Log Message:
PR/45370: Takehiko NOZAKI: termcap emulation tget{flag,num,str} should
work with non-NUL terminated strings.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libterminfo/termcap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/lib/libterminfo/termcap.c
diff -u src/lib/libterminfo/termcap.c:1.14 src/lib/libterminfo/termcap.c:1.15
--- src/lib/libterminfo/termcap.c:1.14	Fri Mar 18 06:42:54 2011
+++ src/lib/libterminfo/termcap.c	Fri Sep 16 14:51:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: termcap.c,v 1.14 2011/03/18 10:42:54 roy Exp $ */
+/* $NetBSD: termcap.c,v 1.15 2011/09/16 18:51:44 christos Exp $ */
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: termcap.c,v 1.14 2011/03/18 10:42:54 roy Exp $");
+__RCSID("$NetBSD: termcap.c,v 1.15 2011/09/16 18:51:44 christos Exp $");
 
 #include <assert.h>
 #include <ctype.h>
@@ -74,13 +74,12 @@
 }
 
 int
-tgetflag(const char *id)
+tgetflag(const char *id2)
 {
 	uint32_t ind;
 	size_t i;
 	TERMUSERDEF *ud;
-
-	_DIAGASSERT(id != NULL);
+	const char id[] = { id2[0], id2[1], '\0' };
 
 	if (cur_term == NULL)
 		return 0;
@@ -99,14 +98,13 @@
 }
 
 int
-tgetnum(const char *id)
+tgetnum(const char *id2)
 {
 	uint32_t ind;
 	size_t i;
 	TERMUSERDEF *ud;
 	const TENTRY *te;
-
-	_DIAGASSERT(id != NULL);
+	const char id[] = { id2[0], id2[1], '\0' };
 
 	if (cur_term == NULL)
 		return -1;
@@ -132,14 +130,13 @@
 }
 
 char *
-tgetstr(const char *id, char **area)
+tgetstr(const char *id2, char **area)
 {
 	uint32_t ind;
 	size_t i;
 	TERMUSERDEF *ud;
 	const char *str;
-
-	_DIAGASSERT(id != NULL);
+	const char id[] = { id2[0], id2[1], '\0' };
 
 	if (cur_term == NULL)
 		return NULL;