mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
ec4b0518a3
Thu Sep 19 21:50:55 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/gettimeofday.c (__gettimeofday): Use localtime_r instead of localtime. Reported by Matthias Urlichs. * shlib-versions: Remove version number for libcrypt. * features.h: Define __USE_REENTRANT if _REENTRANT or _THREAD_SAFE. * libc-symbols.h: Define _REENTRANT while compiling libc. * sysdeps/unix/sysv/linux/i386/sysdep.S (__errno_location): Define even if !_LIBC_REENTRANT. * sysdeps/unix/sysv/linux/i386/sysdep.S (__errno_location): Likewise. * sysdeps/posix/cuserid.h: Remove prototype for geteuid(). De-ANSI-fy. * MakeTAGS ($P/libc.pot): Generate correctly formed header. * po/header.pot: Correct title line. * po/nl.po: Update. Thu Sep 19 18:59:55 1996 Ulrich Drepper <drepper@cygnus.com> * Makeconfig (soversions.mk): Prefer shared lib version numbers is add ons over version in libc itself. * sysdeps/unix/sysv/linux/i386/sysdep.S: Include <sysdep.h>. * sysdeps/unix/sysv/linux/i386/sysdep.h: Prevent multiple inclusion. * libio/iofgets.c: Use __flockfile and __funlockfile instead of _IO_flockfile and _IO_funlockfile resp. * locale/categories.def: Partly support for correct `era' handling in LC_TIME category. * locale/langinfo.h: Likewise. * locale/programs/ld-time.c: Likewise. * locale/localeinfo.h: Change comment a bit. * malloc/memalign.c: Don't use goto, not necessary anymore. 1996-09-18 Paul Eggert <eggert@twinsun.com> * time/mktime.c (ydhms_tm_diff): Work correctly even if year is negative, or if time_t is unsigned. * time/strftime.c (tm_diff): Work correctly even if tm_year is near INT_MIN. Tue Sep 17 16:14:34 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/__math.h (__inline_mathop): Changed to generate all three versions of the math function. (__inline_mathopf, __inline_mathopl): Removed. (__inline_functions): New temporary definition containing all non-trivial inline functions. Wed Sep 18 00:25:41 1996 Ulrich Drepper <drepper@cygnus.com> * time/strftime.c (strftime): The T_FMT_AMPM string may be empty. Tue Sep 17 20:27:18 1996 Ulrich Drepper <drepper@cygnus.com> * math/Makefile (extra-libs-others): Use $(extra-libs) instead of $(extra-libc). Tue Sep 17 17:09:44 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/stub/fpu_control.h: Correct end of file comment. Tue Sep 17 05:39:18 1996 Ulrich Drepper <drepper@cygnus.com> * stdio-common/bug3.c, stdio-common/bug4.c, stdio-common/bug5.c, stdio-common/test-popen.c: Remove temporary files after test. * stdio-common/bug5.c: Use `system' instead of `execlp'. Patches by Andreas Jaeger. * stdio-common/bug5.c: Create string for `system' argument to make sure the input and output file names are really correct. Sun Sep 15 12:46:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * configure.in: If $os contains a hyphen add the part before the hyphen to $ostry. Sun Sep 15 18:14:02 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/__math.h (__ieee754_pow, __ieee754_powf, __ieee754_powl): Rename local variable i to __i. (__ieee754_atan2, __ieee754_atan2f, __ieee754_atan2l): New inline functions. * sysdeps/m68k/fpu/e_atan2.c, sysdeps/m68k/fpu/e_atan2f.c, sysdeps/m68k/fpu/e_atan2l.c: New files. 1996-09-15 Paul Eggert <eggert@twinsun.com> * manual/time.texi: Change `range X to Y' to `range X through Y', to avoid ambiguity in English. (strftime): Numbers that do not have a range indicated are not padded. Describe E and O modifiers. %g, %G, %u: New formats. %C, %y, %Y: Describe behavior on negative years. %e: Fix typo (was labeled %d). %l, %V: Fix typo in range. %M, %S, %U, %w, %W: Give ranges. %p: Clarify how noon and midnight are handled for AM and PM. %s: Clarify leap second handling. %r: Now locale-defined. %C, %D, %e, %h, %n, %r, %t, %T: Say that they are POSIX.2 extensions. %z: Say that it is a GNU extension. %Z: Wording fix. * time/strftime.c: (strftime): %V: Fix mishandling of week numbers near year boundaries. %g, %G: New formats (suggested by Arthur David Olson). %U, %W: Use inline expression instead of `week' function. %C, %y: Handle negative years portably. %C, %Y: Use width 1, since values can be arbitrarily wide. %r: Use T_FMT_AMPM format if _NL_CURRENT is defined. %u: New Posix.2 format. %w: Width is 1, not 2. (iso_week_days): New function, for %V, %G, %g. (week): Remove; it didn't handle %V correctly. (__isleap): New macro. (mbsinit): Use arg, to pacify GCC -Wall. 1996-09-13 Paul Eggert <eggert@twinsun.com> * time/strftime.c (strftime): If using the GNU C library, do not bother to check for multibyte encodings, since they're safe in formats. Otherwise: - Check for multibyte encodings when encountering any character that is not in the basic execution character set of the C Standard. - Use mbrlen (if available) instead of mblen, to avoid modifying mblen's internal state. - Do not assume that '%' cannot appear as the first character of a multibyte character sequence, since this is possible when not in the initial shift state. (HAVE_MBRLEN, MULTIBYTE_IS_FORMAT_SAFE): Define if _LIBC is defined. (DO_MULTIBYTE): New macro. (<ctype.h>): Do not include. (<wchar.h>): Include if HAVE_MBRLEN. (mbstate_t, mbrlen, mbsinit): Define if ! HAVE_MBRLEN. (mbstate_zero): New constant. 1996-09-12 Paul Eggert <eggert@twinsun.com> * time/strftime.c (strftime): Use an empty zone if it can't be determined; POSIX.2 requires this. Use plain `int' for pad and modifier (which now contain char value). Use plain `int' for number_value, to print negative values correctly. Use plain `int' for digits; there was no need to make it unsigned. Initialize subfmt consistently. Remove incorrect code for %EC and %Ey; they aren't implemented yet. For %O, if there is no alternate digit, output Ascii instead of "". Output the `%' of an unknown format; this is most likely the right thing to do if a multibyte string has been misparsed. Thu Sep 12 23:23:13 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * stdio-common/scanf7.c (main): Remove extra conversion from printf format string. Thu Sep 12 23:01:16 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * stdlib/test-canon.c (tests): Rename structure member from errno to error, all uses changed. Thu Sep 12 20:08:06 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/__math.h (__ldexp, __ldexpf, __ldexpl): Removed. * sysdeps/m68k/fpu/s_ldexp.c, sysdeps/m68k/fpu/s_ldexpf.c, sysdeps/m68k/fpu/s_ldexpl.c: Removed, use generic implementation instead. * sysdeps/m68k/fpu/s_scalbn.c, sysdeps/m68k/fpu/s_scalbnf.c, sysdeps/m68k/fpu/s_scalbnl.c: Replaced with old contents of s_ldexp.c, s_ldexpf.c and s_ldexpl.c, resp., suitably adpted. * sysdeps/m68k/fpu/__math.h (__frexp, __frexpf, __frexpl): Return value must be in [0.5, 1), not [1, 2). Reported by Chris Lawrence. (__ilogb, __ilogbf, __ilogbl): Check for argument being zero. (__scalbn, __scalbnf, __scalbnl): Use second argument directly. Thu Sep 12 19:59:24 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/e_acoshl.c: Fix typos. * sysdeps/libm-ieee754/s_cbrtl.c: Remove unused variable. Thu Sep 12 19:59:24 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/e_acoshl.c: Fix typos. * sysdeps/libm-ieee754/s_cbrtl.c: Remove unused variable. Thu Sep 12 19:56:07 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * inet/herrno.c (__h_errno_location): Fix return type. Tue Sep 17 10:51:58 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * malloc/memalign.c (memalign): Only acquire __libc_malloc_lock for actual modifications to global state. Fri Sep 13 01:21:36 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/Makefile (includes): Add -I$(common-objpfx)mach/. * sysdeps/mach/hurd/Makefile (includes): Add -I$(common-objpfx)hurd/. Reported by Marcus Daniels. * sysdeps/generic/schedbits.h (struct sched_param): Renamed from struct sched_params. * sysdeps/stub/sched_setp.c (__sched_setparam): struct sched_params -> struct sched_param. * sysdeps/stub/sched_getp.c (__sched_getparam): Likewise. * sysdeps/stub/sched_sets.c (__sched_setscheduler): Likewise. Thu Sep 12 23:58:25 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/libc-lock.h (__libc_cleanup_region_start): Fix syntax error. * stdio-common/Makefile: Put lockfile in routines unconditionally. Define _MT_SAFE_IO if using for libio and compiling reentrant libc. * stdio-common/vfprintf.c (__flockfile, __funlockfile): Declare this always, not just if _LIBC_REENTRANT. (__funlockfile): Don't use weak_extern for this one; __libc_cleanup_region_end might be defined and the use of __funlockfile can't be protected the way the use of __flockfile can be. * sched.h: New file. Helper to access posix/sched.h. Thu Sep 12 12:33:52 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/hurd/dl-cache.c: Delete second copy of file accidentally added on. * sysdeps/stub/intr-msg.h: New file. * stdio-common/vfprintf.c: Include <libc-lock.h>. * stdio-common/vfscanf.c: Include <libc-lock.h>. * sysdeps/mach/libc-lock.h (__libc_cleanup_region_start): New macro. (__libc_cleanup_region_end): New macro.
865 lines
20 KiB
C
865 lines
20 KiB
C
/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU 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., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#ifdef _LIBC
|
|
# define HAVE_LIMITS_H 1
|
|
# define HAVE_MBLEN 1
|
|
# define HAVE_MBRLEN 1
|
|
# define HAVE_TM_GMTOFF 1
|
|
# define HAVE_TM_ZONE 1
|
|
# define MULTIBYTE_IS_FORMAT_SAFE 1
|
|
# define STDC_HEADERS 1
|
|
# include <ansidecl.h>
|
|
# include "../locale/localeinfo.h"
|
|
#endif
|
|
|
|
#include <sys/types.h> /* Some systems define `time_t' here. */
|
|
|
|
#ifdef TIME_WITH_SYS_TIME
|
|
# include <sys/time.h>
|
|
# include <time.h>
|
|
#else
|
|
# ifdef HAVE_SYS_TIME_H
|
|
# include <sys/time.h>
|
|
# else
|
|
# include <time.h>
|
|
# endif
|
|
#endif
|
|
|
|
/* Do multibyte processing if multibytes are supported, unless
|
|
multibyte sequences are safe in formats. Multibyte sequences are
|
|
safe if they cannot contain byte sequences that look like format
|
|
conversion specifications. The GNU C Library uses UTF8 multibyte
|
|
encoding, which is safe for formats, but strftime.c can be used
|
|
with other C libraries that use unsafe encodings. */
|
|
#define DO_MULTIBYTE (HAVE_MBLEN && ! MULTIBYTE_IS_FORMAT_SAFE)
|
|
|
|
#if DO_MULTIBYTE
|
|
# if HAVE_MBRLEN
|
|
# include <wchar.h>
|
|
# else
|
|
/* Simulate mbrlen with mblen as best we can. */
|
|
# define mbstate_t int
|
|
# define mbrlen(s, n, ps) mblen (s, n)
|
|
# define mbsinit(ps) (*(ps) == 0)
|
|
# endif
|
|
static const mbstate_t mbstate_zero;
|
|
#endif
|
|
|
|
#if HAVE_LIMITS_H
|
|
# include <limits.h>
|
|
#endif
|
|
|
|
#if STDC_HEADERS
|
|
# include <stddef.h>
|
|
# include <stdlib.h>
|
|
# include <string.h>
|
|
#else
|
|
# define memcpy(d, s, n) bcopy (s, d, n)
|
|
#endif
|
|
|
|
#ifndef __P
|
|
#if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
|
|
#define __P(args) args
|
|
#else
|
|
#define __P(args) ()
|
|
#endif /* GCC. */
|
|
#endif /* Not __P. */
|
|
|
|
#ifndef PTR
|
|
#ifdef __STDC__
|
|
#define PTR void *
|
|
#else
|
|
#define PTR char *
|
|
#endif
|
|
#endif
|
|
|
|
#ifndef CHAR_BIT
|
|
#define CHAR_BIT 8
|
|
#endif
|
|
|
|
#define TYPE_SIGNED(t) ((t) -1 < 0)
|
|
|
|
/* Bound on length of the string representing an integer value of type t.
|
|
Subtract one for the sign bit if t is signed;
|
|
302 / 1000 is log10 (2) rounded up;
|
|
add one for integer division truncation;
|
|
add one more for a minus sign if t is signed. */
|
|
#define INT_STRLEN_BOUND(t) \
|
|
((sizeof (t) * CHAR_BIT - TYPE_SIGNED (t)) * 302 / 100 + 1 + TYPE_SIGNED (t))
|
|
|
|
#define TM_YEAR_BASE 1900
|
|
|
|
#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
|
|
|
|
|
|
#ifdef _LIBC
|
|
# define gmtime_r __gmtime_r
|
|
# define localtime_r __localtime_r
|
|
#else
|
|
# if ! HAVE_LOCALTIME_R
|
|
# if ! HAVE_TM_GMTOFF
|
|
/* Approximate gmtime_r as best we can in its absence. */
|
|
#define gmtime_r my_gmtime_r
|
|
static struct tm *gmtime_r __P ((const time_t *, struct tm *));
|
|
static struct tm *
|
|
gmtime_r (t, tp)
|
|
const time_t *t;
|
|
struct tm *tp;
|
|
{
|
|
struct tm *l = gmtime (t);
|
|
if (! l)
|
|
return 0;
|
|
*tp = *l;
|
|
return tp;
|
|
}
|
|
# endif /* ! HAVE_TM_GMTOFF */
|
|
|
|
/* 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 /* ! HAVE_LOCALTIME_R */
|
|
#endif /* ! defined (_LIBC) */
|
|
|
|
|
|
#define add(n, f) \
|
|
do \
|
|
{ \
|
|
i += (n); \
|
|
if (i >= maxsize) \
|
|
return 0; \
|
|
else \
|
|
if (p) \
|
|
{ \
|
|
f; \
|
|
p += (n); \
|
|
} \
|
|
} while (0)
|
|
#define cpy(n, s) add ((n), memcpy((PTR) p, (PTR) (s), (n)))
|
|
|
|
#if ! HAVE_TM_GMTOFF
|
|
/* Yield the difference between *A and *B,
|
|
measured in seconds, ignoring leap seconds. */
|
|
static int tm_diff __P ((const struct tm *, const struct tm *));
|
|
static int
|
|
tm_diff (a, b)
|
|
const struct tm *a;
|
|
const struct tm *b;
|
|
{
|
|
/* Compute intervening leap days correctly even if year is negative.
|
|
Take care to avoid int overflow in leap day calculations,
|
|
but it's OK to assume that A and B are close to each other. */
|
|
int a4 = (a->tm_year >> 2) + (TM_YEAR_BASE >> 2) - ! (a->tm_year & 3);
|
|
int b4 = (b->tm_year >> 2) + (TM_YEAR_BASE >> 2) - ! (b->tm_year & 3);
|
|
int a100 = a4 / 25 - (a4 % 25 < 0);
|
|
int b100 = b4 / 25 - (b4 % 25 < 0);
|
|
int a400 = a100 >> 2;
|
|
int b400 = b100 >> 2;
|
|
int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400);
|
|
int years = a->tm_year - b->tm_year;
|
|
int days = (365 * years + intervening_leap_days
|
|
+ (a->tm_yday - b->tm_yday));
|
|
return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour))
|
|
+ (a->tm_min - b->tm_min))
|
|
+ (a->tm_sec - b->tm_sec));
|
|
}
|
|
#endif /* ! HAVE_TM_GMTOFF */
|
|
|
|
|
|
|
|
/* The number of days from the first day of the first ISO week of this
|
|
year to the year day YDAY with week day WDAY. ISO weeks start on
|
|
Monday; the first ISO week has the year's first Thursday. YDAY may
|
|
be as small as YDAY_MINIMUM. */
|
|
#define ISO_WEEK_START_WDAY 1 /* Monday */
|
|
#define ISO_WEEK1_WDAY 4 /* Thursday */
|
|
#define YDAY_MINIMUM (-366)
|
|
static int iso_week_days __P ((int, int));
|
|
#ifdef __GNUC__
|
|
inline
|
|
#endif
|
|
static int
|
|
iso_week_days (yday, wday)
|
|
int yday;
|
|
int wday;
|
|
{
|
|
/* Add enough to the first operand of % to make it nonnegative. */
|
|
int big_enough_multiple_of_7 = (-YDAY_MINIMUM / 7 + 2) * 7;
|
|
return (yday
|
|
- (yday - wday + ISO_WEEK1_WDAY + big_enough_multiple_of_7) % 7
|
|
+ ISO_WEEK1_WDAY - ISO_WEEK_START_WDAY);
|
|
}
|
|
|
|
|
|
#ifndef _NL_CURRENT
|
|
static char const weekday_name[][10] =
|
|
{
|
|
"Sunday", "Monday", "Tuesday", "Wednesday",
|
|
"Thursday", "Friday", "Saturday"
|
|
};
|
|
static char const month_name[][10] =
|
|
{
|
|
"January", "February", "March", "April", "May", "June",
|
|
"July", "August", "September", "October", "November", "December"
|
|
};
|
|
#endif
|
|
|
|
/* Write information from TP into S according to the format
|
|
string FORMAT, writing no more that MAXSIZE characters
|
|
(including the terminating '\0') and returning number of
|
|
characters written. If S is NULL, nothing will be written
|
|
anywhere, so to determine how many characters would be
|
|
written, use NULL for S and (size_t) UINT_MAX for MAXSIZE. */
|
|
size_t
|
|
strftime (s, maxsize, format, tp)
|
|
char *s;
|
|
size_t maxsize;
|
|
const char *format;
|
|
register const struct tm *tp;
|
|
{
|
|
int hour12 = tp->tm_hour;
|
|
#ifdef _NL_CURRENT
|
|
const char *const a_wkday = _NL_CURRENT (LC_TIME, ABDAY_1 + tp->tm_wday);
|
|
const char *const f_wkday = _NL_CURRENT (LC_TIME, DAY_1 + tp->tm_wday);
|
|
const char *const a_month = _NL_CURRENT (LC_TIME, ABMON_1 + tp->tm_mon);
|
|
const char *const f_month = _NL_CURRENT (LC_TIME, MON_1 + tp->tm_mon);
|
|
const char *const ampm = _NL_CURRENT (LC_TIME,
|
|
hour12 > 11 ? PM_STR : AM_STR);
|
|
size_t aw_len = strlen(a_wkday);
|
|
size_t am_len = strlen(a_month);
|
|
size_t ap_len = strlen (ampm);
|
|
|
|
const char *alt_digits = _NL_CURRENT (LC_TIME, ALT_DIGITS);
|
|
const char *end_alt_digits = _NL_CURRENT (LC_TIME, ALT_DIGITS + 1);
|
|
#else
|
|
const char *const f_wkday = weekday_name[tp->tm_wday];
|
|
const char *const f_month = month_name[tp->tm_mon];
|
|
const char *const a_wkday = f_wkday;
|
|
const char *const a_month = f_month;
|
|
const char *const ampm = "AMPM" + 2 * (hour12 > 11);
|
|
size_t aw_len = 3;
|
|
size_t am_len = 3;
|
|
size_t ap_len = 2;
|
|
#endif
|
|
size_t wkday_len = strlen (f_wkday);
|
|
size_t month_len = strlen (f_month);
|
|
const char *zone;
|
|
size_t zonelen;
|
|
register size_t i = 0;
|
|
register char *p = s;
|
|
register const char *f;
|
|
|
|
zone = 0;
|
|
#if HAVE_TM_ZONE
|
|
zone = (const char *) tp->tm_zone;
|
|
#endif
|
|
#if HAVE_TZNAME
|
|
if (!(zone && *zone) && tp->tm_isdst >= 0)
|
|
zone = tzname[tp->tm_isdst];
|
|
#endif
|
|
if (! zone)
|
|
zone = ""; /* POSIX.2 requires the empty string here. */
|
|
|
|
zonelen = strlen (zone);
|
|
|
|
if (hour12 > 12)
|
|
hour12 -= 12;
|
|
else
|
|
if (hour12 == 0) hour12 = 12;
|
|
|
|
for (f = format; *f != '\0'; ++f)
|
|
{
|
|
int pad; /* Padding for number ('-', '_', or 0). */
|
|
int modifier; /* Field modifier ('E', 'O', or 0). */
|
|
int digits; /* Max digits for numeric format. */
|
|
int number_value; /* Numeric value to be printed. */
|
|
int negative_number; /* 1 if the number is negative. */
|
|
const char *subfmt;
|
|
char *bufp;
|
|
char buf[1 + (sizeof (int) < sizeof (time_t)
|
|
? INT_STRLEN_BOUND (time_t)
|
|
: INT_STRLEN_BOUND (int))];
|
|
|
|
#if DO_MULTIBYTE
|
|
|
|
switch (*f)
|
|
{
|
|
case '%':
|
|
break;
|
|
|
|
case '\a': case '\b': case '\t': case '\n':
|
|
case '\v': case '\f': case '\r':
|
|
case ' ': case '!': case '"': case '#': case '&': case'\'':
|
|
case '(': case ')': case '*': case '+': case ',': case '-':
|
|
case '.': case '/': case '0': case '1': case '2': case '3':
|
|
case '4': case '5': case '6': case '7': case '8': case '9':
|
|
case ':': case ';': case '<': case '=': case '>': case '?':
|
|
case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
|
|
case 'G': case 'H': case 'I': case 'J': case 'K': case 'L':
|
|
case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R':
|
|
case 'S': case 'T': case 'U': case 'V': case 'W': case 'X':
|
|
case 'Y': case 'Z': case '[': case'\\': case ']': case '^':
|
|
case '_': case 'a': case 'b': case 'c': case 'd': case 'e':
|
|
case 'f': case 'g': case 'h': case 'i': case 'j': case 'k':
|
|
case 'l': case 'm': case 'n': case 'o': case 'p': case 'q':
|
|
case 'r': case 's': case 't': case 'u': case 'v': case 'w':
|
|
case 'x': case 'y': case 'z': case '{': case '|': case '}':
|
|
case '~':
|
|
/* The C Standard requires these 98 characters (plus '%') to
|
|
be in the basic execution character set. None of these
|
|
characters can start a multibyte sequence, so they need
|
|
not be analyzed further. */
|
|
add (1, *p = *f);
|
|
continue;
|
|
|
|
default:
|
|
/* Copy this multibyte sequence until we reach its end, find
|
|
an error, or come back to the initial shift state. */
|
|
{
|
|
mbstate_t mbstate = mbstate_zero;
|
|
size_t len = 0;
|
|
|
|
do
|
|
{
|
|
size_t bytes = mbrlen (f + len, (size_t) -1, &mbstate);
|
|
|
|
if (bytes == 0)
|
|
break;
|
|
|
|
if (bytes == (size_t) -2 || bytes == (size_t) -1)
|
|
{
|
|
len++;
|
|
break;
|
|
}
|
|
|
|
len += bytes;
|
|
}
|
|
while (! mbsinit (&mbstate));
|
|
|
|
cpy (len, f);
|
|
continue;
|
|
}
|
|
}
|
|
|
|
#else /* ! DO_MULTIBYTE */
|
|
|
|
/* Either multibyte encodings are not supported, or they are
|
|
safe for formats, so any non-'%' byte can be copied through. */
|
|
if (*f != '%')
|
|
{
|
|
add (1, *p = *f);
|
|
continue;
|
|
}
|
|
|
|
#endif /* ! DO_MULTIBYTE */
|
|
|
|
/* Check for flags that can modify a number format. */
|
|
++f;
|
|
switch (*f)
|
|
{
|
|
case '_':
|
|
case '-':
|
|
pad = *f++;
|
|
break;
|
|
|
|
default:
|
|
pad = 0;
|
|
break;
|
|
}
|
|
|
|
/* Check for modifiers. */
|
|
switch (*f)
|
|
{
|
|
case 'E':
|
|
case 'O':
|
|
modifier = *f++;
|
|
break;
|
|
|
|
default:
|
|
modifier = 0;
|
|
break;
|
|
}
|
|
|
|
/* Now do the specified format. */
|
|
switch (*f)
|
|
{
|
|
#define DO_NUMBER(d, v) \
|
|
digits = d; number_value = v; goto do_number
|
|
#define DO_NUMBER_SPACEPAD(d, v) \
|
|
digits = d; number_value = v; goto do_number_spacepad
|
|
|
|
case '\0': /* GNU extension: % at end of format. */
|
|
--f;
|
|
/* Fall through. */
|
|
case '%':
|
|
if (modifier != 0)
|
|
goto bad_format;
|
|
add (1, *p = *f);
|
|
break;
|
|
|
|
case 'a':
|
|
if (modifier != 0)
|
|
goto bad_format;
|
|
cpy (aw_len, a_wkday);
|
|
break;
|
|
|
|
case 'A':
|
|
if (modifier != 0)
|
|
goto bad_format;
|
|
cpy (wkday_len, f_wkday);
|
|
break;
|
|
|
|
case 'b':
|
|
case 'h': /* POSIX.2 extension. */
|
|
if (modifier != 0)
|
|
goto bad_format;
|
|
cpy (am_len, a_month);
|
|
break;
|
|
|
|
case 'B':
|
|
if (modifier != 0)
|
|
goto bad_format;
|
|
cpy (month_len, f_month);
|
|
break;
|
|
|
|
case 'c':
|
|
if (modifier == 'O')
|
|
goto bad_format;
|
|
#ifdef _NL_CURRENT
|
|
if (! (modifier == 'E'
|
|
&& *(subfmt = _NL_CURRENT (LC_TIME, ERA_D_T_FMT)) != '\0'))
|
|
subfmt = _NL_CURRENT (LC_TIME, D_T_FMT);
|
|
#else
|
|
subfmt = "%a %b %e %H:%M:%S %Z %Y";
|
|
#endif
|
|
|
|
subformat:
|
|
{
|
|
size_t len = strftime (p, maxsize - i, subfmt, tp);
|
|
if (len == 0 && *subfmt)
|
|
return 0;
|
|
add (len, ;);
|
|
}
|
|
break;
|
|
|
|
case 'C': /* POSIX.2 extension. */
|
|
if (modifier == 'O')
|
|
goto bad_format;
|
|
#ifdef _NL_CURRENT
|
|
/* XXX %EC is not implemented yet. */
|
|
#endif
|
|
{
|
|
int year = tp->tm_year + TM_YEAR_BASE;
|
|
DO_NUMBER (1, year / 100 - (year % 100 < 0));
|
|
}
|
|
|
|
case 'x':
|
|
if (modifier == 'O')
|
|
goto bad_format;
|
|
#ifdef _NL_CURRENT
|
|
if (! (modifier == 'E'
|
|
&& *(subfmt = _NL_CURRENT (LC_TIME, ERA_D_FMT)) != '\0'))
|
|
subfmt = _NL_CURRENT (LC_TIME, D_FMT);
|
|
goto subformat;
|
|
#endif
|
|
/* Fall through. */
|
|
case 'D': /* POSIX.2 extension. */
|
|
if (modifier != 0)
|
|
goto bad_format;
|
|
subfmt = "%m/%d/%y";
|
|
goto subformat;
|
|
|
|
case 'd':
|
|
if (modifier == 'E')
|
|
goto bad_format;
|
|
|
|
DO_NUMBER (2, tp->tm_mday);
|
|
|
|
case 'e': /* POSIX.2 extension. */
|
|
if (modifier == 'E')
|
|
goto bad_format;
|
|
|
|
DO_NUMBER_SPACEPAD (2, tp->tm_mday);
|
|
|
|
/* All numeric formats set DIGITS and NUMBER_VALUE and then
|
|
jump to one of these two labels. */
|
|
|
|
do_number_spacepad:
|
|
/* Force `_' flag. */
|
|
pad = '_';
|
|
|
|
do_number:
|
|
/* Format the number according to the MODIFIER flag. */
|
|
|
|
#ifdef _NL_CURRENT
|
|
if (modifier == 'O' && 0 <= number_value)
|
|
{
|
|
/* ALT_DIGITS is the first entry in an array with
|
|
alternative digit symbols. We have to find string
|
|
number NUMBER_VALUE, but must not look beyond
|
|
END_ALT_DIGITS. */
|
|
int run = number_value;
|
|
const char *cp = alt_digits;
|
|
|
|
while (run-- > 0 && cp < end_alt_digits)
|
|
cp = strchr (cp, '\0') + 1;
|
|
|
|
if (cp < end_alt_digits)
|
|
{
|
|
size_t digitlen = strlen (cp);
|
|
if (digitlen != 0)
|
|
{
|
|
cpy (digitlen, cp);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
{
|
|
unsigned int u = number_value;
|
|
|
|
bufp = buf + sizeof (buf);
|
|
negative_number = number_value < 0;
|
|
|
|
if (negative_number)
|
|
u = -u;
|
|
|
|
do
|
|
*--bufp = u % 10 + '0';
|
|
while ((u /= 10) != 0);
|
|
}
|
|
|
|
do_number_sign_and_padding:
|
|
if (negative_number)
|
|
*--bufp = '-';
|
|
|
|
if (pad != '-')
|
|
{
|
|
int padding = digits - (buf + sizeof (buf) - bufp);
|
|
|
|
if (pad == '_')
|
|
{
|
|
while (0 < padding--)
|
|
*--bufp = ' ';
|
|
}
|
|
else
|
|
{
|
|
bufp += negative_number;
|
|
while (0 < padding--)
|
|
*--bufp = '0';
|
|
if (negative_number)
|
|
*--bufp = '-';
|
|
}
|
|
}
|
|
|
|
cpy (buf + sizeof (buf) - bufp, bufp);
|
|
break;
|
|
|
|
|
|
case 'H':
|
|
if (modifier == 'E')
|
|
goto bad_format;
|
|
|
|
DO_NUMBER (2, tp->tm_hour);
|
|
|
|
case 'I':
|
|
if (modifier == 'E')
|
|
goto bad_format;
|
|
|
|
DO_NUMBER (2, hour12);
|
|
|
|
case 'k': /* GNU extension. */
|
|
if (modifier == 'E')
|
|
goto bad_format;
|
|
|
|
DO_NUMBER_SPACEPAD (2, tp->tm_hour);
|
|
|
|
case 'l': /* GNU extension. */
|
|
if (modifier == 'E')
|
|
goto bad_format;
|
|
|
|
DO_NUMBER_SPACEPAD (2, hour12);
|
|
|
|
case 'j':
|
|
if (modifier == 'E')
|
|
goto bad_format;
|
|
|
|
DO_NUMBER (3, 1 + tp->tm_yday);
|
|
|
|
case 'M':
|
|
if (modifier == 'E')
|
|
goto bad_format;
|
|
|
|
DO_NUMBER (2, tp->tm_min);
|
|
|
|
case 'm':
|
|
if (modifier == 'E')
|
|
goto bad_format;
|
|
|
|
DO_NUMBER (2, tp->tm_mon + 1);
|
|
|
|
case 'n': /* POSIX.2 extension. */
|
|
add (1, *p = '\n');
|
|
break;
|
|
|
|
case 'p':
|
|
cpy (ap_len, ampm);
|
|
break;
|
|
|
|
case 'R': /* GNU extension. */
|
|
subfmt = "%H:%M";
|
|
goto subformat;
|
|
|
|
case 'r': /* POSIX.2 extension. */
|
|
#ifdef _NL_CURRENT
|
|
if (*(subfmt = _NL_CURRENT (LC_TIME, T_FMT_AMPM)) == '\0')
|
|
#endif
|
|
subfmt = "%I:%M:%S %p";
|
|
goto subformat;
|
|
|
|
case 'S':
|
|
if (modifier == 'E')
|
|
goto bad_format;
|
|
|
|
DO_NUMBER (2, tp->tm_sec);
|
|
|
|
case 's': /* GNU extension. */
|
|
{
|
|
struct tm ltm = *tp;
|
|
time_t t = mktime (<m);
|
|
|
|
/* Generate string value for T using time_t arithmetic;
|
|
this works even if sizeof (long) < sizeof (time_t). */
|
|
|
|
bufp = buf + sizeof (buf);
|
|
negative_number = t < 0;
|
|
|
|
do
|
|
{
|
|
int d = t % 10;
|
|
t /= 10;
|
|
|
|
if (negative_number)
|
|
{
|
|
d = -d;
|
|
|
|
/* Adjust if division truncates to minus infinity. */
|
|
if (0 < -1 % 10 && d < 0)
|
|
{
|
|
t++;
|
|
d += 10;
|
|
}
|
|
}
|
|
|
|
*--bufp = d + '0';
|
|
}
|
|
while (t != 0);
|
|
|
|
digits = 1;
|
|
goto do_number_sign_and_padding;
|
|
}
|
|
|
|
case 'X':
|
|
if (modifier == 'O')
|
|
goto bad_format;
|
|
#ifdef _NL_CURRENT
|
|
if (! (modifier == 'E'
|
|
&& *(subfmt = _NL_CURRENT (LC_TIME, ERA_T_FMT)) != '\0'))
|
|
subfmt = _NL_CURRENT (LC_TIME, T_FMT);
|
|
goto subformat;
|
|
#endif
|
|
/* Fall through. */
|
|
case 'T': /* POSIX.2 extension. */
|
|
subfmt = "%H:%M:%S";
|
|
goto subformat;
|
|
|
|
case 't': /* POSIX.2 extension. */
|
|
add (1, *p = '\t');
|
|
break;
|
|
|
|
case 'u': /* POSIX.2 extension. */
|
|
DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1);
|
|
|
|
case 'U':
|
|
if (modifier == 'E')
|
|
goto bad_format;
|
|
|
|
DO_NUMBER (2, (tp->tm_yday - tp->tm_wday + 7) / 7);
|
|
|
|
case 'V':
|
|
case 'g': /* GNU extension. */
|
|
case 'G': /* GNU extension. */
|
|
if (modifier == 'E')
|
|
goto bad_format;
|
|
{
|
|
int year = tp->tm_year + TM_YEAR_BASE;
|
|
int days = iso_week_days (tp->tm_yday, tp->tm_wday);
|
|
|
|
if (days < 0)
|
|
{
|
|
/* This ISO week belongs to the previous year. */
|
|
year--;
|
|
days = iso_week_days (tp->tm_yday + (365 + __isleap (year)),
|
|
tp->tm_wday);
|
|
}
|
|
else
|
|
{
|
|
int d = iso_week_days (tp->tm_yday - (365 + __isleap (year)),
|
|
tp->tm_wday);
|
|
if (0 <= d)
|
|
{
|
|
/* This ISO week belongs to the next year. */
|
|
year++;
|
|
days = d;
|
|
}
|
|
}
|
|
|
|
switch (*f)
|
|
{
|
|
case 'g':
|
|
DO_NUMBER (2, (year % 100 + 100) % 100);
|
|
|
|
case 'G':
|
|
DO_NUMBER (1, year);
|
|
|
|
default:
|
|
DO_NUMBER (2, days / 7 + 1);
|
|
}
|
|
}
|
|
|
|
case 'W':
|
|
if (modifier == 'E')
|
|
goto bad_format;
|
|
|
|
DO_NUMBER (2, (tp->tm_yday - (tp->tm_wday - 1 + 7) % 7 + 7) / 7);
|
|
|
|
case 'w':
|
|
if (modifier == 'E')
|
|
goto bad_format;
|
|
|
|
DO_NUMBER (1, tp->tm_wday);
|
|
|
|
case 'Y':
|
|
#ifdef _NL_CURRENT
|
|
if (modifier == 'E'
|
|
&& *(subfmt = _NL_CURRENT (LC_TIME, ERA_YEAR)) != '\0')
|
|
goto subformat;
|
|
#endif
|
|
if (modifier == 'O')
|
|
goto bad_format;
|
|
else
|
|
DO_NUMBER (1, tp->tm_year + TM_YEAR_BASE);
|
|
|
|
case 'y':
|
|
#ifdef _NL_CURRENT
|
|
/* XXX %Ey is not implemented yet. */
|
|
#endif
|
|
DO_NUMBER (2, (tp->tm_year % 100 + 100) % 100);
|
|
|
|
case 'Z':
|
|
cpy(zonelen, zone);
|
|
break;
|
|
|
|
case 'z': /* GNU extension. */
|
|
if (tp->tm_isdst < 0)
|
|
break;
|
|
|
|
{
|
|
int diff;
|
|
#if HAVE_TM_GMTOFF
|
|
diff = tp->tm_gmtoff;
|
|
#else
|
|
struct tm gtm;
|
|
struct tm ltm = *tp;
|
|
time_t lt = mktime (<m);
|
|
|
|
if (lt == (time_t) -1)
|
|
{
|
|
/* mktime returns -1 for errors, but -1 is also a
|
|
valid time_t value. Check whether an error really
|
|
occurred. */
|
|
struct tm tm;
|
|
localtime_r (<, &tm);
|
|
|
|
if ((ltm.tm_sec ^ tm.tm_sec)
|
|
| (ltm.tm_min ^ tm.tm_min)
|
|
| (ltm.tm_hour ^ tm.tm_hour)
|
|
| (ltm.tm_mday ^ tm.tm_mday)
|
|
| (ltm.tm_mon ^ tm.tm_mon)
|
|
| (ltm.tm_year ^ tm.tm_year))
|
|
break;
|
|
}
|
|
|
|
if (! gmtime_r (<, >m))
|
|
break;
|
|
|
|
diff = tm_diff (<m, >m);
|
|
#endif
|
|
|
|
if (diff < 0)
|
|
{
|
|
add (1, *p = '-');
|
|
diff = -diff;
|
|
}
|
|
else
|
|
add (1, *p = '+');
|
|
|
|
diff /= 60;
|
|
DO_NUMBER (4, (diff / 60) * 100 + diff % 60);
|
|
}
|
|
|
|
default:
|
|
/* Unknown format; output the format, including the '%',
|
|
since this is most likely the right thing to do if a
|
|
multibyte string has been misparsed. */
|
|
bad_format:
|
|
{
|
|
int flen;
|
|
for (flen = 2; f[1 - flen] != '%'; flen++)
|
|
continue;
|
|
cpy (flen, &f[1 - flen]);
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (p)
|
|
*p = '\0';
|
|
return i;
|
|
}
|