fix nl_langinfo to actually use the existing, correct internal version

diff --git a/src/locale/langinfo.c b/src/locale/langinfo.c
index f7f5601..0159314 100644 (file)
--- a/src/locale/langinfo.c
+++ b/src/locale/langinfo.c
@@ -1,5 +1,6 @@
 #include <locale.h>
 #include <langinfo.h>
 #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"
 
 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" "";
 
 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;
 {
        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++);
        }
 
        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 (file)
index bb3a2c4..0000000
--- 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 "";
-       }
-}