updates from ncurses-4.2-990116

5 files changed, 58 insertions, 40 deletions

diff --git a/usr.bin/tic/MKtermsort.sh b/usr.bin/tic/MKtermsort.sh
index 6cbe9548354..ae02e353747 100644
--- a/usr.bin/tic/MKtermsort.sh
+++ b/usr.bin/tic/MKtermsort.sh
@@ -5,6 +5,8 @@
 # The output of this script is C source for nine arrays that list three sort
 # orders for each of the three different classes of terminfo capabilities.
 #
+# $OpenBSD: MKtermsort.sh,v 1.2 1999/01/18 18:57:52 millert Exp $
+#
 AWK=${1-awk}
 DATA=${2-../include/Caps}
 
diff --git a/usr.bin/tic/captoinfo.1tbl b/usr.bin/tic/captoinfo.1tbl
index ba050b28c09..7beafe674e4 100644
--- a/usr.bin/tic/captoinfo.1tbl
+++ b/usr.bin/tic/captoinfo.1tbl
@@ -1,5 +1,5 @@
 '\" t
-.\" $OpenBSD: captoinfo.1tbl,v 1.3 1998/11/03 21:59:53 millert Exp $
+.\" $OpenBSD: captoinfo.1tbl,v 1.4 1999/01/18 18:57:52 millert Exp $
 .\"
 .\"***************************************************************************
 .\" Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -29,14 +29,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $From: captoinfo.1m,v 1.11 1998/08/27 21:21:04 Rick.Ohnemus Exp $
+.\" $From: captoinfo.1m,v 1.13 1998/12/26 19:57:11 tom Exp $
 .TH captoinfo 1 ""
 .ds n 5
 .ds d /usr/share/terminfo
 .SH NAME
 \fBcaptoinfo\fR - convert a \fItermcap\fR description into a \fIterminfo\fR description
 .SH SYNOPSIS
-\fBcaptoinfo\fR [\fB-v\fIn\fR \fIwidth\fR]  [\fB-V\fR] [\fB-1\fR] [\fB-w\fR \fIwidth\fR] \fIfile\fR . . .
+\fBcaptoinfo\fR [\fB-v\fR\fIn\fR \fIwidth\fR]  [\fB-V\fR] [\fB-1\fR] [\fB-w\fR \fIwidth\fR] \fIfile\fR . . .
 .SH DESCRIPTION
 \fBcaptoinfo\fR looks in \fIfile\fR for \fBtermcap\fR descriptions.  For each
 one found, an equivalent \fBterminfo\fR description is written to standard
@@ -49,7 +49,7 @@ the terminal whose name is specified in the environment variable \fBTERM\fR is
 extracted from that file.  If the environment variable \fBTERMCAP\fR is not
 set, then the file \fB\*d\fR is read.
 .TP 5
-\fB-v\fR 
+\fB-v\fR
 print out tracing information on standard error as the program runs.
 .TP 5
 \fB-V\fR
@@ -86,7 +86,7 @@ BO	mr	AT&T	enter_reverse_mode
 CI	vi	AT&T	cursor_invisible
 CV	ve	AT&T	cursor_normal
 DS	mh	AT&T	enter_dim_mode
-EE	me	AT&T	exit_attribute_mode	
+EE	me	AT&T	exit_attribute_mode
 FE	LF	AT&T	label_on
 FL	LO	AT&T	label_off
 XS	mk	AT&T	enter_secure_mode
@@ -170,7 +170,7 @@ font3	s3ds
 Additionally, the AIX \fBbox1\fR capability will be automatically translated to
 an \fBacsc\fR string.
 .PP
-Hewlett-Packard's terminfo library supports two nonstandard terminfo 
+Hewlett-Packard's terminfo library supports two nonstandard terminfo
 capabilities \fBmeml\fR (memory lock) and \fBmemu\fR (memory unlock).
 These will be discarded with a warning message.
 .SH NOTES
diff --git a/usr.bin/tic/tic.1 b/usr.bin/tic/tic.1
index 50a395091f0..6bda1732bec 100644
--- a/usr.bin/tic/tic.1
+++ b/usr.bin/tic/tic.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tic.1,v 1.2 1998/07/24 19:52:53 millert Exp $
+.\" $OpenBSD: tic.1,v 1.3 1999/01/18 18:57:52 millert Exp $
 .\"
 .\"***************************************************************************
 .\" Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $From: tic.1m,v 1.21 1998/05/17 00:23:46 tom Exp $
+.\" $From: tic.1m,v 1.23 1998/12/26 01:47:41 tom Exp $
 .TH tic 1 ""
 .ds n 5
 .ds d /usr/share/terminfo
@@ -36,7 +36,7 @@
 \fBtic\fR - the \fIterminfo\fR entry-description compiler
 .SH SYNOPSIS
 \fBtic\fR
-[\fB-\
+[\fB\-\
 1\
 C\
 I\
@@ -158,6 +158,10 @@ contains a '/'.
 Display complex terminfo strings which contain if/then/else/endif expressions
 indented for readability.
 .TP
+\fB-g\fR
+Display constant character literals in quoted form
+rather than their decimal equivalents.
+.TP
 \fB-s\fR
 Summarize the compile by showing the directory into which entries
 are written, and the number of entries which are compiled.
@@ -240,7 +244,19 @@ compiled entries.
 The error messages from this \fBtic\fR have the same format as GNU C
 error messages, and can be parsed by GNU Emacs's compile facility.
 
-The -o, -I, -C, -N, -R, -e, -f, -T, -r and -s options
+The
+\fB-o\fR,
+\fB-I\fR,
+\fB-C\fR,
+\fB-N\fR,
+\fB-R\fR,
+\fB-e\fR,
+\fB-f\fR,
+\fB-g\fR,
+\fB-T\fR,
+\fB-r\fR and
+\fB-s\fR
+options
 are not supported under SVr4.
 The SVr4 -c mode does not report bad use links.
 
diff --git a/usr.bin/tic/tic.c b/usr.bin/tic/tic.c
index c6ffccf71b8..08d6da4394f 100644
--- a/usr.bin/tic/tic.c
+++ b/usr.bin/tic/tic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tic.c,v 1.3 1998/12/28 05:54:44 millert Exp $	*/
+/*	$OpenBSD: tic.c,v 1.4 1999/01/18 18:57:52 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -44,7 +44,7 @@
 #include <dump_entry.h>
 #include <term_entry.h>
 
-MODULE_ID("$From: tic.c,v 1.38 1998/10/18 00:27:14 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.4 1999/01/18 18:57:52 millert Exp $")
 
 const char *_nc_progname = "tic";
 
@@ -488,6 +488,26 @@ bool	check_only = FALSE;
 	debug_level = (v_opt > 0) ? v_opt : (v_opt == 0);
 	_nc_tracing = (1 << debug_level) - 1;
 
+#ifndef HAVE_BIG_CORE
+	/*
+	 * Aaargh! immedhook seriously hoses us!
+	 *
+	 * One problem with immedhook is it means we can't do -e.  Problem
+	 * is that we can't guarantee that for each terminal listed, all the
+	 * terminals it depends on will have been kept in core for reference
+	 * resolution -- in fact it's certain the primitive types at the end
+	 * of reference chains *won't* be in core unless they were explicitly
+	 * in the select list themselves.
+	 */
+	if (namelst && (!infodump && !capdump))
+	{
+	    (void) fprintf(stderr,
+			   "Sorry, -e can't be used without -I or -C\n");
+	    cleanup();
+	    return EXIT_FAILURE;
+	}
+#endif /* HAVE_BIG_CORE */
+
 	if (optind < argc) {
 		source_file = argv[optind++];
 		if (optind < argc) {
@@ -566,26 +586,6 @@ bool	check_only = FALSE;
 	    }
 	}
 
-#ifndef HAVE_BIG_CORE
-	/*
-	 * Aaargh! immedhook seriously hoses us!
-	 *
-	 * One problem with immedhook is it means we can't do -e.  Problem
-	 * is that we can't guarantee that for each terminal listed, all the
-	 * terminals it depends on will have been kept in core for reference
-	 * resolution -- in fact it's certain the primitive types at the end
-	 * of reference chains *won't* be in core unless they were explicitly
-	 * in the select list themselves.
-	 */
-	if (namelst && (!infodump && !capdump))
-	{
-	    (void) fprintf(stderr,
-			   "Sorry, -e can't be used without -I or -C\n");
-	    cleanup();
-	    return EXIT_FAILURE;
-	}
-#endif /* HAVE_BIG_CORE */
-
 	/* length check */
 	if (check_only && (capdump || infodump))
 	{
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index 8f620aa5044..62912fee6f5 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -103,7 +103,7 @@ char *ttyname(int fd);
 #include <curses.h>	/* for bool typedef */
 #include <dump_entry.h>
 
-MODULE_ID("$From: tset.c,v 0.34 1998/09/05 22:02:19 tom Exp $")
+MODULE_ID("$From: tset.c,v 0.35 1999/01/02 19:57:24 tom Exp $")
 
 extern char **environ;
 
@@ -340,7 +340,7 @@ add_mapping(const char *port, char *arg)
 	char *base = 0;
 
 	copy = strdup(arg);
-	mapp = malloc((u_int)sizeof(MAP));
+	mapp = malloc(sizeof(MAP));
 	if (copy == 0 || mapp == 0)
 		failed("malloc");
 	mapp->next = 0;
@@ -592,7 +592,7 @@ found:	if ((p = getenv("TERMCAP")) != 0 && *p != '/') {
 			ttype = askuser(0);
 	}
 	/* Find the terminfo entry.  If it doesn't exist, ask the user. */
-	while ((rval = setupterm(ttype, STDOUT_FILENO, &errret)) != OK) {
+	while ((rval = setupterm((NCURSES_CONST char *)ttype, STDOUT_FILENO, &errret)) != OK) {
 		if (errret == 0) {
 			(void)fprintf(stderr, "tset: unknown terminal type %s\n",
 			    ttype);
@@ -965,10 +965,10 @@ set_tabs()
  * Tell the user if a control key has been changed from the default value.
  */
 static void
-report(const char *name, int which, u_int def)
+report(const char *name, int which, unsigned def)
 {
 #ifdef TERMIOS
-	u_int older, newer;
+	unsigned older, newer;
 	char *p;
 
 	newer = mode.c_cc[which];
@@ -986,7 +986,7 @@ report(const char *name, int which, u_int def)
 	if (newer == 0177)
 		(void)fprintf(stderr, "delete.\n");
 	else if ((p = key_backspace) != 0
-	 && newer == (u_int)p[0]
+	 && newer == (unsigned char)p[0]
 	 && p[1] == '\0')
 		(void)fprintf(stderr, "backspace.\n");
 	else if (newer < 040) {
@@ -1054,10 +1054,10 @@ main(int argc, char **argv)
 	struct winsize win;
 #endif
 	int ch, noinit, noset, quiet, Sflag, sflag, showterm;
-	const char *p, *t;
+	const char *p;
 	const char *ttype;
 #ifdef __OpenBSD__
-	char tcapbuf[1024];
+	char tcapbuf[1024], *t;
 	int tcgetent(char *, const char *);
 	void wrtermcap (char *);
 #endif