mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
7a12c6bba7
* intl/Makefile (CPPFLAGS): Change $(nlsdir) to $(i18ndir) in LOCALE_ALIAS_PATH. Fri May 3 03:14:02 1996 Ulrich Drepper <drepper@cygnus.com> * intl/Makefile (routines): Add l10nflist and explodename. (distribute): Add loadinfo.h and locale.alias. (install-others): New variable to install locale.alias. * intl/dcgettext.c, intl/finddomain.c, intl/gettextP.h, intl/loadmsgcat.c: Adapt for upcoming gettext-0.10.13. Some code is now shared with the locale implementation. * intl/explodename.c, intl/l10nflist.c, intl/loadinfo.h: New file. Extracted from finddomain.c. This is also used in the locale implementation. * intl/locale.alias: New file. Locale alias database compatible with X Window System's locale alias file. Can now be used in locale and gettext code. * libio/stdio.h: Add prototypes for asprint and vasprintf. * locale/C-collate.c, locale/C-ctype.c, locale/C-messages.c, locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c: Add new field in structure with name of locale ("C" in this case). * locale/Makefile (routines): Add findlocale. * locale/findlocale.c: New file. Instead of trying to load the directly described file we now try to be much smarter when this fails. Use the same code as gettext does. * locale/loadlocale.c, locale/setlocale.c: Rewrite to know about new loading scheme. * locale/localeinfo.h: Adapt prototypes and declarations for new setlocale implementation. Remove definition of u32_t type. We now use u_int32_t from <sys/types.h>. * locale/programs/charset.h (ILLEGAL_CHAR_VALUE): Provide type with constant. * locale/programs/config.h, locale/lc-collate.c, locale/localeinfo.h, locale/programs/ld-collate.c, locale/programs/ld-ctype.c, locale/programs/ld-messages.c, locale/programs/ld-monetary.c, locale/programs/ld-numeric.c, locale/programs/ld-time.c, locale/weight.h, string/strcoll.c: Change to use u_int32_t and u_int16_t. * locale/programs/localedef.c (construct_output_path): Change name of output locale to contain normalized form of the character set portion. * string/Makefile (routines): Add agrz-ctsep and argz-next. (tests): Add tst-strlen. * string/argz-ctsep.c: New file. Implement reverse operation from argz-stringify. * string/argz-next.c: Non-inline version of function from argz.h. * string/argz.h, string/envz.h: Make usable as global header file. * string/envz.c: Fix declarations to use size_t where prototypes say so. * string/tst-strlen.c: New file. Another test for critical situation in strlen implementations. * sysdeps/i386/i586/strlen.S: Fix bug with highest byte in word being zero. * wctype/test_wctype.c: Fix controlling comparison after change to 32 bit character class array. Fri May 3 12:53:12 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * sysdeps/unix/sysv/linux/sys/socket.h: Remove spurious doubled line. Thu May 2 22:50:52 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/getpriority.c: New file. * sysdeps/unix/sysv/linux/syscalls.list: Add s_getpriority. Thu May 2 22:41:31 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/fpu_control.h (_FPU_DEFAULT): Disable all exceptions. Thu May 2 22:33:14 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/e_acos.c, sysdeps/m68k/fpu/e_acosf.c, sysdeps/m68k/fpu/e_fmod.c, sysdeps/m68k/fpu/e_fmodf.c, sysdeps/m68k/fpu/isinfl.c, sysdeps/m68k/fpu/isnanl.c, sysdeps/m68k/fpu/s_atan.c, sysdeps/m68k/fpu/s_atanf.c, sysdeps/m68k/fpu/s_frexp.c, sysdeps/m68k/fpu/s_frexpf.c, sysdeps/m68k/fpu/s_ilogb.c, sysdeps/m68k/fpu/s_ilogbf.c, sysdeps/m68k/fpu/s_isinf.c, sysdeps/m68k/fpu/s_isinff.c, sysdeps/m68k/fpu/s_ldexp.c, sysdeps/m68k/fpu/s_ldexpf.c, sysdeps/m68k/fpu/s_modf.c, sysdeps/m68k/fpu/s_modff.c: Don't define __NO_MATH_INLINES, which is already defined on command line. Thu May 2 22:18:28 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/e_j0f.c (__ieee754_j0f, __ieee754_y0f): Replace 0x80000000 by 0x48000000. * sysdeps/libm-ieee754/e_j1f.c (__ieee754_j1f): Likewise. Thu May 2 21:30:33 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sunrpc/svc_simple.c: Make global variable pl local to registerrpc. Thu May 2 00:24:04 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * time/Makefile (tz-cflags): New variable. (CFLAGS-tzfile.c): New variable. (CFLAGS-zic.c): Add $(tz-cflags). (tz-cc): Remove variable. ($(objpfx)tzfile.o, $(objpfx)zic.o): Remove targets. * sysdeps/mach/hurd/getcwd.c: Jump out of both loops when we find a name, instead of checking for reaching end of buffer, which happens when the match is the last entry in the buffer.
311 lines
9.1 KiB
C
311 lines
9.1 KiB
C
/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
|
|
|
|
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. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <langinfo.h>
|
|
#include <string.h>
|
|
|
|
/* Undefine following line in production version. */
|
|
/* #define NDEBUG 1 */
|
|
#include <assert.h>
|
|
|
|
#include "locales.h"
|
|
#include "localeinfo.h"
|
|
#include "stringtrans.h"
|
|
|
|
|
|
void *xmalloc (size_t __n);
|
|
|
|
|
|
/* The real definition of the struct for the LC_TIME locale. */
|
|
struct locale_time_t
|
|
{
|
|
const char *abday[7];
|
|
size_t cur_num_abday;
|
|
const char *day[7];
|
|
size_t cur_num_day;
|
|
const char *abmon[12];
|
|
size_t cur_num_abmon;
|
|
const char *mon[12];
|
|
size_t cur_num_mon;
|
|
const char *am_pm[2];
|
|
size_t cur_num_am_pm;
|
|
const char *d_t_fmt;
|
|
const char *d_fmt;
|
|
const char *t_fmt;
|
|
const char *t_fmt_ampm;
|
|
const char *era;
|
|
const char *era_year;
|
|
const char *era_d_t_fmt;
|
|
const char *era_t_fmt;
|
|
const char *era_d_fmt;
|
|
const char *alt_digits[100];
|
|
size_t cur_num_alt_digits;
|
|
};
|
|
|
|
|
|
void
|
|
time_startup (struct linereader *lr, struct localedef_t *locale,
|
|
struct charset_t *charset)
|
|
{
|
|
struct locale_time_t *time;
|
|
|
|
/* It is important that we always use UCS1 encoding for strings now. */
|
|
encoding_method = ENC_UCS1;
|
|
|
|
locale->categories[LC_TIME].time = time =
|
|
(struct locale_time_t *) xmalloc (sizeof (struct locale_time_t));
|
|
|
|
memset (time, '\0', sizeof (struct locale_time_t));
|
|
}
|
|
|
|
|
|
void
|
|
time_finish (struct localedef_t *locale)
|
|
{
|
|
struct locale_time_t *time = locale->categories[LC_TIME].time;
|
|
|
|
#define TESTARR_ELEM(cat, max) \
|
|
if (time->cur_num_##cat == 0) \
|
|
error (0, 0, _("field `%s' in category `%s' not defined"), \
|
|
#cat, "LC_TIME"); \
|
|
else if (time->cur_num_##cat != max) \
|
|
error (0, 0, _("field `%s' in category `%s' has not enough values"), \
|
|
#cat, "LC_TIME")
|
|
|
|
TESTARR_ELEM (abday, 7);
|
|
TESTARR_ELEM (day, 7);
|
|
TESTARR_ELEM (abmon, 12);
|
|
TESTARR_ELEM (mon, 12);
|
|
TESTARR_ELEM (am_pm, 2);
|
|
|
|
#define TEST_ELEM(cat) \
|
|
if (time->cat == NULL) \
|
|
error (0, 0, _("field `%s' in category `%s' not defined"), \
|
|
#cat, "LC_TIME")
|
|
|
|
TEST_ELEM (d_t_fmt);
|
|
TEST_ELEM (d_fmt);
|
|
TEST_ELEM (t_fmt);
|
|
TEST_ELEM (t_fmt_ampm);
|
|
}
|
|
|
|
|
|
void
|
|
time_output (struct localedef_t *locale, const char *output_path)
|
|
{
|
|
struct locale_time_t *time = locale->categories[LC_TIME].time;
|
|
struct iovec iov[2 + _NL_ITEM_INDEX (_NL_NUM_LC_TIME)
|
|
+ time->cur_num_alt_digits];
|
|
struct locale_file data;
|
|
u_int32_t idx[_NL_ITEM_INDEX (_NL_NUM_LC_TIME)];
|
|
size_t cnt, last_idx, num;
|
|
|
|
if ((locale->binary & (1 << LC_TIME)) != 0)
|
|
{
|
|
iov[0].iov_base = time;
|
|
iov[0].iov_len = locale->len[LC_TIME];
|
|
|
|
write_locale_data (output_path, "LC_TIME", 1, iov);
|
|
|
|
return;
|
|
}
|
|
|
|
data.magic = LIMAGIC (LC_TIME);
|
|
data.n = _NL_ITEM_INDEX (_NL_NUM_LC_TIME);
|
|
iov[0].iov_base = (void *) &data;
|
|
iov[0].iov_len = sizeof (data);
|
|
|
|
iov[1].iov_base = (void *) idx;
|
|
iov[1].iov_len = sizeof (idx);
|
|
|
|
idx[0] = iov[0].iov_len + iov[1].iov_len;
|
|
|
|
/* The ab'days. */
|
|
for (cnt = 0; cnt <= _NL_ITEM_INDEX (ABDAY_7); ++cnt)
|
|
{
|
|
iov[2 + cnt].iov_base =
|
|
(void *) (time->abday[cnt - _NL_ITEM_INDEX (ABDAY_1)] ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
}
|
|
|
|
/* The days. */
|
|
for (; cnt <= _NL_ITEM_INDEX (DAY_7); ++cnt)
|
|
{
|
|
iov[2 + cnt].iov_base =
|
|
(void *) (time->day[cnt - _NL_ITEM_INDEX (DAY_1)] ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
}
|
|
|
|
/* The ab'mons. */
|
|
for (; cnt <= _NL_ITEM_INDEX (ABMON_12); ++cnt)
|
|
{
|
|
iov[2 + cnt].iov_base =
|
|
(void *) (time->abmon[cnt - _NL_ITEM_INDEX (ABMON_1)] ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
}
|
|
|
|
/* The mons. */
|
|
for (; cnt <= _NL_ITEM_INDEX (MON_12); ++cnt)
|
|
{
|
|
iov[2 + cnt].iov_base =
|
|
(void *) (time->mon[cnt - _NL_ITEM_INDEX (MON_1)] ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
}
|
|
|
|
/* AM/PM. */
|
|
for (; cnt <= _NL_ITEM_INDEX (PM_STR); ++cnt)
|
|
{
|
|
iov[2 + cnt].iov_base =
|
|
(void *) (time->am_pm[cnt - _NL_ITEM_INDEX (AM_STR)] ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
}
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->d_t_fmt ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->d_fmt ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->t_fmt ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->t_fmt_ampm ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->era ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->era_year ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->era_d_fmt ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
last_idx = ++cnt;
|
|
|
|
idx[1 + last_idx] = idx[last_idx];
|
|
for (num = 0; num < time->cur_num_alt_digits; ++num, ++cnt)
|
|
{
|
|
iov[2 + cnt].iov_base = (void *) (time->alt_digits[num] ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + last_idx] += iov[2 + cnt].iov_len;
|
|
}
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->era_d_t_fmt ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->era_d_fmt ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
++cnt;
|
|
|
|
assert (cnt == (_NL_ITEM_INDEX (_NL_NUM_LC_TIME) - 1
|
|
+ time->cur_num_alt_digits));
|
|
|
|
write_locale_data (output_path, "LC_TIME", 2 + cnt, iov);
|
|
}
|
|
|
|
|
|
void
|
|
time_add (struct linereader *lr, struct localedef_t *locale,
|
|
enum token_t tok, struct token *code,
|
|
struct charset_t *charset)
|
|
{
|
|
struct locale_time_t *time = locale->categories[LC_TIME].time;
|
|
|
|
switch (tok)
|
|
{
|
|
#define STRARR_ELEM(cat, max) \
|
|
case tok_##cat: \
|
|
if (time->cur_num_##cat >= max) \
|
|
lr_error (lr, _(" \
|
|
too many values for field `%s' in category `LC_TIME'"), \
|
|
#cat, "LC_TIME"); \
|
|
else if (code->val.str.start == NULL) \
|
|
{ \
|
|
lr_error (lr, _("unknown character in field `%s' of category `%s'"),\
|
|
#cat, "LC_TIME"); \
|
|
time->cat[time->cur_num_##cat++] = ""; \
|
|
} \
|
|
else \
|
|
time->cat[time->cur_num_##cat++] \
|
|
= code->val.str.start; \
|
|
break
|
|
|
|
STRARR_ELEM (abday, 7);
|
|
STRARR_ELEM (day, 7);
|
|
STRARR_ELEM (abmon, 12);
|
|
STRARR_ELEM (mon, 12);
|
|
STRARR_ELEM (am_pm, 2);
|
|
STRARR_ELEM (alt_digits, 100);
|
|
|
|
#define STR_ELEM(cat) \
|
|
case tok_##cat: \
|
|
if (time->cat != NULL) \
|
|
lr_error (lr, _("\
|
|
field `%s' in category `%s' declared more than once"), \
|
|
#cat, "LC_TIME"); \
|
|
else if (code->val.str.start == NULL) \
|
|
{ \
|
|
lr_error (lr, _("unknown character in field `%s' of category `%s'"),\
|
|
#cat, "LC_TIME"); \
|
|
time->cat = ""; \
|
|
} \
|
|
else \
|
|
time->cat = code->val.str.start; \
|
|
break
|
|
|
|
STR_ELEM (d_t_fmt);
|
|
STR_ELEM (d_fmt);
|
|
STR_ELEM (t_fmt);
|
|
STR_ELEM (t_fmt_ampm);
|
|
STR_ELEM (era);
|
|
STR_ELEM (era_year);
|
|
STR_ELEM (era_d_t_fmt);
|
|
STR_ELEM (era_d_fmt);
|
|
STR_ELEM (era_t_fmt);
|
|
|
|
default:
|
|
assert (! "unknown token in category `LC_TIME': should not happen");
|
|
}
|
|
}
|