mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-08 17:42:12 +03:00
* locale/lc-time.c (_nl_init_era_entries, _nl_get_era_entry,
_nl_select_era_entry): Moved to ... * time/era.c: ... here, new file. (_nl_init_era_entries, _nl_get_era_entry, _nl_select_era_entry): Add internal_function to definitions. Take an additional argument giving the `struct locale_data *' to use. * locale/lc-time.c (_get_alt_digit, _nl_get_walt_digit, _nl_parse_alt_digit): Moved to ... * time/alt_digit.c: ... here, new file. * time/lc-time-cleanup.c: New file. * locale/lc-time.c (_nl_postload_time, free_mem): Functions removed. * locale/localeinfo.h (_nl_postload_time): Remove decl. (_nl_cleanup_time): Declare it. (_nl_get_era_entry, _nl_select_era_entry): Update decls. (_get_alt_digit, _nl_get_walt_digit, _nl_parse_alt_digit): Likewise. * time/Makefile (aux): New variable: era, alt_digit, lc-time-cleanup. * time/strftime.c: Pass locale data to helper functions. * time/strptime.c: Likewise. * locale/localeinfo.h (struct locale_data): New member `private' * locale/loadlocale.c (_nl_intern_locale_data): Initialize it. (_nl_unload_locale): Call LOCALE->private.cleanup if it is set. * locale/C-collate.c: Update initializer. * locale/C-identification.c: Likewise. * locale/C-measurement.c: Likewise. * locale/C-telephone.c: Likewise. * locale/C-address.c: Likewise. * locale/C-name.c: Likewise. * locale/C-paper.c: Likewise. * locale/C-time.c: Likewise. * locale/C-numeric.c: Likewise. * locale/C-monetary.c: Likewise. * locale/C-messages.c : Likewise. * locale/C-ctype.c: Likewise. * time/strptime.c [USE_IN_EXTENDED_LOCALE_MODEL] (_NL_CURRENT_WORD): Redefine this too.
This commit is contained in:
Roland McGrath
193
time/alt_digit.c
Normal file
193
time/alt_digit.c
Normal file
@@ -0,0 +1,193 @@
|
||||
/* Helper functions used by strftime/strptime to handle alternate digits.
|
||||
Copyright (C) 1995-2001,02 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
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include "../locale/localeinfo.h"
|
||||
#include <bits/libc-lock.h>
|
||||
#include <stdlib.h>
|
||||
#include <wchar.h>
|
||||
#include <string.h>
|
||||
|
||||
/* Some of the functions here must not be used while setlocale is called. */
|
||||
__libc_lock_define (extern, __libc_setlocale_lock attribute_hidden)
|
||||
|
||||
#define CURRENT(item) (current->values[_NL_ITEM_INDEX (item)].string)
|
||||
#define CURRENT_WSTR(item) \
|
||||
((wchar_t *) current->values[_NL_ITEM_INDEX (item)].wstr)
|
||||
|
||||
static void
|
||||
_nl_init_alt_digit (struct locale_data *current)
|
||||
{
|
||||
struct lc_time_data *data;
|
||||
|
||||
if (current->private.time == NULL)
|
||||
{
|
||||
current->private.time = malloc (sizeof *current->private.time);
|
||||
if (current->private.time == NULL)
|
||||
return;
|
||||
memset (current->private.time, 0, sizeof *current->private.time);
|
||||
current->private.cleanup = &_nl_cleanup_time;
|
||||
}
|
||||
data = current->private.time;
|
||||
|
||||
if (! data->alt_digits_initialized)
|
||||
{
|
||||
const char *ptr = CURRENT (ALT_DIGITS);
|
||||
size_t cnt;
|
||||
|
||||
data->alt_digits_initialized = 1;
|
||||
|
||||
if (ptr != NULL)
|
||||
{
|
||||
data->alt_digits = malloc (100 * sizeof (const char *));
|
||||
if (data->alt_digits != NULL)
|
||||
for (cnt = 0; cnt < 100; ++cnt)
|
||||
{
|
||||
data->alt_digits[cnt] = ptr;
|
||||
|
||||
/* Skip digit format. */
|
||||
ptr = strchr (ptr, '\0') + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
const char *
|
||||
internal_function
|
||||
_nl_get_alt_digit (unsigned int number, struct locale_data *current)
|
||||
{
|
||||
const char *result;
|
||||
|
||||
if (number >= 100 || CURRENT (ALT_DIGITS)[0] == '\0')
|
||||
return NULL;
|
||||
|
||||
__libc_lock_lock (__libc_setlocale_lock);
|
||||
|
||||
if (current->private.time == NULL
|
||||
|| ! current->private.time->alt_digits_initialized)
|
||||
_nl_init_alt_digit (current);
|
||||
|
||||
result = ((current->private.time != NULL
|
||||
&& current->private.time->alt_digits != NULL)
|
||||
? current->private.time->alt_digits[number]
|
||||
: NULL);
|
||||
|
||||
__libc_lock_unlock (__libc_setlocale_lock);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
const wchar_t *
|
||||
internal_function
|
||||
_nl_get_walt_digit (unsigned int number, struct locale_data *current)
|
||||
{
|
||||
const wchar_t *result = NULL;
|
||||
struct lc_time_data *data;
|
||||
|
||||
if (number >= 100 || CURRENT_WSTR (_NL_WALT_DIGITS)[0] == L'\0')
|
||||
return NULL;
|
||||
|
||||
__libc_lock_lock (__libc_setlocale_lock);
|
||||
|
||||
if (current->private.time == NULL)
|
||||
{
|
||||
current->private.time = malloc (sizeof *current->private.time);
|
||||
if (current->private.time == NULL)
|
||||
goto out;
|
||||
memset (current->private.time, 0, sizeof *current->private.time);
|
||||
current->private.cleanup = &_nl_cleanup_time;
|
||||
}
|
||||
data = current->private.time;
|
||||
|
||||
if (! data->walt_digits_initialized)
|
||||
{
|
||||
const wchar_t *ptr = CURRENT_WSTR (_NL_WALT_DIGITS);
|
||||
size_t cnt;
|
||||
|
||||
data->walt_digits_initialized = 1;
|
||||
|
||||
if (ptr != NULL)
|
||||
{
|
||||
data->walt_digits = malloc (100 * sizeof (const uint32_t *));
|
||||
if (data->walt_digits != NULL)
|
||||
for (cnt = 0; cnt < 100; ++cnt)
|
||||
{
|
||||
data->walt_digits[cnt] = ptr;
|
||||
|
||||
/* Skip digit format. */
|
||||
ptr = wcschr (ptr, L'\0') + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (data->walt_digits != NULL)
|
||||
result = data->walt_digits[number];
|
||||
|
||||
out:
|
||||
__libc_lock_unlock (__libc_setlocale_lock);
|
||||
|
||||
return (wchar_t *) result;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
internal_function
|
||||
_nl_parse_alt_digit (const char **strp, struct locale_data *current)
|
||||
{
|
||||
const char *str = *strp;
|
||||
int result = -1;
|
||||
size_t cnt;
|
||||
size_t maxlen = 0;
|
||||
|
||||
if (CURRENT_WSTR (_NL_WALT_DIGITS)[0] == L'\0')
|
||||
return result;
|
||||
|
||||
__libc_lock_lock (__libc_setlocale_lock);
|
||||
|
||||
if (current->private.time == NULL
|
||||
|| ! current->private.time->alt_digits_initialized)
|
||||
_nl_init_alt_digit (current);
|
||||
|
||||
if (current->private.time != NULL &&
|
||||
current->private.time->alt_digits != NULL)
|
||||
/* Matching is not unambiguous. The alternative digits could be like
|
||||
I, II, III, ... and the first one is a substring of the second
|
||||
and third. Therefore we must keep on searching until we found
|
||||
the longest possible match. Note that this is not specified in
|
||||
the standard. */
|
||||
for (cnt = 0; cnt < 100; ++cnt)
|
||||
{
|
||||
const char *const dig = current->private.time->alt_digits[cnt];
|
||||
size_t len = strlen (dig);
|
||||
|
||||
if (len > maxlen && strncmp (dig, str, len) == 0)
|
||||
{
|
||||
maxlen = len;
|
||||
result = (int) cnt;
|
||||
}
|
||||
}
|
||||
|
||||
__libc_lock_unlock (__libc_setlocale_lock);
|
||||
|
||||
if (result != -1)
|
||||
*strp += maxlen;
|
||||
|
||||
return result;
|
||||
}
|
||||
Reference in New Issue
Block a user