mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
0d8733c4fc
1997-03-16 18:43 Ulrich Drepper <drepper@cygnus.com> * manual/filesys.texi: Add documentation for scandir and alphasort. * math/math.c (fpclassify): Correct stupid typos. * math/libm-test.c: New file. libm test suite by Andreas Jaeger. * nss/nss_files/files-hosts.c: Add gethostbyname2 imlementation. * posix/Makefile (routines): Add bsd-getpgrp. * posix/bsd-getpgrp.c: New file. * posix/unistd.h [__FAVOR_BSD]: Define macro getpgrp which maps calls to __bsd_getpgrp. * sysdeps/generic/getpgrp.c: De-ANSI-declfy. * sysdeps/i386/huge_val.h: New file. ix87 specific infinity values. * sysdeps/m68k/huge_val.h: New file. m68k specific infinity values. * sysdeps/generic/huge_val.h: Remove definition of long double definition. Make it the same as the double definition. * sysdeps/libm-i387/e_acos.S: Fix bug in FPU stack handling. * sysdeps/libm-i387/e_acosf.S: Likewise. * sysdeps/libm-i387/e_acosl.S: Likewise. * sysdeps/libm-i387/e_asin.S: Likewise. * sysdeps/libm-i387/e_asinf.S: Likewise. * sysdeps/libm-i387/e_asinl.S: Likewise. * sysdeps/libm-i387/e_exp.S: Likewise. * sysdeps/libm-i387/e_expf.S: Likewise. * sysdeps/libm-i387/e_expl.S: Likewise. * sysdeps/libm-i387/e_scalbn.S: Likewise. * sysdeps/libm-i387/e_scalbnf.S: Likewise. * sysdeps/libm-i387/e_scalbnl.S: Likewise. * sysdeps/libm-i387/e_log.S: Optimize branch code. * sysdeps/libm-i387/e_logf.S: Likewise. * sysdeps/libm-i387/e_logl.S: Likewise. * sysdeps/libm-i387/e_log10.S: Likewise. * sysdeps/libm-i387/e_log10f.S: Likewise. * sysdeps/libm-i387/e_log10l.S: Likewise. * sysdeps/libm-i387/e_pow.S: Major rewrite to handle special cases. * sysdeps/libm-i387/e_powf.S: Likewise. * sysdeps/libm-i387/e_powl.S: Likewise. * sysdeps/libm-i387/e_expm1.S: Change return value for -inf argument to -1.0. * sysdeps/libm-i387/e_expm1f.S: Likewise. * sysdeps/libm-i387/e_expm1l.S: Likewise. * sysdeps/libm-i387/e_isinfl.c: Return -1 for -inf. * sysdeps/libm-i387/e_logbl.S: Correct return value. Discard first stack element after fxtract. * sysdeps/libm-ieee754/e_atan2l.c: New file. `long double' implementation for atan2 function. * sysdeps/libm-ieee754/k_standard.c: Return NAN for libm not in _SVID_ mode when acos, asin, atan2, log, log10 is called with argument out of range. Add new error case for pow(+0,neg). * sysdeps/libm-ieee754/s_fpclassifyf.c: Correct recognition of NaN and +-inf. * sysdeps/libm-ieee754/s_fpclassifyl.c: Mask out explicit leading digit in stupid 80 bit formats. * sysdeps/libm-ieee754/s_isinf.c: Rewrite to return -1 for -inf. * sysdeps/libm-ieee754/s_isinff.c: Likewise. * sysdeps/libm-ieee754/s_isinfl.c: Likewise. * sysdeps/libm-ieee754/s_scalbnl.c (huge, tiny): Adapt values for long double type. * sysdeps/libm-ieee754/w_atan2.c: Do not raise exception expect when in SVID mode. * sysdeps/libm-ieee754/w_atan2f.c: Likewise. * sysdeps/libm-ieee754/w_atan2l.c: Likewise. * sysdeps/libm-ieee754/w_pow.c: Distinguish error cases for x is +0 or -0. * sysdeps/posix/isfdtype.c: Add cast to prevent warning. * sysdeps/stub/fcntlbits.h: Update copyright. * sysdeps/unix/bsd/fcntlbits.h: Likewise. * sysdeps/unix/bsd/bsd4.4/fcntlbits.h: Likewise. * sysdeps/unix/bsd/sun/sunos4/fcntlbits.h: Likewise. * sysdeps/unix/bsd/ultrix4/fcntlbits.h: Likewise. * sysdeps/unix/common/fcntlbits.h: Likewise. * sysdeps/unix/sysv/fcntlbits.h: Likewise. Define O_FSYNC as alias of O_SYNC. Add BSD compatibility macros FAPPEND, FFSYNC, FNONBLOCK, and FNDELAY. * sysdeps/unix/sysv/irix4/fcntlbits.h: Likewise. * sysdeps/unix/readdir_r.c: Don't copy whole `struct dirent' record, only reclen bytes. * sysdeps/unix/sysv/linux/fcntlbits.h [__USE_GNU]: Add O_READ, O_WRITE and O_NORW. * sysdeps/unix/sysv/linux/alpha/fcntlbits.h: Likewise. * sysdeps/unix/sysv/linux/init-first.h: Add copyright. * sysdeps/unix/sysv/linux/fxstat.c: New file. Rewrite kernel-level struct stat to user-level form. * sysdeps/unix/sysv/linux/lxstat: New file. * sysdeps/unix/sysv/linux/xstat: New file. * sysdeps/unix/sysv/linux/kernel_stat.h: Define struct stat used in kernel. * sysdeps/unix/sysv/linux/statbuf.h (struct stat): Change definition to use prescribed types for elements. (_STAT_VER): Change to value 3. * sysdeps/unix/sysv/linux/alph/statbuf.h: Likewise. * sysdeps/unix/sysv/linux/Dist: Add kernel_stat.h. * sysdeps/unix/sysv/linux/alpha/Dist: Likewise. * time/Makefile: Correct dependencies for test-tz. 1997-03-16 14:59 Philip Blundell <phil@london.uk.eu.org> * resolv/netdb.h: Add prototypes for gai_strerror and getnameinfo (needed for IPv6 basic sockets API). 1997-03-16 15:02 a sun <asun@zoology.washington.edu> * sysdeps/unix/sysv/linux/net/if_ppp.h: Don't use incompatible kernel header. * sysdeps/unix/sysv/linux/net/ppp_defs.h: Likewise. 1997-03-14 17:15 Ulrich Drepper <drepper@cygnus.com> * db/hash/hash_bigkey.c (__big_delete): Don't call __free_ovflpage without testing for last_bfp to be NULL. Reported by fabsoft@fabserver1.zarm.uni-bremen.de. 1997-03-13 11:42 Jim Meyering <meyering@asic.sc.ti.com> * time/mktime.c (TIME_T_MIN): Work around a bug in Cray C 5.0.3.0. 1997-03-14 04:00 Kurt Garloff <garloff@kg1.ping.de> * sysdeps/unix/sysv/linux/fcntlbits.h (O_FSYNC): Make alias for O_SYNC. (FASYNC): Move to __USE_BSD section. Create new macro O_ASYNC. 1997-03-14 02:50 Ulrich Drepper <drepper@cygnus.com> * nis/nss_nis/nis-hosts.c (_nss_nis_gethostbyname2_r): New functions. Compare result for correct address type. (_nss_nis_gethostbyname_r): Use _nss_nis_gethostbyname2_r. Reported by Mirko Streckenbach <mirko@marian.hil.de>. 1997-02-17 01:40 Zlatko Calusic <zcalusic@srce.hr> * time/strptime.c (recursive): Return rp to caller. (strptime_internal): First check for long names, then abbreviated (month & weekday). 1997-03-10 19:44 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig: Remove useless definitions of ASFLAGS-%. * config.make.in (ASFLAGS-.so): Remove. * configure.in: Don't substitute ASFLAGS_SO. * sysdeps/sparc/configure.in: Remove file. * sysdeps/sparc/Makefile (ASFLAGS-.so): Define. 1997-03-11 17:00 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * time/strptime.c (strptime_internal) [case 'Y']: Always subtract 1900 from year, regardless of century. 1997-03-12 05:43 Ulrich Drepper <drepper@cygnus.com> * stdlib/strtod.c (_tens_in_limb) [BITS_PER_MP_LIMB > 32]: Make all numbers unsigned to make buggy gccs happy. Patch by Bryan W. Headley <bheadley@interaccess.com>. * sysdeps/unix/sysv/linux/netinet/ip.h: Add backward-compatibility definitions. Patch by a sun <asun@zoology.washington.edu>. Pretty print header. * Makerules (build-shlib): Also create symlink if library is versioned. based on a patch by H.J. Lu <hjl@gnu.ai.mit.edu>. Remove special rule to libc.so symlink. 1997-03-11 20:16 Andreas Jaeger <aj@arthur.pfalz.de> * manual/math.texi (Domain and Range Errors): Change descriptions according to recent changes for ISO C 9X. 1997-03-11 22:39 Ulrich Drepper <drepper@cygnus.com> * sysdeps/libm-ieee754/k_standard.c (__kernel_standard): Correct return values for acos, asin, and atan2. Reported by Andreas Jaeger <aj@arthur.pfalz.de>. 1997-03-10 18:16 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * ypclnt.c (__yp_bind): Fix possible buffer overflow. 1997-03-10 18:06 Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE> * dirent/alphasort.c (alphasort): Interpret arguments as pointers to pointers to directory entries so that alphasort really can be used as argument for scandir. 1997-03-09 23:33 Andreas Jaeger <aj@arthur.pfalz.de> * string/strdup.c: Declare memcpy if !(_LIBC || STDC_HEADERS) instead of strcpy. 1997-03-10 03:34 Ulrich Drepper <drepper@cygnus.com> * catgets/catgets.c (catopen): Always add NLSPATH to search path for catalogs, not only if the envvar NLSPATH is not available. Reported by Andries.Brouwer@cwi.nl. 1997-03-10 02:46 Ulrich Drepper <drepper@cygnus.com> * Makeconfig (localtime-file): Don't define using installation directory. (inst_localtime-file): New variable. * time/Makefile (installed-localtime-file): Use inst_localtime-file. Reported by Edward Seidl <seidl@janed.com>. 1997-03-10 02:31 H.J. Lu <hjl@gnu.ai.mit.edu> * time/Makefile: Add source files to dependencies for test data. 1997-03-09 22:53 Thorsten Kukuk <kukuk@weber.uni-paderborn.de> * nis/nss_nis/nis-ethers.c: Don't ignore return value of yp_all. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. 1997-03-08 14:37 Miguel de Icaza <miguel@nuclecu.unam.mx> * sysdeps/sparc/dl-machine.h (elf_machine_rela): Upgrade to versioning; Added missing R_SPARC_WDISP30 handling. (RTLD_START): Implement it. * sysdeps/unix/sysv/linux/sparc/brk.c: Fix. * sysdeps/unix/sysv/linux/sparc/start.c: Startup code for Linux/SPARC. 1997-03-02 18:06 Miguel de Icaza <miguel@nuclecu.unam.mx> * sysdeps/sparc/dl-machine.h (RTLD_START): Make arg as expected by the dynamic linker instead of having a new conditional define. Thanks to Richard Henderson for pointing this out. * elf/rtld.c: Remove usage of ELF_ADJUST_ARG. 1997-03-20 20:44 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/hurd/euidaccess.c: Define as __euidaccess and make euidaccess weak alias. 1997-03-07 10:30 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * stdio-common/printf_fphex.c (MIN): New macro. * sysdeps/generic/netinet/in.h: Include <sys/types.h>. * sysdeps/generic/sys/mman.h (msync): Mention third arg. * sysdeps/generic/netinet/in.h: Add definitions for IPv6 basic API. (See change by Philip Blundell on Feb 16, 1997.) 1997-03-05 10:40 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * hurd/hurd.h (vpprintf): Include <stdarg.h>. New declaration. * hurd/set-host.c (_hurd_set_host_config): Cast second arg to __file_name_split. * mach/mach_error.c (mach_error_string_int): Give full prototype. * mach/errstring.c (mach_error_string_int): Likewise. * mach/error_compat.c (__mach_error_map_compat): Likewise. * hurd/vpprintf.c (pwrite, vpprintf): Likewise. * stdio/vasprintf.c (vasprintf): Likewise. * mach/mach/mach_traps.h: Include <mach/kern_return.h>. * mach/spin-solid.c: Include <mach/mach_traps.h>. * mach/spin-solid.c (__spin_lock_solid): Provide arg to swtch_pri. * mach/mach_init.c: Include <mach/mig_support.h>. * mach/mach_error.h (mach_error_string, mach_error, mach_error_type): Always provide prototypes. * mach/mach/error.h (mach_error_fn_t): Comment out declaration; it appears to be entirely unused dead code. * stdio/stdio.h (freopen): Fix spelling error. 1997-03-02 13:38 Miles Bader <miles@gnu.ai.mit.edu> * string/argz.h (__need_error_t): New macro, before including <errno.h> [!__const] (__const): New macro. [!__error_t_defined] (error_t): New typedef. * sysdeps/generic/socketbits.h: Add PF_FILE as synonym for PF_LOCAL * sysdeps/unix/sysv/linux/socketbits.h: Likewise.
735 lines
17 KiB
C
735 lines
17 KiB
C
/* Convert a string representation of time to a time value.
|
|
Copyright (C) 1996, 1997 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
/* XXX This version of the implementation is not really complete.
|
|
Some of the fields cannot add information alone. But if seeing
|
|
some of them in the same format (such as year, week and weekday)
|
|
this is enough information for determining the date. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <ctype.h>
|
|
#include <langinfo.h>
|
|
#include <limits.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
|
|
#ifdef _LIBC
|
|
# include "../locale/localeinfo.h"
|
|
#endif
|
|
|
|
|
|
#ifndef __P
|
|
# if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
|
|
# define __P(args) args
|
|
# else
|
|
# define __P(args) ()
|
|
# endif /* GCC. */
|
|
#endif /* Not __P. */
|
|
|
|
#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
|
|
static struct tm *localtime_r __P ((const time_t *, struct tm *));
|
|
static struct tm *
|
|
localtime_r (t, tp)
|
|
const time_t *t;
|
|
struct tm *tp;
|
|
{
|
|
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 ((cs1), (s2), len) == 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) \
|
|
do { \
|
|
val = 0; \
|
|
if (*rp < '0' || *rp > '9') \
|
|
return NULL; \
|
|
do { \
|
|
val *= 10; \
|
|
val += *rp++ - '0'; \
|
|
} while (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) \
|
|
do { \
|
|
if (*decided != raw) \
|
|
{ \
|
|
const char *alts = _NL_CURRENT (LC_TIME, ALT_DIGITS); \
|
|
val = 0; \
|
|
while (*alts != '\0') \
|
|
{ \
|
|
size_t len = strlen (alts); \
|
|
if (strncasecmp (alts, rp, len) == 0) \
|
|
break; \
|
|
alts = strchr (alts, '\0') + 1; \
|
|
++val; \
|
|
} \
|
|
if (*alts == '\0') \
|
|
{ \
|
|
if (*decided == loc && val != 0) \
|
|
return NULL; \
|
|
} \
|
|
else \
|
|
{ \
|
|
*decided = loc; \
|
|
break; \
|
|
} \
|
|
} \
|
|
get_number (from, to); \
|
|
} while (0)
|
|
#else
|
|
# define get_alt_number(from, to) \
|
|
/* We don't have the alternate representation. */ \
|
|
get_number(from, to)
|
|
#endif
|
|
#define recursive(new_fmt) \
|
|
(*(new_fmt) != '\0' \
|
|
&& (rp = strptime_internal (rp, (new_fmt), tm, decided)) != NULL)
|
|
|
|
|
|
#ifdef _LIBC
|
|
/* This is defined in locale/C-time.c in the GNU libc. */
|
|
extern const struct locale_data _nl_C_LC_TIME;
|
|
|
|
# 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)
|
|
# 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_T_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)
|
|
#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"
|
|
#endif
|
|
|
|
/* Status of lookup: do we use the locale data or the raw data? */
|
|
enum locale_status { not, loc, raw };
|
|
|
|
static char *
|
|
strptime_internal __P ((const char *buf, const char *format, struct tm *tm,
|
|
enum locale_status *decided));
|
|
|
|
static char *
|
|
strptime_internal (buf, format, tm, decided)
|
|
const char *buf;
|
|
const char *format;
|
|
struct tm *tm;
|
|
enum locale_status *decided;
|
|
{
|
|
const char *rp;
|
|
const char *fmt;
|
|
int cnt;
|
|
size_t val;
|
|
int have_I, is_pm;
|
|
|
|
rp = buf;
|
|
fmt = format;
|
|
have_I = is_pm = 0;
|
|
|
|
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;
|
|
#ifndef _NL_CURRENT
|
|
/* We need this for handling the `E' modifier. */
|
|
start_over:
|
|
#endif
|
|
switch (*fmt++)
|
|
{
|
|
case '%':
|
|
/* Match the `%' character itself. */
|
|
match_char ('%', *rp++);
|
|
break;
|
|
case 'a':
|
|
case 'A':
|
|
/* Match day of week. */
|
|
for (cnt = 0; cnt < 7; ++cnt)
|
|
{
|
|
#ifdef _NL_CURRENT
|
|
if (*decided !=raw)
|
|
{
|
|
if (match_string (_NL_CURRENT (LC_TIME, DAY_1 + cnt), rp))
|
|
{
|
|
if (*decided == not
|
|
&& strcmp (_NL_CURRENT (LC_TIME, DAY_1 + cnt),
|
|
weekday_name[cnt]))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
if (match_string (_NL_CURRENT (LC_TIME, ABDAY_1 + cnt), rp))
|
|
{
|
|
if (*decided == not
|
|
&& strcmp (_NL_CURRENT (LC_TIME, ABDAY_1 + cnt),
|
|
ab_weekday_name[cnt]))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
}
|
|
#endif
|
|
if (*decided != loc
|
|
&& (match_string (weekday_name[cnt], rp)
|
|
|| match_string (ab_weekday_name[cnt], rp)))
|
|
{
|
|
*decided = raw;
|
|
break;
|
|
}
|
|
}
|
|
if (cnt == 7)
|
|
/* Does not match a weekday name. */
|
|
return NULL;
|
|
tm->tm_wday = cnt;
|
|
break;
|
|
case 'b':
|
|
case 'B':
|
|
case 'h':
|
|
/* Match month name. */
|
|
for (cnt = 0; cnt < 12; ++cnt)
|
|
{
|
|
#ifdef _NL_CURRENT
|
|
if (*decided !=raw)
|
|
{
|
|
if (match_string (_NL_CURRENT (LC_TIME, MON_1 + cnt), rp))
|
|
{
|
|
if (*decided == not
|
|
&& strcmp (_NL_CURRENT (LC_TIME, MON_1 + cnt),
|
|
month_name[cnt]))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
if (match_string (_NL_CURRENT (LC_TIME, ABMON_1 + cnt), rp))
|
|
{
|
|
if (*decided == not
|
|
&& strcmp (_NL_CURRENT (LC_TIME, ABMON_1 + cnt),
|
|
ab_month_name[cnt]))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
}
|
|
#endif
|
|
if (match_string (month_name[cnt], rp)
|
|
|| match_string (ab_month_name[cnt], rp))
|
|
{
|
|
*decided = raw;
|
|
break;
|
|
}
|
|
}
|
|
if (cnt == 12)
|
|
/* Does not match a month name. */
|
|
return NULL;
|
|
tm->tm_mon = cnt;
|
|
break;
|
|
case 'c':
|
|
/* Match locale's date and time format. */
|
|
#ifdef _NL_CURRENT
|
|
if (*decided != raw)
|
|
{
|
|
if (!recursive (_NL_CURRENT (LC_TIME, D_T_FMT)))
|
|
{
|
|
if (*decided == loc)
|
|
return NULL;
|
|
}
|
|
else
|
|
{
|
|
if (*decided == not &&
|
|
strcmp (_NL_CURRENT (LC_TIME, D_T_FMT), HERE_D_T_FMT))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
#endif
|
|
if (!recursive (HERE_D_T_FMT))
|
|
return NULL;
|
|
break;
|
|
case 'C':
|
|
/* Match century number. */
|
|
get_number (0, 99);
|
|
/* We don't need the number. */
|
|
break;
|
|
case 'd':
|
|
case 'e':
|
|
/* Match day of month. */
|
|
get_number (1, 31);
|
|
tm->tm_mday = val;
|
|
break;
|
|
case 'x':
|
|
#ifdef _NL_CURRENT
|
|
if (*decided != raw)
|
|
{
|
|
if (!recursive (_NL_CURRENT (LC_TIME, D_FMT)))
|
|
{
|
|
if (*decided == loc)
|
|
return NULL;
|
|
}
|
|
else
|
|
{
|
|
if (decided == not
|
|
&& strcmp (_NL_CURRENT (LC_TIME, D_FMT), HERE_D_FMT))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
#endif
|
|
/* Fall through. */
|
|
case 'D':
|
|
/* Match standard day format. */
|
|
if (!recursive (HERE_D_FMT))
|
|
return NULL;
|
|
break;
|
|
case 'H':
|
|
/* Match hour in 24-hour clock. */
|
|
get_number (0, 23);
|
|
tm->tm_hour = val;
|
|
have_I = 0;
|
|
break;
|
|
case 'I':
|
|
/* Match hour in 12-hour clock. */
|
|
get_number (1, 12);
|
|
tm->tm_hour = val - 1;
|
|
have_I = 1;
|
|
break;
|
|
case 'j':
|
|
/* Match day number of year. */
|
|
get_number (1, 366);
|
|
tm->tm_yday = val - 1;
|
|
break;
|
|
case 'm':
|
|
/* Match number of month. */
|
|
get_number (1, 12);
|
|
tm->tm_mon = val - 1;
|
|
break;
|
|
case 'M':
|
|
/* Match minute. */
|
|
get_number (0, 59);
|
|
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
|
|
if (*decided != raw)
|
|
{
|
|
if (match_string (_NL_CURRENT (LC_TIME, AM_STR), rp))
|
|
{
|
|
if (strcmp (_NL_CURRENT (LC_TIME, AM_STR), HERE_AM_STR))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
if (match_string (_NL_CURRENT (LC_TIME, PM_STR), rp))
|
|
{
|
|
if (strcmp (_NL_CURRENT (LC_TIME, PM_STR), HERE_PM_STR))
|
|
*decided = loc;
|
|
is_pm = 1;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
#endif
|
|
if (!match_string (HERE_AM_STR, rp))
|
|
if (match_string (HERE_PM_STR, rp))
|
|
is_pm = 1;
|
|
else
|
|
return NULL;
|
|
break;
|
|
case 'r':
|
|
#ifdef _NL_CURRENT
|
|
if (*decided != raw)
|
|
{
|
|
if (!recursive (_NL_CURRENT (LC_TIME, T_FMT_AMPM)))
|
|
{
|
|
if (*decided == loc)
|
|
return NULL;
|
|
}
|
|
else
|
|
{
|
|
if (*decided == not &&
|
|
strcmp (_NL_CURRENT (LC_TIME, T_FMT_AMPM),
|
|
HERE_T_FMT_AMPM))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
#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;
|
|
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);
|
|
tm->tm_sec = val;
|
|
break;
|
|
case 'X':
|
|
#ifdef _NL_CURRENT
|
|
if (*decided != raw)
|
|
{
|
|
if (!recursive (_NL_CURRENT (LC_TIME, T_FMT)))
|
|
{
|
|
if (*decided == loc)
|
|
return NULL;
|
|
}
|
|
else
|
|
{
|
|
if (strcmp (_NL_CURRENT (LC_TIME, T_FMT), HERE_T_FMT))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
#endif
|
|
/* Fall through. */
|
|
case 'T':
|
|
if (!recursive (HERE_T_FMT))
|
|
return NULL;
|
|
break;
|
|
case 'u':
|
|
get_number (1, 7);
|
|
tm->tm_wday = val % 7;
|
|
break;
|
|
case 'g':
|
|
get_number (0, 99);
|
|
/* 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':
|
|
case 'V':
|
|
case 'W':
|
|
get_number (0, 53);
|
|
/* XXX This cannot determine any field in TM without some
|
|
information. */
|
|
break;
|
|
case 'w':
|
|
/* Match number of weekday. */
|
|
get_number (0, 6);
|
|
tm->tm_wday = val;
|
|
break;
|
|
case 'y':
|
|
/* Match year within century. */
|
|
get_number (0, 99);
|
|
tm->tm_year = val;
|
|
break;
|
|
case 'Y':
|
|
/* Match year including century number. */
|
|
get_number (0, INT_MAX);
|
|
tm->tm_year = val - 1900;
|
|
break;
|
|
case 'Z':
|
|
/* XXX How to handle this? */
|
|
break;
|
|
case 'E':
|
|
#ifdef _NL_CURRENT
|
|
switch (*fmt++)
|
|
{
|
|
case 'c':
|
|
/* Match locale's alternate date and time format. */
|
|
if (*decided != raw)
|
|
{
|
|
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))
|
|
{
|
|
if (*decided == loc)
|
|
return NULL;
|
|
}
|
|
else
|
|
{
|
|
if (strcmp (fmt, HERE_D_T_FMT))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
/* The C locale has no era information, so use the
|
|
normal representation. */
|
|
if (!recursive (HERE_D_T_FMT))
|
|
return NULL;
|
|
break;
|
|
case 'C':
|
|
case 'y':
|
|
case 'Y':
|
|
/* Match name of base year in locale's alternate
|
|
representation. */
|
|
/* XXX This is currently not implemented. It should
|
|
use the value _NL_CURRENT (LC_TIME, ERA). */
|
|
break;
|
|
case 'x':
|
|
if (*decided != raw)
|
|
{
|
|
const char *fmt = _NL_CURRENT (LC_TIME, ERA_D_FMT);
|
|
|
|
if (*fmt == '\0')
|
|
fmt = _NL_CURRENT (LC_TIME, D_FMT);
|
|
|
|
if (!recursive (fmt))
|
|
{
|
|
if (*decided == loc)
|
|
return NULL;
|
|
}
|
|
else
|
|
{
|
|
if (strcmp (fmt, HERE_D_FMT))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
if (!recursive (HERE_D_FMT))
|
|
return NULL;
|
|
break;
|
|
case 'X':
|
|
if (*decided != raw)
|
|
{
|
|
const char *fmt = _NL_CURRENT (LC_TIME, ERA_T_FMT);
|
|
|
|
if (*fmt == '\0')
|
|
fmt = _NL_CURRENT (LC_TIME, T_FMT);
|
|
|
|
if (!recursive (fmt))
|
|
{
|
|
if (*decided == loc)
|
|
return NULL;
|
|
}
|
|
else
|
|
{
|
|
if (strcmp (fmt, HERE_T_FMT))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
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++)
|
|
{
|
|
case 'd':
|
|
case 'e':
|
|
/* Match day of month using alternate numeric symbols. */
|
|
get_alt_number (1, 31);
|
|
tm->tm_mday = val;
|
|
break;
|
|
case 'H':
|
|
/* Match hour in 24-hour clock using alternate numeric
|
|
symbols. */
|
|
get_alt_number (0, 23);
|
|
tm->tm_hour = val;
|
|
have_I = 0;
|
|
break;
|
|
case 'I':
|
|
/* Match hour in 12-hour clock using alternate numeric
|
|
symbols. */
|
|
get_alt_number (1, 12);
|
|
tm->tm_hour = val - 1;
|
|
have_I = 1;
|
|
break;
|
|
case 'm':
|
|
/* Match month using alternate numeric symbols. */
|
|
get_alt_number (1, 12);
|
|
tm->tm_mon = val - 1;
|
|
break;
|
|
case 'M':
|
|
/* Match minutes using alternate numeric symbols. */
|
|
get_alt_number (0, 59);
|
|
tm->tm_min = val;
|
|
break;
|
|
case 'S':
|
|
/* Match seconds using alternate numeric symbols. */
|
|
get_alt_number (0, 61);
|
|
tm->tm_sec = val;
|
|
break;
|
|
case 'U':
|
|
case 'V':
|
|
case 'W':
|
|
get_alt_number (0, 53);
|
|
/* 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);
|
|
tm->tm_wday = val;
|
|
break;
|
|
case 'y':
|
|
/* Match year within century using alternate numeric symbols. */
|
|
get_alt_number (0, 99);
|
|
break;
|
|
default:
|
|
return NULL;
|
|
}
|
|
break;
|
|
default:
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
if (have_I && is_pm)
|
|
tm->tm_hour += 12;
|
|
|
|
return (char *) rp;
|
|
}
|
|
|
|
|
|
char *
|
|
strptime (buf, format, tm)
|
|
const char *buf;
|
|
const char *format;
|
|
struct tm *tm;
|
|
{
|
|
enum locale_status decided;
|
|
#ifdef _NL_CURRENT
|
|
decided = not;
|
|
#else
|
|
decided = raw;
|
|
#endif
|
|
return strptime_internal (buf, format, tm, &decided);
|
|
}
|