2018-01-01 08:32:25 +08:00
|
|
|
/* Copyright (C) 2002-2018 Free Software Foundation, Inc.
|
2002-08-28 06:57:05 +08:00
|
|
|
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
|
2012-02-10 07:18:22 +08:00
|
|
|
License along with the GNU C Library; if not, see
|
|
|
|
|
<http://www.gnu.org/licenses/>. */
|
2002-08-28 06:57:05 +08:00
|
|
|
|
2004-03-15 05:12:06 +08:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
|
# include <config.h>
|
|
|
|
|
#endif
|
2002-08-28 06:57:05 +08:00
|
|
|
|
2004-08-09 06:20:57 +08:00
|
|
|
#include <assert.h>
|
2004-03-15 05:12:06 +08:00
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <langinfo.h>
|
|
|
|
|
#include <limits.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <time.h>
|
2004-08-10 03:47:44 +08:00
|
|
|
#include <stdbool.h>
|
2004-03-15 05:12:06 +08:00
|
|
|
|
|
|
|
|
#ifdef _LIBC
|
2014-07-10 16:51:27 +08:00
|
|
|
# define HAVE_LOCALTIME_R 0
|
2004-03-15 05:12:06 +08:00
|
|
|
# include "../locale/localeinfo.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if ! HAVE_LOCALTIME_R && ! defined localtime_r
|
|
|
|
|
# ifdef _LIBC
|
|
|
|
|
# define localtime_r __localtime_r
|
|
|
|
|
# else
|
|
|
|
|
/* Approximate localtime_r as best we can in its absence. */
|
|
|
|
|
# define localtime_r my_localtime_r
|
2008-06-28 05:36:13 +08:00
|
|
|
static struct tm *localtime_r (const time_t *, struct tm *);
|
2004-03-15 05:12:06 +08:00
|
|
|
static struct tm *
|
2015-10-20 19:54:09 +08:00
|
|
|
localtime_r (const time_t *t, struct tm *tp)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
|
|
|
|
struct tm *l = localtime (t);
|
|
|
|
|
if (! l)
|
|
|
|
|
return 0;
|
|
|
|
|
*tp = *l;
|
|
|
|
|
return tp;
|
|
|
|
|
}
|
|
|
|
|
# endif /* ! _LIBC */
|
|
|
|
|
#endif /* ! HAVE_LOCALTIME_R && ! defined (localtime_r) */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define match_char(ch1, ch2) if (ch1 != ch2) return NULL
|
|
|
|
|
#if defined __GNUC__ && __GNUC__ >= 2
|
|
|
|
|
# define match_string(cs1, s2) \
|
|
|
|
|
({ size_t len = strlen (cs1); \
|
|
|
|
|
int result = __strncasecmp_l ((cs1), (s2), len, locale) == 0; \
|
|
|
|
|
if (result) (s2) += len; \
|
|
|
|
|
result; })
|
|
|
|
|
#else
|
|
|
|
|
/* Oh come on. Get a reasonable compiler. */
|
|
|
|
|
# define match_string(cs1, s2) \
|
|
|
|
|
(strncasecmp ((cs1), (s2), strlen (cs1)) ? 0 : ((s2) += strlen (cs1), 1))
|
|
|
|
|
#endif
|
|
|
|
|
/* We intentionally do not use isdigit() for testing because this will
|
|
|
|
|
lead to problems with the wide character version. */
|
|
|
|
|
#define get_number(from, to, n) \
|
|
|
|
|
do { \
|
|
|
|
|
int __n = n; \
|
|
|
|
|
val = 0; \
|
2013-04-23 18:02:42 +08:00
|
|
|
while (ISSPACE (*rp)) \
|
2004-03-15 05:12:06 +08:00
|
|
|
++rp; \
|
|
|
|
|
if (*rp < '0' || *rp > '9') \
|
|
|
|
|
return NULL; \
|
|
|
|
|
do { \
|
|
|
|
|
val *= 10; \
|
|
|
|
|
val += *rp++ - '0'; \
|
|
|
|
|
} while (--__n > 0 && val * 10 <= to && *rp >= '0' && *rp <= '9'); \
|
|
|
|
|
if (val < from || val > to) \
|
|
|
|
|
return NULL; \
|
|
|
|
|
} while (0)
|
|
|
|
|
#ifdef _NL_CURRENT
|
|
|
|
|
# define get_alt_number(from, to, n) \
|
|
|
|
|
({ \
|
|
|
|
|
__label__ do_normal; \
|
|
|
|
|
\
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided != raw) \
|
2004-03-15 05:12:06 +08:00
|
|
|
{ \
|
|
|
|
|
val = _nl_parse_alt_digit (&rp HELPER_LOCALE_ARG); \
|
2007-07-29 03:08:57 +08:00
|
|
|
if (val == -1 && s.decided != loc) \
|
2004-03-15 05:12:06 +08:00
|
|
|
{ \
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = loc; \
|
2004-03-15 05:12:06 +08:00
|
|
|
goto do_normal; \
|
|
|
|
|
} \
|
|
|
|
|
if (val < from || val > to) \
|
|
|
|
|
return NULL; \
|
|
|
|
|
} \
|
|
|
|
|
else \
|
|
|
|
|
{ \
|
|
|
|
|
do_normal: \
|
|
|
|
|
get_number (from, to, n); \
|
|
|
|
|
} \
|
|
|
|
|
0; \
|
|
|
|
|
})
|
|
|
|
|
#else
|
|
|
|
|
# define get_alt_number(from, to, n) \
|
|
|
|
|
/* We don't have the alternate representation. */ \
|
|
|
|
|
get_number(from, to, n)
|
|
|
|
|
#endif
|
|
|
|
|
#define recursive(new_fmt) \
|
|
|
|
|
(*(new_fmt) != '\0' \
|
2007-07-29 03:08:57 +08:00
|
|
|
&& (rp = __strptime_internal (rp, (new_fmt), tm, &s LOCALE_ARG)) != NULL)
|
2004-03-15 05:12:06 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
/* This is defined in locale/C-time.c in the GNU libc. */
|
2010-01-10 02:56:41 +08:00
|
|
|
extern const struct __locale_data _nl_C_LC_TIME attribute_hidden;
|
2004-03-15 05:12:06 +08:00
|
|
|
|
|
|
|
|
# define weekday_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (DAY_1)].string)
|
|
|
|
|
# define ab_weekday_name \
|
|
|
|
|
(&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABDAY_1)].string)
|
|
|
|
|
# define month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (MON_1)].string)
|
|
|
|
|
# define ab_month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABMON_1)].string)
|
Implement alternative month names (bug 10871).
Some languages (Slavic, Baltic, etc.) require a genitive case of the
month name when formatting a full date (with the day number) while
they require a nominative case when referring to the month standalone.
This requirement cannot be fulfilled without providing two forms for
each month name. From now it is specified that nl_langinfo(MON_1)
series (up to MON_12) and strftime("%B") generate the month names in
the grammatical form used when the month is a part of a complete date.
If the grammatical form used when the month is named by itself is needed,
the new values nl_langinfo(ALTMON_1) (up to ALTMON_12) and
strftime("%OB") are supported. This new feature is optional so the
languages which do not need it or do not yet provide the updated
locales simply do not use it and their behaviour is unchanged.
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add alternative month names,
define them as the same as primary full month names explicitly.
* locale/categories.def (LC_TIME): Add alt_mon and wide-alt_mon.
* locale/langinfo.h (__ALTMON_1, __ALTMON_2, __ALTMON_3, __ALTMON_4,
__ALTMON_5, __ALTMON_6, __ALTMON_7, __ALTMON_8, __ALTMON_9, __ALTMON_10,
__ALTMON_11, __ALTMON_12, _NL_WALTMON_1, _NL_WALTMON_2, _NL_WALTMON_3,
_NL_WALTMON_4, _NL_WALTMON_5, _NL_WALTMON_6, _NL_WALTMON_7,
_NL_WALTMON_8, _NL_WALTMON_9, _NL_WALTMON_10, _NL_WALTMON_11,
_NL_WALTMON_12): New enum constants.
[__USE_GNU] (ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, ALTMON_5, ALTMON_6,
ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, ALTMON_11, ALTMON_12): New
macros.
* locale/programs/ld-time.c (struct locale_time_t): Add alt_mon,
walt_mon, and alt_mon_defined members.
(time_output): Output alt_mon and walt_mon members.
(time_read): Read them, initialize them as copies of mon and wmon
respectively if they are missing, initialize alt_mon_defined.
* locale/programs/locfile-kw.gperf (alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_alt_mon): New enum constant.
* localedata/tst-langinfo.c (map): Add tests for the new constants
ALTMON_1 .. ALTMON_12.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add fr_FR.UTF-8
and pl_PL.UTF-8.
* time/strftime_l.c (f_altmonth): New macro.
(__strftime_internal): Handle %OB format.
* time/strptime_l.c [_LIBC] (alt_month_name): New macro.
(__strptime_internal): Handle %OB format.
* time/tst-strptime.c (day_tests): Add tests to parse different forms
of month names including the new %OB format specifier.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
2017-11-14 09:19:35 +08:00
|
|
|
# define alt_month_name \
|
|
|
|
|
(&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ALTMON_1)].string)
|
Abbreviated alternative month names (%Ob) also added (bug 10871).
All the previous changes also repeated to support abbreviated
alternative month names. In most languages which have declension and
need nominative/genitive month names the abbreviated forms for both
cases are the same. An example where they do differ is May in Russian:
this name is too short to be abbreviated so even the abbreviated form
features the declension suffixes.
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add abbreviated alternative month
names, define them as the same as abbreviated month names explicitly.
* locale/categories.def (LC_TIME): Add ab_alt_mon and wide-ab_alt_mon.
* locale/langinfo.h: (_NL_ABALTMON_1, _NL_ABALTMON_2, _NL_ABALTMON_3,
_NL_ABALTMON_4, _NL_ABALTMON_5, _NL_ABALTMON_6, _NL_ABALTMON_7,
_NL_ABALTMON_8, _NL_ABALTMON_9, _NL_ABALTMON_10, _NL_ABALTMON_11,
_NL_ABALTMON_12, _NL_WABALTMON_1, _NL_WABALTMON_2, _NL_WABALTMON_3,
_NL_WABALTMON_4, _NL_WABALTMON_5, _NL_WABALTMON_6, _NL_WABALTMON_7,
_NL_WABALTMON_8, _NL_WABALTMON_9, _NL_WABALTMON_10, _NL_WABALTMON_11,
_NL_WABALTMON_12): New enum constants.
* locale/programs/ld-time.c (struct locale_time_t): Add ab_alt_mon,
wab_alt_mon, and ab_alt_mon_defined members.
(time_output): Output ab_alt_mon and wab_alt_mon members.
(time_read): Read them, initialize them as copies of abmon and wabmon
respectively if they are missing, initialize ab_alt_mon_defined.
* locale/programs/locfile-kw.gperf (ab_alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_ab_alt_mon): New enum constant.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add es_ES.UTF-8
and ru_RU.UTF-8.
* time/strftime_l.c (a_altmonth, aam_len): New macros.
[!COMPILE_WIDE] (ABALTMON_1): New macro.
(__strftime_internal): Handle %Ob and %Oh formats.
* time/strptime_l.c [_LIBC] (ab_alt_month_name): New macro.
(__strptime_internal): Handle %Ob and %Oh formats.
* time/tst-strptime.c (day_tests): Add more tests to parse different
forms of month names including the new %Ob format specifier.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
2017-11-14 09:22:38 +08:00
|
|
|
# define ab_alt_month_name \
|
|
|
|
|
(&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (_NL_ABALTMON_1)].string)
|
2004-03-15 05:12:06 +08:00
|
|
|
# define HERE_D_T_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_T_FMT)].string)
|
|
|
|
|
# define HERE_D_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_FMT)].string)
|
|
|
|
|
# define HERE_AM_STR (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (AM_STR)].string)
|
|
|
|
|
# define HERE_PM_STR (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (PM_STR)].string)
|
|
|
|
|
# define HERE_T_FMT_AMPM \
|
|
|
|
|
(_nl_C_LC_TIME.values[_NL_ITEM_INDEX (T_FMT_AMPM)].string)
|
|
|
|
|
# define HERE_T_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (T_FMT)].string)
|
|
|
|
|
|
|
|
|
|
# define strncasecmp(s1, s2, n) __strncasecmp (s1, s2, n)
|
|
|
|
|
#else
|
|
|
|
|
static char const weekday_name[][10] =
|
|
|
|
|
{
|
|
|
|
|
"Sunday", "Monday", "Tuesday", "Wednesday",
|
|
|
|
|
"Thursday", "Friday", "Saturday"
|
|
|
|
|
};
|
|
|
|
|
static char const ab_weekday_name[][4] =
|
|
|
|
|
{
|
|
|
|
|
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
|
|
|
|
|
};
|
|
|
|
|
static char const month_name[][10] =
|
|
|
|
|
{
|
|
|
|
|
"January", "February", "March", "April", "May", "June",
|
|
|
|
|
"July", "August", "September", "October", "November", "December"
|
|
|
|
|
};
|
|
|
|
|
static char const ab_month_name[][4] =
|
|
|
|
|
{
|
|
|
|
|
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
|
|
|
|
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
|
|
|
|
|
};
|
|
|
|
|
# define HERE_D_T_FMT "%a %b %e %H:%M:%S %Y"
|
|
|
|
|
# define HERE_D_FMT "%m/%d/%y"
|
|
|
|
|
# define HERE_AM_STR "AM"
|
|
|
|
|
# define HERE_PM_STR "PM"
|
|
|
|
|
# define HERE_T_FMT_AMPM "%I:%M:%S %p"
|
|
|
|
|
# define HERE_T_FMT "%H:%M:%S"
|
|
|
|
|
|
|
|
|
|
static const unsigned short int __mon_yday[2][13] =
|
|
|
|
|
{
|
|
|
|
|
/* Normal years. */
|
|
|
|
|
{ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
|
|
|
|
|
/* Leap years. */
|
|
|
|
|
{ 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
|
|
|
|
|
};
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if defined _LIBC
|
|
|
|
|
/* We use this code also for the extended locale handling where the
|
|
|
|
|
function gets as an additional argument the locale which has to be
|
|
|
|
|
used. To access the values we have to redefine the _NL_CURRENT
|
|
|
|
|
macro. */
|
|
|
|
|
# define strptime __strptime_l
|
|
|
|
|
# undef _NL_CURRENT
|
|
|
|
|
# define _NL_CURRENT(category, item) \
|
|
|
|
|
(current->values[_NL_ITEM_INDEX (item)].string)
|
|
|
|
|
# undef _NL_CURRENT_WORD
|
|
|
|
|
# define _NL_CURRENT_WORD(category, item) \
|
|
|
|
|
(current->values[_NL_ITEM_INDEX (item)].word)
|
Use locale_t, not __locale_t, throughout glibc
<locale.h> is specified to define locale_t in POSIX.1-2008, and so are
all of the headers that define functions that take locale_t arguments.
Under _GNU_SOURCE, the additional headers that define such functions
have also always defined locale_t. Therefore, there is no need to use
__locale_t in public function prototypes, nor in any internal code.
* ctype/ctype-c99_l.c, ctype/ctype.h, ctype/ctype_l.c
* include/monetary.h, include/stdlib.h, include/time.h
* include/wchar.h, locale/duplocale.c, locale/freelocale.c
* locale/global-locale.c, locale/langinfo.h, locale/locale.h
* locale/localeinfo.h, locale/newlocale.c
* locale/nl_langinfo_l.c, locale/uselocale.c
* localedata/bug-usesetlocale.c, localedata/tst-xlocale2.c
* stdio-common/vfscanf.c, stdlib/monetary.h, stdlib/stdlib.h
* stdlib/strfmon_l.c, stdlib/strtod_l.c, stdlib/strtof_l.c
* stdlib/strtol.c, stdlib/strtol_l.c, stdlib/strtold_l.c
* stdlib/strtoll_l.c, stdlib/strtoul_l.c, stdlib/strtoull_l.c
* string/strcasecmp.c, string/strcoll_l.c, string/string.h
* string/strings.h, string/strncase.c, string/strxfrm_l.c
* sysdeps/ieee754/float128/strtof128_l.c
* sysdeps/ieee754/float128/wcstof128.c
* sysdeps/ieee754/float128/wcstof128_l.c
* sysdeps/ieee754/ldbl-128ibm/strtold_l.c
* sysdeps/ieee754/ldbl-64-128/strtold_l.c
* sysdeps/ieee754/ldbl-opt/nldbl-compat.c
* sysdeps/ieee754/ldbl-opt/nldbl-strfmon_l.c
* sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c
* sysdeps/ieee754/ldbl-opt/nldbl-wcstold_l.c
* sysdeps/powerpc/powerpc32/power7/strcasecmp.S
* sysdeps/powerpc/powerpc64/power7/strcasecmp.S
* sysdeps/x86_64/strcasecmp_l-nonascii.c
* sysdeps/x86_64/strncase_l-nonascii.c, time/strftime_l.c
* time/strptime_l.c, time/time.h, wcsmbs/mbsrtowcs_l.c
* wcsmbs/wchar.h, wcsmbs/wcscasecmp.c, wcsmbs/wcsncase.c
* wcsmbs/wcstod.c, wcsmbs/wcstod_l.c, wcsmbs/wcstof.c
* wcsmbs/wcstof_l.c, wcsmbs/wcstol_l.c, wcsmbs/wcstold.c
* wcsmbs/wcstold_l.c, wcsmbs/wcstoll_l.c, wcsmbs/wcstoul_l.c
* wcsmbs/wcstoull_l.c, wctype/iswctype_l.c
* wctype/towctrans_l.c, wctype/wcfuncs_l.c
* wctype/wctrans_l.c, wctype/wctype.h, wctype/wctype_l.c:
Change all uses of __locale_t to locale_t.
2017-06-20 21:26:43 +08:00
|
|
|
# define LOCALE_PARAM , locale_t locale
|
2004-03-15 05:12:06 +08:00
|
|
|
# define LOCALE_ARG , locale
|
|
|
|
|
# define HELPER_LOCALE_ARG , current
|
|
|
|
|
# define ISSPACE(Ch) __isspace_l (Ch, locale)
|
|
|
|
|
#else
|
|
|
|
|
# define LOCALE_PARAM
|
|
|
|
|
# define LOCALE_ARG
|
|
|
|
|
# define HELPER_LOCALE_ARG
|
|
|
|
|
# define ISSPACE(Ch) isspace (Ch)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef __isleap
|
|
|
|
|
/* Nonzero if YEAR is a leap year (every 4 years,
|
|
|
|
|
except every 100th isn't, and every 400th is). */
|
|
|
|
|
# define __isleap(year) \
|
|
|
|
|
((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Compute the day of the week. */
|
|
|
|
|
static void
|
|
|
|
|
day_of_the_week (struct tm *tm)
|
|
|
|
|
{
|
|
|
|
|
/* We know that January 1st 1970 was a Thursday (= 4). Compute the
|
2011-04-23 09:34:32 +08:00
|
|
|
difference between this data in the one on TM and so determine
|
2004-03-15 05:12:06 +08:00
|
|
|
the weekday. */
|
|
|
|
|
int corr_year = 1900 + tm->tm_year - (tm->tm_mon < 2);
|
|
|
|
|
int wday = (-473
|
|
|
|
|
+ (365 * (tm->tm_year - 70))
|
|
|
|
|
+ (corr_year / 4)
|
|
|
|
|
- ((corr_year / 4) / 25) + ((corr_year / 4) % 25 < 0)
|
|
|
|
|
+ (((corr_year / 4) / 25) / 4)
|
|
|
|
|
+ __mon_yday[0][tm->tm_mon]
|
|
|
|
|
+ tm->tm_mday - 1);
|
|
|
|
|
tm->tm_wday = ((wday % 7) + 7) % 7;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Compute the day of the year. */
|
|
|
|
|
static void
|
|
|
|
|
day_of_the_year (struct tm *tm)
|
|
|
|
|
{
|
|
|
|
|
tm->tm_yday = (__mon_yday[__isleap (1900 + tm->tm_year)][tm->tm_mon]
|
|
|
|
|
+ (tm->tm_mday - 1));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
char *
|
|
|
|
|
#else
|
|
|
|
|
static char *
|
|
|
|
|
#endif
|
Convert miscellaneous function definitions to prototype style.
This patch converts various miscellaneous functions definitions in
glibc, found with grep and not covered by my previous scripted
conversions, from old-style K&R to prototype-style. These changes
were made manually. This is not necessarily exhaustive as formatting
variants may have prevented my grep from finding some such
definitions.
Regarding the changes to files from GMP, they may originally have been
omitted when removing __STDC__ conditionals because of the files
coming from another package, but (a) GMP no longer has __STDC__
conditionals there anyway and (b) we don't try to keep these files
verbatim in sync with GMP (and there are licensing differences), so
making the change to them in glibc seems reasonable.
Tested for x86_64 and x86 (testsuite - this patch affects files
containing assertions).
* debug/fortify_fail.c (__fortify_fail): Convert to
prototype-style function definition. Use internal_function.
* libio/genops.c (save_for_backup): Convert to prototype-style
function definition.
* libio/wgenops.c (save_for_wbackup): Likewise.
* login/grantpt.c (grantpt): Likewise.
* login/ptsname.c (ptsname): Likewise.
(__ptsname_r): Likewise.
* login/unlockpt.c (unlockpt): Likewise.
* mach/msgserver.c (__mach_msg_server): Likewise.
* misc/efgcvt.c (__APPEND (FUNC_PREFIX, fcvt)): Likewise.
(__APPEND (FUNC_PREFIX, ecvt)): Likewise.
(__APPEND (FUNC_PREFIX, gcvt)): Likewise.
* misc/efgcvt_r.c (__APPEND (FUNC_PREFIX, fcvt_r)): Likewise.
(__APPEND (FUNC_PREFIX, ecvt_r)): Likewise.
* nptl/cleanup_compat.c (_pthread_cleanup_push): Likewise.
* nptl/cleanup_defer_compat.c (_pthread_cleanup_push_defer):
Likewise.
* nptl/libc_pthread_init.c (__libc_pthread_init): Likewise. Use
internal_function.
* nptl/pthread_atfork.c (__pthread_atfork): Convert to
prototype-style function definition.
* nptl/pthread_create.c (__pthread_create_2_1): Likewise.
[SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)]
(__pthread_create_2_0): Likewise.
* nptl/pthread_key_create.c (__pthread_key_create): Likewise.
* nptl/register-atfork.c (__register_atfork): Likewise.
* posix/glob.c (glob): Likewise.
* posix/regcomp.c (re_comp): Likewise.
* posix/regexec.c (re_exec): Likewise.
* stdlib/add_n.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/cmp.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/divmod_1.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/divrem.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/lshift.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/mod_1.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/mul.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/mul_n.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/rshift.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/strtod.c (INTERNAL (STRTOF)): Convert to prototype-style
function definition.
(STRTOF): Likewise.
* stdlib/strtod_l.c (__STRTOF): Likewise.
* stdlib/strtol.c (INTERNAL (strtol)): Likewise.
* stdlib/strtol_l.c (INTERNAL (__strtol_l)): Likewise.
(__strtol_l): Likewise.
* stdlib/sub_n.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* string/memrchr.c (MEMRCHR): Convert to prototype-style function
definition.
* string/strcasecmp.c (LOCALE_PARAM_DECL): Remove macro.
[USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
type.
(__strcasecmp): Convert to prototype-style function definition.
* string/strncase.c (LOCALE_PARAM_DECL): Remove macro.
[USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
type.
(__strncasecmp): Convert to prototype-style function definition.
* sunrpc/pm_getport.c (__libc_rpc_getport): Likewise.
* sunrpc/xdr.c (xdr_union): Likewise.
* sunrpc/xdr_array.c (xdr_array): Likewise.
* sunrpc/xdr_ref.c (xdr_reference): Likewise.
* sysdeps/m68k/m680x0/fpu/s_atan.c (__CONCATX(__,FUNC)): Likewise.
* sysdeps/m68k/m680x0/fpu/s_isinf.c (__CONCATX(__,FUNC)):
Likewise.
* sysdeps/m68k/m680x0/fpu/s_scalbn.c (__CONCATX(__scalbn,suffix):
Likewise.
* sysdeps/m68k/m680x0/fpu/s_sincos.c (CONCATX(__,FUNC)): Likewise.
* sysdeps/unix/sysv/linux/i386/scandir64.c (__old_scandir64):
Likewise.
* time/strftime_l.c (LOCALE_PARAM_DECL): Remove macro.
(LOCALE_PARAM_PROTO): Likewise.
[_LIBC && USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include
argument type.
(ut_argument_spec): Remove macro.
(ut_argument_spec_iso): Rename to ut_argument_spec.
(memcpy_lowcase): Use LOCALE_PARAM in declaration. Convert to
prototype-style function definition.
(memcpy_uppcase): Likewise.
(__strftime_internal): Likewise.
(my_strftime): Likewise.
* time/strptime_l.c (LOCALE_PARAM_PROTO): Remove macro.
(LOCALE_PARAM_DECL): Likewise.
[_LIBC] (LOCALE_PARAM): Include argument type.
(__strptime_internal): Convert to prototype-style function
definition.
(strptime): Likewise.
* wcsmbs/wcscasecmp.c (LOCALE_PARAM_DECL): Remove macro.
[USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
type.
(__wcscasecmp): Convert to prototype-style function definition.
* wcsmbs/wcsncase.c (LOCALE_PARAM_DECL): Remove macro.
[USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
type.
(__wcsncasecmp): Convert to prototype-style function definition.
2015-10-21 05:27:22 +08:00
|
|
|
__strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
|
|
|
|
|
void *statep LOCALE_PARAM)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
|
|
|
|
#ifdef _LIBC
|
2010-01-10 02:56:41 +08:00
|
|
|
struct __locale_data *const current = locale->__locales[LC_TIME];
|
2004-03-15 05:12:06 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
const char *rp_backup;
|
2007-07-11 06:14:12 +08:00
|
|
|
const char *rp_longest;
|
2004-03-15 05:12:06 +08:00
|
|
|
int cnt;
|
2007-07-11 06:14:12 +08:00
|
|
|
int cnt_longest;
|
2004-03-15 05:12:06 +08:00
|
|
|
size_t val;
|
|
|
|
|
size_t num_eras;
|
2007-07-29 03:08:57 +08:00
|
|
|
struct era_entry *era = NULL;
|
|
|
|
|
enum ptime_locale_status { not, loc, raw } decided_longest;
|
|
|
|
|
struct __strptime_state
|
|
|
|
|
{
|
|
|
|
|
unsigned int have_I : 1;
|
|
|
|
|
unsigned int have_wday : 1;
|
|
|
|
|
unsigned int have_yday : 1;
|
|
|
|
|
unsigned int have_mon : 1;
|
|
|
|
|
unsigned int have_mday : 1;
|
|
|
|
|
unsigned int have_uweek : 1;
|
|
|
|
|
unsigned int have_wweek : 1;
|
|
|
|
|
unsigned int is_pm : 1;
|
|
|
|
|
unsigned int want_century : 1;
|
|
|
|
|
unsigned int want_era : 1;
|
|
|
|
|
unsigned int want_xday : 1;
|
|
|
|
|
enum ptime_locale_status decided : 2;
|
|
|
|
|
signed char week_no;
|
|
|
|
|
signed char century;
|
|
|
|
|
int era_cnt;
|
|
|
|
|
} s;
|
|
|
|
|
struct tm tmb;
|
|
|
|
|
struct tm *tm;
|
|
|
|
|
|
|
|
|
|
if (statep == NULL)
|
|
|
|
|
{
|
|
|
|
|
memset (&s, 0, sizeof (s));
|
|
|
|
|
s.century = -1;
|
|
|
|
|
s.era_cnt = -1;
|
|
|
|
|
#ifdef _NL_CURRENT
|
|
|
|
|
s.decided = not;
|
|
|
|
|
#else
|
|
|
|
|
s.decided = raw;
|
|
|
|
|
#endif
|
|
|
|
|
tm = tmp;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
s = *(struct __strptime_state *) statep;
|
|
|
|
|
tmb = *tmp;
|
|
|
|
|
tm = &tmb;
|
|
|
|
|
}
|
2004-03-15 05:12:06 +08:00
|
|
|
|
|
|
|
|
while (*fmt != '\0')
|
|
|
|
|
{
|
|
|
|
|
/* A white space in the format string matches 0 more or white
|
|
|
|
|
space in the input string. */
|
|
|
|
|
if (ISSPACE (*fmt))
|
|
|
|
|
{
|
|
|
|
|
while (ISSPACE (*rp))
|
|
|
|
|
++rp;
|
|
|
|
|
++fmt;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Any character but `%' must be matched by the same character
|
|
|
|
|
in the iput string. */
|
|
|
|
|
if (*fmt != '%')
|
|
|
|
|
{
|
|
|
|
|
match_char (*fmt++, *rp++);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
++fmt;
|
2013-12-04 20:53:13 +08:00
|
|
|
/* We discard strftime modifiers. */
|
|
|
|
|
while (*fmt == '-' || *fmt == '_' || *fmt == '0'
|
|
|
|
|
|| *fmt == '^' || *fmt == '#')
|
|
|
|
|
++fmt;
|
|
|
|
|
|
|
|
|
|
/* And field width. */
|
|
|
|
|
while (*fmt >= '0' && *fmt <= '9')
|
|
|
|
|
++fmt;
|
2007-07-29 03:10:22 +08:00
|
|
|
|
Implement alternative month names (bug 10871).
Some languages (Slavic, Baltic, etc.) require a genitive case of the
month name when formatting a full date (with the day number) while
they require a nominative case when referring to the month standalone.
This requirement cannot be fulfilled without providing two forms for
each month name. From now it is specified that nl_langinfo(MON_1)
series (up to MON_12) and strftime("%B") generate the month names in
the grammatical form used when the month is a part of a complete date.
If the grammatical form used when the month is named by itself is needed,
the new values nl_langinfo(ALTMON_1) (up to ALTMON_12) and
strftime("%OB") are supported. This new feature is optional so the
languages which do not need it or do not yet provide the updated
locales simply do not use it and their behaviour is unchanged.
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add alternative month names,
define them as the same as primary full month names explicitly.
* locale/categories.def (LC_TIME): Add alt_mon and wide-alt_mon.
* locale/langinfo.h (__ALTMON_1, __ALTMON_2, __ALTMON_3, __ALTMON_4,
__ALTMON_5, __ALTMON_6, __ALTMON_7, __ALTMON_8, __ALTMON_9, __ALTMON_10,
__ALTMON_11, __ALTMON_12, _NL_WALTMON_1, _NL_WALTMON_2, _NL_WALTMON_3,
_NL_WALTMON_4, _NL_WALTMON_5, _NL_WALTMON_6, _NL_WALTMON_7,
_NL_WALTMON_8, _NL_WALTMON_9, _NL_WALTMON_10, _NL_WALTMON_11,
_NL_WALTMON_12): New enum constants.
[__USE_GNU] (ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, ALTMON_5, ALTMON_6,
ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, ALTMON_11, ALTMON_12): New
macros.
* locale/programs/ld-time.c (struct locale_time_t): Add alt_mon,
walt_mon, and alt_mon_defined members.
(time_output): Output alt_mon and walt_mon members.
(time_read): Read them, initialize them as copies of mon and wmon
respectively if they are missing, initialize alt_mon_defined.
* locale/programs/locfile-kw.gperf (alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_alt_mon): New enum constant.
* localedata/tst-langinfo.c (map): Add tests for the new constants
ALTMON_1 .. ALTMON_12.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add fr_FR.UTF-8
and pl_PL.UTF-8.
* time/strftime_l.c (f_altmonth): New macro.
(__strftime_internal): Handle %OB format.
* time/strptime_l.c [_LIBC] (alt_month_name): New macro.
(__strptime_internal): Handle %OB format.
* time/tst-strptime.c (day_tests): Add tests to parse different forms
of month names including the new %OB format specifier.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
2017-11-14 09:19:35 +08:00
|
|
|
/* In some cases, modifiers are handled by adjusting state and
|
|
|
|
|
then restarting the switch statement below. */
|
2004-03-15 05:12:06 +08:00
|
|
|
start_over:
|
|
|
|
|
|
|
|
|
|
/* Make back up of current processing pointer. */
|
|
|
|
|
rp_backup = rp;
|
|
|
|
|
|
|
|
|
|
switch (*fmt++)
|
|
|
|
|
{
|
|
|
|
|
case '%':
|
|
|
|
|
/* Match the `%' character itself. */
|
|
|
|
|
match_char ('%', *rp++);
|
|
|
|
|
break;
|
|
|
|
|
case 'a':
|
|
|
|
|
case 'A':
|
|
|
|
|
/* Match day of week. */
|
2007-07-11 06:14:12 +08:00
|
|
|
rp_longest = NULL;
|
2007-07-29 03:08:57 +08:00
|
|
|
decided_longest = s.decided;
|
2007-07-11 06:14:12 +08:00
|
|
|
cnt_longest = -1;
|
2004-03-15 05:12:06 +08:00
|
|
|
for (cnt = 0; cnt < 7; ++cnt)
|
|
|
|
|
{
|
2007-07-11 06:14:12 +08:00
|
|
|
const char *trp;
|
2004-03-15 05:12:06 +08:00
|
|
|
#ifdef _NL_CURRENT
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided !=raw)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-11 06:14:12 +08:00
|
|
|
trp = rp;
|
|
|
|
|
if (match_string (_NL_CURRENT (LC_TIME, DAY_1 + cnt), trp)
|
|
|
|
|
&& trp > rp_longest)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-11 06:14:12 +08:00
|
|
|
rp_longest = trp;
|
|
|
|
|
cnt_longest = cnt;
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided == not
|
2004-03-15 05:12:06 +08:00
|
|
|
&& strcmp (_NL_CURRENT (LC_TIME, DAY_1 + cnt),
|
|
|
|
|
weekday_name[cnt]))
|
2007-07-11 06:14:12 +08:00
|
|
|
decided_longest = loc;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
2007-07-11 06:14:12 +08:00
|
|
|
trp = rp;
|
|
|
|
|
if (match_string (_NL_CURRENT (LC_TIME, ABDAY_1 + cnt), trp)
|
|
|
|
|
&& trp > rp_longest)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-11 06:14:12 +08:00
|
|
|
rp_longest = trp;
|
|
|
|
|
cnt_longest = cnt;
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided == not
|
2004-03-15 05:12:06 +08:00
|
|
|
&& strcmp (_NL_CURRENT (LC_TIME, ABDAY_1 + cnt),
|
|
|
|
|
ab_weekday_name[cnt]))
|
2007-07-11 06:14:12 +08:00
|
|
|
decided_longest = loc;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided != loc
|
2007-07-11 06:14:12 +08:00
|
|
|
&& (((trp = rp, match_string (weekday_name[cnt], trp))
|
|
|
|
|
&& trp > rp_longest)
|
|
|
|
|
|| ((trp = rp, match_string (ab_weekday_name[cnt], rp))
|
|
|
|
|
&& trp > rp_longest)))
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-11 06:14:12 +08:00
|
|
|
rp_longest = trp;
|
|
|
|
|
cnt_longest = cnt;
|
|
|
|
|
decided_longest = raw;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
}
|
2007-07-11 06:14:12 +08:00
|
|
|
if (rp_longest == NULL)
|
2004-03-15 05:12:06 +08:00
|
|
|
/* Does not match a weekday name. */
|
|
|
|
|
return NULL;
|
2007-07-11 06:14:12 +08:00
|
|
|
rp = rp_longest;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = decided_longest;
|
2007-07-11 06:14:12 +08:00
|
|
|
tm->tm_wday = cnt_longest;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.have_wday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'b':
|
|
|
|
|
case 'B':
|
|
|
|
|
case 'h':
|
|
|
|
|
/* Match month name. */
|
2007-07-11 06:14:12 +08:00
|
|
|
rp_longest = NULL;
|
2007-07-29 03:08:57 +08:00
|
|
|
decided_longest = s.decided;
|
2007-07-11 06:14:12 +08:00
|
|
|
cnt_longest = -1;
|
2004-03-15 05:12:06 +08:00
|
|
|
for (cnt = 0; cnt < 12; ++cnt)
|
|
|
|
|
{
|
2007-07-11 06:14:12 +08:00
|
|
|
const char *trp;
|
2004-03-15 05:12:06 +08:00
|
|
|
#ifdef _NL_CURRENT
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided !=raw)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-11 06:14:12 +08:00
|
|
|
trp = rp;
|
|
|
|
|
if (match_string (_NL_CURRENT (LC_TIME, MON_1 + cnt), trp)
|
|
|
|
|
&& trp > rp_longest)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-11 06:14:12 +08:00
|
|
|
rp_longest = trp;
|
|
|
|
|
cnt_longest = cnt;
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided == not
|
2004-03-15 05:12:06 +08:00
|
|
|
&& strcmp (_NL_CURRENT (LC_TIME, MON_1 + cnt),
|
|
|
|
|
month_name[cnt]))
|
2007-07-11 06:14:12 +08:00
|
|
|
decided_longest = loc;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
2007-07-11 06:14:12 +08:00
|
|
|
trp = rp;
|
|
|
|
|
if (match_string (_NL_CURRENT (LC_TIME, ABMON_1 + cnt), trp)
|
|
|
|
|
&& trp > rp_longest)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-11 06:14:12 +08:00
|
|
|
rp_longest = trp;
|
|
|
|
|
cnt_longest = cnt;
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided == not
|
2004-03-15 05:12:06 +08:00
|
|
|
&& strcmp (_NL_CURRENT (LC_TIME, ABMON_1 + cnt),
|
|
|
|
|
ab_month_name[cnt]))
|
2007-07-11 06:14:12 +08:00
|
|
|
decided_longest = loc;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
Implement alternative month names (bug 10871).
Some languages (Slavic, Baltic, etc.) require a genitive case of the
month name when formatting a full date (with the day number) while
they require a nominative case when referring to the month standalone.
This requirement cannot be fulfilled without providing two forms for
each month name. From now it is specified that nl_langinfo(MON_1)
series (up to MON_12) and strftime("%B") generate the month names in
the grammatical form used when the month is a part of a complete date.
If the grammatical form used when the month is named by itself is needed,
the new values nl_langinfo(ALTMON_1) (up to ALTMON_12) and
strftime("%OB") are supported. This new feature is optional so the
languages which do not need it or do not yet provide the updated
locales simply do not use it and their behaviour is unchanged.
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add alternative month names,
define them as the same as primary full month names explicitly.
* locale/categories.def (LC_TIME): Add alt_mon and wide-alt_mon.
* locale/langinfo.h (__ALTMON_1, __ALTMON_2, __ALTMON_3, __ALTMON_4,
__ALTMON_5, __ALTMON_6, __ALTMON_7, __ALTMON_8, __ALTMON_9, __ALTMON_10,
__ALTMON_11, __ALTMON_12, _NL_WALTMON_1, _NL_WALTMON_2, _NL_WALTMON_3,
_NL_WALTMON_4, _NL_WALTMON_5, _NL_WALTMON_6, _NL_WALTMON_7,
_NL_WALTMON_8, _NL_WALTMON_9, _NL_WALTMON_10, _NL_WALTMON_11,
_NL_WALTMON_12): New enum constants.
[__USE_GNU] (ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, ALTMON_5, ALTMON_6,
ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, ALTMON_11, ALTMON_12): New
macros.
* locale/programs/ld-time.c (struct locale_time_t): Add alt_mon,
walt_mon, and alt_mon_defined members.
(time_output): Output alt_mon and walt_mon members.
(time_read): Read them, initialize them as copies of mon and wmon
respectively if they are missing, initialize alt_mon_defined.
* locale/programs/locfile-kw.gperf (alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_alt_mon): New enum constant.
* localedata/tst-langinfo.c (map): Add tests for the new constants
ALTMON_1 .. ALTMON_12.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add fr_FR.UTF-8
and pl_PL.UTF-8.
* time/strftime_l.c (f_altmonth): New macro.
(__strftime_internal): Handle %OB format.
* time/strptime_l.c [_LIBC] (alt_month_name): New macro.
(__strptime_internal): Handle %OB format.
* time/tst-strptime.c (day_tests): Add tests to parse different forms
of month names including the new %OB format specifier.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
2017-11-14 09:19:35 +08:00
|
|
|
#ifdef _LIBC
|
|
|
|
|
/* Now check the alt month. */
|
|
|
|
|
trp = rp;
|
|
|
|
|
if (match_string (_NL_CURRENT (LC_TIME, ALTMON_1 + cnt), trp)
|
|
|
|
|
&& trp > rp_longest)
|
|
|
|
|
{
|
|
|
|
|
rp_longest = trp;
|
|
|
|
|
cnt_longest = cnt;
|
|
|
|
|
if (s.decided == not
|
|
|
|
|
&& strcmp (_NL_CURRENT (LC_TIME, ALTMON_1 + cnt),
|
|
|
|
|
alt_month_name[cnt]))
|
|
|
|
|
decided_longest = loc;
|
|
|
|
|
}
|
Abbreviated alternative month names (%Ob) also added (bug 10871).
All the previous changes also repeated to support abbreviated
alternative month names. In most languages which have declension and
need nominative/genitive month names the abbreviated forms for both
cases are the same. An example where they do differ is May in Russian:
this name is too short to be abbreviated so even the abbreviated form
features the declension suffixes.
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add abbreviated alternative month
names, define them as the same as abbreviated month names explicitly.
* locale/categories.def (LC_TIME): Add ab_alt_mon and wide-ab_alt_mon.
* locale/langinfo.h: (_NL_ABALTMON_1, _NL_ABALTMON_2, _NL_ABALTMON_3,
_NL_ABALTMON_4, _NL_ABALTMON_5, _NL_ABALTMON_6, _NL_ABALTMON_7,
_NL_ABALTMON_8, _NL_ABALTMON_9, _NL_ABALTMON_10, _NL_ABALTMON_11,
_NL_ABALTMON_12, _NL_WABALTMON_1, _NL_WABALTMON_2, _NL_WABALTMON_3,
_NL_WABALTMON_4, _NL_WABALTMON_5, _NL_WABALTMON_6, _NL_WABALTMON_7,
_NL_WABALTMON_8, _NL_WABALTMON_9, _NL_WABALTMON_10, _NL_WABALTMON_11,
_NL_WABALTMON_12): New enum constants.
* locale/programs/ld-time.c (struct locale_time_t): Add ab_alt_mon,
wab_alt_mon, and ab_alt_mon_defined members.
(time_output): Output ab_alt_mon and wab_alt_mon members.
(time_read): Read them, initialize them as copies of abmon and wabmon
respectively if they are missing, initialize ab_alt_mon_defined.
* locale/programs/locfile-kw.gperf (ab_alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_ab_alt_mon): New enum constant.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add es_ES.UTF-8
and ru_RU.UTF-8.
* time/strftime_l.c (a_altmonth, aam_len): New macros.
[!COMPILE_WIDE] (ABALTMON_1): New macro.
(__strftime_internal): Handle %Ob and %Oh formats.
* time/strptime_l.c [_LIBC] (ab_alt_month_name): New macro.
(__strptime_internal): Handle %Ob and %Oh formats.
* time/tst-strptime.c (day_tests): Add more tests to parse different
forms of month names including the new %Ob format specifier.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
2017-11-14 09:22:38 +08:00
|
|
|
trp = rp;
|
|
|
|
|
if (match_string (_NL_CURRENT (LC_TIME, _NL_ABALTMON_1 + cnt),
|
|
|
|
|
trp)
|
|
|
|
|
&& trp > rp_longest)
|
|
|
|
|
{
|
|
|
|
|
rp_longest = trp;
|
|
|
|
|
cnt_longest = cnt;
|
|
|
|
|
if (s.decided == not
|
|
|
|
|
&& strcmp (_NL_CURRENT (LC_TIME, _NL_ABALTMON_1 + cnt),
|
|
|
|
|
alt_month_name[cnt]))
|
|
|
|
|
decided_longest = loc;
|
|
|
|
|
}
|
Implement alternative month names (bug 10871).
Some languages (Slavic, Baltic, etc.) require a genitive case of the
month name when formatting a full date (with the day number) while
they require a nominative case when referring to the month standalone.
This requirement cannot be fulfilled without providing two forms for
each month name. From now it is specified that nl_langinfo(MON_1)
series (up to MON_12) and strftime("%B") generate the month names in
the grammatical form used when the month is a part of a complete date.
If the grammatical form used when the month is named by itself is needed,
the new values nl_langinfo(ALTMON_1) (up to ALTMON_12) and
strftime("%OB") are supported. This new feature is optional so the
languages which do not need it or do not yet provide the updated
locales simply do not use it and their behaviour is unchanged.
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add alternative month names,
define them as the same as primary full month names explicitly.
* locale/categories.def (LC_TIME): Add alt_mon and wide-alt_mon.
* locale/langinfo.h (__ALTMON_1, __ALTMON_2, __ALTMON_3, __ALTMON_4,
__ALTMON_5, __ALTMON_6, __ALTMON_7, __ALTMON_8, __ALTMON_9, __ALTMON_10,
__ALTMON_11, __ALTMON_12, _NL_WALTMON_1, _NL_WALTMON_2, _NL_WALTMON_3,
_NL_WALTMON_4, _NL_WALTMON_5, _NL_WALTMON_6, _NL_WALTMON_7,
_NL_WALTMON_8, _NL_WALTMON_9, _NL_WALTMON_10, _NL_WALTMON_11,
_NL_WALTMON_12): New enum constants.
[__USE_GNU] (ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, ALTMON_5, ALTMON_6,
ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, ALTMON_11, ALTMON_12): New
macros.
* locale/programs/ld-time.c (struct locale_time_t): Add alt_mon,
walt_mon, and alt_mon_defined members.
(time_output): Output alt_mon and walt_mon members.
(time_read): Read them, initialize them as copies of mon and wmon
respectively if they are missing, initialize alt_mon_defined.
* locale/programs/locfile-kw.gperf (alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_alt_mon): New enum constant.
* localedata/tst-langinfo.c (map): Add tests for the new constants
ALTMON_1 .. ALTMON_12.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add fr_FR.UTF-8
and pl_PL.UTF-8.
* time/strftime_l.c (f_altmonth): New macro.
(__strftime_internal): Handle %OB format.
* time/strptime_l.c [_LIBC] (alt_month_name): New macro.
(__strptime_internal): Handle %OB format.
* time/tst-strptime.c (day_tests): Add tests to parse different forms
of month names including the new %OB format specifier.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
2017-11-14 09:19:35 +08:00
|
|
|
#endif
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
#endif
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided != loc
|
2007-07-11 06:14:12 +08:00
|
|
|
&& (((trp = rp, match_string (month_name[cnt], trp))
|
|
|
|
|
&& trp > rp_longest)
|
|
|
|
|
|| ((trp = rp, match_string (ab_month_name[cnt], trp))
|
Implement alternative month names (bug 10871).
Some languages (Slavic, Baltic, etc.) require a genitive case of the
month name when formatting a full date (with the day number) while
they require a nominative case when referring to the month standalone.
This requirement cannot be fulfilled without providing two forms for
each month name. From now it is specified that nl_langinfo(MON_1)
series (up to MON_12) and strftime("%B") generate the month names in
the grammatical form used when the month is a part of a complete date.
If the grammatical form used when the month is named by itself is needed,
the new values nl_langinfo(ALTMON_1) (up to ALTMON_12) and
strftime("%OB") are supported. This new feature is optional so the
languages which do not need it or do not yet provide the updated
locales simply do not use it and their behaviour is unchanged.
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add alternative month names,
define them as the same as primary full month names explicitly.
* locale/categories.def (LC_TIME): Add alt_mon and wide-alt_mon.
* locale/langinfo.h (__ALTMON_1, __ALTMON_2, __ALTMON_3, __ALTMON_4,
__ALTMON_5, __ALTMON_6, __ALTMON_7, __ALTMON_8, __ALTMON_9, __ALTMON_10,
__ALTMON_11, __ALTMON_12, _NL_WALTMON_1, _NL_WALTMON_2, _NL_WALTMON_3,
_NL_WALTMON_4, _NL_WALTMON_5, _NL_WALTMON_6, _NL_WALTMON_7,
_NL_WALTMON_8, _NL_WALTMON_9, _NL_WALTMON_10, _NL_WALTMON_11,
_NL_WALTMON_12): New enum constants.
[__USE_GNU] (ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, ALTMON_5, ALTMON_6,
ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, ALTMON_11, ALTMON_12): New
macros.
* locale/programs/ld-time.c (struct locale_time_t): Add alt_mon,
walt_mon, and alt_mon_defined members.
(time_output): Output alt_mon and walt_mon members.
(time_read): Read them, initialize them as copies of mon and wmon
respectively if they are missing, initialize alt_mon_defined.
* locale/programs/locfile-kw.gperf (alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_alt_mon): New enum constant.
* localedata/tst-langinfo.c (map): Add tests for the new constants
ALTMON_1 .. ALTMON_12.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add fr_FR.UTF-8
and pl_PL.UTF-8.
* time/strftime_l.c (f_altmonth): New macro.
(__strftime_internal): Handle %OB format.
* time/strptime_l.c [_LIBC] (alt_month_name): New macro.
(__strptime_internal): Handle %OB format.
* time/tst-strptime.c (day_tests): Add tests to parse different forms
of month names including the new %OB format specifier.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
2017-11-14 09:19:35 +08:00
|
|
|
&& trp > rp_longest)
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
|| ((trp = rp, match_string (alt_month_name[cnt], trp))
|
|
|
|
|
&& trp > rp_longest)
|
Abbreviated alternative month names (%Ob) also added (bug 10871).
All the previous changes also repeated to support abbreviated
alternative month names. In most languages which have declension and
need nominative/genitive month names the abbreviated forms for both
cases are the same. An example where they do differ is May in Russian:
this name is too short to be abbreviated so even the abbreviated form
features the declension suffixes.
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add abbreviated alternative month
names, define them as the same as abbreviated month names explicitly.
* locale/categories.def (LC_TIME): Add ab_alt_mon and wide-ab_alt_mon.
* locale/langinfo.h: (_NL_ABALTMON_1, _NL_ABALTMON_2, _NL_ABALTMON_3,
_NL_ABALTMON_4, _NL_ABALTMON_5, _NL_ABALTMON_6, _NL_ABALTMON_7,
_NL_ABALTMON_8, _NL_ABALTMON_9, _NL_ABALTMON_10, _NL_ABALTMON_11,
_NL_ABALTMON_12, _NL_WABALTMON_1, _NL_WABALTMON_2, _NL_WABALTMON_3,
_NL_WABALTMON_4, _NL_WABALTMON_5, _NL_WABALTMON_6, _NL_WABALTMON_7,
_NL_WABALTMON_8, _NL_WABALTMON_9, _NL_WABALTMON_10, _NL_WABALTMON_11,
_NL_WABALTMON_12): New enum constants.
* locale/programs/ld-time.c (struct locale_time_t): Add ab_alt_mon,
wab_alt_mon, and ab_alt_mon_defined members.
(time_output): Output ab_alt_mon and wab_alt_mon members.
(time_read): Read them, initialize them as copies of abmon and wabmon
respectively if they are missing, initialize ab_alt_mon_defined.
* locale/programs/locfile-kw.gperf (ab_alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_ab_alt_mon): New enum constant.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add es_ES.UTF-8
and ru_RU.UTF-8.
* time/strftime_l.c (a_altmonth, aam_len): New macros.
[!COMPILE_WIDE] (ABALTMON_1): New macro.
(__strftime_internal): Handle %Ob and %Oh formats.
* time/strptime_l.c [_LIBC] (ab_alt_month_name): New macro.
(__strptime_internal): Handle %Ob and %Oh formats.
* time/tst-strptime.c (day_tests): Add more tests to parse different
forms of month names including the new %Ob format specifier.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
2017-11-14 09:22:38 +08:00
|
|
|
|| ((trp = rp, match_string (ab_alt_month_name[cnt], trp))
|
|
|
|
|
&& trp > rp_longest)
|
Implement alternative month names (bug 10871).
Some languages (Slavic, Baltic, etc.) require a genitive case of the
month name when formatting a full date (with the day number) while
they require a nominative case when referring to the month standalone.
This requirement cannot be fulfilled without providing two forms for
each month name. From now it is specified that nl_langinfo(MON_1)
series (up to MON_12) and strftime("%B") generate the month names in
the grammatical form used when the month is a part of a complete date.
If the grammatical form used when the month is named by itself is needed,
the new values nl_langinfo(ALTMON_1) (up to ALTMON_12) and
strftime("%OB") are supported. This new feature is optional so the
languages which do not need it or do not yet provide the updated
locales simply do not use it and their behaviour is unchanged.
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add alternative month names,
define them as the same as primary full month names explicitly.
* locale/categories.def (LC_TIME): Add alt_mon and wide-alt_mon.
* locale/langinfo.h (__ALTMON_1, __ALTMON_2, __ALTMON_3, __ALTMON_4,
__ALTMON_5, __ALTMON_6, __ALTMON_7, __ALTMON_8, __ALTMON_9, __ALTMON_10,
__ALTMON_11, __ALTMON_12, _NL_WALTMON_1, _NL_WALTMON_2, _NL_WALTMON_3,
_NL_WALTMON_4, _NL_WALTMON_5, _NL_WALTMON_6, _NL_WALTMON_7,
_NL_WALTMON_8, _NL_WALTMON_9, _NL_WALTMON_10, _NL_WALTMON_11,
_NL_WALTMON_12): New enum constants.
[__USE_GNU] (ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, ALTMON_5, ALTMON_6,
ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, ALTMON_11, ALTMON_12): New
macros.
* locale/programs/ld-time.c (struct locale_time_t): Add alt_mon,
walt_mon, and alt_mon_defined members.
(time_output): Output alt_mon and walt_mon members.
(time_read): Read them, initialize them as copies of mon and wmon
respectively if they are missing, initialize alt_mon_defined.
* locale/programs/locfile-kw.gperf (alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_alt_mon): New enum constant.
* localedata/tst-langinfo.c (map): Add tests for the new constants
ALTMON_1 .. ALTMON_12.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add fr_FR.UTF-8
and pl_PL.UTF-8.
* time/strftime_l.c (f_altmonth): New macro.
(__strftime_internal): Handle %OB format.
* time/strptime_l.c [_LIBC] (alt_month_name): New macro.
(__strptime_internal): Handle %OB format.
* time/tst-strptime.c (day_tests): Add tests to parse different forms
of month names including the new %OB format specifier.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
2017-11-14 09:19:35 +08:00
|
|
|
#endif
|
|
|
|
|
))
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-11 06:14:12 +08:00
|
|
|
rp_longest = trp;
|
|
|
|
|
cnt_longest = cnt;
|
|
|
|
|
decided_longest = raw;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
}
|
2007-07-11 06:14:12 +08:00
|
|
|
if (rp_longest == NULL)
|
2004-03-15 05:12:06 +08:00
|
|
|
/* Does not match a month name. */
|
|
|
|
|
return NULL;
|
2007-07-11 06:14:12 +08:00
|
|
|
rp = rp_longest;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = decided_longest;
|
2007-07-11 06:14:12 +08:00
|
|
|
tm->tm_mon = cnt_longest;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.have_mon = 1;
|
|
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'c':
|
|
|
|
|
/* Match locale's date and time format. */
|
|
|
|
|
#ifdef _NL_CURRENT
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided != raw)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
|
|
|
|
if (!recursive (_NL_CURRENT (LC_TIME, D_T_FMT)))
|
|
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided == loc)
|
2004-03-15 05:12:06 +08:00
|
|
|
return NULL;
|
|
|
|
|
else
|
|
|
|
|
rp = rp_backup;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided == not &&
|
2004-03-15 05:12:06 +08:00
|
|
|
strcmp (_NL_CURRENT (LC_TIME, D_T_FMT), HERE_D_T_FMT))
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = loc;
|
|
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
}
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = raw;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
if (!recursive (HERE_D_T_FMT))
|
|
|
|
|
return NULL;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'C':
|
|
|
|
|
/* Match century number. */
|
|
|
|
|
match_century:
|
|
|
|
|
get_number (0, 99, 2);
|
2007-07-29 03:08:57 +08:00
|
|
|
s.century = val;
|
|
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'd':
|
|
|
|
|
case 'e':
|
|
|
|
|
/* Match day of month. */
|
|
|
|
|
get_number (1, 31, 2);
|
|
|
|
|
tm->tm_mday = val;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.have_mday = 1;
|
|
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'F':
|
|
|
|
|
if (!recursive ("%Y-%m-%d"))
|
|
|
|
|
return NULL;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'x':
|
|
|
|
|
#ifdef _NL_CURRENT
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided != raw)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
|
|
|
|
if (!recursive (_NL_CURRENT (LC_TIME, D_FMT)))
|
|
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided == loc)
|
2004-03-15 05:12:06 +08:00
|
|
|
return NULL;
|
|
|
|
|
else
|
|
|
|
|
rp = rp_backup;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided == not
|
2004-03-15 05:12:06 +08:00
|
|
|
&& strcmp (_NL_CURRENT (LC_TIME, D_FMT), HERE_D_FMT))
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = loc;
|
|
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
}
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = raw;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
/* Fall through. */
|
|
|
|
|
case 'D':
|
|
|
|
|
/* Match standard day format. */
|
|
|
|
|
if (!recursive (HERE_D_FMT))
|
|
|
|
|
return NULL;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'k':
|
|
|
|
|
case 'H':
|
|
|
|
|
/* Match hour in 24-hour clock. */
|
|
|
|
|
get_number (0, 23, 2);
|
|
|
|
|
tm->tm_hour = val;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.have_I = 0;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'l':
|
|
|
|
|
/* Match hour in 12-hour clock. GNU extension. */
|
|
|
|
|
case 'I':
|
|
|
|
|
/* Match hour in 12-hour clock. */
|
|
|
|
|
get_number (1, 12, 2);
|
|
|
|
|
tm->tm_hour = val % 12;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.have_I = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'j':
|
|
|
|
|
/* Match day number of year. */
|
|
|
|
|
get_number (1, 366, 3);
|
|
|
|
|
tm->tm_yday = val - 1;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.have_yday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'm':
|
|
|
|
|
/* Match number of month. */
|
|
|
|
|
get_number (1, 12, 2);
|
|
|
|
|
tm->tm_mon = val - 1;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.have_mon = 1;
|
|
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'M':
|
|
|
|
|
/* Match minute. */
|
|
|
|
|
get_number (0, 59, 2);
|
|
|
|
|
tm->tm_min = val;
|
|
|
|
|
break;
|
|
|
|
|
case 'n':
|
|
|
|
|
case 't':
|
|
|
|
|
/* Match any white space. */
|
|
|
|
|
while (ISSPACE (*rp))
|
|
|
|
|
++rp;
|
|
|
|
|
break;
|
|
|
|
|
case 'p':
|
|
|
|
|
/* Match locale's equivalent of AM/PM. */
|
|
|
|
|
#ifdef _NL_CURRENT
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided != raw)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
|
|
|
|
if (match_string (_NL_CURRENT (LC_TIME, AM_STR), rp))
|
|
|
|
|
{
|
|
|
|
|
if (strcmp (_NL_CURRENT (LC_TIME, AM_STR), HERE_AM_STR))
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = loc;
|
|
|
|
|
s.is_pm = 0;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (match_string (_NL_CURRENT (LC_TIME, PM_STR), rp))
|
|
|
|
|
{
|
|
|
|
|
if (strcmp (_NL_CURRENT (LC_TIME, PM_STR), HERE_PM_STR))
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = loc;
|
|
|
|
|
s.is_pm = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
}
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = raw;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
if (!match_string (HERE_AM_STR, rp))
|
2005-01-10 04:23:44 +08:00
|
|
|
{
|
|
|
|
|
if (match_string (HERE_PM_STR, rp))
|
2007-07-29 03:08:57 +08:00
|
|
|
s.is_pm = 1;
|
2005-01-10 04:23:44 +08:00
|
|
|
else
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2007-07-29 03:08:57 +08:00
|
|
|
else
|
|
|
|
|
s.is_pm = 0;
|
2005-01-10 19:10:54 +08:00
|
|
|
break;
|
2004-03-15 05:12:06 +08:00
|
|
|
case 'r':
|
|
|
|
|
#ifdef _NL_CURRENT
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided != raw)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
|
|
|
|
if (!recursive (_NL_CURRENT (LC_TIME, T_FMT_AMPM)))
|
|
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided == loc)
|
2004-03-15 05:12:06 +08:00
|
|
|
return NULL;
|
|
|
|
|
else
|
|
|
|
|
rp = rp_backup;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided == not &&
|
2004-03-15 05:12:06 +08:00
|
|
|
strcmp (_NL_CURRENT (LC_TIME, T_FMT_AMPM),
|
|
|
|
|
HERE_T_FMT_AMPM))
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = loc;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
}
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = raw;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
if (!recursive (HERE_T_FMT_AMPM))
|
|
|
|
|
return NULL;
|
|
|
|
|
break;
|
|
|
|
|
case 'R':
|
|
|
|
|
if (!recursive ("%H:%M"))
|
|
|
|
|
return NULL;
|
|
|
|
|
break;
|
|
|
|
|
case 's':
|
|
|
|
|
{
|
|
|
|
|
/* The number of seconds may be very high so we cannot use
|
|
|
|
|
the `get_number' macro. Instead read the number
|
|
|
|
|
character for character and construct the result while
|
|
|
|
|
doing this. */
|
|
|
|
|
time_t secs = 0;
|
|
|
|
|
if (*rp < '0' || *rp > '9')
|
|
|
|
|
/* We need at least one digit. */
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
secs *= 10;
|
|
|
|
|
secs += *rp++ - '0';
|
|
|
|
|
}
|
|
|
|
|
while (*rp >= '0' && *rp <= '9');
|
|
|
|
|
|
|
|
|
|
if (localtime_r (&secs, tm) == NULL)
|
|
|
|
|
/* Error in function. */
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'S':
|
|
|
|
|
get_number (0, 61, 2);
|
|
|
|
|
tm->tm_sec = val;
|
|
|
|
|
break;
|
|
|
|
|
case 'X':
|
|
|
|
|
#ifdef _NL_CURRENT
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided != raw)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
|
|
|
|
if (!recursive (_NL_CURRENT (LC_TIME, T_FMT)))
|
|
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided == loc)
|
2004-03-15 05:12:06 +08:00
|
|
|
return NULL;
|
|
|
|
|
else
|
|
|
|
|
rp = rp_backup;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (strcmp (_NL_CURRENT (LC_TIME, T_FMT), HERE_T_FMT))
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = loc;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
}
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = raw;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
/* Fall through. */
|
|
|
|
|
case 'T':
|
|
|
|
|
if (!recursive (HERE_T_FMT))
|
|
|
|
|
return NULL;
|
|
|
|
|
break;
|
|
|
|
|
case 'u':
|
|
|
|
|
get_number (1, 7, 1);
|
|
|
|
|
tm->tm_wday = val % 7;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.have_wday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'g':
|
|
|
|
|
get_number (0, 99, 2);
|
|
|
|
|
/* XXX This cannot determine any field in TM. */
|
|
|
|
|
break;
|
|
|
|
|
case 'G':
|
|
|
|
|
if (*rp < '0' || *rp > '9')
|
|
|
|
|
return NULL;
|
|
|
|
|
/* XXX Ignore the number since we would need some more
|
|
|
|
|
information to compute a real date. */
|
|
|
|
|
do
|
|
|
|
|
++rp;
|
|
|
|
|
while (*rp >= '0' && *rp <= '9');
|
|
|
|
|
break;
|
|
|
|
|
case 'U':
|
|
|
|
|
get_number (0, 53, 2);
|
2007-07-29 03:08:57 +08:00
|
|
|
s.week_no = val;
|
|
|
|
|
s.have_uweek = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'W':
|
|
|
|
|
get_number (0, 53, 2);
|
2007-07-29 03:08:57 +08:00
|
|
|
s.week_no = val;
|
|
|
|
|
s.have_wweek = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'V':
|
|
|
|
|
get_number (0, 53, 2);
|
|
|
|
|
/* XXX This cannot determine any field in TM without some
|
|
|
|
|
information. */
|
|
|
|
|
break;
|
|
|
|
|
case 'w':
|
|
|
|
|
/* Match number of weekday. */
|
|
|
|
|
get_number (0, 6, 1);
|
|
|
|
|
tm->tm_wday = val;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.have_wday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'y':
|
|
|
|
|
match_year_in_century:
|
|
|
|
|
/* Match year within century. */
|
|
|
|
|
get_number (0, 99, 2);
|
|
|
|
|
/* The "Year 2000: The Millennium Rollover" paper suggests that
|
|
|
|
|
values in the range 69-99 refer to the twentieth century. */
|
|
|
|
|
tm->tm_year = val >= 69 ? val : val + 100;
|
|
|
|
|
/* Indicate that we want to use the century, if specified. */
|
2007-07-29 03:08:57 +08:00
|
|
|
s.want_century = 1;
|
|
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'Y':
|
|
|
|
|
/* Match year including century number. */
|
|
|
|
|
get_number (0, 9999, 4);
|
|
|
|
|
tm->tm_year = val - 1900;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.want_century = 0;
|
|
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'Z':
|
2013-10-26 01:04:47 +08:00
|
|
|
/* Read timezone but perform no conversion. */
|
|
|
|
|
while (ISSPACE (*rp))
|
|
|
|
|
rp++;
|
|
|
|
|
while (!ISSPACE (*rp) && *rp != '\0')
|
|
|
|
|
rp++;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
2005-04-27 12:33:01 +08:00
|
|
|
case 'z':
|
2015-09-17 15:56:13 +08:00
|
|
|
/* We recognize four formats:
|
|
|
|
|
1. Two digits specify hours.
|
|
|
|
|
2. Four digits specify hours and minutes.
|
|
|
|
|
3. Two digits, ':', and two digits specify hours and minutes.
|
|
|
|
|
4. 'Z' is equivalent to +0000. */
|
2005-04-27 12:33:01 +08:00
|
|
|
{
|
|
|
|
|
val = 0;
|
2013-04-23 18:02:42 +08:00
|
|
|
while (ISSPACE (*rp))
|
2005-04-27 12:33:01 +08:00
|
|
|
++rp;
|
2015-09-17 15:55:04 +08:00
|
|
|
if (*rp == 'Z')
|
|
|
|
|
{
|
|
|
|
|
++rp;
|
|
|
|
|
tm->tm_gmtoff = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2005-04-27 12:33:01 +08:00
|
|
|
if (*rp != '+' && *rp != '-')
|
|
|
|
|
return NULL;
|
|
|
|
|
bool neg = *rp++ == '-';
|
|
|
|
|
int n = 0;
|
|
|
|
|
while (n < 4 && *rp >= '0' && *rp <= '9')
|
|
|
|
|
{
|
|
|
|
|
val = val * 10 + *rp++ - '0';
|
|
|
|
|
++n;
|
2015-09-17 15:56:13 +08:00
|
|
|
if (*rp == ':' && n == 2 && isdigit (*(rp + 1)))
|
|
|
|
|
++rp;
|
2005-04-27 12:33:01 +08:00
|
|
|
}
|
|
|
|
|
if (n == 2)
|
|
|
|
|
val *= 100;
|
|
|
|
|
else if (n != 4)
|
|
|
|
|
/* Only two or four digits recognized. */
|
|
|
|
|
return NULL;
|
strptime %z: fix rounding, extend range to +/-9959 [BZ #16141]
Topic: strptime supports a %z input field descriptor, which parses a
time zone offset from UTC time into the broken-out time field tm_gmtoff.
Problems:
1) In the current implementation, the minutes portion calculation is
correct only for minutes evenly divisible by 3. This is because the
minutes value is converted to decimal time, but inadequate precision
leads to rounding which calculates results that are too low for
some values.
For example, due to rounding, a +1159 offset string results in an
incorrect tm_gmtoff of 43128 (== 11 * 3600 + 58.8 * 60) seconds,
instead of 43140 (== 11 * 3600 + 59 * 60) seconds. In contrast,
a +1157 offset (minutes divisible by 3) does not cause the bug,
and results in a correct tm_gmtoff of 43020.
2) strptime's %z specifier will not parse time offsets less than
-1200 or greater than +1200, or if only hour digits are present, less
than -12 or greater than +12. It will return NULL for offsets outside
that range. These limits do not meet historical and modern use cases:
* Present day exceeds the +1200 limit:
- Pacific/Auckland (New Zealand) summer time is +1300.
- Pacific/Kiritimati (Christmas Island) is +1400.
- Pacific/Apia (Samoa) summer time is +1400.
* Historical offsets exceeded +1500/-1500.
* POSIX supports -2459 to +2559.
* Offsets up to +/-9959 may occasionally be useful.
* Paul Eggert's notes provide additional detail:
- https://sourceware.org/ml/libc-alpha/2014-12/msg00068.html
- https://sourceware.org/ml/libc-alpha/2014-12/msg00072.html
3) tst-strptime2, part of the 'make check' test suite, does not test
for the above problems.
Corrective actions:
1) In time/strptime_l.c, calculate the offset from the hour and
minute portions directly, without the rounding errors introduced by
decimal time.
2) Remove the +/-1200 range limit, permitting strptime to parse offsets
from -9959 through +9959.
3) Add zone offset values to time/tst-strptime2.c.
* Test minutes evenly divisible by three (+1157) and not evenly
divisible by three (+1158 and +1159).
* Test offsets near the old and new range limits (-1201, -1330, -2459,
-2500, -99, -9959, +1201, +1330, +1400, +1401, +2559, +2600, +99,
and +9959)
The revised strptime passes all old and new tst-strptime2 tests.
2015-08-18 04:48:38 +08:00
|
|
|
else if (val % 100 >= 60)
|
|
|
|
|
/* Minutes valid range is 0 through 59. */
|
2005-04-27 12:33:01 +08:00
|
|
|
return NULL;
|
strptime %z: fix rounding, extend range to +/-9959 [BZ #16141]
Topic: strptime supports a %z input field descriptor, which parses a
time zone offset from UTC time into the broken-out time field tm_gmtoff.
Problems:
1) In the current implementation, the minutes portion calculation is
correct only for minutes evenly divisible by 3. This is because the
minutes value is converted to decimal time, but inadequate precision
leads to rounding which calculates results that are too low for
some values.
For example, due to rounding, a +1159 offset string results in an
incorrect tm_gmtoff of 43128 (== 11 * 3600 + 58.8 * 60) seconds,
instead of 43140 (== 11 * 3600 + 59 * 60) seconds. In contrast,
a +1157 offset (minutes divisible by 3) does not cause the bug,
and results in a correct tm_gmtoff of 43020.
2) strptime's %z specifier will not parse time offsets less than
-1200 or greater than +1200, or if only hour digits are present, less
than -12 or greater than +12. It will return NULL for offsets outside
that range. These limits do not meet historical and modern use cases:
* Present day exceeds the +1200 limit:
- Pacific/Auckland (New Zealand) summer time is +1300.
- Pacific/Kiritimati (Christmas Island) is +1400.
- Pacific/Apia (Samoa) summer time is +1400.
* Historical offsets exceeded +1500/-1500.
* POSIX supports -2459 to +2559.
* Offsets up to +/-9959 may occasionally be useful.
* Paul Eggert's notes provide additional detail:
- https://sourceware.org/ml/libc-alpha/2014-12/msg00068.html
- https://sourceware.org/ml/libc-alpha/2014-12/msg00072.html
3) tst-strptime2, part of the 'make check' test suite, does not test
for the above problems.
Corrective actions:
1) In time/strptime_l.c, calculate the offset from the hour and
minute portions directly, without the rounding errors introduced by
decimal time.
2) Remove the +/-1200 range limit, permitting strptime to parse offsets
from -9959 through +9959.
3) Add zone offset values to time/tst-strptime2.c.
* Test minutes evenly divisible by three (+1157) and not evenly
divisible by three (+1158 and +1159).
* Test offsets near the old and new range limits (-1201, -1330, -2459,
-2500, -99, -9959, +1201, +1330, +1400, +1401, +2559, +2600, +99,
and +9959)
The revised strptime passes all old and new tst-strptime2 tests.
2015-08-18 04:48:38 +08:00
|
|
|
tm->tm_gmtoff = (val / 100) * 3600 + (val % 100) * 60;
|
2005-04-27 12:33:01 +08:00
|
|
|
if (neg)
|
|
|
|
|
tm->tm_gmtoff = -tm->tm_gmtoff;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2004-03-15 05:12:06 +08:00
|
|
|
case 'E':
|
|
|
|
|
#ifdef _NL_CURRENT
|
|
|
|
|
switch (*fmt++)
|
|
|
|
|
{
|
|
|
|
|
case 'c':
|
|
|
|
|
/* Match locale's alternate date and time format. */
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided != raw)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
|
|
|
|
const char *fmt = _NL_CURRENT (LC_TIME, ERA_D_T_FMT);
|
|
|
|
|
|
|
|
|
|
if (*fmt == '\0')
|
|
|
|
|
fmt = _NL_CURRENT (LC_TIME, D_T_FMT);
|
|
|
|
|
|
|
|
|
|
if (!recursive (fmt))
|
|
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided == loc)
|
2004-03-15 05:12:06 +08:00
|
|
|
return NULL;
|
|
|
|
|
else
|
|
|
|
|
rp = rp_backup;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (strcmp (fmt, HERE_D_T_FMT))
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = loc;
|
|
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
}
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = raw;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
/* The C locale has no era information, so use the
|
|
|
|
|
normal representation. */
|
|
|
|
|
if (!recursive (HERE_D_T_FMT))
|
|
|
|
|
return NULL;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'C':
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided != raw)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.era_cnt >= 0)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
era = _nl_select_era_entry (s.era_cnt HELPER_LOCALE_ARG);
|
2004-03-15 05:12:06 +08:00
|
|
|
if (era != NULL && match_string (era->era_name, rp))
|
|
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = loc;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2004-08-09 06:20:57 +08:00
|
|
|
|
|
|
|
|
num_eras = _NL_CURRENT_WORD (LC_TIME,
|
|
|
|
|
_NL_TIME_ERA_NUM_ENTRIES);
|
2007-07-29 03:08:57 +08:00
|
|
|
for (s.era_cnt = 0; s.era_cnt < (int) num_eras;
|
|
|
|
|
++s.era_cnt, rp = rp_backup)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
era = _nl_select_era_entry (s.era_cnt
|
2004-08-09 06:20:57 +08:00
|
|
|
HELPER_LOCALE_ARG);
|
|
|
|
|
if (era != NULL && match_string (era->era_name, rp))
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = loc;
|
2004-08-09 06:20:57 +08:00
|
|
|
break;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
}
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.era_cnt != (int) num_eras)
|
2004-08-09 06:20:57 +08:00
|
|
|
break;
|
|
|
|
|
|
2007-07-29 03:08:57 +08:00
|
|
|
s.era_cnt = -1;
|
|
|
|
|
if (s.decided == loc)
|
2004-08-09 06:20:57 +08:00
|
|
|
return NULL;
|
2004-03-15 05:12:06 +08:00
|
|
|
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = raw;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
/* The C locale has no era information, so use the
|
|
|
|
|
normal representation. */
|
|
|
|
|
goto match_century;
|
|
|
|
|
case 'y':
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided != raw)
|
2004-08-09 06:20:57 +08:00
|
|
|
{
|
|
|
|
|
get_number(0, 9999, 4);
|
|
|
|
|
tm->tm_year = val;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.want_era = 1;
|
|
|
|
|
s.want_xday = 1;
|
|
|
|
|
s.want_century = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.era_cnt >= 0)
|
2004-08-09 06:20:57 +08:00
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
assert (s.decided == loc);
|
2004-08-09 06:20:57 +08:00
|
|
|
|
2007-07-29 03:08:57 +08:00
|
|
|
era = _nl_select_era_entry (s.era_cnt HELPER_LOCALE_ARG);
|
2004-08-09 06:20:57 +08:00
|
|
|
bool match = false;
|
|
|
|
|
if (era != NULL)
|
|
|
|
|
{
|
|
|
|
|
int delta = ((tm->tm_year - era->offset)
|
|
|
|
|
* era->absolute_direction);
|
|
|
|
|
match = (delta >= 0
|
|
|
|
|
&& delta < (((int64_t) era->stop_date[0]
|
|
|
|
|
- (int64_t) era->start_date[0])
|
|
|
|
|
* era->absolute_direction));
|
|
|
|
|
}
|
|
|
|
|
if (! match)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
num_eras = _NL_CURRENT_WORD (LC_TIME,
|
|
|
|
|
_NL_TIME_ERA_NUM_ENTRIES);
|
2007-07-29 03:08:57 +08:00
|
|
|
for (s.era_cnt = 0; s.era_cnt < (int) num_eras; ++s.era_cnt)
|
2004-08-09 06:20:57 +08:00
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
era = _nl_select_era_entry (s.era_cnt
|
2004-08-09 06:20:57 +08:00
|
|
|
HELPER_LOCALE_ARG);
|
|
|
|
|
if (era != NULL)
|
|
|
|
|
{
|
|
|
|
|
int delta = ((tm->tm_year - era->offset)
|
|
|
|
|
* era->absolute_direction);
|
|
|
|
|
if (delta >= 0
|
|
|
|
|
&& delta < (((int64_t) era->stop_date[0]
|
|
|
|
|
- (int64_t) era->start_date[0])
|
|
|
|
|
* era->absolute_direction))
|
|
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = loc;
|
2004-08-09 06:20:57 +08:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.era_cnt != (int) num_eras)
|
2004-08-09 06:20:57 +08:00
|
|
|
break;
|
|
|
|
|
|
2007-07-29 03:08:57 +08:00
|
|
|
s.era_cnt = -1;
|
|
|
|
|
if (s.decided == loc)
|
2004-08-09 06:20:57 +08:00
|
|
|
return NULL;
|
|
|
|
|
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = raw;
|
2004-08-09 06:20:57 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
goto match_year_in_century;
|
2004-03-15 05:12:06 +08:00
|
|
|
case 'Y':
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided != raw)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
|
|
|
|
num_eras = _NL_CURRENT_WORD (LC_TIME,
|
|
|
|
|
_NL_TIME_ERA_NUM_ENTRIES);
|
2007-07-29 03:08:57 +08:00
|
|
|
for (s.era_cnt = 0; s.era_cnt < (int) num_eras;
|
|
|
|
|
++s.era_cnt, rp = rp_backup)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
era = _nl_select_era_entry (s.era_cnt HELPER_LOCALE_ARG);
|
2004-03-15 05:12:06 +08:00
|
|
|
if (era != NULL && recursive (era->era_format))
|
|
|
|
|
break;
|
|
|
|
|
}
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.era_cnt == (int) num_eras)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
s.era_cnt = -1;
|
|
|
|
|
if (s.decided == loc)
|
2004-03-15 05:12:06 +08:00
|
|
|
return NULL;
|
|
|
|
|
else
|
|
|
|
|
rp = rp_backup;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = loc;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = raw;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
get_number (0, 9999, 4);
|
|
|
|
|
tm->tm_year = val - 1900;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.want_century = 0;
|
|
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'x':
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided != raw)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
|
|
|
|
const char *fmt = _NL_CURRENT (LC_TIME, ERA_D_FMT);
|
|
|
|
|
|
|
|
|
|
if (*fmt == '\0')
|
|
|
|
|
fmt = _NL_CURRENT (LC_TIME, D_FMT);
|
|
|
|
|
|
|
|
|
|
if (!recursive (fmt))
|
|
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided == loc)
|
2004-03-15 05:12:06 +08:00
|
|
|
return NULL;
|
|
|
|
|
else
|
|
|
|
|
rp = rp_backup;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (strcmp (fmt, HERE_D_FMT))
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = loc;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
}
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = raw;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
if (!recursive (HERE_D_FMT))
|
|
|
|
|
return NULL;
|
|
|
|
|
break;
|
|
|
|
|
case 'X':
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided != raw)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
|
|
|
|
const char *fmt = _NL_CURRENT (LC_TIME, ERA_T_FMT);
|
|
|
|
|
|
|
|
|
|
if (*fmt == '\0')
|
|
|
|
|
fmt = _NL_CURRENT (LC_TIME, T_FMT);
|
|
|
|
|
|
|
|
|
|
if (!recursive (fmt))
|
|
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.decided == loc)
|
2004-03-15 05:12:06 +08:00
|
|
|
return NULL;
|
|
|
|
|
else
|
|
|
|
|
rp = rp_backup;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (strcmp (fmt, HERE_T_FMT))
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = loc;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
}
|
2007-07-29 03:08:57 +08:00
|
|
|
s.decided = raw;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
if (!recursive (HERE_T_FMT))
|
|
|
|
|
return NULL;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
#else
|
|
|
|
|
/* We have no information about the era format. Just use
|
|
|
|
|
the normal format. */
|
|
|
|
|
if (*fmt != 'c' && *fmt != 'C' && *fmt != 'y' && *fmt != 'Y'
|
|
|
|
|
&& *fmt != 'x' && *fmt != 'X')
|
|
|
|
|
/* This is an illegal format. */
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
goto start_over;
|
|
|
|
|
#endif
|
|
|
|
|
case 'O':
|
|
|
|
|
switch (*fmt++)
|
|
|
|
|
{
|
Abbreviated alternative month names (%Ob) also added (bug 10871).
All the previous changes also repeated to support abbreviated
alternative month names. In most languages which have declension and
need nominative/genitive month names the abbreviated forms for both
cases are the same. An example where they do differ is May in Russian:
this name is too short to be abbreviated so even the abbreviated form
features the declension suffixes.
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add abbreviated alternative month
names, define them as the same as abbreviated month names explicitly.
* locale/categories.def (LC_TIME): Add ab_alt_mon and wide-ab_alt_mon.
* locale/langinfo.h: (_NL_ABALTMON_1, _NL_ABALTMON_2, _NL_ABALTMON_3,
_NL_ABALTMON_4, _NL_ABALTMON_5, _NL_ABALTMON_6, _NL_ABALTMON_7,
_NL_ABALTMON_8, _NL_ABALTMON_9, _NL_ABALTMON_10, _NL_ABALTMON_11,
_NL_ABALTMON_12, _NL_WABALTMON_1, _NL_WABALTMON_2, _NL_WABALTMON_3,
_NL_WABALTMON_4, _NL_WABALTMON_5, _NL_WABALTMON_6, _NL_WABALTMON_7,
_NL_WABALTMON_8, _NL_WABALTMON_9, _NL_WABALTMON_10, _NL_WABALTMON_11,
_NL_WABALTMON_12): New enum constants.
* locale/programs/ld-time.c (struct locale_time_t): Add ab_alt_mon,
wab_alt_mon, and ab_alt_mon_defined members.
(time_output): Output ab_alt_mon and wab_alt_mon members.
(time_read): Read them, initialize them as copies of abmon and wabmon
respectively if they are missing, initialize ab_alt_mon_defined.
* locale/programs/locfile-kw.gperf (ab_alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_ab_alt_mon): New enum constant.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add es_ES.UTF-8
and ru_RU.UTF-8.
* time/strftime_l.c (a_altmonth, aam_len): New macros.
[!COMPILE_WIDE] (ABALTMON_1): New macro.
(__strftime_internal): Handle %Ob and %Oh formats.
* time/strptime_l.c [_LIBC] (ab_alt_month_name): New macro.
(__strptime_internal): Handle %Ob and %Oh formats.
* time/tst-strptime.c (day_tests): Add more tests to parse different
forms of month names including the new %Ob format specifier.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
2017-11-14 09:22:38 +08:00
|
|
|
case 'b':
|
Implement alternative month names (bug 10871).
Some languages (Slavic, Baltic, etc.) require a genitive case of the
month name when formatting a full date (with the day number) while
they require a nominative case when referring to the month standalone.
This requirement cannot be fulfilled without providing two forms for
each month name. From now it is specified that nl_langinfo(MON_1)
series (up to MON_12) and strftime("%B") generate the month names in
the grammatical form used when the month is a part of a complete date.
If the grammatical form used when the month is named by itself is needed,
the new values nl_langinfo(ALTMON_1) (up to ALTMON_12) and
strftime("%OB") are supported. This new feature is optional so the
languages which do not need it or do not yet provide the updated
locales simply do not use it and their behaviour is unchanged.
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add alternative month names,
define them as the same as primary full month names explicitly.
* locale/categories.def (LC_TIME): Add alt_mon and wide-alt_mon.
* locale/langinfo.h (__ALTMON_1, __ALTMON_2, __ALTMON_3, __ALTMON_4,
__ALTMON_5, __ALTMON_6, __ALTMON_7, __ALTMON_8, __ALTMON_9, __ALTMON_10,
__ALTMON_11, __ALTMON_12, _NL_WALTMON_1, _NL_WALTMON_2, _NL_WALTMON_3,
_NL_WALTMON_4, _NL_WALTMON_5, _NL_WALTMON_6, _NL_WALTMON_7,
_NL_WALTMON_8, _NL_WALTMON_9, _NL_WALTMON_10, _NL_WALTMON_11,
_NL_WALTMON_12): New enum constants.
[__USE_GNU] (ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, ALTMON_5, ALTMON_6,
ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, ALTMON_11, ALTMON_12): New
macros.
* locale/programs/ld-time.c (struct locale_time_t): Add alt_mon,
walt_mon, and alt_mon_defined members.
(time_output): Output alt_mon and walt_mon members.
(time_read): Read them, initialize them as copies of mon and wmon
respectively if they are missing, initialize alt_mon_defined.
* locale/programs/locfile-kw.gperf (alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_alt_mon): New enum constant.
* localedata/tst-langinfo.c (map): Add tests for the new constants
ALTMON_1 .. ALTMON_12.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add fr_FR.UTF-8
and pl_PL.UTF-8.
* time/strftime_l.c (f_altmonth): New macro.
(__strftime_internal): Handle %OB format.
* time/strptime_l.c [_LIBC] (alt_month_name): New macro.
(__strptime_internal): Handle %OB format.
* time/tst-strptime.c (day_tests): Add tests to parse different forms
of month names including the new %OB format specifier.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
2017-11-14 09:19:35 +08:00
|
|
|
case 'B':
|
Abbreviated alternative month names (%Ob) also added (bug 10871).
All the previous changes also repeated to support abbreviated
alternative month names. In most languages which have declension and
need nominative/genitive month names the abbreviated forms for both
cases are the same. An example where they do differ is May in Russian:
this name is too short to be abbreviated so even the abbreviated form
features the declension suffixes.
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add abbreviated alternative month
names, define them as the same as abbreviated month names explicitly.
* locale/categories.def (LC_TIME): Add ab_alt_mon and wide-ab_alt_mon.
* locale/langinfo.h: (_NL_ABALTMON_1, _NL_ABALTMON_2, _NL_ABALTMON_3,
_NL_ABALTMON_4, _NL_ABALTMON_5, _NL_ABALTMON_6, _NL_ABALTMON_7,
_NL_ABALTMON_8, _NL_ABALTMON_9, _NL_ABALTMON_10, _NL_ABALTMON_11,
_NL_ABALTMON_12, _NL_WABALTMON_1, _NL_WABALTMON_2, _NL_WABALTMON_3,
_NL_WABALTMON_4, _NL_WABALTMON_5, _NL_WABALTMON_6, _NL_WABALTMON_7,
_NL_WABALTMON_8, _NL_WABALTMON_9, _NL_WABALTMON_10, _NL_WABALTMON_11,
_NL_WABALTMON_12): New enum constants.
* locale/programs/ld-time.c (struct locale_time_t): Add ab_alt_mon,
wab_alt_mon, and ab_alt_mon_defined members.
(time_output): Output ab_alt_mon and wab_alt_mon members.
(time_read): Read them, initialize them as copies of abmon and wabmon
respectively if they are missing, initialize ab_alt_mon_defined.
* locale/programs/locfile-kw.gperf (ab_alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_ab_alt_mon): New enum constant.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add es_ES.UTF-8
and ru_RU.UTF-8.
* time/strftime_l.c (a_altmonth, aam_len): New macros.
[!COMPILE_WIDE] (ABALTMON_1): New macro.
(__strftime_internal): Handle %Ob and %Oh formats.
* time/strptime_l.c [_LIBC] (ab_alt_month_name): New macro.
(__strptime_internal): Handle %Ob and %Oh formats.
* time/tst-strptime.c (day_tests): Add more tests to parse different
forms of month names including the new %Ob format specifier.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
2017-11-14 09:22:38 +08:00
|
|
|
case 'h':
|
Implement alternative month names (bug 10871).
Some languages (Slavic, Baltic, etc.) require a genitive case of the
month name when formatting a full date (with the day number) while
they require a nominative case when referring to the month standalone.
This requirement cannot be fulfilled without providing two forms for
each month name. From now it is specified that nl_langinfo(MON_1)
series (up to MON_12) and strftime("%B") generate the month names in
the grammatical form used when the month is a part of a complete date.
If the grammatical form used when the month is named by itself is needed,
the new values nl_langinfo(ALTMON_1) (up to ALTMON_12) and
strftime("%OB") are supported. This new feature is optional so the
languages which do not need it or do not yet provide the updated
locales simply do not use it and their behaviour is unchanged.
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add alternative month names,
define them as the same as primary full month names explicitly.
* locale/categories.def (LC_TIME): Add alt_mon and wide-alt_mon.
* locale/langinfo.h (__ALTMON_1, __ALTMON_2, __ALTMON_3, __ALTMON_4,
__ALTMON_5, __ALTMON_6, __ALTMON_7, __ALTMON_8, __ALTMON_9, __ALTMON_10,
__ALTMON_11, __ALTMON_12, _NL_WALTMON_1, _NL_WALTMON_2, _NL_WALTMON_3,
_NL_WALTMON_4, _NL_WALTMON_5, _NL_WALTMON_6, _NL_WALTMON_7,
_NL_WALTMON_8, _NL_WALTMON_9, _NL_WALTMON_10, _NL_WALTMON_11,
_NL_WALTMON_12): New enum constants.
[__USE_GNU] (ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, ALTMON_5, ALTMON_6,
ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, ALTMON_11, ALTMON_12): New
macros.
* locale/programs/ld-time.c (struct locale_time_t): Add alt_mon,
walt_mon, and alt_mon_defined members.
(time_output): Output alt_mon and walt_mon members.
(time_read): Read them, initialize them as copies of mon and wmon
respectively if they are missing, initialize alt_mon_defined.
* locale/programs/locfile-kw.gperf (alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_alt_mon): New enum constant.
* localedata/tst-langinfo.c (map): Add tests for the new constants
ALTMON_1 .. ALTMON_12.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add fr_FR.UTF-8
and pl_PL.UTF-8.
* time/strftime_l.c (f_altmonth): New macro.
(__strftime_internal): Handle %OB format.
* time/strptime_l.c [_LIBC] (alt_month_name): New macro.
(__strptime_internal): Handle %OB format.
* time/tst-strptime.c (day_tests): Add tests to parse different forms
of month names including the new %OB format specifier.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
2017-11-14 09:19:35 +08:00
|
|
|
/* Match month name. Reprocess as plain 'B'. */
|
|
|
|
|
fmt--;
|
|
|
|
|
goto start_over;
|
2004-03-15 05:12:06 +08:00
|
|
|
case 'd':
|
|
|
|
|
case 'e':
|
|
|
|
|
/* Match day of month using alternate numeric symbols. */
|
|
|
|
|
get_alt_number (1, 31, 2);
|
|
|
|
|
tm->tm_mday = val;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.have_mday = 1;
|
|
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'H':
|
|
|
|
|
/* Match hour in 24-hour clock using alternate numeric
|
|
|
|
|
symbols. */
|
|
|
|
|
get_alt_number (0, 23, 2);
|
|
|
|
|
tm->tm_hour = val;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.have_I = 0;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'I':
|
|
|
|
|
/* Match hour in 12-hour clock using alternate numeric
|
|
|
|
|
symbols. */
|
|
|
|
|
get_alt_number (1, 12, 2);
|
|
|
|
|
tm->tm_hour = val % 12;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.have_I = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'm':
|
|
|
|
|
/* Match month using alternate numeric symbols. */
|
|
|
|
|
get_alt_number (1, 12, 2);
|
|
|
|
|
tm->tm_mon = val - 1;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.have_mon = 1;
|
|
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'M':
|
|
|
|
|
/* Match minutes using alternate numeric symbols. */
|
|
|
|
|
get_alt_number (0, 59, 2);
|
|
|
|
|
tm->tm_min = val;
|
|
|
|
|
break;
|
|
|
|
|
case 'S':
|
|
|
|
|
/* Match seconds using alternate numeric symbols. */
|
|
|
|
|
get_alt_number (0, 61, 2);
|
|
|
|
|
tm->tm_sec = val;
|
|
|
|
|
break;
|
|
|
|
|
case 'U':
|
|
|
|
|
get_alt_number (0, 53, 2);
|
2007-07-29 03:08:57 +08:00
|
|
|
s.week_no = val;
|
|
|
|
|
s.have_uweek = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'W':
|
|
|
|
|
get_alt_number (0, 53, 2);
|
2007-07-29 03:08:57 +08:00
|
|
|
s.week_no = val;
|
|
|
|
|
s.have_wweek = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'V':
|
|
|
|
|
get_alt_number (0, 53, 2);
|
|
|
|
|
/* XXX This cannot determine any field in TM without
|
|
|
|
|
further information. */
|
|
|
|
|
break;
|
|
|
|
|
case 'w':
|
|
|
|
|
/* Match number of weekday using alternate numeric symbols. */
|
|
|
|
|
get_alt_number (0, 6, 1);
|
|
|
|
|
tm->tm_wday = val;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.have_wday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
case 'y':
|
|
|
|
|
/* Match year within century using alternate numeric symbols. */
|
|
|
|
|
get_alt_number (0, 99, 2);
|
|
|
|
|
tm->tm_year = val >= 69 ? val : val + 100;
|
2007-07-29 03:08:57 +08:00
|
|
|
s.want_xday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2007-07-29 03:08:57 +08:00
|
|
|
if (statep != NULL)
|
|
|
|
|
{
|
|
|
|
|
/* Recursive invocation, returning success, so
|
|
|
|
|
update parent's struct tm and state. */
|
|
|
|
|
*(struct __strptime_state *) statep = s;
|
|
|
|
|
*tmp = tmb;
|
|
|
|
|
return (char *) rp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (s.have_I && s.is_pm)
|
2004-03-15 05:12:06 +08:00
|
|
|
tm->tm_hour += 12;
|
|
|
|
|
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.century != -1)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.want_century)
|
|
|
|
|
tm->tm_year = tm->tm_year % 100 + (s.century - 19) * 100;
|
2004-03-15 05:12:06 +08:00
|
|
|
else
|
|
|
|
|
/* Only the century, but not the year. Strange, but so be it. */
|
2007-07-29 03:08:57 +08:00
|
|
|
tm->tm_year = (s.century - 19) * 100;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.era_cnt != -1)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
era = _nl_select_era_entry (s.era_cnt HELPER_LOCALE_ARG);
|
2004-03-15 05:12:06 +08:00
|
|
|
if (era == NULL)
|
|
|
|
|
return NULL;
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.want_era)
|
2004-03-15 05:12:06 +08:00
|
|
|
tm->tm_year = (era->start_date[0]
|
|
|
|
|
+ ((tm->tm_year - era->offset)
|
|
|
|
|
* era->absolute_direction));
|
|
|
|
|
else
|
|
|
|
|
/* Era start year assumed. */
|
|
|
|
|
tm->tm_year = era->start_date[0];
|
|
|
|
|
}
|
|
|
|
|
else
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.want_era)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
|
|
|
|
/* No era found but we have seen an E modifier. Rectify some
|
|
|
|
|
values. */
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.want_century && s.century == -1 && tm->tm_year < 69)
|
2004-03-15 05:12:06 +08:00
|
|
|
tm->tm_year += 100;
|
|
|
|
|
}
|
|
|
|
|
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.want_xday && !s.have_wday)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
if ( !(s.have_mon && s.have_mday) && s.have_yday)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
|
|
|
|
/* We don't have tm_mon and/or tm_mday, compute them. */
|
|
|
|
|
int t_mon = 0;
|
|
|
|
|
while (__mon_yday[__isleap(1900 + tm->tm_year)][t_mon] <= tm->tm_yday)
|
|
|
|
|
t_mon++;
|
2007-07-29 03:08:57 +08:00
|
|
|
if (!s.have_mon)
|
2004-03-15 05:12:06 +08:00
|
|
|
tm->tm_mon = t_mon - 1;
|
2007-07-29 03:08:57 +08:00
|
|
|
if (!s.have_mday)
|
2004-03-15 05:12:06 +08:00
|
|
|
tm->tm_mday =
|
|
|
|
|
(tm->tm_yday
|
|
|
|
|
- __mon_yday[__isleap(1900 + tm->tm_year)][t_mon - 1] + 1);
|
2007-07-29 03:08:57 +08:00
|
|
|
s.have_mon = 1;
|
|
|
|
|
s.have_mday = 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
2007-02-09 09:33:57 +08:00
|
|
|
/* Don't crash in day_of_the_week if tm_mon is uninitialized. */
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.have_mon || (unsigned) tm->tm_mon <= 11)
|
2007-02-09 09:33:57 +08:00
|
|
|
day_of_the_week (tm);
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.want_xday && !s.have_yday && (s.have_mon || (unsigned) tm->tm_mon <= 11))
|
2004-03-15 05:12:06 +08:00
|
|
|
day_of_the_year (tm);
|
|
|
|
|
|
2007-07-29 03:08:57 +08:00
|
|
|
if ((s.have_uweek || s.have_wweek) && s.have_wday)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
|
|
|
|
int save_wday = tm->tm_wday;
|
|
|
|
|
int save_mday = tm->tm_mday;
|
|
|
|
|
int save_mon = tm->tm_mon;
|
2007-07-29 03:08:57 +08:00
|
|
|
int w_offset = s.have_uweek ? 0 : 1;
|
2004-03-15 05:12:06 +08:00
|
|
|
|
|
|
|
|
tm->tm_mday = 1;
|
|
|
|
|
tm->tm_mon = 0;
|
|
|
|
|
day_of_the_week (tm);
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.have_mday)
|
2004-03-15 05:12:06 +08:00
|
|
|
tm->tm_mday = save_mday;
|
2007-07-29 03:08:57 +08:00
|
|
|
if (s.have_mon)
|
2004-03-15 05:12:06 +08:00
|
|
|
tm->tm_mon = save_mon;
|
|
|
|
|
|
2007-07-29 03:08:57 +08:00
|
|
|
if (!s.have_yday)
|
2004-03-15 05:12:06 +08:00
|
|
|
tm->tm_yday = ((7 - (tm->tm_wday - w_offset)) % 7
|
2013-02-05 21:40:39 +08:00
|
|
|
+ (s.week_no - 1) * 7
|
|
|
|
|
+ (save_wday - w_offset + 7) % 7);
|
2004-03-15 05:12:06 +08:00
|
|
|
|
2007-07-29 03:08:57 +08:00
|
|
|
if (!s.have_mday || !s.have_mon)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
|
|
|
|
int t_mon = 0;
|
|
|
|
|
while (__mon_yday[__isleap(1900 + tm->tm_year)][t_mon]
|
|
|
|
|
<= tm->tm_yday)
|
|
|
|
|
t_mon++;
|
2007-07-29 03:08:57 +08:00
|
|
|
if (!s.have_mon)
|
2004-03-15 05:12:06 +08:00
|
|
|
tm->tm_mon = t_mon - 1;
|
2007-07-29 03:08:57 +08:00
|
|
|
if (!s.have_mday)
|
2004-03-15 05:12:06 +08:00
|
|
|
tm->tm_mday =
|
|
|
|
|
(tm->tm_yday
|
|
|
|
|
- __mon_yday[__isleap(1900 + tm->tm_year)][t_mon - 1] + 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tm->tm_wday = save_wday;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return (char *) rp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
char *
|
Convert miscellaneous function definitions to prototype style.
This patch converts various miscellaneous functions definitions in
glibc, found with grep and not covered by my previous scripted
conversions, from old-style K&R to prototype-style. These changes
were made manually. This is not necessarily exhaustive as formatting
variants may have prevented my grep from finding some such
definitions.
Regarding the changes to files from GMP, they may originally have been
omitted when removing __STDC__ conditionals because of the files
coming from another package, but (a) GMP no longer has __STDC__
conditionals there anyway and (b) we don't try to keep these files
verbatim in sync with GMP (and there are licensing differences), so
making the change to them in glibc seems reasonable.
Tested for x86_64 and x86 (testsuite - this patch affects files
containing assertions).
* debug/fortify_fail.c (__fortify_fail): Convert to
prototype-style function definition. Use internal_function.
* libio/genops.c (save_for_backup): Convert to prototype-style
function definition.
* libio/wgenops.c (save_for_wbackup): Likewise.
* login/grantpt.c (grantpt): Likewise.
* login/ptsname.c (ptsname): Likewise.
(__ptsname_r): Likewise.
* login/unlockpt.c (unlockpt): Likewise.
* mach/msgserver.c (__mach_msg_server): Likewise.
* misc/efgcvt.c (__APPEND (FUNC_PREFIX, fcvt)): Likewise.
(__APPEND (FUNC_PREFIX, ecvt)): Likewise.
(__APPEND (FUNC_PREFIX, gcvt)): Likewise.
* misc/efgcvt_r.c (__APPEND (FUNC_PREFIX, fcvt_r)): Likewise.
(__APPEND (FUNC_PREFIX, ecvt_r)): Likewise.
* nptl/cleanup_compat.c (_pthread_cleanup_push): Likewise.
* nptl/cleanup_defer_compat.c (_pthread_cleanup_push_defer):
Likewise.
* nptl/libc_pthread_init.c (__libc_pthread_init): Likewise. Use
internal_function.
* nptl/pthread_atfork.c (__pthread_atfork): Convert to
prototype-style function definition.
* nptl/pthread_create.c (__pthread_create_2_1): Likewise.
[SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)]
(__pthread_create_2_0): Likewise.
* nptl/pthread_key_create.c (__pthread_key_create): Likewise.
* nptl/register-atfork.c (__register_atfork): Likewise.
* posix/glob.c (glob): Likewise.
* posix/regcomp.c (re_comp): Likewise.
* posix/regexec.c (re_exec): Likewise.
* stdlib/add_n.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/cmp.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/divmod_1.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/divrem.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/lshift.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/mod_1.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/mul.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/mul_n.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/rshift.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/strtod.c (INTERNAL (STRTOF)): Convert to prototype-style
function definition.
(STRTOF): Likewise.
* stdlib/strtod_l.c (__STRTOF): Likewise.
* stdlib/strtol.c (INTERNAL (strtol)): Likewise.
* stdlib/strtol_l.c (INTERNAL (__strtol_l)): Likewise.
(__strtol_l): Likewise.
* stdlib/sub_n.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* string/memrchr.c (MEMRCHR): Convert to prototype-style function
definition.
* string/strcasecmp.c (LOCALE_PARAM_DECL): Remove macro.
[USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
type.
(__strcasecmp): Convert to prototype-style function definition.
* string/strncase.c (LOCALE_PARAM_DECL): Remove macro.
[USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
type.
(__strncasecmp): Convert to prototype-style function definition.
* sunrpc/pm_getport.c (__libc_rpc_getport): Likewise.
* sunrpc/xdr.c (xdr_union): Likewise.
* sunrpc/xdr_array.c (xdr_array): Likewise.
* sunrpc/xdr_ref.c (xdr_reference): Likewise.
* sysdeps/m68k/m680x0/fpu/s_atan.c (__CONCATX(__,FUNC)): Likewise.
* sysdeps/m68k/m680x0/fpu/s_isinf.c (__CONCATX(__,FUNC)):
Likewise.
* sysdeps/m68k/m680x0/fpu/s_scalbn.c (__CONCATX(__scalbn,suffix):
Likewise.
* sysdeps/m68k/m680x0/fpu/s_sincos.c (CONCATX(__,FUNC)): Likewise.
* sysdeps/unix/sysv/linux/i386/scandir64.c (__old_scandir64):
Likewise.
* time/strftime_l.c (LOCALE_PARAM_DECL): Remove macro.
(LOCALE_PARAM_PROTO): Likewise.
[_LIBC && USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include
argument type.
(ut_argument_spec): Remove macro.
(ut_argument_spec_iso): Rename to ut_argument_spec.
(memcpy_lowcase): Use LOCALE_PARAM in declaration. Convert to
prototype-style function definition.
(memcpy_uppcase): Likewise.
(__strftime_internal): Likewise.
(my_strftime): Likewise.
* time/strptime_l.c (LOCALE_PARAM_PROTO): Remove macro.
(LOCALE_PARAM_DECL): Likewise.
[_LIBC] (LOCALE_PARAM): Include argument type.
(__strptime_internal): Convert to prototype-style function
definition.
(strptime): Likewise.
* wcsmbs/wcscasecmp.c (LOCALE_PARAM_DECL): Remove macro.
[USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
type.
(__wcscasecmp): Convert to prototype-style function definition.
* wcsmbs/wcsncase.c (LOCALE_PARAM_DECL): Remove macro.
[USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
type.
(__wcsncasecmp): Convert to prototype-style function definition.
2015-10-21 05:27:22 +08:00
|
|
|
strptime (const char *buf, const char *format, struct tm *tm LOCALE_PARAM)
|
2004-03-15 05:12:06 +08:00
|
|
|
{
|
2007-07-29 03:08:57 +08:00
|
|
|
return __strptime_internal (buf, format, tm, NULL LOCALE_ARG);
|
2004-03-15 05:12:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef _LIBC
|
2002-08-28 06:57:05 +08:00
|
|
|
weak_alias (__strptime_l, strptime_l)
|
2004-03-15 05:12:06 +08:00
|
|
|
#endif
|
