Import the most recent ncurses 5.1 prerelease (20000701).

Mostly this is intended to resolve the trace() badness once and for all.

Obtained from:  ftp://dickey.his.com/ncurses/

17 files changed, 138 insertions, 152 deletions

diff --git a/contrib/ncurses/tack/HISTORY b/contrib/ncurses/tack/HISTORY
index b1de61d..3fe2cab 100644
--- a/contrib/ncurses/tack/HISTORY
+++ b/contrib/ncurses/tack/HISTORY
@@ -1,6 +1,8 @@
 
 Current history:
 
+2000/03/04		Fix a few spelling errors
+1999/09/04		Minor fix to build/link on BeOS
 1999/05/16		Minor fix to build/link on CLIX
 1999/05/09		Update to build/link on NeXT
 1999/04/17		Update to work with ncurses 5.0 beta1 (TERMTYPE struct)
@@ -21,7 +23,7 @@ as little of curses as possible.
 released to USENET in comp.sources.  TED was originally written to
 test both terminfos and termcaps.  The original intent was to
 create a terminfo editor.  This code fell quite short of its goal.
-Tests were controled by command line switches and editing was done
+Tests were controlled by command line switches and editing was done
 with pen and paper.
 
    In 1995 Eric S. Raymond got interested in the program and added
diff --git a/contrib/ncurses/tack/Makefile.in b/contrib/ncurses/tack/Makefile.in
index 48f4619..a4d08ea 100644
--- a/contrib/ncurses/tack/Makefile.in
+++ b/contrib/ncurses/tack/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.9 1999/09/18 23:33:48 tom Exp $
+# $Id: Makefile.in,v 1.18 2000/05/28 01:28:24 tom Exp $
 # Makefile for tack
 #
 # The variable 'srcdir' refers to the source-distribution, and can be set with
@@ -24,6 +24,7 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 libdir		= @libdir@
+mandir		= @mandir@/man1
 includedir	= @includedir@
 datadir		= @datadir@
 
@@ -31,11 +32,13 @@ ticdir		= $(datadir)/terminfo
 
 INSTALL		= @INSTALL@
 INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+INSTALL_DATA	= @INSTALL_DATA@
 
 AWK		= @AWK@
 LN_S		= @LN_S@
 
 CC		= @CC@
+CPP		= @CPP@
 CFLAGS		= @CFLAGS@
 
 INCDIR		= $(srcdir)/../include
@@ -51,25 +54,25 @@ CFLAGS_SHARED	= $(CCFLAGS) # @CC_SHARED_OPTS@
 CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
 
 LD		= @LD@
-LINK		= $(CC)
+LINK		= @LINK_PROGS@ $(CC)
 LDFLAGS		= @EXTRA_LDFLAGS@ \
 		@PROG_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ @EXTRA_LIBS@
 
 LDFLAGS_NORMAL	= $(LDFLAGS)
 LDFLAGS_DEBUG	= $(LDFLAGS) @CC_G_OPT@
 LDFLAGS_PROFILE	= $(LDFLAGS) -pg
-LDFLAGS_SHARED	= $(LDFLAGS) @CC_SHARED_OPTS@ # @LD_SHARED_OPTS@
+LDFLAGS_SHARED	= $(LDFLAGS) @LD_SHARED_OPTS@
 
 LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)
 
 LINT		= @LINT@
 LINT_OPTS	= @LINT_OPTS@
-LINT_LIBS	= -lncurses @LIBS@
+LINT_LIBS	= -lncurses@LIB_SUFFIX@ @LIBS@
 
 PROGS = tack$x
 
 # Default library, for linking applications
-DEPS_CURSES = ../lib/libncurses@DFT_DEP_SUFFIX@
+DEPS_CURSES = ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
 
 ################################################################################
 all:	$(PROGS)
@@ -80,16 +83,22 @@ install: install.tack
 uninstall: uninstall.tack
 
 # this line simplifies the configure-script
-install.libs:
+libs \
+install.libs \
 uninstall.libs:
 
-install.tack: $(PROGS) $(INSTALL_PREFIX)$(bindir)
-	$(INSTALL_PROGRAM) tack$x    $(INSTALL_PREFIX)$(bindir)/tack$x
+install.tack: $(PROGS) \
+	$(INSTALL_PREFIX)$(bindir) \
+	$(INSTALL_PREFIX)$(mandir)
+	$(INSTALL_PROGRAM) tack$x $(INSTALL_PREFIX)$(bindir)/tack$x
+	$(INSTALL_DATA) $(srcdir)/tack.1 $(INSTALL_PREFIX)$(mandir)/tack.1
 
 uninstall.tack:
 	-@rm -f $(INSTALL_PREFIX)$(bindir)/tack$x
+	-@rm -f $(INSTALL_PREFIX)$(mandir)/tack.1
 
-$(INSTALL_PREFIX)$(bindir) :
+$(INSTALL_PREFIX)$(bindir) \
+$(INSTALL_PREFIX)$(mandir) :
 	$(srcdir)/../mkinstalldirs $@
 
 #
@@ -151,7 +160,7 @@ $(DEPS_CURSES) :
 	cd ../ncurses; $(MAKE) $(CF_MFLAGS)
 
 lint:
-	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/clear.c                          $(LINT_LIBS)
+	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/*.c $(LINT_LIBS)
 
 ###############################################################################
 # The remainder of this file is automatically generated during configuration
diff --git a/contrib/ncurses/tack/README b/contrib/ncurses/tack/README
index c1b0286..7114704 100644
--- a/contrib/ncurses/tack/README
+++ b/contrib/ncurses/tack/README
@@ -1,5 +1,14 @@
--- $Id: README,v 1.1 1999/04/18 01:41:31 tom Exp $
+-- $Id: README,v 1.2 2000/03/12 02:39:12 Daniel.Weaver Exp $
 
-The 'tack' program is distributed with ncurses, but is not an integral
-part of ncurses (the two are licensed differently, and the tack directory
-may be removed without causing ncurses to configure or build properly).
+The 'tack' program is a diagnostic that is designed to create and
+verify the correctness of terminfo's.  This program can be used to
+create new terminal descriptions that are not included in the standard
+release.  Although 'tack' is distributed with ncurses, it is not an
+integral part of ncurses.  It may be removed from the release without
+limiting the usefulness of ncurses on those terminals described in the
+terminfo data base.  The best way to remove 'tack' from the build is
+to delete or rename the 'tack' directory before running the configure
+script.
+
+Unlike most of ncurses the 'tack' program is covered under the GNU
+Public License.
diff --git a/contrib/ncurses/tack/ansi.c b/contrib/ncurses/tack/ansi.c
index a514a9c..df7b39f 100644
--- a/contrib/ncurses/tack/ansi.c
+++ b/contrib/ncurses/tack/ansi.c
@@ -21,7 +21,7 @@
 
 #include <tack.h>
 
-MODULE_ID("$Id: ansi.c,v 1.2 1999/08/21 23:11:57 tom Exp $")
+MODULE_ID("$Id: ansi.c,v 1.5 2000/04/22 21:06:57 tom Exp $")
 
 /*
  * Standalone tests for ANSI terminals.  Three entry points:
@@ -45,10 +45,9 @@ MODULE_ID("$Id: ansi.c,v 1.2 1999/08/21 23:11:57 tom Exp $")
 #define MAX_MODES 256
 
 static char default_bank[] = "\033(B\017";
-static int private_use, ape, terminal_class, got_escape;
+static int private_use, ape, terminal_class;
 static short ansi_value[256];
-static char ansi_buf[512], pack_buf[512];
-static char *ach, *pch;
+static unsigned char ansi_buf[512], pack_buf[512];
 
 struct ansi_reports {
 	int lvl, final;
@@ -71,7 +70,7 @@ static struct ansi_reports report_list[] = {
 	{63, 0, "(DECRQSS) Top and bottom margins", "\033P$qr\033\\"},
 	{63, 0, "(DECRQSS) Character attributes", "\033P$qm\033\\"},
 	{63, 0, "(DECRQSS) Illegal request", "\033P$q@\033\\"},
-	{63, 0, "(DECRQUPSS) User pref suplemental set", "\033[&u"},
+	{63, 0, "(DECRQUPSS) User pref supplemental set", "\033[&u"},
 	{63, 0, "(DECRQPSR) Cursor information", "\033[1$w"},
 	{63, 0, "(DECRQPSR) Tab stop information", "\033[2$w"},
 	{64, 0, "(DA) Tertiary device attributes", "\033[=0c"},
@@ -107,11 +106,11 @@ static const struct request_control rqss[] = {
 	{"\033[0$~\033[1$}", "\033[0$}", 0, 0, 0},
 	{"Data sent to enabled status line", "1", "$}", 0, 0},
 	{"\033[2$~\033[1$}", "\033[0$}", 0, 0, 0},
-	{"Disbale status line", "0", "$~", "\033[0$~", 0},
+	{"Disable status line", "0", "$~", "\033[0$~", 0},
 	{"Top status line", "1", "$~", "\033[1$~", 0},
 	{"Bottom status line", "2", "$~", "\033[2$~", 0},
-	{"Eraseable character", "0", "\"q", "\033[0\"q", 0},
-	{"Noneraseable character", "1", "\"q", "\033[1\"q", "\033[0\"q"},
+	{"Erasable character", "0", "\"q", "\033[0\"q", 0},
+	{"Nonerasable character", "1", "\"q", "\033[1\"q", "\033[0\"q"},
 	{"Top and bottom margins", "3;10", "r", "\0337\033[3;10r", 0},
 	{"\033[r\0338", 0, 0, 0, 0},
 	{"Top and bottom margins", "default", "r", "\0337\033[r", "\0338"},
@@ -124,48 +123,6 @@ static const struct request_control rqss[] = {
 	{0, 0, 0, 0, 0}
 };
 
-/*
-**	pack_ansi()
-**
-**	read and pack an ANSI character
-*/
-static int 
-pack_ansi(void)
-{
-	int ch;
-
-	if (*pch)
-		return *pch++;
-
-	while (1) {
-		ch = getchp(char_mask);
-		if (ch == EOF)
-			return EOF;
-		if (ch == A_DC1 || ch == A_DC3)
-			continue;
-		*ach++ = ch;
-		*ach = '\0';
-		if (got_escape && ch >= ' ') {
-			got_escape = 0;
-			if (ch < '@' || ch > '_') {
-				*pch++ = A_ESC;
-				*pch = ch;
-				pch[1] = '\0';
-				return A_ESC;
-			}
-			ch += 0x40;
-			break;
-		} else if (ch == A_ESC) {
-			got_escape = 1;
-		} else {
-			break;
-		}
-	}
-	*pch++ = ch;
-	*pch = '\0';
-	return ch;
-}
-
 
 /*
 **	read_ansi()
@@ -175,34 +132,36 @@ pack_ansi(void)
 static void
 read_ansi(void)
 {
-	int ch;
+	int ch, i, j, last_escape;
 
 	fflush(stdout);
-	ach = ansi_buf;
-	pch = pack_buf;
-	ansi_buf[0] = pack_buf[0] = '\0';
-	got_escape = 0;
-	ch = pack_ansi();
-	if (ch == A_ESC)
-		do {
-			ch = pack_ansi();
-			if (ch == EOF)
-				return;
-		} while (ch < '0' || ch > '~');
-	else
-	if (ch == A_CSI)
-		do {
-			ch = pack_ansi();
-			if (ch == EOF)
-				return;
-		} while (ch < '@' || ch > '~');
-	else
-	if (ch == A_DCS)
-		do {
-			ch = pack_ansi();
-			if (ch == EOF)
-				return;
-		} while (ch != A_ST);
+	read_key(ansi_buf, sizeof(ansi_buf));
+	/* Throw away control characters inside CSI sequences.
+	   Convert two character 7-bit sequences into 8-bit sequences. */
+	for (i = j = last_escape = 0; (ch = ansi_buf[i]) != 0; i++) {
+		if (ch == A_ESC) {
+			if (last_escape == A_ESC) {
+				pack_buf[j++] = A_ESC;
+			}
+			last_escape = A_ESC;
+		} else
+		if (last_escape == A_ESC && ch >= '@' && ch <= '_') {
+			pack_buf[j++] = last_escape = ch + 0x40;
+		} else
+		if (last_escape != A_CSI || (ch > 0x20 && ch != 0x80)) {
+			if (last_escape == A_ESC) {
+				pack_buf[j++] = A_ESC;
+			}
+			if (ch > 0x80 && ch < 0xa0) {
+				last_escape = ch;
+			}
+			pack_buf[j++] = ch;
+		}
+	}
+	if (last_escape == A_ESC) {
+		pack_buf[j++] = A_ESC;
+	}
+	pack_buf[j] = '\0';
 	return;
 }
 
@@ -265,11 +224,12 @@ read_reports(void)
 			tc < report_list[i].lvl) {
 			put_crlf();
 			menu_prompt();
-			ptext(" <return> to continue > ");
+			ptext("/status [q] > ");
 			j = wait_here();
-			if (j != 'c' && j != 'C')
-				return j;
+			if (j != 'n' && j != 'N')
+				return 0;
 			tc = report_list[i].lvl;
+			lc = 1;
 		} else if (lc + 2 >= lines) {
 			put_crlf();
 			ptext("Hit any key to continue ");
@@ -295,15 +255,19 @@ read_reports(void)
 				break;
 			}
 		j = pack_buf[0] & 0xff;
-		if (j == A_CSI || j == A_DCS) {
-			s = expand(ansi_buf);
-			if (char_count + expand_chars >= columns) {
-				put_str("\r\n        ");
-				lc++;
-			}
-			put_str(s);
+		if (j != A_CSI && j != A_DCS) {
+			put_crlf();
+			s = "*** The above request gives illegal response ***";
+			ptext(s);
+			for (j = strlen(s); j < 49; j++)
+				putchp(' ');
 		}
-		put_crlf();
+		s = expand(ansi_buf);
+		if (char_count + expand_chars >= columns) {
+			put_str("\r\n        ");
+			lc++;
+		}
+		putln(s);
 		if (vcr) {	/* find out how big the screen is */
 			tc_putp(report_list[i].request);
 			if (!valid_mode('R'))
@@ -324,7 +288,7 @@ read_reports(void)
 		}
 	}
 	menu_prompt();
-	ptext(" r->repeat test, <return> to continue > ");
+	ptext("/status r->repeat test, <return> to continue > ");
 	return wait_here();
 }
 
@@ -610,7 +574,7 @@ ansi_report_help(void)
 	ptext("Begin ANSI status report testing. ");
 	ptext(" Parity bit set will be displayed in reverse video. ");
 	ptext(" If the terminal hangs, hit any alphabetic key. ");
-	ptextln(" Use c to continue testing.  Use any other letter to quit.");
+	ptextln(" Use n to continue testing.  Use q to quit.");
 	put_crlf();
 }
 
diff --git a/contrib/ncurses/tack/charset.c b/contrib/ncurses/tack/charset.c
index c31b78b..ca0ac6f 100644
--- a/contrib/ncurses/tack/charset.c
+++ b/contrib/ncurses/tack/charset.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
+** Copyright (C) 1991, 1997-2000 Free Software Foundation, Inc.
 ** 
 ** This file is part of TACK.
 ** 
@@ -21,7 +21,7 @@
 
 #include <tack.h>
 
-MODULE_ID("$Id: charset.c,v 1.2 1999/05/09 18:30:49 tom Exp $")
+MODULE_ID("$Id: charset.c,v 1.4 2000/03/04 20:30:52 tom Exp $")
 
 /*
 	Menu definitions for alternate character set and SGR tests.
@@ -40,7 +40,7 @@ static void charset_smacs(struct test_list *t, int *state, int *ch);
 static void charset_attributes(struct test_list *t, int *state, int *ch);
 static void charset_sgr(struct test_list *t, int *state, int *ch);
 
-const struct test_list acs_test_list[] = {
+struct test_list acs_test_list[] = {
 	{0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu},
 	{MENU_NEXT, 3, "bel", 0, 0, charset_bel, 0},
 	{MENU_NEXT, 3, "flash", 0, 0, charset_flash, 0},
@@ -369,7 +369,7 @@ charset_attributes(
 /*
 **	charset_smacs(test_list, status, ch)
 **
-**	display all posible acs characters
+**	display all possible acs characters
 **	(smacs) (rmacs)
 */
 static void
diff --git a/contrib/ncurses/tack/color.c b/contrib/ncurses/tack/color.c
index 710538a..479081c 100644
--- a/contrib/ncurses/tack/color.c
+++ b/contrib/ncurses/tack/color.c
@@ -21,7 +21,7 @@
 
 #include <tack.h>
 
-MODULE_ID("$Id: color.c,v 1.1 1999/04/18 01:24:45 tom Exp $")
+MODULE_ID("$Id: color.c,v 1.2 2000/03/04 21:05:54 tom Exp $")
 
 /*
  * Color terminal tests.  Has only one entry point: test_color().
@@ -306,7 +306,7 @@ load_palette(int n)
 
 static int
 rainbow(int n)
-{				/* print the programable color display */
+{				/* print the programmable color display */
 	int i, c, d, palette_full, initial_pair;
 	static const struct {
 		const char *name;
diff --git a/contrib/ncurses/tack/control.c b/contrib/ncurses/tack/control.c
index 4c2158e..4a85384 100644
--- a/contrib/ncurses/tack/control.c
+++ b/contrib/ncurses/tack/control.c
@@ -25,7 +25,7 @@
 #include <sys/time.h>
 #endif
 
-MODULE_ID("$Id: control.c,v 1.2 1999/06/16 00:45:59 tom Exp $")
+MODULE_ID("$Id: control.c,v 1.3 2000/03/04 21:10:59 tom Exp $")
 
 /* terminfo test program control subroutines */
 
@@ -53,14 +53,14 @@ char txt_shorter_augment[80];	/* <) use smaller augment */
 int tt_delay_max;		/* max number of milliseconds we can delay */
 int tt_delay_used;		/* number of milliseconds consumed in delay */
 const char *tt_cap[TT_MAX];	/* value of string */
-int tt_affected[TT_MAX];	/* lines or columns effected (repitition factor) */
+int tt_affected[TT_MAX];	/* lines or columns effected (repetition factor) */
 int tt_count[TT_MAX];		/* Number of times sent */
 int tt_delay[TT_MAX];		/* Number of milliseconds delay */
 int ttp;			/* number of entries used */
 
 /* Saved value of the above data base */
 const char *tx_cap[TT_MAX];	/* value of string */
-int tx_affected[TT_MAX];	/* lines or columns effected (repitition factor) */
+int tx_affected[TT_MAX];	/* lines or columns effected (repetition factor) */
 int tx_count[TT_MAX];		/* Number of times sent */
 int tx_index[TT_MAX];		/* String index */
 int tx_delay[TT_MAX];		/* Number of milliseconds delay */
diff --git a/contrib/ncurses/tack/crum.c b/contrib/ncurses/tack/crum.c
index 9418363..e66cc05 100644
--- a/contrib/ncurses/tack/crum.c
+++ b/contrib/ncurses/tack/crum.c
@@ -21,7 +21,7 @@
 
 #include <tack.h>
 
-MODULE_ID("$Id: crum.c,v 1.2 1999/08/21 23:09:08 tom Exp $")
+MODULE_ID("$Id: crum.c,v 1.3 2000/03/04 21:09:18 tom Exp $")
 
 /*
  * Test cursor movement.
@@ -81,7 +81,7 @@ move_to(
 			rf = rt;
 		}
 	}
-	if (sel & 4) {	/* paramiterized relative cursor movement */
+	if (sel & 4) {	/* parameterized relative cursor movement */
 		if (parm_right_cursor)
 			if (cf < ct) {
 				s = tparm(parm_right_cursor, ct - cf);
diff --git a/contrib/ncurses/tack/edit.c b/contrib/ncurses/tack/edit.c
index 5685d92..a628103 100644
--- a/contrib/ncurses/tack/edit.c
+++ b/contrib/ncurses/tack/edit.c
@@ -23,7 +23,7 @@
 #include <time.h>
 #include <tic.h>
 
-MODULE_ID("$Id: edit.c,v 1.3 1999/06/16 00:43:43 tom Exp $")
+MODULE_ID("$Id: edit.c,v 1.5 2000/03/25 17:26:12 tom Exp $")
 
 /*
  * Terminfo edit features
@@ -81,7 +81,7 @@ static int display_lines;		/* number of lines displayed */
 /*
 **	send_info_string(str)
 **
-**	Return the terminfo string prefixed by the correct seperator
+**	Return the terminfo string prefixed by the correct separator
 */
 static void
 send_info_string(
@@ -170,7 +170,7 @@ show_info(
 /*
 **	save_info_string(str, fp)
 **
-**	Write the terminfo string prefixed by the correct seperator
+**	Write the terminfo string prefixed by the correct separator
 */
 static void
 save_info_string(
@@ -341,7 +341,7 @@ show_value(
 	switch (nt->nte_type) {
 	case STRING:
 		_nc_reset_input((FILE *) 0, buf);
-		_nc_trans_string(tmp);
+		_nc_trans_string(tmp, tmp + sizeof(tmp));
 		s = (char *)malloc(strlen(tmp) + 1);
 		strcpy(s, tmp);
 		CUR Strings[nt->nte_index] = s;
@@ -556,7 +556,7 @@ mark_cap(
 **
 **	Scan the name list and get the names.
 **	Enter each name into the can-test data base.
-**	<space> ( and ) may be used as seperators.
+**	<space> ( and ) may be used as separators.
 */
 void
 can_test(
@@ -588,7 +588,7 @@ can_test(
 **	cap_index(name-list, index-list)
 **
 **	Scan the name list and return a list of indexes.
-**	<space> ( and ) may be used as seperators.
+**	<space> ( and ) may be used as separators.
 **	This list is terminated with -1.
 */
 void
@@ -629,7 +629,7 @@ cap_index(
 **
 **	Scan the name list and see if the cap is in the list.
 **	Return TRUE if we find an exact match.
-**	<space> ( and ) may be used as seperators.
+**	<space> ( and ) may be used as separators.
 */
 int
 cap_match(
@@ -863,7 +863,7 @@ change_one_entry(
 		ptextln("That string is not currently defined.  Please enter a new value, including the padding delay:");
 		read_string(buf, sizeof(buf));
 		_nc_reset_input((FILE *) 0, buf);
-		_nc_trans_string(pad);
+		_nc_trans_string(pad, pad + sizeof(pad));
 		t = (char *)malloc(strlen(pad) + 1);
 		strcpy(t, pad);
 		CUR Strings[x] = t;
diff --git a/contrib/ncurses/tack/fun.c b/contrib/ncurses/tack/fun.c
index 7ddfbbd..fd895c3 100644
--- a/contrib/ncurses/tack/fun.c
+++ b/contrib/ncurses/tack/fun.c
@@ -21,7 +21,7 @@
 
 #include <tack.h>
 
-MODULE_ID("$Id: fun.c,v 1.2 1999/06/16 00:46:12 tom Exp $")
+MODULE_ID("$Id: fun.c,v 1.3 2000/03/04 20:29:21 tom Exp $")
 
 /*
  * Test the function keys on the terminal.  The code for echo tests
@@ -215,7 +215,7 @@ enter_key(
 
 static void
 fresh_line(void)
-{				/* clear the line for a new fumction key line */
+{				/* clear the line for a new function key line */
 	if (over_strike) {
 		put_crlf();
 	} else {
@@ -610,7 +610,7 @@ funkey_prog(
 		mm[i] = '\0';
 		put_crlf();
 		if (mm[0] != 'a' || mm[1] != 'b' || mm[2] != 'c') {
-			sprintf(temp, "Error string recieved was: %s", expand(mm));
+			sprintf(temp, "Error string received was: %s", expand(mm));
 			ptextln(temp);
 		} else {
 			putln("Thank you\n");
@@ -764,8 +764,8 @@ report_help(int crx)
 {
 	ptextln("The following commands may also be entered:");
 	ptextln(" clear   clear screen.");
-	ptextln(" columns print a test patterm to help count screen width.");
-	ptextln(" lines   print a test patterm to help count screen length.");
+	ptextln(" columns print a test pattern to help count screen width.");
+	ptextln(" lines   print a test pattern to help count screen length.");
 	ptextln(" end     exit.");
 	ptextln(" echo    redisplay last report.");
 	if (crx) {
diff --git a/contrib/ncurses/tack/init.c b/contrib/ncurses/tack/init.c
index e19493d..4255452 100644
--- a/contrib/ncurses/tack/init.c
+++ b/contrib/ncurses/tack/init.c
@@ -1,18 +1,18 @@
 /*
 ** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
-** 
+**
 ** This file is part of TACK.
-** 
+**
 ** TACK is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
 ** the Free Software Foundation; either version 2, or (at your option)
 ** any later version.
-** 
+**
 ** TACK is distributed in the hope that it will be useful,
 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ** GNU General Public License for more details.
-** 
+**
 ** You should have received a copy of the GNU General Public License
 ** along with TACK; see the file COPYING.  If not, write to
 ** the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -22,7 +22,7 @@
 
 #include <tack.h>
 
-MODULE_ID("$Id: init.c,v 1.1 1999/04/18 01:05:23 tom Exp $")
+MODULE_ID("$Id: init.c,v 1.2 2000/05/13 19:58:48 Daniel.Weaver Exp $")
 
 #if NCURSES_VERSION_MAJOR >= 5 || NCURSES_VERSION_PATCH >= 981219
 #define _nc_get_curterm(p) _nc_get_tty_mode(p)
@@ -244,7 +244,7 @@ curses_setup(
 	fflush(stdout);	/* waste some time */
 	sleep(1);	/* waste more time */
 	charset_can_test();
-	can_test("lines cols cr nxon rf if iprog rmp", FLAG_CAN_TEST);
+	can_test("lines cols cr nxon rf if iprog rmp smcup rmcup", FLAG_CAN_TEST);
 	edit_init();			/* initialize the edit data base */
 
 	if (send_reset_init && enter_ca_mode) {
diff --git a/contrib/ncurses/tack/menu.c b/contrib/ncurses/tack/menu.c
index a2bcc38..6714d58 100644
--- a/contrib/ncurses/tack/menu.c
+++ b/contrib/ncurses/tack/menu.c
@@ -21,7 +21,7 @@
 
 #include <tack.h>
 
-MODULE_ID("$Id: menu.c,v 1.1 1998/01/10 00:29:30 tom Exp $")
+MODULE_ID("$Id: menu.c,v 1.2 2000/03/04 21:13:53 tom Exp $")
 
 /*
    Menu control
@@ -85,7 +85,7 @@ menu_test_loop(
 		}
 		nch = 0;
 		if (test->test_procedure) {
-			/* The procedure takes precidence so I can pass
+			/* The procedure takes precedence so I can pass
 			   the menu entry as an argument.
 			*/
 			can_test(test->caps_done, FLAG_TESTED);
@@ -340,7 +340,7 @@ subtest_menu(
 /*
 **	menu_can_scan(menu-structure)
 **
-**	Recursivly scan the menu tree and find which cap names can be tested.
+**	Recursively scan the menu tree and find which cap names can be tested.
 */
 void
 menu_can_scan(
@@ -362,7 +362,7 @@ menu_can_scan(
 /*
 **	menu_search(menu-structure, cap)
 **
-**	Recursivly search the menu tree and execute any tests that use cap.
+**	Recursively search the menu tree and execute any tests that use cap.
 */
 static void
 menu_search(
diff --git a/contrib/ncurses/tack/output.c b/contrib/ncurses/tack/output.c
index 3c419a8..fac566e 100644
--- a/contrib/ncurses/tack/output.c
+++ b/contrib/ncurses/tack/output.c
@@ -23,7 +23,7 @@
 #include <tack.h>
 #include <time.h>
 
-MODULE_ID("$Id: output.c,v 1.4 1999/06/16 00:46:53 tom Exp $")
+MODULE_ID("$Id: output.c,v 1.5 2000/03/04 21:06:57 tom Exp $")
 
 /* globals */
 long char_sent;			/* number of characters sent */
@@ -409,8 +409,8 @@ put_columns(const char *s, int len, int w)
 **	ptext(string)
 **
 **	Output a string but do not assume the terminal will wrap to a
-**	new line.  Break the line at a word boundry then send a CR LF.
-**	This is more estetic on 40 column terminals.
+**	new line.  Break the line at a word boundary then send a CR LF.
+**	This is more esthetic on 40 column terminals.
 */
 void
 ptext(const char *s)
diff --git a/contrib/ncurses/tack/pad.c b/contrib/ncurses/tack/pad.c
index bc6c693..980258c 100644
--- a/contrib/ncurses/tack/pad.c
+++ b/contrib/ncurses/tack/pad.c
@@ -21,7 +21,7 @@
 
 #include <tack.h>
 
-MODULE_ID("$Id: pad.c,v 1.1 1998/01/10 00:30:27 tom Exp $")
+MODULE_ID("$Id: pad.c,v 1.2 2000/03/04 21:04:58 tom Exp $")
 
 /* test the pad counts on the terminal */
 
@@ -448,12 +448,14 @@ pad_clear(
 				break;
 			}
 			clear_select++;
+			/* FALLTHRU */
 		case 2:
 			end_message = "Clear one character per line.  ";
 			if (newline) {
 				break;
 			}
 			clear_select++;
+			/* FALLTHRU */
 		case 3:
 			end_message = "Clear one full line.  ";
 			break;
@@ -1008,7 +1010,7 @@ pad_xch1(
 	if (enter_insert_mode || exit_insert_mode ||
 		enter_delete_mode || exit_delete_mode ||
 		!insert_character || !delete_character) {
-		/* this test is quitely ignored */
+		/* this test is quietly ignored */
 		return;
 	}
 	if (skip_pad_test(t, state, ch,
@@ -1025,7 +1027,7 @@ pad_xch1(
 	} while(still_testing());
 	pad_test_shutdown(t, 1);
 	ptextln(xch1);
-	ptext("The preceeding two lines should be the same.  ");
+	ptext("The preceding two lines should be the same.  ");
 	pad_done_message(t, state, ch);
 }
 
diff --git a/contrib/ncurses/tack/sync.c b/contrib/ncurses/tack/sync.c
index d8866a0..3323b93 100644
--- a/contrib/ncurses/tack/sync.c
+++ b/contrib/ncurses/tack/sync.c
@@ -22,7 +22,7 @@
 #include <tack.h>
 #include <time.h>
 
-MODULE_ID("$Id: sync.c,v 1.1 1998/01/10 00:31:07 tom Exp $")
+MODULE_ID("$Id: sync.c,v 1.2 2000/03/04 20:28:16 tom Exp $")
 
 /* terminal-synchronization and performance tests */
 
@@ -157,7 +157,7 @@ probe_enq_ok(void)
 		ptextln(" the terminal is overrun with data.");
 		ptext("\nENQ sequence from (u9): ");
 		putln(expand(tty_ENQ));
-		ptext("ACK recieved: ");
+		ptext("ACK received: ");
 		putln(expand(tty_ACK));
 		len = user8 ? strlen(user8) : 0;
 		sprintf(temp, "Length of ACK %d.  Expected length of ACK %d.",
@@ -368,7 +368,7 @@ sync_clear(
 }
 
 /*
-**	sync_symmary(test_list, status, ch)
+**	sync_summary(test_list, status, ch)
 **
 **	Print out the test results.
 */
diff --git a/contrib/ncurses/tack/sysdep.c b/contrib/ncurses/tack/sysdep.c
index c07b4d9..43ef445 100644
--- a/contrib/ncurses/tack/sysdep.c
+++ b/contrib/ncurses/tack/sysdep.c
@@ -19,7 +19,7 @@
 ** Boston, MA 02111-1307, USA.
 */
 /*
- * Operating system dependant functions.  We assume the POSIX API.
+ * Operating system dependent functions.  We assume the POSIX API.
  * Note: on strict-POSIX systems (including BSD/OS) the select_delay_type
  * global has no effect.
  */
@@ -43,7 +43,7 @@
 #endif
 #endif
 
-MODULE_ID("$Id: sysdep.c,v 1.6 1999/09/04 13:45:00 tom Exp $")
+MODULE_ID("$Id: sysdep.c,v 1.7 2000/03/04 21:02:11 tom Exp $")
 
 #if DECL_ERRNO
 extern int errno;
diff --git a/contrib/ncurses/tack/tack.h b/contrib/ncurses/tack/tack.h
index 22e15af..52464d3 100644
--- a/contrib/ncurses/tack/tack.h
+++ b/contrib/ncurses/tack/tack.h
@@ -19,7 +19,7 @@
 ** Boston, MA 02111-1307, USA.
 */
 
-/* $Id: tack.h,v 1.5 1999/06/26 22:14:07 tom Exp $ */
+/* $Id: tack.h,v 1.6 2000/03/04 21:10:07 tom Exp $ */
 
 #ifndef _TACK_H
 #define _TACK_H 1
@@ -178,14 +178,14 @@ extern const int mode_map[];
 extern int tt_delay_max;	/* max number of milliseconds we can delay */
 extern int tt_delay_used;	/* number of milliseconds consumed in delay */
 extern const char *tt_cap[TT_MAX]; /* value of string */
-extern int tt_affected[TT_MAX];	/* lines or columns effected (repitition
+extern int tt_affected[TT_MAX];	/* lines or columns effected (repetition
 				   factor) */
 extern int tt_count[TT_MAX];	/* Number of times sent */
 extern int tt_delay[TT_MAX];	/* Number of milliseconds delay */
 extern int ttp;			/* number of entries used */
 
 extern const char *tx_cap[TT_MAX]; /* value of string */
-extern int tx_affected[TT_MAX];	/* lines or columns effected (repitition
+extern int tx_affected[TT_MAX];	/* lines or columns effected (repetition
 				   factor) */
 extern int tx_count[TT_MAX];	/* Number of times sent */
 extern int tx_delay[TT_MAX];	/* Number of milliseconds delay */