From abfec47a85e6e655b18dae0750d1dcf5b7731cf6 Mon Sep 17 00:00:00 2001
From: ache <ache@FreeBSD.org>
Date: Fri, 1 Sep 2000 11:13:38 +0000
Subject: setlocale may return NULL, handle this case too by resetting to "C"

---
 lib/libc/nls/msgcat.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'lib/libc/nls/msgcat.c')

diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c
index 4dba0cd..f02af8e 100644
--- a/lib/libc/nls/msgcat.c
+++ b/lib/libc/nls/msgcat.c
@@ -107,11 +107,9 @@ int type;
     } else {
 	if (type == NL_CAT_LOCALE)
 		lang = setlocale(LC_MESSAGES, NULL);
-	else {
-		if ((lang = (char *) getenv("LANG")) == NULL)
-			lang = "C";
-	}
-	if (strchr(lang, '/') != NULL)
+	else
+		lang = getenv("LANG");
+	if (lang == NULL || strchr(lang, '/') != NULL)
 		lang = "C";
 	if ((nlspath = (char *) getenv("NLSPATH")) == NULL
 #ifndef __NETBSD_SYSCALLS
-- 
cgit v1.1