X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_newterm.c;h=7da4069b5b8505271bc6380ce51f33911de7b501;hp=08e35cf501822152e7bdd4c423d5a66b4ffb7586;hb=c633e5103a29a38532cf1925257b91cea33fd090;hpb=b1f61d9f3aa244512045a6b02e759825d7049d34

diff --git a/ncurses/base/lib_newterm.c b/ncurses/base/lib_newterm.c
index 08e35cf5..7da4069b 100644
--- a/ncurses/base/lib_newterm.c
+++ b/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;
 	}
     }