2668 syntax error in terminfo.src trips uninitialized var in tic, screws terminfo

Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Approved by: Robert Mustacchi <rm@joyent.com>

5 files changed, 18 insertions, 20 deletions

diff --git a/usr/src/cmd/terminfo/terminfo.src b/usr/src/cmd/terminfo/terminfo.src
index c12f63574b..bd98d6cbee 100644
--- a/usr/src/cmd/terminfo/terminfo.src
+++ b/usr/src/cmd/terminfo/terminfo.src
@@ -4890,7 +4890,7 @@ screen-16color-s|GNU Screen with 16 colors and status line,
 screen-16color-bce|GNU Screen with 16 colors and BCE,
 	use=ibm+16color, use=screen-bce,
 
-screen-16color-bce-s|GNU Screen with 16 colors, BCE, and status line,
+screen-16color-bce-s|GNU Screen with 16 colors BCE and status line,
 	bce, use=ibm+16color, use=screen-s,
 
 # ======================================================================
@@ -4908,7 +4908,7 @@ screen-256color-bce|GNU Screen with 256 colors and BCE,
 	ccc@,
 	initc@, use=xterm+256color, use=screen-bce,
 
-screen-256color-bce-s|GNU Screen with 256 colors, BCE, and status line,
+screen-256color-bce-s|GNU Screen with 256 colors BCE and status line,
 	bce, ccc@,
 	initc@, use=xterm+256color, use=screen-s,
 
diff --git a/usr/src/cmd/tic/tic_parse.c b/usr/src/cmd/tic/tic_parse.c
index f3b28f5a07..37f5a7db6f 100644
--- a/usr/src/cmd/tic/tic_parse.c
+++ b/usr/src/cmd/tic/tic_parse.c
@@ -235,7 +235,7 @@ void
 dump_list(char *str)
 {
 	struct use_item *ptr;
-	char line[512];
+	char line[1024];
 
 	fprintf(stderr, "dump_list %s\n", str);
 	for (ptr = use_list.head; ptr != NULL; ptr = ptr->fptr) {
diff --git a/usr/src/cmd/tic/tic_scan.c b/usr/src/cmd/tic/tic_scan.c
index 7e8339328d..fa21e9c086 100644
--- a/usr/src/cmd/tic/tic_scan.c
+++ b/usr/src/cmd/tic/tic_scan.c
@@ -37,8 +37,6 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  *			COPYRIGHT NOTICE
  *
@@ -135,7 +133,7 @@ int
 get_token()
 {
 	long		number;
-	int		type;
+	int		type = UNDEF;
 	register int	ch;
 	static char	buffer[1024];
 	register char	*ptr;
diff --git a/usr/src/lib/libcurses/screen/compiler.h b/usr/src/lib/libcurses/screen/compiler.h
index c1d6f82be0..e96c396cac 100644
--- a/usr/src/lib/libcurses/screen/compiler.h
+++ b/usr/src/lib/libcurses/screen/compiler.h
@@ -40,8 +40,6 @@
 #ifndef	_COMPILER_H
 #define	_COMPILER_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  *			COPYRIGHT NOTICE
  *
@@ -131,11 +129,12 @@ EXTERN int	debug_level;	/* level of debugging output */
 	 *
 	 */
 
-#define	BOOLEAN 0	/* Boolean capability */
-#define	NUMBER 1	/* Numeric capability */
-#define	STRING 2	/* String-valued capability */
-#define	CANCEL 3	/* Capability to be cancelled in following tc's */
-#define	NAMES  4	/* The names for a terminal type */
+#define	BOOLEAN	0	/* Boolean capability */
+#define	NUMBER	1	/* Numeric capability */
+#define	STRING	2	/* String-valued capability */
+#define	CANCEL	3	/* Capability to be cancelled in following tc's */
+#define	NAMES	4	/* The names for a terminal type */
+#define	UNDEF	5	/* Invalid token type */
 
 #define	MAXBOOLS 64	/* Maximum # of boolean caps we can handle */
 #define	MAXNUMS	64	/* Maximum # of numeric caps we can handle */
diff --git a/usr/src/lib/libxcurses/src/tic/tic.h b/usr/src/lib/libxcurses/src/tic/tic.h
index e66d8d436e..1ed52370c1 100644
--- a/usr/src/lib/libxcurses/src/tic/tic.h
+++ b/usr/src/lib/libxcurses/src/tic/tic.h
@@ -24,8 +24,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  *	tic.h			Terminal Information Compiler
  *
@@ -114,12 +112,15 @@ extern int debug_level;		/* level of debugging output */
  *	The first three are also used in the hash table of capability
  *	names.  The scanner returns one of these values after loading
  *	the specifics into the global structure curr_token.
+ *
+ *	Note that EOF is also, implicitly, a token type.
  */
-#define BOOLEAN 0	/* Boolean capability */
-#define NUMBER 1	/* Numeric capability */
-#define STRING 2	/* String-valued capability */
-#define CANCEL 3	/* Capability to be cancelled in following tc's */
-#define NAMES  4	/* The names for a terminal type */
+#define	BOOLEAN	0	/* Boolean capability */
+#define	NUMBER 	1	/* Numeric capability */
+#define	STRING 	2	/* String-valued capability */
+#define	CANCEL 	3	/* Capability to be cancelled in following tc's */
+#define	NAMES  	4	/* The names for a terminal type */
+#define	UNDEF	5	/* Invalid token */
 
 /*
  *	The global structure in which the specific parts of a