mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-22 16:20:23 +02:00
Code Releases Activity

27990: don't use return value from setupterm()

Browse source 
to decide if module booted OK
This commit is contained in:
Peter Stephenson 2010-06-02 13:13:43 +00:00
parent 5068080f78
commit fdebbca754
3 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,10 @@
2010-06-02 Peter Stephenson <pws@csr.com>
* 27990: Src/Modules/termcap.c (not in original patch),
Src/Modules/terminfo.c: ignore error return value from
setupterm(), it's not useful in telling us whether the module
booted OK.
2010-06-01 Peter Stephenson <p.w.stephenson@ntlworld.com>
* Daniel Friesel: 27982: Completion/Unix/Command/_feh: update.
@ -13182,5 +13189,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.4987 $
* $Revision: 1.4988 $
*****************************************************

10
Src/Modules/termcap.c
View file

@ -370,9 +370,13 @@ boot_(Module m)
#ifdef HAVE_TGETENT
# ifdef HAVE_SETUPTERM
int errret;
if (setupterm((char *)0, 1, &errret) == ERR) {
return 1;
}
/*
* Just because we can't set up the terminal doesn't
* mean the modules hasn't booted---TERM may change,
* and it should be handled dynamically---so ignore errors here.
*/
(void)setupterm((char *)0, 1, &errret);
# endif
#endif
return 0;

8
Src/Modules/terminfo.c
View file

@ -341,8 +341,12 @@ boot_(Module m)
# ifdef HAVE_SETUPTERM
int errret;
if (setupterm((char *)0, 1, &errret) == ERR)
return 1;
/*
* Just because we can't set up the terminal doesn't
* mean the modules hasn't booted---TERM may change,
* and it should be handled dynamically---so ignore errors here.
*/
(void)setupterm((char *)0, 1, &errret);
# endif
#endif