>From 2f79aa294db5d9230ad71298e3de4b5561b441be Mon Sep 17 00:00:00 2001 From: Laine Gholson Date: Wed, 9 Nov 2016 20:19:00 -0600 Subject: [PATCH] bind_textdomain_codeset: don't return failure unless encoding isn't UTF-8 VLC isn't happy when bind_textdomain_codeset returns NULL --- src/locale/bind_textdomain_codeset.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/locale/bind_textdomain_codeset.c b/src/locale/bind_textdomain_codeset.c index 5ebfd5e..e5f3f52 100644 --- a/src/locale/bind_textdomain_codeset.c +++ b/src/locale/bind_textdomain_codeset.c @@ -5,7 +5,9 @@ char *bind_textdomain_codeset(const char *domainname, const char *codeset) { - if (codeset && strcasecmp(codeset, "UTF-8")) + if (codeset && ((strcasecmp(codeset, "UTF-8") == 0) || (strcasecmp(codeset, "UTF8") == 0))) { + return "UTF-8"; + } else if (codeset) errno = EINVAL; return NULL; } -- 2.10.2