diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2000-10-11 07:31:01 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2000-10-11 07:31:01 +0000 |
| commit | 18259542b2f8fa7e3f76f4bb0dd37995dfd424aa (patch) | |
| tree | 9ec00b41242bbe63b83c0ac5316c539466d9f9de /contrib/ncurses/ncurses/base/lib_newterm.c | |
| parent | 15589c42fa2774d2f8ee650f4f31eb8d3a861316 (diff) | |
| download | src-18259542b2f8fa7e3f76f4bb0dd37995dfd424aa.tar.gz src-18259542b2f8fa7e3f76f4bb0dd37995dfd424aa.zip | |
Import ncurses-5.1-20001009 onto the vendor branch
Notes
Notes:
svn path=/vendor/ncurses/dist/; revision=66963
Diffstat (limited to 'contrib/ncurses/ncurses/base/lib_newterm.c')
| -rw-r--r-- | contrib/ncurses/ncurses/base/lib_newterm.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/contrib/ncurses/ncurses/base/lib_newterm.c b/contrib/ncurses/ncurses/base/lib_newterm.c index 08e35cf50182..7da4069b5b85 100644 --- a/contrib/ncurses/ncurses/base/lib_newterm.c +++ b/contrib/ncurses/ncurses/base/lib_newterm.c @@ -40,14 +40,14 @@ #include <curses.priv.h> -#if defined(SVR4_TERMIO) && !defined(_POSIX_SOURCE) +#if SVR4_TERMIO && !defined(_POSIX_SOURCE) #define _POSIX_SOURCE #endif #include <term.h> /* clear_screen, cup & friends, cur_term */ #include <tic.h> -MODULE_ID("$Id: lib_newterm.c,v 1.46 2000/07/01 22:26:22 tom Exp $") +MODULE_ID("$Id: lib_newterm.c,v 1.48 2000/09/02 18:11:42 tom Exp $") #ifndef ONLCR /* Allows compilation under the QNX 4.2 OS */ #define ONLCR 0 @@ -191,17 +191,21 @@ newterm(NCURSES_CONST char *name, FILE * ofp, FILE * ifp) SP->_use_rmso = SGR0_TEST(exit_standout_mode); SP->_use_rmul = SGR0_TEST(exit_underline_mode); -#ifdef USE_WIDEC_SUPPORT +#if USE_WIDEC_SUPPORT /* * XFree86 xterm can be configured to support UTF-8 based on environment * variable settings. */ { char *s; - if (((s = getenv("LC_ALL")) != 0 - || (s = getenv("LC_CTYPE")) != 0 - || (s = getenv("LANG")) != 0) - && strstr(s, "UTF-8") != 0) { + s = getenv("LC_ALL"); + if (s == NULL || *s == '\0') { + s = getenv("LC_CTYPE"); + if (s == NULL || *s == '\0') { + s = getenv("LANG"); + } + } + if (s != NULL && *s != '\0' && strstr(s, "UTF-8") != NULL) { SP->_outch = _nc_utf8_outch; } } |