Re: Or on ReliantUNIX ... RE: Make Failure on SunOS-4.1 (correction)

[Clint Adams <clint@zsh.org>]

> Either it should be tested in getterm{info,cap}, or removed entirely.

Hmm, good point.

Index: Src/Modules/termcap.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/termcap.c,v
retrieving revision 1.11
diff -u -r1.11 termcap.c
--- Src/Modules/termcap.c	2001/04/26 15:48:17	1.11
+++ Src/Modules/termcap.c	2001/04/26 15:51:02
@@ -147,10 +147,6 @@
     BUILTIN("echotc", 0, bin_echotc, 1, -1, 0, NULL, NULL),
 };
 
-/* This says if we are cleaning up when the module is unloaded. */
-
-static int incleanup;
-
 /**/
 #ifdef HAVE_TGETENT
 
@@ -363,8 +359,6 @@
 int
 setup_(Module m)
 {
-    incleanup = 0;
-
     return 0;
 }
 
@@ -391,11 +385,7 @@
 {
 #ifdef HAVE_TGETENT
     Param pm;
-#endif
-
-    incleanup = 1;
 
-#ifdef HAVE_TGETENT
     if ((pm = (Param) paramtab->getnode(paramtab, termcap_nam)) &&
 	pm == termcap_pm) {
 	pm->flags &= ~PM_READONLY;
Index: Src/Modules/terminfo.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/terminfo.c,v
retrieving revision 1.16
diff -u -r1.16 terminfo.c
--- Src/Modules/terminfo.c	2001/04/24 06:48:54	1.16
+++ Src/Modules/terminfo.c	2001/04/26 15:51:02
@@ -109,10 +109,6 @@
     BUILTIN("echoti", 0, bin_echoti, 1, -1, 0, NULL, NULL),
 };
 
-/* This says if we are cleaning up when the module is unloaded. */
-
-static int incleanup;
-
 /**/
 #ifdef HAVE_TIGETSTR
 
@@ -337,8 +333,6 @@
 int
 setup_(Module m)
 {
-    incleanup = 0;
-
     return 0;
 }
 
@@ -365,11 +359,7 @@
 {
 #ifdef HAVE_TIGETSTR
     Param pm;
-#endif
-
-    incleanup = 1;
 
-#ifdef HAVE_TIGETSTR
     if ((pm = (Param) paramtab->getnode(paramtab, terminfo_nam)) &&
 	pm == terminfo_pm) {
 	pm->flags &= ~PM_READONLY;