commit f8500b2be599053daa05248a86a743232ec6a536
author schwarze@openbsd.org <schwarze@openbsd.org> Mon Apr 17 14:31:23 2017 +0000
committer Damien Miller <djm@mindrot.org> Tue Apr 18 10:17:46 2017 +1000
tree 6cb3ef2cd0b37dffc8b3946bce8b9b9d0716afb9
parent 7480dfedf8c5c93baaabef444b3def9331e86ad5

upstream commit

Recognize nl_langinfo(CODESET) return values "646" and ""
as aliases for "US-ASCII", useful for different versions of NetBSD and
Solaris. Found by dtucker@ and by Tom G. Christensen <tgc at jupiterrise dot
com>. OK dtucker@ deraadt@

Upstream-ID: 38c2133817cbcae75c88c63599ac54228f0fa384

utf8.c

diff --git a/utf8.c b/utf8.c
index dead79b..da57781 100644
--- a/utf8.c
+++ b/utf8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utf8.c,v 1.5 2017/02/19 00:10:57 djm Exp $ */
+/* $OpenBSD: utf8.c,v 1.6 2017/04/17 14:31:23 schwarze Exp $ */
 /*
  * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -61,7 +61,8 @@
 
 	loc = nl_langinfo(CODESET);
 	return strcmp(loc, "US-ASCII") != 0 && strcmp(loc, "UTF-8") != 0 &&
-	    strcmp(loc, "ANSI_X3.4-1968") != 0 && strcmp(loc, "646") != 0;
+	    strcmp(loc, "ANSI_X3.4-1968") != 0 && strcmp(loc, "646") != 0 &&
+	    strcmp(loc, "") != 0;
 }
 
 static int