diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2010-06-02 13:13:43 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2010-06-02 13:13:43 +0000 |
| commit | fdebbca7547a0bbeac5335e8ee97e073ac495c40 (patch) | |
| tree | 4fdc953d432eabc6475b66ff4ec2f002d1699d82 /Src/Modules | |
| parent | 5068080f7824c09ba1cce43e15303695b315589a (diff) | |
| download | zsh-fdebbca7547a0bbeac5335e8ee97e073ac495c40.tar.gz zsh-fdebbca7547a0bbeac5335e8ee97e073ac495c40.tar.xz zsh-fdebbca7547a0bbeac5335e8ee97e073ac495c40.zip | |
27990: don't use return value from setupterm()
to decide if module booted OK
Diffstat (limited to 'Src/Modules')
| -rw-r--r-- | Src/Modules/termcap.c | 10 | ||||
| -rw-r--r-- | Src/Modules/terminfo.c | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/Src/Modules/termcap.c b/Src/Modules/termcap.c index 784844169..7367dade7 100644 --- a/Src/Modules/termcap.c +++ b/Src/Modules/termcap.c @@ -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; diff --git a/Src/Modules/terminfo.c b/Src/Modules/terminfo.c index db9a6c053..88e326f63 100644 --- a/Src/Modules/terminfo.c +++ b/Src/Modules/terminfo.c @@ -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 |