mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-14 07:30:32 +02:00
Update Gnulib to v0.1-603-g1d16a7b
This commit is contained in:
Andy Wingo
parent
139ef2d17c
commit
2d4da30fde
412 changed files with 3961 additions and 2000 deletions
122
lib/strftime.c
122
lib/strftime.c
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (C) 1991-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1991-2001, 2003-2007, 2009-2015 Free Software Foundation, Inc.
|
||||
|
||||
NOTE: The canonical source of this file is maintained with the GNU C Library.
|
||||
Bugs can be reported to bug-glibc@prep.ai.mit.edu.
|
||||
|
|
@ -30,6 +30,7 @@
|
|||
# else
|
||||
# include "strftime.h"
|
||||
# endif
|
||||
# include "time-internal.h"
|
||||
#endif
|
||||
|
||||
#include <ctype.h>
|
||||
|
|
@ -121,22 +122,11 @@ extern char *tzname[];
|
|||
|
||||
|
||||
#ifdef _LIBC
|
||||
# define mktime_z(tz, tm) mktime (tm)
|
||||
# define tzname __tzname
|
||||
# define tzset __tzset
|
||||
#endif
|
||||
|
||||
#if !HAVE_TM_GMTOFF
|
||||
/* Portable standalone applications should supply a "time.h" that
|
||||
declares a POSIX-compliant localtime_r, for the benefit of older
|
||||
implementations that lack localtime_r or have a nonstandard one.
|
||||
See the gnulib time_r module for one way to implement this. */
|
||||
# undef __gmtime_r
|
||||
# undef __localtime_r
|
||||
# define __gmtime_r gmtime_r
|
||||
# define __localtime_r localtime_r
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef FPRINTFTIME
|
||||
# define FPRINTFTIME 0
|
||||
#endif
|
||||
|
|
@ -385,12 +375,7 @@ iso_week_days (int yday, int wday)
|
|||
|
||||
/* When compiling this file, GNU applications can #define my_strftime
|
||||
to a symbol (typically nstrftime) to get an extended strftime with
|
||||
extra arguments UT and NS. Emacs is a special case for now, but
|
||||
this Emacs-specific code can be removed once Emacs's config.h
|
||||
defines my_strftime. */
|
||||
#if defined emacs && !defined my_strftime
|
||||
# define my_strftime nstrftime
|
||||
#endif
|
||||
extra arguments TZ and NS. */
|
||||
|
||||
#if FPRINTFTIME
|
||||
# undef my_strftime
|
||||
|
|
@ -398,8 +383,9 @@ iso_week_days (int yday, int wday)
|
|||
#endif
|
||||
|
||||
#ifdef my_strftime
|
||||
# define extra_args , ut, ns
|
||||
# define extra_args_spec , int ut, int ns
|
||||
# undef HAVE_TZSET
|
||||
# define extra_args , tz, ns
|
||||
# define extra_args_spec , timezone_t tz, int ns
|
||||
#else
|
||||
# if defined COMPILE_WIDE
|
||||
# define my_strftime wcsftime
|
||||
|
|
@ -411,7 +397,7 @@ iso_week_days (int yday, int wday)
|
|||
# define extra_args
|
||||
# define extra_args_spec
|
||||
/* We don't have this information in general. */
|
||||
# define ut 0
|
||||
# define tz 1
|
||||
# define ns 0
|
||||
#endif
|
||||
|
||||
|
|
@ -454,6 +440,9 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
|
|||
# define aw_len STRLEN (a_wkday)
|
||||
# define am_len STRLEN (a_month)
|
||||
# define ap_len STRLEN (ampm)
|
||||
#endif
|
||||
#if HAVE_TZNAME
|
||||
char **tzname_vec = tzname;
|
||||
#endif
|
||||
const char *zone;
|
||||
size_t i = 0;
|
||||
|
|
@ -483,20 +472,29 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
|
|||
zone = (const char *) tp->tm_zone;
|
||||
#endif
|
||||
#if HAVE_TZNAME
|
||||
if (ut)
|
||||
if (!tz)
|
||||
{
|
||||
if (! (zone && *zone))
|
||||
zone = "GMT";
|
||||
}
|
||||
else
|
||||
{
|
||||
# if !HAVE_TM_ZONE
|
||||
/* Infer the zone name from *TZ instead of from TZNAME. */
|
||||
tzname_vec = tz->tzname_copy;
|
||||
# endif
|
||||
/* POSIX.1 requires that local time zone information be used as
|
||||
though strftime called tzset. */
|
||||
# if HAVE_TZSET
|
||||
tzset ();
|
||||
# endif
|
||||
}
|
||||
/* The tzset() call might have changed the value. */
|
||||
if (!(zone && *zone) && tp->tm_isdst >= 0)
|
||||
zone = tzname_vec[tp->tm_isdst != 0];
|
||||
#endif
|
||||
if (! zone)
|
||||
zone = "";
|
||||
|
||||
if (hour12 > 12)
|
||||
hour12 -= 12;
|
||||
|
|
@ -681,24 +679,44 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
|
|||
switch (format_char)
|
||||
{
|
||||
#define DO_NUMBER(d, v) \
|
||||
digits = d; \
|
||||
number_value = v; goto do_number
|
||||
do \
|
||||
{ \
|
||||
digits = d; \
|
||||
number_value = v; \
|
||||
goto do_number; \
|
||||
} \
|
||||
while (0)
|
||||
#define DO_SIGNED_NUMBER(d, negative, v) \
|
||||
digits = d; \
|
||||
negative_number = negative; \
|
||||
u_number_value = v; goto do_signed_number
|
||||
do \
|
||||
{ \
|
||||
digits = d; \
|
||||
negative_number = negative; \
|
||||
u_number_value = v; \
|
||||
goto do_signed_number; \
|
||||
} \
|
||||
while (0)
|
||||
|
||||
/* The mask is not what you might think.
|
||||
When the ordinal i'th bit is set, insert a colon
|
||||
before the i'th digit of the time zone representation. */
|
||||
#define DO_TZ_OFFSET(d, negative, mask, v) \
|
||||
digits = d; \
|
||||
negative_number = negative; \
|
||||
tz_colon_mask = mask; \
|
||||
u_number_value = v; goto do_tz_offset
|
||||
do \
|
||||
{ \
|
||||
digits = d; \
|
||||
negative_number = negative; \
|
||||
tz_colon_mask = mask; \
|
||||
u_number_value = v; \
|
||||
goto do_tz_offset; \
|
||||
} \
|
||||
while (0)
|
||||
#define DO_NUMBER_SPACEPAD(d, v) \
|
||||
digits = d; \
|
||||
number_value = v; goto do_number_spacepad
|
||||
do \
|
||||
{ \
|
||||
digits = d; \
|
||||
number_value = v; \
|
||||
goto do_number_spacepad; \
|
||||
} \
|
||||
while (0)
|
||||
|
||||
case L_('%'):
|
||||
if (modifier != 0)
|
||||
|
|
@ -1124,7 +1142,7 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
|
|||
time_t t;
|
||||
|
||||
ltm = *tp;
|
||||
t = mktime (<m);
|
||||
t = mktime_z (tz, <m);
|
||||
|
||||
/* Generate string value for T using time_t arithmetic;
|
||||
this works even if sizeof (long) < sizeof (time_t). */
|
||||
|
|
@ -1265,9 +1283,9 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
|
|||
}
|
||||
if (modifier == L_('O'))
|
||||
goto bad_format;
|
||||
else
|
||||
DO_SIGNED_NUMBER (4, tp->tm_year < -TM_YEAR_BASE,
|
||||
tp->tm_year + (unsigned int) TM_YEAR_BASE);
|
||||
|
||||
DO_SIGNED_NUMBER (4, tp->tm_year < -TM_YEAR_BASE,
|
||||
tp->tm_year + (unsigned int) TM_YEAR_BASE);
|
||||
|
||||
case L_('y'):
|
||||
if (modifier == L_('E'))
|
||||
|
|
@ -1299,14 +1317,6 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
|
|||
to_lowcase = true;
|
||||
}
|
||||
|
||||
#if HAVE_TZNAME
|
||||
/* The tzset() call might have changed the value. */
|
||||
if (!(zone && *zone) && tp->tm_isdst >= 0)
|
||||
zone = tzname[tp->tm_isdst != 0];
|
||||
#endif
|
||||
if (! zone)
|
||||
zone = "";
|
||||
|
||||
#ifdef COMPILE_WIDE
|
||||
{
|
||||
/* The zone string is always given in multibyte form. We have
|
||||
|
|
@ -1346,7 +1356,7 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
|
|||
#if HAVE_TM_GMTOFF
|
||||
diff = tp->tm_gmtoff;
|
||||
#else
|
||||
if (ut)
|
||||
if (!tz)
|
||||
diff = 0;
|
||||
else
|
||||
{
|
||||
|
|
@ -1355,7 +1365,7 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
|
|||
time_t lt;
|
||||
|
||||
ltm = *tp;
|
||||
lt = mktime (<m);
|
||||
lt = mktime_z (tz, <m);
|
||||
|
||||
if (lt == (time_t) -1)
|
||||
{
|
||||
|
|
@ -1364,7 +1374,7 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
|
|||
occurred. */
|
||||
struct tm tm;
|
||||
|
||||
if (! __localtime_r (<, &tm)
|
||||
if (! localtime_rz (tz, <, &tm)
|
||||
|| ((ltm.tm_sec ^ tm.tm_sec)
|
||||
| (ltm.tm_min ^ tm.tm_min)
|
||||
| (ltm.tm_hour ^ tm.tm_hour)
|
||||
|
|
@ -1374,7 +1384,7 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
|
|||
break;
|
||||
}
|
||||
|
||||
if (! __gmtime_r (<, >m))
|
||||
if (! localtime_rz (0, <, >m))
|
||||
break;
|
||||
|
||||
diff = tm_diff (<m, >m);
|
||||
|
|
@ -1453,15 +1463,3 @@ my_strftime (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
|
|||
#if defined _LIBC && ! FPRINTFTIME
|
||||
libc_hidden_def (my_strftime)
|
||||
#endif
|
||||
|
||||
|
||||
#if defined emacs && ! FPRINTFTIME
|
||||
/* For Emacs we have a separate interface which corresponds to the normal
|
||||
strftime function plus the ut argument, but without the ns argument. */
|
||||
size_t
|
||||
emacs_strftimeu (char *s, size_t maxsize, const char *format,
|
||||
const struct tm *tp, int ut)
|
||||
{
|
||||
return my_strftime (s, maxsize, format, tp, ut, 0);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue