From e61715de39af65bd575c31be9ffe8f77eb4614e8 Mon Sep 17 00:00:00 2001
From: David Greenman <dg@FreeBSD.org>
Date: Sat, 11 Nov 2000 23:03:38 +0000
Subject: [PATCH] Changed variable killchar to killch and erasechar to erasech
 to avoid a name clash with the library functions of the same name (in
 libncurses). This problem was masked when building tset shared (the local
 symbols had precedence), but caused tset to core dump when it was built
 -static.

---
 usr.bin/tset/extern.h |  3 ++-
 usr.bin/tset/set.c    | 16 ++++++++--------
 usr.bin/tset/tset.c   |  8 ++++----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/usr.bin/tset/extern.h b/usr.bin/tset/extern.h
index f1c1163671e..8cce2287339 100644
--- a/usr.bin/tset/extern.h
+++ b/usr.bin/tset/extern.h
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/9/93
+ *	$FreeBSD$
  */
 
 #include <termcap.h>
 
 extern struct termios mode, oldmode;
 extern int Columns, isreset, Lines;
-extern int erasechar, intrchar, killchar;
+extern int erasech, intrchar, killch;
 
 void	 add_mapping __P((char *, char *));
 void	 cat __P((char *));
diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c
index e5c52cff08a..515a87da16a 100644
--- a/usr.bin/tset/set.c
+++ b/usr.bin/tset/set.c
@@ -169,19 +169,19 @@ set_control_chars()
 	else
 		bs_char = 0;
 
-	if (erasechar == 0 && bs_char != 0 && !tgetflag("os"))
-		erasechar = -1;
-	if (erasechar < 0)
-		erasechar = (bs_char != 0) ? bs_char : CTRL('h');
+	if (erasech == 0 && bs_char != 0 && !tgetflag("os"))
+		erasech = -1;
+	if (erasech < 0)
+		erasech = (bs_char != 0) ? bs_char : CTRL('h');
 
-	if (mode.c_cc[VERASE] == 0 || erasechar != 0)
-		mode.c_cc[VERASE] = erasechar ? erasechar : CERASE;
+	if (mode.c_cc[VERASE] == 0 || erasech != 0)
+		mode.c_cc[VERASE] = erasech ? erasech : CERASE;
 
 	if (mode.c_cc[VINTR] == 0 || intrchar != 0)
 		 mode.c_cc[VINTR] = intrchar ? intrchar : CINTR;
 
-	if (mode.c_cc[VKILL] == 0 || killchar != 0)
-		mode.c_cc[VKILL] = killchar ? killchar : CKILL;
+	if (mode.c_cc[VKILL] == 0 || killch != 0)
+		mode.c_cc[VKILL] = killch ? killch : CKILL;
 }
 
 /*
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index c14654765b5..7a7ca82eb8c 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -62,10 +62,10 @@ void	usage __P((void));
 
 struct termios mode, oldmode;
 
-int	erasechar;		/* new erase character */
+int	erasech;		/* new erase character */
 int	intrchar;		/* new interrupt character */
 int	isreset;		/* invoked as reset */
-int	killchar;		/* new kill character */
+int	killch;			/* new kill character */
 int	Lines, Columns;		/* window size */
 speed_t	Ospeed;
 
@@ -110,7 +110,7 @@ main(argc, argv)
 			add_mapping("dialup", optarg);
 			break;
 		case 'e':		/* erase character */
-			erasechar = optarg[0] == '^' && optarg[1] != '\0' ?
+			erasech = optarg[0] == '^' && optarg[1] != '\0' ?
 			    optarg[1] == '?' ? '\177' : CTRL(optarg[1]) :
 			    optarg[0];
 			break;
@@ -123,7 +123,7 @@ main(argc, argv)
 			    optarg[0];
 			break;
 		case 'k':		/* kill character */
-			killchar = optarg[0] == '^' && optarg[1] != '\0' ?
+			killch = optarg[0] == '^' && optarg[1] != '\0' ?
 			    optarg[1] == '?' ? '\177' : CTRL(optarg[1]) :
 			    optarg[0];
 			break;