From: Rich Felker <dalias@aerifal.cx>
Date: Sun, 3 Apr 2011 23:51:14 +0000 (-0400)
Subject: fix nl_langinfo to actually use the existing, correct internal version
X-Git-Tag: v0.7.6~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5600088d387491bd0af1879aa64e5d388805d8ec;p=oweals%2Fmusl.git

fix nl_langinfo to actually use the existing, correct internal version
---

diff --git a/src/locale/langinfo.c b/src/locale/langinfo.c
index f7f56012..01593148 100644
--- a/src/locale/langinfo.c
+++ b/src/locale/langinfo.c
@@ -1,5 +1,6 @@
 #include <locale.h>
 #include <langinfo.h>
+#include "libc.h"
 
 static const char c_time[] =
 	"Sun\0" "Mon\0" "Tue\0" "Wed\0" "Thu\0" "Fri\0" "Sat\0"
@@ -24,7 +25,7 @@ static const char c_time[] =
 static const char c_messages[] = "^[yY]\0" "^[nN]";
 static const char c_numeric[] = ".\0" "";
 
-const char *__langinfo(nl_item item)
+char *__langinfo(nl_item item)
 {
 	int cat = item >> 16;
 	int idx = item & 65535;
@@ -54,5 +55,7 @@ const char *__langinfo(nl_item item)
 	}
 
 	for (; idx; idx--, str++) for (; *str; str++);
-	return str;
+	return (char *)str;
 }
+
+weak_alias(__langinfo, nl_langinfo);
diff --git a/src/locale/nl_langinfo.c b/src/locale/nl_langinfo.c
deleted file mode 100644
index bb3a2c46..00000000
--- a/src/locale/nl_langinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <langinfo.h>
-
-// FIXME: other items
-
-char *nl_langinfo(nl_item item)
-{
-	switch (item) {
-	case CODESET:
-		return "UTF-8";
-	default:
-		return "";
-	}
-}