about summary refs log tree commit diff
path: root/locale/nl_langinfo.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-09-26 07:56:19 +0000
committerUlrich Drepper <drepper@redhat.com>2000-09-26 07:56:19 +0000
commit316ca440b070114ba877455c3dbbcdc1b20e4f33 (patch)
tree4224faacba4731e0b405a79552dde36c31e3eeea /locale/nl_langinfo.c
parente5448d7ad2c39a6784894e8e840514b0d88333bc (diff)
downloadglibc-316ca440b070114ba877455c3dbbcdc1b20e4f33.tar.gz
glibc-316ca440b070114ba877455c3dbbcdc1b20e4f33.tar.xz
glibc-316ca440b070114ba877455c3dbbcdc1b20e4f33.zip
Update.
	* misc/daemon.c (daemon): Fail if !noclose and we cannot open the
	real /dev/null device.

	* sysdeps/generic/check_fds.c: Include device-nrs.h.
	* sysdeps/generic/device-nrs.h: New file.
	* sysdeps/unix/sysv/linux/device-nrs.h: New file.
	* misc/Makefile (distribute): Add device-nrs.h.

	* posix/wordexp.c (exec_comm_child): Likewise.
	* locale/nl_langinfo.c: Allow use of file for __nl_langinfo_l
	definition.
Diffstat (limited to 'locale/nl_langinfo.c')
-rw-r--r--locale/nl_langinfo.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/locale/nl_langinfo.c b/locale/nl_langinfo.c
index 5347d79beb..7d8c9ab586 100644
--- a/locale/nl_langinfo.c
+++ b/locale/nl_langinfo.c
@@ -25,9 +25,16 @@
 
 /* Return a string with the data for locale-dependent parameter ITEM.  */
 
+#ifdef USE_IN_EXTENDED_LOCALE_MODEL
+char *
+__nl_langinfo_l (item, l)
+     nl_item item;
+     __locale_t l;
+#else
 char *
 nl_langinfo (item)
      nl_item item;
+#endif
 {
   int category = _NL_ITEM_CATEGORY (item);
   unsigned int index = _NL_ITEM_INDEX (item);
@@ -37,7 +44,11 @@ nl_langinfo (item)
     /* Bogus category: bogus item.  */
     return (char *) "";
 
+#ifdef USE_IN_EXTENDED_LOCALE_MODEL
+  data = l->__locales[category];
+#else
   data = *_nl_current[category];
+#endif
 
   if (index >= data->nstrings)
     /* Bogus index for this category: bogus item.  */