about summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2003-09-14 05:10:05 +0000
committerClint Adams <clint@users.sourceforge.net>2003-09-14 05:10:05 +0000
commitcd89b92a0de7c2ef66c8aeec260377a1643a18d7 (patch)
tree04fa2484f7c6400dc8b03be8cdde9b2f244a402f
parent6e09c17757603c0ae64a9919df724d71ca8c8bf9 (diff)
downloadzsh-cd89b92a0de7c2ef66c8aeec260377a1643a18d7.tar.gz
zsh-cd89b92a0de7c2ef66c8aeec260377a1643a18d7.tar.xz
zsh-cd89b92a0de7c2ef66c8aeec260377a1643a18d7.zip
19076: don't call setupterm with NULL as last argument as that causes
the shell to exit when the terminal is unknown.
-rw-r--r--ChangeLog6
-rw-r--r--Src/Modules/terminfo.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a73aa012..849e62793 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-14  Clint Adams  <clint@zsh.org>
+
+	* 19076: Src/Modules/terminfo.c: don't call setupterm
+	with NULL as last argument as that causes the shell to
+	exit when the terminal is unknown.
+
 2003-09-11  Oliver Kiddle  <opk@zsh.org>
 
 	* 19059: acconfig.h, zshconfig.ac, Src/builtin.c, Src/exec.c,
diff --git a/Src/Modules/terminfo.c b/Src/Modules/terminfo.c
index b128e0bb5..f869e0e36 100644
--- a/Src/Modules/terminfo.c
+++ b/Src/Modules/terminfo.c
@@ -376,7 +376,10 @@ boot_(Module m)
 {
 #ifdef HAVE_TIGETSTR
 # ifdef HAVE_SETUPTERM
-    setupterm((char *)0, 1, (int *)0);
+    int errret;
+
+    if (setupterm((char *)0, 1, &errret) == ERR)
+	return 1;
 # endif
 
     if (!createtihash())