mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-18 19:10:06 +00:00
5bef282098
2000-07-24 Jakub Jelinek <jakub@redhat.com> * libio/wfiledoalloc.c (_IO_wfile_doallocate): Measure size in wide characters, not bytes. * libio/tst_putwc.c (do_test): Add test for writing lots of data into file. 2000-07-22 Bruno Haible <haible@clisp.cons.org> * locale/nl_langinfo.c (nl_langinfo): Accept items belonging to the new categories LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE, LC_MEASUREMENT, LC_IDENTIFICATION. * locale/xlocale.h (struct __locale_struct): Increase size of __locales array. * locale/duplocale.c (__duplocale): Copy newly added categories as well. * locale/freelocale.c (__freelocale): Free newly added categories. * locale/newlocale.c (__newlocale): Fix typo in sanity check. If a base is given, use it, don't simply return it. 2000-07-22 Bruno Haible <haible@clisp.cons.org> * crypt/md5-crypt.c (__md5_crypt_r): Avoid gcc warnings: Use pointer variables, copied_key and copied_salt, instead of boolean variables.
185 lines
5.4 KiB
C
185 lines
5.4 KiB
C
/* Return a reference to locale information record.
|
|
Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <argz.h>
|
|
#include <errno.h>
|
|
#include <locale.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "localeinfo.h"
|
|
|
|
|
|
/* Constant data defined in setlocale.c. */
|
|
extern struct locale_data *const _nl_C[];
|
|
|
|
/* Use this when we come along an error. */
|
|
#define ERROR_RETURN \
|
|
do { \
|
|
__set_errno (EINVAL); \
|
|
return NULL; \
|
|
} while (0)
|
|
|
|
|
|
__locale_t
|
|
__newlocale (int category_mask, const char *locale, __locale_t base)
|
|
{
|
|
/* Intermediate memory for result. */
|
|
const char *newnames[__LC_LAST];
|
|
struct __locale_struct result;
|
|
__locale_t result_ptr;
|
|
char *locale_path;
|
|
size_t locale_path_len;
|
|
const char *locpath_var;
|
|
int cnt;
|
|
|
|
/* We treat LC_ALL in the same way as if all bits were set. */
|
|
if (category_mask == LC_ALL)
|
|
category_mask = (1 << __LC_LAST) - 1 - (1 << LC_ALL);
|
|
|
|
/* Sanity check for CATEGORY argument. */
|
|
if ((category_mask & ~((1 << __LC_LAST) - 1 - (1 << LC_ALL))) != 0)
|
|
ERROR_RETURN;
|
|
|
|
/* `newlocale' does not support asking for the locale name. */
|
|
if (locale == NULL)
|
|
ERROR_RETURN;
|
|
|
|
/* Allocate memory for the result. */
|
|
if (base != NULL)
|
|
result = *base;
|
|
else
|
|
{
|
|
/* Fill with pointers to C locale data. */
|
|
for (cnt = 0; cnt < __LC_LAST; ++cnt)
|
|
if (cnt != LC_ALL)
|
|
result.__locales[cnt] = _nl_C[cnt];
|
|
}
|
|
|
|
/* If no category is to be set we return BASE if available or a
|
|
dataset using the C locale data. */
|
|
if (category_mask == 0)
|
|
{
|
|
result_ptr = (__locale_t) malloc (sizeof (struct __locale_struct));
|
|
if (result_ptr == NULL)
|
|
return NULL;
|
|
*result_ptr = result;
|
|
|
|
goto update;
|
|
}
|
|
|
|
/* We perhaps really have to load some data. So we determine the
|
|
path in which to look for the data now. The environment variable
|
|
`LOCPATH' must only be used when the binary has no SUID or SGID
|
|
bit set. */
|
|
locale_path = NULL;
|
|
locale_path_len = 0;
|
|
|
|
locpath_var = __secure_getenv ("LOCPATH");
|
|
if (locpath_var != NULL && locpath_var[0] != '\0')
|
|
if (__argz_create_sep (locpath_var, ':',
|
|
&locale_path, &locale_path_len) != 0)
|
|
return NULL;
|
|
|
|
if (__argz_append (&locale_path, &locale_path_len,
|
|
LOCALE_PATH, sizeof (LOCALE_PATH)) != 0)
|
|
return NULL;
|
|
|
|
/* Get the names for the locales we are interested in. We either
|
|
allow a composite name or a single name. */
|
|
for (cnt = 0; cnt < __LC_LAST; ++cnt)
|
|
if (cnt != LC_ALL)
|
|
newnames[cnt] = locale;
|
|
if (strchr (locale, ';') != NULL)
|
|
{
|
|
/* This is a composite name. Make a copy and split it up. */
|
|
char *np = strdupa (locale);
|
|
char *cp;
|
|
|
|
while ((cp = strchr (np, '=')) != NULL)
|
|
{
|
|
for (cnt = 0; cnt < __LC_LAST; ++cnt)
|
|
if (cnt != LC_ALL
|
|
&& (size_t) (cp - np) == _nl_category_name_sizes[cnt]
|
|
&& memcmp (np, _nl_category_names[cnt], cp - np) == 0)
|
|
break;
|
|
|
|
if (cnt == __LC_LAST)
|
|
/* Bogus category name. */
|
|
ERROR_RETURN;
|
|
|
|
/* Found the category this clause sets. */
|
|
newnames[cnt] = ++cp;
|
|
cp = strchr (cp, ';');
|
|
if (cp != NULL)
|
|
{
|
|
/* Examine the next clause. */
|
|
*cp = '\0';
|
|
np = cp + 1;
|
|
}
|
|
else
|
|
/* This was the last clause. We are done. */
|
|
break;
|
|
}
|
|
|
|
for (cnt = 0; cnt < __LC_LAST; ++cnt)
|
|
if (cnt != LC_ALL
|
|
&& (category_mask & 1 << cnt) != 0 && newnames[cnt] == locale)
|
|
/* The composite name did not specify the category we need. */
|
|
ERROR_RETURN;
|
|
}
|
|
|
|
/* Now process all categories we are interested in. */
|
|
for (cnt = 0; cnt < __LC_LAST; ++cnt)
|
|
if (cnt != LC_ALL && (category_mask & 1 << cnt) != 0)
|
|
{
|
|
result.__locales[cnt] = _nl_find_locale (locale_path, locale_path_len,
|
|
cnt, &newnames[cnt]);
|
|
if (result.__locales[cnt] == NULL)
|
|
return NULL;
|
|
}
|
|
|
|
/* We successfully loaded all required data. */
|
|
if (base == NULL)
|
|
{
|
|
/* Allocate new structure. */
|
|
result_ptr = (__locale_t) malloc (sizeof (struct __locale_struct));
|
|
if (result_ptr == NULL)
|
|
return NULL;
|
|
|
|
*result_ptr = result;
|
|
}
|
|
else
|
|
*(result_ptr = base) = result;
|
|
|
|
/* Update the special members. */
|
|
update:
|
|
{
|
|
union locale_data_value *ctypes = result_ptr->__locales[LC_CTYPE]->values;
|
|
result_ptr->__ctype_b = (const unsigned short int *)
|
|
(ctypes[_NL_ITEM_INDEX (_NL_CTYPE_CLASS)].string);
|
|
result_ptr->__ctype_tolower = (const int *)
|
|
(ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOLOWER)].string);
|
|
result_ptr->__ctype_toupper = (const int *)
|
|
(ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOUPPER)].string);
|
|
}
|
|
|
|
return result_ptr;
|
|
}
|