2009-01-11 05:45:45 +03:00
|
|
|
/* $NetBSD: nb_lc_time_misc.h,v 1.2 2009/01/11 02:46:29 christos Exp $ */
|
Fixes PR lib/39662, shortcomings in LC_{MONETARY,NUMERIC,TIME,MESSAGES} db format.
ok'ed by core and releng.
(thanks for agc@, snj@ and i'm sorry for long time patience).
[libc]
- localeio.[ch] and lc*.[ch] in src/lib/libc/locale was replaced by
new locale-db implementation using citrus_db backend,
see src/lib/libc/citrus/citrus_lc_*.[ch].
- add citrus_bcs_strtou?l.c. don't use strtou?l locale implementation
internally, because they're locale-aware function.
- add some stubs for multi-locale issue, see {current,global}_locale.c.
- remove some obsolete file, setrunelocale.c, ___runetype_mb.c.
- remove __savectype() from ctypeio.[ch].
[tools]
- mklocale(1): add new option ``-t'' that generates new style
LC_{MONETARY,NUMERIC,TIME,MESSAGES} locale-db format.
- chrtbl(1): added ctypeio.[ch] for __savectype().
[locale-db]
- added en_US.US-ASCII locale.
- removed some shareable locale definition file:
en_US.US-ASCII -> en_US.ISO8859-1, en_US.UTF-8
zh_CN.eucCN -> zh_CN.GB18030
and more...see src/share/locale/*/Makefile.
- remove obsoleted locale sr_YU, added new locale sr_ME, sr_RS.
- change locale name ja_JP.ISO2022-JP* -> ja_JP.ISO-2022-JP*
for X11's locale.alias file alignments.
- fix regression test, wrong wcs?width(3), NAN/INF usage.
i tested release-build following arch:
i386, amd64, hpc{mips,arm,sh}, sparc64, vax.
citrus_lc_*.[ch] also can read old-plain-text style locale-db.
so that backward compatibility is keeped, but lc*.[ch] can't read
new citrus_db'ed locale-db and localeio.c never check sanity,
so forward compatibility is broken ;-<
old mklocale(1) doesn't know -t option, so you have to rebuild toolchain.
2009-01-02 03:20:18 +03:00
|
|
|
|
|
|
|
/*-
|
|
|
|
* Copyright (c)2008 Citrus Project,
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _NB_LC_TIME_MISC_H_
|
|
|
|
#define _NB_LC_TIME_MISC_H_
|
|
|
|
|
|
|
|
/*
|
|
|
|
* macro required by nb_lc_template(_decl).h
|
|
|
|
*/
|
|
|
|
#define _CATEGORY_TYPE _TimeLocale
|
|
|
|
|
|
|
|
#define ABDAY_IDX(idx) ((size_t)idx - (size_t)ABDAY_1)
|
|
|
|
#define DAY_IDX(idx) ((size_t)idx - (size_t)DAY_1)
|
|
|
|
#define ABMON_IDX(idx) ((size_t)idx - (size_t)ABMON_1)
|
|
|
|
#define MON_IDX(idx) ((size_t)idx - (size_t)MON_1)
|
|
|
|
#define AM_PM_IDX(idx) ((size_t)idx - (size_t)AM_STR)
|
|
|
|
|
|
|
|
static __inline void
|
|
|
|
/*ARGSUSED*/
|
|
|
|
_PREFIX(build_cache)(struct _locale_cache_t * __restrict cache,
|
|
|
|
_TimeLocale * __restrict data)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
_DIAGASSERT(cache != NULL);
|
|
|
|
_DIAGASSERT(data != NULL);
|
|
|
|
|
|
|
|
for (i = (size_t)ABDAY_1; i <= ABDAY_7; ++i)
|
|
|
|
cache->items[i] = data->abday[ABDAY_IDX(i)];
|
|
|
|
for (i = (size_t)DAY_1; i <= DAY_7; ++i)
|
|
|
|
cache->items[i] = data->day[DAY_IDX(i)];
|
|
|
|
for (i = (size_t)ABMON_1; i <= ABMON_12; ++i)
|
|
|
|
cache->items[i] = data->abmon[ABMON_IDX(i)];
|
|
|
|
for (i = (size_t)MON_1; i <= MON_12; ++i)
|
|
|
|
cache->items[i] = data->mon[MON_IDX(i)];
|
|
|
|
for (i = (size_t)AM_STR; i <= PM_STR; ++i)
|
|
|
|
cache->items[i] = data->am_pm[AM_PM_IDX(i)];
|
|
|
|
cache->items[(size_t)D_T_FMT ] = data->d_t_fmt;
|
|
|
|
cache->items[(size_t)D_FMT ] = data->d_fmt;
|
|
|
|
cache->items[(size_t)T_FMT ] = data->t_fmt;
|
|
|
|
cache->items[(size_t)T_FMT_AMPM ] = data->t_fmt_ampm;
|
|
|
|
|
|
|
|
/* NOT IMPLEMENTED YET */
|
|
|
|
cache->items[(size_t)ERA ] = NULL;
|
|
|
|
cache->items[(size_t)ERA_D_FMT ] = NULL;
|
|
|
|
cache->items[(size_t)ERA_D_T_FMT] = NULL;
|
|
|
|
cache->items[(size_t)ERA_T_FMT ] = NULL;
|
|
|
|
cache->items[(size_t)ALT_DIGITS ] = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __inline void
|
|
|
|
_PREFIX(fixup)(_TimeLocale *data)
|
|
|
|
{
|
|
|
|
_DIAGASSERT(data != NULL);
|
|
|
|
|
|
|
|
_CurrentTimeLocale = data;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* macro required by nb_lc_template.h
|
|
|
|
*/
|
|
|
|
#define _CATEGORY_ID LC_TIME
|
|
|
|
#define _CATEGORY_NAME "LC_TIME"
|
|
|
|
#define _CATEGORY_DEFAULT _DefaultTimeLocale
|
|
|
|
|
|
|
|
#endif /*_NB_LC_TIME_MISC_H_*/
|