aboutsummaryrefslogtreecommitdiff
path: root/locale/nl_langinfo.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-03-28 19:22:05 +0000
committerRoland McGrath <roland@gnu.org>2005-03-28 19:22:05 +0000
commit500a1f289711497e9a6e1da0e67e3ea2369a7027 (patch)
tree216861a8bec4bb410e3c7997e504d5acf9d78271 /locale/nl_langinfo.c
parent78bf97c874e952d21658179467430cbab99bb7b6 (diff)
downloadglibc-500a1f289711497e9a6e1da0e67e3ea2369a7027.tar
glibc-500a1f289711497e9a6e1da0e67e3ea2369a7027.tar.gz
glibc-500a1f289711497e9a6e1da0e67e3ea2369a7027.tar.bz2
glibc-500a1f289711497e9a6e1da0e67e3ea2369a7027.zip
2005-03-28 Roland McGrath <roland@redhat.com>
* locale/langinfo.h (_NL_LOCALE_NAME): New macro. [__USE_GNU] (NL_LOCALE_NAME): New macro. * locale/nl_langinfo.c: Grok special item value for _NL_LOCALE_NAME, return locale name string for the category.
Diffstat (limited to 'locale/nl_langinfo.c')
-rw-r--r--locale/nl_langinfo.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/locale/nl_langinfo.c b/locale/nl_langinfo.c
index 2314b80f0f..c5fbf19e15 100644
--- a/locale/nl_langinfo.c
+++ b/locale/nl_langinfo.c
@@ -1,5 +1,6 @@
/* User interface for extracting locale-dependent parameters.
- Copyright (C) 1995,96,97,99,2000,01,02 Free Software Foundation, Inc.
+ Copyright (C) 1995,96,97,99,2000,2001,2002,2005
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -45,6 +46,18 @@ nl_langinfo (item)
/* Bogus category: bogus item. */
return (char *) "";
+ /* Special case value for NL_LOCALE_NAME (category).
+ This is not a real item index in the string table. */
+ if (index == _NL_ITEM_INDEX (_NL_LOCALE_NAME (category)))
+ {
+#ifdef USE_IN_EXTENDED_LOCALE_MODEL
+# define THISLOCALE l
+#else
+# define THISLOCALE _NL_CURRENT_LOCALE
+#endif
+ return (char *) THISLOCALE->__names[category];
+ }
+
#ifdef USE_IN_EXTENDED_LOCALE_MODEL
data = l->__locales[category];
#elif defined NL_CURRENT_INDIRECT