lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Update.

Browse Source 
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.
This commit is contained in:
Ulrich Drepper
1999-10-17 22:43:33 +00:00
parent 4a3792163e
commit ef5d664596
10 changed files with 210 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
locale/setlocale.c
View File

@ -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