aboutsummaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-10-17 22:43:33 +0000
committerUlrich Drepper <drepper@redhat.com>1999-10-17 22:43:33 +0000
commitef5d6645960b1ad8b1af244be5d32b3b0d65201d (patch)
treeda5069e9fc385969fdb6198888ed08a0348d5686 /locale
parent4a3792163e0cbc2a04d0e8b81544976975d76439 (diff)
downloadglibc-ef5d6645960b1ad8b1af244be5d32b3b0d65201d.tar
glibc-ef5d6645960b1ad8b1af244be5d32b3b0d65201d.tar.gz
glibc-ef5d6645960b1ad8b1af244be5d32b3b0d65201d.tar.bz2
glibc-ef5d6645960b1ad8b1af244be5d32b3b0d65201d.zip
Update.
1999-10-17 Ulrich Drepper <drepper@cygnus.com> * elf/elf.h: Add various platform and architecture extensions. * locale/lc-collate.c (_nl_postload_collate): Disable code for now. * locale/setlocale.c (setlocale): Don't call _nl_find_locale for LC_ALL. * socket/sys/socket.h: Remove K&R compatibility. 1999-10-16 Andreas Jaeger <aj@suse.de> * sysdeps/unix/sysv/linux/bits/in.h: Added struct in_pktinfo. 1999-10-15 Andreas Jaeger <aj@suse.de> * stdlib/Makefile (tests): Added tst-xpg-basename. * stdlib/tst-xpg-basename.c: New test file.
Diffstat (limited to 'locale')
-rw-r--r--locale/lc-collate.c3
-rw-r--r--locale/setlocale.c35
2 files changed, 21 insertions, 17 deletions
diff --git a/locale/lc-collate.c b/locale/lc-collate.c
index a012672b50..c448e1079d 100644
--- a/locale/lc-collate.c
+++ b/locale/lc-collate.c
@@ -45,6 +45,8 @@ const u_int32_t *__collate_symbol_classeswc = _nl_C_LC_COLLATE_symbol_classes;
void
_nl_postload_collate (void)
{
+#if 0
+ /* XXX For now */
#define paste(a,b) paste1(a,b)
#define paste1(a,b) a##b
@@ -61,4 +63,5 @@ _nl_postload_collate (void)
__collate_symbol_hash = current (SYMB_HASH);
__collate_symbol_strings = (const char *) current (SYMB_STR_POOL);
__collate_symbol_classeswc = current (SYMB_CLASSWC);
+#endif
}
diff --git a/locale/setlocale.c b/locale/setlocale.c
index c0f453cd94..8f40520c6e 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -305,26 +305,27 @@ setlocale (int category, const char *locale)
/* Load the new data for each category. */
while (category-- > 0)
- {
- /* XXX hack. Remove when collation works. */
- if (category == LC_COLLATE)
- {
- newdata[category] = NULL;
- continue;
- }
+ if (category != LC_ALL)
+ {
+ /* XXX hack. Remove when collation works. */
+ if (category == LC_COLLATE)
+ {
+ newdata[category] = NULL;
+ continue;
+ }
- newdata[category] = _nl_find_locale (locale_path, locale_path_len,
- category,
- &newnames[category]);
+ newdata[category] = _nl_find_locale (locale_path, locale_path_len,
+ category,
+ &newnames[category]);
- if (newdata[category] == NULL)
- break;
+ if (newdata[category] == NULL)
+ break;
- /* We must not simply free a global locale since we have no
- control over the usage. So we mark it as un-deletable. */
- if (newdata[category]->usage_count != UNDELETABLE)
- newdata[category]->usage_count = UNDELETABLE;
- }
+ /* We must not simply free a global locale since we have no
+ control over the usage. So we mark it as un-deletable. */
+ if (newdata[category]->usage_count != UNDELETABLE)
+ newdata[category]->usage_count = UNDELETABLE;
+ }
/* Create new composite name. */
composite = (category >= 0