Mercurial > emacs
changeset 32629:2683108cd13f
Sync with glibc, file version 1.78.
(my_strftime) [HAVE_TZNAME]: Use `UTC' instead of `GMT' which
should no longer be used according to ISO 8601.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Wed, 18 Oct 2000 19:12:03 +0000 |
| parents | 0b11e5c822d5 |
| children | da542331c809 |
| files | src/strftime.c |
| diffstat | 1 files changed, 824 insertions(+), 693 deletions(-) [+] |
line wrap: on
line diff
--- a/src/strftime.c Wed Oct 18 17:08:35 2000 +0000 +++ b/src/strftime.c Wed Oct 18 19:12:03 2000 +0000 @@ -1,20 +1,20 @@ -/* Copyright (C) 1991,92,93,94,95,96,97,98 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@gnu.org. +/* Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc. + This file is part of the GNU Emacs. - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. + 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. - This program is distributed in the hope that it will be useful, + 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 General Public License for more details. + 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 General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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. */ #ifdef HAVE_CONFIG_H # include <config.h> @@ -39,7 +39,7 @@ #endif #include <ctype.h> -#include <sys/types.h> /* Some systems define `time_t' here. */ +#include <sys/types.h> /* Some systems define `time_t' here. */ #ifdef TIME_WITH_SYS_TIME # include <sys/time.h> @@ -91,16 +91,42 @@ # endif #endif -#ifdef _LIBC -# define MEMPCPY(d, s, n) __mempcpy (d, s, n) +#ifdef COMPILE_WIDE +# include <endian.h> +# define CHAR_T wchar_t +# define UCHAR_T unsigned int +# define L_(Str) L##Str +# define NLW(Sym) _NL_W##Sym + +# define MEMCPY(d, s, n) __wmemcpy (d, s, n) +# define STRLEN(s) __wcslen (s) + #else -# ifndef HAVE_MEMPCPY -# define MEMPCPY(d, s, n) ((void *) ((char *) memcpy (d, s, n) + (n))) +# define CHAR_T char +# define UCHAR_T unsigned char +# define L_(Str) Str +# define NLW(Sym) Sym + +# if !defined STDC_HEADERS && !defined HAVE_MEMCPY +# define MEMCPY(d, s, n) bcopy ((s), (d), (n)) +# else +# define MEMCPY(d, s, n) memcpy ((d), (s), (n)) +# endif +# define STRLEN(s) strlen (s) + +# ifdef _LIBC +# define MEMPCPY(d, s, n) __mempcpy (d, s, n) +# else +# ifndef HAVE_MEMPCPY +# define MEMPCPY(d, s, n) ((void *) ((char *) memcpy (d, s, n) + (n))) +# endif # endif #endif #ifndef __P -# if defined (PROTOTYPES) +# if defined emacs && defined PROTOTYPES +# define __P(args) args +# elif defined __GNUC__ || (defined __STDC__ && __STDC__) # define __P(args) args # else # define __P(args) () @@ -138,7 +164,7 @@ #ifndef __isleap /* Nonzero if YEAR is a leap year (every 4 years, except every 100th isn't, and every 400th is). */ -# define __isleap(year) \ +# define __isleap(year) \ ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0)) #endif @@ -189,111 +215,140 @@ introduce additional dependencies. */ /* The SGI compiler reportedly barfs on the trailing null if we use a string constant as the initializer. 28 June 1997, rms. */ -static const char spaces[16] = /* " " */ - { ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ' }; -static const char zeroes[16] = /* "0000000000000000" */ - { '0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0' }; +static const CHAR_T spaces[16] = /* " " */ +{ + L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' '), + L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' ') +}; +static const CHAR_T zeroes[16] = /* "0000000000000000" */ +{ + L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0'), + L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0') +}; # define memset_space(P, Len) \ - do { \ - int _len = (Len); \ - \ - do \ - { \ - int _this = _len > 16 ? 16 : _len; \ - (P) = MEMPCPY ((P), spaces, _this); \ - _len -= _this; \ - } \ - while (_len > 0); \ + do { \ + int _len = (Len); \ + \ + do \ + { \ + int _this = _len > 16 ? 16 : _len; \ + (P) = MEMPCPY ((P), spaces, _this * sizeof (CHAR_T)); \ + _len -= _this; \ + } \ + while (_len > 0); \ } while (0) # define memset_zero(P, Len) \ - do { \ - int _len = (Len); \ - \ - do \ - { \ - int _this = _len > 16 ? 16 : _len; \ - (P) = MEMPCPY ((P), zeroes, _this); \ - _len -= _this; \ - } \ - while (_len > 0); \ + do { \ + int _len = (Len); \ + \ + do \ + { \ + int _this = _len > 16 ? 16 : _len; \ + (P) = MEMPCPY ((P), zeroes, _this * sizeof (CHAR_T)); \ + _len -= _this; \ + } \ + while (_len > 0); \ } while (0) #else -# define memset_space(P, Len) (memset ((P), ' ', (Len)), (P) += (Len)) -# define memset_zero(P, Len) (memset ((P), '0', (Len)), (P) += (Len)) +# ifdef COMPILE_WIDE +# define memset_space(P, Len) (wmemset ((P), L' ', (Len)), (P) += (Len)) +# define memset_zero(P, Len) (wmemset ((P), L'0', (Len)), (P) += (Len)) +# else +# define memset_space(P, Len) (memset ((P), ' ', (Len)), (P) += (Len)) +# define memset_zero(P, Len) (memset ((P), '0', (Len)), (P) += (Len)) +# endif #endif -#define add(n, f) \ - do \ - { \ - int _n = (n); \ - int _delta = width - _n; \ - int _incr = _n + (_delta > 0 ? _delta : 0); \ - if (i + _incr >= maxsize) \ - return 0; \ - if (p) \ - { \ - if (_delta > 0) \ - { \ - if (pad == '0') \ - memset_zero (p, _delta); \ - else \ - memset_space (p, _delta); \ - } \ - f; \ - p += _n; \ - } \ - i += _incr; \ +#define add(n, f) \ + do \ + { \ + int _n = (n); \ + int _delta = width - _n; \ + int _incr = _n + (_delta > 0 ? _delta : 0); \ + if (i + _incr >= maxsize) \ + return 0; \ + if (p) \ + { \ + if (_delta > 0) \ + { \ + if (pad == L_('0')) \ + memset_zero (p, _delta); \ + else \ + memset_space (p, _delta); \ + } \ + f; \ + p += _n; \ + } \ + i += _incr; \ } while (0) #define cpy(n, s) \ - add ((n), \ - if (to_lowcase) \ - memcpy_lowcase (p, (s), _n); \ - else if (to_uppcase) \ - memcpy_uppcase (p, (s), _n); \ - else \ - memcpy ((PTR) p, (PTR) (s), _n)) + add ((n), \ + if (to_lowcase) \ + memcpy_lowcase (p, (s), _n); \ + else if (to_uppcase) \ + memcpy_uppcase (p, (s), _n); \ + else \ + MEMCPY ((PTR) p, (PTR) (s), _n)) + +#ifdef COMPILE_WIDE +# define widen(os, ws, l) \ + { \ + mbstate_t __st; \ + const char *__s = os; \ + memset (&__st, '\0', sizeof (__st)); \ + l = __mbsrtowcs (NULL, &__s, 0, &__st); \ + ws = alloca ((l + 1) * sizeof (wchar_t)); \ + (void) __mbsrtowcs (ws, &__s, l, &__st); \ + } +#endif - -#ifdef _LIBC -# define TOUPPER(Ch) toupper (Ch) -# define TOLOWER(Ch) tolower (Ch) +#ifdef COMPILE_WIDE +# define TOUPPER(Ch) towupper (Ch) +# define TOLOWER(Ch) towlower (Ch) #else -# define TOUPPER(Ch) (islower (Ch) ? toupper (Ch) : (Ch)) -# define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) +# ifdef _LIBC +# define TOUPPER(Ch) toupper (Ch) +# define TOLOWER(Ch) tolower (Ch) +# else +# define TOUPPER(Ch) (islower (Ch) ? toupper (Ch) : (Ch)) +# define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) +# endif #endif /* We don't use `isdigit' here since the locale dependent interpretation is not what we want here. We only need to accept the arabic digits in the ASCII range. One day there is perhaps a more reliable way to accept other sets of digits. */ -#define ISDIGIT(Ch) ((unsigned int) (Ch) - '0' <= 9) +#define ISDIGIT(Ch) ((unsigned int) (Ch) - L_('0') <= 9) -static char *memcpy_lowcase __P ((char *dest, const char *src, size_t len)); +static CHAR_T *memcpy_lowcase __P ((CHAR_T *dest, const CHAR_T *src, + size_t len)); -static char * +static CHAR_T * memcpy_lowcase (dest, src, len) - char *dest; - const char *src; + CHAR_T *dest; + const CHAR_T *src; size_t len; { while (len-- > 0) - dest[len] = TOLOWER ((unsigned char) src[len]); + dest[len] = TOLOWER ((UCHAR_T) src[len]); return dest; } -static char *memcpy_uppcase __P ((char *dest, const char *src, size_t len)); +static CHAR_T *memcpy_uppcase __P ((CHAR_T *dest, const CHAR_T *src, + size_t len)); -static char * +static CHAR_T * memcpy_uppcase (dest, src, len) - char *dest; - const char *src; + CHAR_T *dest; + const CHAR_T *src; size_t len; { while (len-- > 0) - dest[len] = TOUPPER ((unsigned char) src[len]); + dest[len] = TOUPPER ((UCHAR_T) src[len]); return dest; } @@ -320,10 +375,10 @@ 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)); + + (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)); + + (a->tm_min - b->tm_min)) + + (a->tm_sec - b->tm_sec)); } #endif /* ! HAVE_TM_GMTOFF */ @@ -348,21 +403,22 @@ /* 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); + - (yday - wday + ISO_WEEK1_WDAY + big_enough_multiple_of_7) % 7 + + ISO_WEEK1_WDAY - ISO_WEEK_START_WDAY); } #if !(defined _NL_CURRENT || HAVE_STRFTIME) -static char const weekday_name[][10] = +static CHAR_T const weekday_name[][10] = { - "Sunday", "Monday", "Tuesday", "Wednesday", - "Thursday", "Friday", "Saturday" + L_("Sunday"), L_("Monday"), L_("Tuesday"), L_("Wednesday"), + L_("Thursday"), L_("Friday"), L_("Saturday") }; -static char const month_name[][10] = +static CHAR_T const month_name[][10] = { - "January", "February", "March", "April", "May", "June", - "July", "August", "September", "October", "November", "December" + L_("January"), L_("February"), L_("March"), L_("April"), L_("May"), + L_("June"), L_("July"), L_("August"), L_("September"), L_("October"), + L_("November"), L_("December") }; #endif @@ -373,7 +429,11 @@ # define ut_argument_spec int ut; # define ut_argument_spec_iso , int ut #else -# define my_strftime strftime +# ifdef COMPILE_WIDE +# define my_strftime wcsftime +# else +# define my_strftime strftime +# endif # define ut_argument # define ut_argument_spec # define ut_argument_spec_iso @@ -385,12 +445,12 @@ /* Solaris 2.5 tzset sometimes modifies the storage returned by localtime. Work around this bug by copying *tp before it might be munged. */ size_t _strftime_copytm __P ((char *, size_t, const char *, - const struct tm * ut_argument_spec_iso)); + const struct tm * ut_argument_spec_iso)); size_t my_strftime (s, maxsize, format, tp ut_argument) - char *s; + CHAR_T *s; size_t maxsize; - const char *format; + const CHAR_T *format; const struct tm *tp; ut_argument_spec { @@ -399,7 +459,8 @@ return _strftime_copytm (s, maxsize, format, &tmcopy ut_argument); } # undef my_strftime -# define my_strftime _strftime_copytm +# define my_strftime(S, Maxsize, Format, Tp) \ + _strftime_copytm (S, Maxsize, Format, Tp) #endif @@ -411,9 +472,9 @@ written, use NULL for S and (size_t) UINT_MAX for MAXSIZE. */ size_t my_strftime (s, maxsize, format, tp ut_argument) - char *s; + CHAR_T *s; size_t maxsize; - const char *format; + const CHAR_T *format; const struct tm *tp; ut_argument_spec { @@ -425,22 +486,28 @@ might be generated by a strptime() call that initialized only a few elements. Dereference the pointers only if the format requires this. Then it is ok to fail if the pointers are invalid. */ -# define a_wkday _NL_CURRENT (LC_TIME, ABDAY_1 + tp->tm_wday) -# define f_wkday _NL_CURRENT (LC_TIME, DAY_1 + tp->tm_wday) -# define a_month _NL_CURRENT (LC_TIME, ABMON_1 + tp->tm_mon) -# define f_month _NL_CURRENT (LC_TIME, MON_1 + tp->tm_mon) -# define ampm _NL_CURRENT (LC_TIME, tp->tm_hour > 11 ? PM_STR : AM_STR) +# define a_wkday \ + ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABDAY_1) + tp->tm_wday)) +# define f_wkday \ + ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(DAY_1) + tp->tm_wday)) +# define a_month \ + ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABMON_1) + tp->tm_mon)) +# define f_month \ + ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon)) +# define ampm \ + ((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11 \ + ? NLW(PM_STR) : NLW(AM_STR))) -# define aw_len strlen (a_wkday) -# define am_len strlen (a_month) -# define ap_len strlen (ampm) +# define aw_len STRLEN (a_wkday) +# define am_len STRLEN (a_month) +# define ap_len STRLEN (ampm) #else # if !HAVE_STRFTIME -# define f_wkday (weekday_name[tp->tm_wday]) -# define f_month (month_name[tp->tm_mon]) -# define a_wkday f_wkday -# define a_month f_month -# define ampm ("AMPM" + 2 * (tp->tm_hour > 11)) +# define f_wkday (weekday_name[tp->tm_wday]) +# define f_month (month_name[tp->tm_mon]) +# define a_wkday f_wkday +# define a_month f_month +# define ampm (L_("AMPM") + 2 * (tp->tm_hour > 11)) size_t aw_len = 3; size_t am_len = 3; @@ -449,8 +516,8 @@ #endif const char *zone; size_t i = 0; - char *p = s; - const char *f; + CHAR_T *p = s; + const CHAR_T *f; zone = NULL; #if HAVE_TM_ZONE @@ -466,13 +533,13 @@ if (ut) { if (! (zone && *zone)) - zone = "GMT"; + zone = "UTC"; } else { /* POSIX.1 8.1.1 requires that whenever strftime() is called, the - time zone names contained in the external variable `tzname' shall - be set as if the tzset() function had been called. */ + time zone names contained in the external variable `tzname' shall + be set as if the tzset() function had been called. */ # if HAVE_TZSET tzset (); # endif @@ -487,758 +554,822 @@ for (f = format; *f != '\0'; ++f) { - int pad = 0; /* 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))]; + int pad = 0; /* 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_T *subfmt; + CHAR_T *bufp; + CHAR_T buf[1 + (sizeof (int) < sizeof (time_t) + ? INT_STRLEN_BOUND (time_t) + : INT_STRLEN_BOUND (int))]; int width = -1; int to_lowcase = 0; int to_uppcase = 0; int change_case = 0; int format_char; -#if DO_MULTIBYTE - - switch (*f) - { - case '%': - break; +#if DO_MULTIBYTE && !defined COMPILE_WIDE + switch (*f) + { + case L_('%'): + break; - 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 97 characters (plus '%', '\a') to - be in the basic execution character set. None of these - characters can start a multibyte sequence, so they need - not be analyzed further. Some old compilers object to - '\a', so don't bother optimizing for it. */ - add (1, *p = *f); - continue; + case L_('\b'): case L_('\t'): case L_('\n'): + case L_('\v'): case L_('\f'): case L_('\r'): + case L_(' '): case L_('!'): case L_('"'): case L_('#'): case L_('&'): + case L_('\''): case L_('('): case L_(')'): case L_('*'): case L_('+'): + case L_(','): case L_('-'): case L_('.'): case L_('/'): case L_('0'): + case L_('1'): case L_('2'): case L_('3'): case L_('4'): case L_('5'): + case L_('6'): case L_('7'): case L_('8'): case L_('9'): case L_(':'): + case L_(';'): case L_('<'): case L_('='): case L_('>'): case L_('?'): + case L_('A'): case L_('B'): case L_('C'): case L_('D'): case L_('E'): + case L_('F'): case L_('G'): case L_('H'): case L_('I'): case L_('J'): + case L_('K'): case L_('L'): case L_('M'): case L_('N'): case L_('O'): + case L_('P'): case L_('Q'): case L_('R'): case L_('S'): case L_('T'): + case L_('U'): case L_('V'): case L_('W'): case L_('X'): case L_('Y'): + case L_('Z'): case L_('['): case L_('\\'): case L_(']'): case L_('^'): + case L_('_'): case L_('a'): case L_('b'): case L_('c'): case L_('d'): + case L_('e'): case L_('f'): case L_('g'): case L_('h'): case L_('i'): + case L_('j'): case L_('k'): case L_('l'): case L_('m'): case L_('n'): + case L_('o'): case L_('p'): case L_('q'): case L_('r'): case L_('s'): + case L_('t'): case L_('u'): case L_('v'): case L_('w'): case L_('x'): + case L_('y'): case L_('z'): case L_('{'): case L_('|'): case L_('}'): + case L_('~'): + /* The C Standard requires these 97 characters (plus '%', `\a') to + be in the basic execution character set. None of these + characters can start a multibyte sequence, so they need + not be analyzed further. Some old compilers object to + `\a', so don't bother optimizing for it. */ + 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; + 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); + do + { + size_t bytes = mbrlen (f + len, (size_t) -1, &mbstate); - if (bytes == 0) - break; + if (bytes == 0) + break; - if (bytes == (size_t) -2) - { - len += strlen (f + len); - break; - } + if (bytes == (size_t) -2) + { + len += strlen (f + len); + break; + } - if (bytes == (size_t) -1) - { - len++; - break; - } + if (bytes == (size_t) -1) + { + len++; + break; + } - len += bytes; - } - while (! mbsinit (&mbstate)); + len += bytes; + } + while (! mbsinit (&mbstate)); - cpy (len, f); - f += len - 1; - continue; - } - } + cpy (len, f); + f += len - 1; + 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; - } + /* Either multibyte encodings are not supported, they are + safe for formats, so any non-'%' byte can be copied through, + or this is the wide character version. */ + if (*f != L_('%')) + { + add (1, *p = *f); + continue; + } #endif /* ! DO_MULTIBYTE */ /* Check for flags that can modify a format. */ while (1) - { - switch (*++f) - { - /* This influences the number formats. */ - case '_': - case '-': - case '0': - pad = *f; - continue; + { + switch (*++f) + { + /* This influences the number formats. */ + case L_('_'): + case L_('-'): + case L_('0'): + pad = *f; + continue; - /* This changes textual output. */ - case '^': - to_uppcase = 1; - continue; - case '#': - change_case = 1; - continue; + /* This changes textual output. */ + case L_('^'): + to_uppcase = 1; + continue; + case L_('#'): + change_case = 1; + continue; - default: - break; - } - break; - } + default: + break; + } + break; + } /* As a GNU extension we allow to specify the field width. */ if (ISDIGIT (*f)) - { - width = 0; - do - { - width *= 10; - width += *f - '0'; - ++f; - } - while (ISDIGIT (*f)); - } + { + width = 0; + do + { + width *= 10; + width += *f - L_('0'); + ++f; + } + while (ISDIGIT (*f)); + } /* Check for modifiers. */ switch (*f) - { - case 'E': - case 'O': - modifier = *f++; - break; + { + case L_('E'): + case L_('O'): + modifier = *f++; + break; - default: - modifier = 0; - break; - } + default: + modifier = 0; + break; + } /* Now do the specified format. */ format_char = *f; switch (format_char) - { + { #define DO_NUMBER(d, v) \ - digits = width == -1 ? d : width; \ - number_value = v; goto do_number + digits = width == -1 ? d : width; \ + number_value = v; goto do_number #define DO_NUMBER_SPACEPAD(d, v) \ - digits = width == -1 ? d : width; \ - number_value = v; goto do_number_spacepad + digits = width == -1 ? d : width; \ + number_value = v; goto do_number_spacepad - case '%': - if (modifier != 0) - goto bad_format; - add (1, *p = *f); - break; + case L_('%'): + if (modifier != 0) + goto bad_format; + add (1, *p = *f); + break; - case 'a': - if (modifier != 0) - goto bad_format; - if (change_case) - { - to_uppcase = 1; - to_lowcase = 0; - } + case L_('a'): + if (modifier != 0) + goto bad_format; + if (change_case) + { + to_uppcase = 1; + to_lowcase = 0; + } #if defined _NL_CURRENT || !HAVE_STRFTIME - cpy (aw_len, a_wkday); - break; + cpy (aw_len, a_wkday); + break; #else - goto underlying_strftime; + goto underlying_strftime; +#endif + + case 'A': + if (modifier != 0) + goto bad_format; + if (change_case) + { + to_uppcase = 1; + to_lowcase = 0; + } +#if defined _NL_CURRENT || !HAVE_STRFTIME + cpy (STRLEN (f_wkday), f_wkday); + break; +#else + goto underlying_strftime; #endif - case 'A': - if (modifier != 0) - goto bad_format; - if (change_case) - { - to_uppcase = 1; - to_lowcase = 0; - } + case L_('b'): + case L_('h'): /* POSIX.2 extension. */ + if (change_case) + { + to_uppcase = 1; + to_lowcase = 0; + } + if (modifier != 0) + goto bad_format; #if defined _NL_CURRENT || !HAVE_STRFTIME - cpy (strlen (f_wkday), f_wkday); - break; + cpy (am_len, a_month); + break; #else - goto underlying_strftime; -#endif - - case 'b': - case 'h': /* POSIX.2 extension. */ - if (modifier != 0) - goto bad_format; -#if defined _NL_CURRENT || !HAVE_STRFTIME - cpy (am_len, a_month); - break; -#else - goto underlying_strftime; + goto underlying_strftime; #endif - case 'B': - if (modifier != 0) - goto bad_format; - if (change_case) - { - to_uppcase = 1; - to_lowcase = 0; - } + case L_('B'): + if (modifier != 0) + goto bad_format; + if (change_case) + { + to_uppcase = 1; + to_lowcase = 0; + } #if defined _NL_CURRENT || !HAVE_STRFTIME - cpy (strlen (f_month), f_month); - break; + cpy (STRLEN (f_month), f_month); + break; #else - goto underlying_strftime; + goto underlying_strftime; #endif - case 'c': - if (modifier == 'O') - goto bad_format; + case L_('c'): + if (modifier == L_('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); + if (! (modifier == 'E' + && (*(subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME, + NLW(ERA_D_T_FMT))) + != '\0'))) + subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_T_FMT)); #else # if HAVE_STRFTIME - goto underlying_strftime; + goto underlying_strftime; # else - subfmt = "%a %b %e %H:%M:%S %Y"; + subfmt = L_("%a %b %e %H:%M:%S %Y"); # endif #endif - subformat: - { - char *old_start = p; - size_t len = my_strftime (NULL, (size_t) -1, subfmt, - tp ut_argument); - add (len, my_strftime (p, maxsize - i, subfmt, tp ut_argument)); + subformat: + { + CHAR_T *old_start = p; + size_t len = my_strftime (NULL, (size_t) -1, subfmt, tp); + add (len, my_strftime (p, maxsize - i, subfmt, tp)); - if (to_uppcase) - while (old_start < p) - { - *old_start = TOUPPER ((unsigned char) *old_start); - ++old_start; - } - } - break; + if (to_uppcase) + while (old_start < p) + { + *old_start = TOUPPER ((UCHAR_T) *old_start); + ++old_start; + } + } + break; #if HAVE_STRFTIME && ! (defined _NL_CURRENT && HAVE_STRUCT_ERA_ENTRY) - underlying_strftime: - { - /* The relevant information is available only via the - underlying strftime implementation, so use that. */ - char ufmt[4]; - char *u = ufmt; - char ubuf[1024]; /* enough for any single format in practice */ - size_t len; - *u++ = '%'; - if (modifier != 0) - *u++ = modifier; - *u++ = format_char; - *u = '\0'; - len = strftime (ubuf, sizeof ubuf, ufmt, tp); - if (len == 0 && ubuf[0] != '\0') - return 0; - cpy (len, ubuf); - } - break; + underlying_strftime: + { + /* The relevant information is available only via the + underlying strftime implementation, so use that. */ + char ufmt[4]; + char *u = ufmt; + char ubuf[1024]; /* enough for any single format in practice */ + size_t len; + /* Make sure we're calling the actual underlying strftime. + In some cases, config.h contains something like + "#define strftime rpl_strftime". */ +# ifdef strftime +# undef strftime + size_t strftime (); +# endif + + *u++ = '%'; + if (modifier != 0) + *u++ = modifier; + *u++ = format_char; + *u = '\0'; + len = strftime (ubuf, sizeof ubuf, ufmt, tp); + if (len == 0 && ubuf[0] != '\0') + return 0; + cpy (len, ubuf); + } + break; #endif - case 'C': /* POSIX.2 extension. */ - if (modifier == 'O') - goto bad_format; - if (modifier == 'E') - { + case L_('C'): /* POSIX.2 extension. */ + if (modifier == L_('O')) + goto bad_format; + if (modifier == L_('E')) + { #if HAVE_STRUCT_ERA_ENTRY - struct era_entry *era = _nl_get_era_entry (tp); - if (era) - { - size_t len = strlen (era->name_fmt); - cpy (len, era->name_fmt); - break; - } + struct era_entry *era = _nl_get_era_entry (tp); + if (era) + { +# ifdef COMPILE_WIDE + size_t len = __wcslen (era->era_wname); + cpy (len, era->era_wname); +# else + size_t len = strlen (era->era_name); + cpy (len, era->era_name); +# endif + break; + } #else # if HAVE_STRFTIME - goto underlying_strftime; + goto underlying_strftime; # endif #endif - } + } - { - int year = tp->tm_year + TM_YEAR_BASE; - DO_NUMBER (1, year / 100 - (year % 100 < 0)); - } + { + int year = tp->tm_year + TM_YEAR_BASE; + DO_NUMBER (1, year / 100 - (year % 100 < 0)); + } - case 'x': - if (modifier == 'O') - goto bad_format; + case L_('x'): + if (modifier == L_('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; + if (! (modifier == L_('E') + && (*(subfmt = (CHAR_T *)_NL_CURRENT (LC_TIME, + NLW(ERA_D_FMT))) + != L_('\0')))) + subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_FMT)); + goto subformat; #else # if HAVE_STRFTIME - goto underlying_strftime; + goto underlying_strftime; # else - /* Fall through. */ + /* Fall through. */ # endif #endif - case 'D': /* POSIX.2 extension. */ - if (modifier != 0) - goto bad_format; - subfmt = "%m/%d/%y"; - goto subformat; + case L_('D'): /* POSIX.2 extension. */ + if (modifier != 0) + goto bad_format; + subfmt = L_("%m/%d/%y"); + goto subformat; - case 'd': - if (modifier == 'E') - goto bad_format; + case L_('d'): + if (modifier == L_('E')) + goto bad_format; - DO_NUMBER (2, tp->tm_mday); + DO_NUMBER (2, tp->tm_mday); - case 'e': /* POSIX.2 extension. */ - if (modifier == 'E') - goto bad_format; + case L_('e'): /* POSIX.2 extension. */ + if (modifier == L_('E')) + goto bad_format; - DO_NUMBER_SPACEPAD (2, tp->tm_mday); + DO_NUMBER_SPACEPAD (2, tp->tm_mday); - /* All numeric formats set DIGITS and NUMBER_VALUE and then - jump to one of these two labels. */ + /* All numeric formats set DIGITS and NUMBER_VALUE and then + jump to one of these two labels. */ - do_number_spacepad: - /* Force `_' flag unless overwritten by `0' flag. */ - if (pad != '0') - pad = '_'; + do_number_spacepad: + /* Force `_' flag unless overwritten by `0' flag. */ + if (pad != L_('0')) + pad = L_('_'); - do_number: - /* Format the number according to the MODIFIER flag. */ + do_number: + /* Format the number according to the MODIFIER flag. */ - if (modifier == 'O' && 0 <= number_value) - { + if (modifier == L_('O') && 0 <= number_value) + { #ifdef _NL_CURRENT - /* Get the locale specific alternate representation of - the number NUMBER_VALUE. If none exist NULL is returned. */ - const char *cp = _nl_get_alt_digit (number_value); + /* Get the locale specific alternate representation of + the number NUMBER_VALUE. If none exist NULL is returned. */ +# ifdef COMPILE_WIDE + const wchar_t *cp = _nl_get_walt_digit (number_value); +# else + const char *cp = _nl_get_alt_digit (number_value); +# endif - if (cp != NULL) - { - size_t digitlen = strlen (cp); - if (digitlen != 0) - { - cpy (digitlen, cp); - break; - } - } + if (cp != NULL) + { + size_t digitlen = STRLEN (cp); + if (digitlen != 0) + { + cpy (digitlen, cp); + break; + } + } #else # if HAVE_STRFTIME - goto underlying_strftime; + goto underlying_strftime; # endif #endif - } - { - unsigned int u = number_value; + } + { + unsigned int u = number_value; - bufp = buf + sizeof (buf); - negative_number = number_value < 0; + bufp = buf + sizeof (buf) / sizeof (buf[0]); + negative_number = number_value < 0; - if (negative_number) - u = -u; + if (negative_number) + u = -u; - do - *--bufp = u % 10 + '0'; - while ((u /= 10) != 0); - } + do + *--bufp = u % 10 + L_('0'); + while ((u /= 10) != 0); + } - do_number_sign_and_padding: - if (negative_number) - *--bufp = '-'; + do_number_sign_and_padding: + if (negative_number) + *--bufp = L_('-'); - if (pad != '-') - { - int padding = digits - (buf + sizeof (buf) - bufp); + if (pad != L_('-')) + { + int padding = digits - (buf + (sizeof (buf) / sizeof (buf[0])) + - bufp); - if (pad == '_') - { - while (0 < padding--) - *--bufp = ' '; - } - else - { - bufp += negative_number; - while (0 < padding--) - *--bufp = '0'; - if (negative_number) - *--bufp = '-'; - } - } + if (pad == L_('_')) + { + while (0 < padding--) + *--bufp = L_(' '); + } + else + { + bufp += negative_number; + while (0 < padding--) + *--bufp = L_('0'); + if (negative_number) + *--bufp = L_('-'); + } + } - cpy (buf + sizeof (buf) - bufp, bufp); - break; + cpy (buf + sizeof (buf) / sizeof (buf[0]) - bufp, bufp); + break; - case 'F': - if (modifier != 0) - goto bad_format; - subfmt = "%Y-%m-%d"; - goto subformat; + case L_('F'): + if (modifier != 0) + goto bad_format; + subfmt = L_("%Y-%m-%d"); + goto subformat; - case 'H': - if (modifier == 'E') - goto bad_format; + case L_('H'): + if (modifier == L_('E')) + goto bad_format; - DO_NUMBER (2, tp->tm_hour); + DO_NUMBER (2, tp->tm_hour); - case 'I': - if (modifier == 'E') - goto bad_format; + case L_('I'): + if (modifier == L_('E')) + goto bad_format; - DO_NUMBER (2, hour12); + DO_NUMBER (2, hour12); - case 'k': /* GNU extension. */ - if (modifier == 'E') - goto bad_format; + case L_('k'): /* GNU extension. */ + if (modifier == L_('E')) + goto bad_format; - DO_NUMBER_SPACEPAD (2, tp->tm_hour); + DO_NUMBER_SPACEPAD (2, tp->tm_hour); - case 'l': /* GNU extension. */ - if (modifier == 'E') - goto bad_format; + case L_('l'): /* GNU extension. */ + if (modifier == L_('E')) + goto bad_format; - DO_NUMBER_SPACEPAD (2, hour12); + DO_NUMBER_SPACEPAD (2, hour12); - case 'j': - if (modifier == 'E') - goto bad_format; + case L_('j'): + if (modifier == L_('E')) + goto bad_format; - DO_NUMBER (3, 1 + tp->tm_yday); + DO_NUMBER (3, 1 + tp->tm_yday); - case 'M': - if (modifier == 'E') - goto bad_format; + case L_('M'): + if (modifier == L_('E')) + goto bad_format; - DO_NUMBER (2, tp->tm_min); + DO_NUMBER (2, tp->tm_min); - case 'm': - if (modifier == 'E') - goto bad_format; + case L_('m'): + if (modifier == L_('E')) + goto bad_format; - DO_NUMBER (2, tp->tm_mon + 1); + DO_NUMBER (2, tp->tm_mon + 1); - case 'n': /* POSIX.2 extension. */ - add (1, *p = '\n'); - break; + case L_('n'): /* POSIX.2 extension. */ + add (1, *p = L_('\n')); + break; - case 'P': - to_lowcase = 1; + case L_('P'): + to_lowcase = 1; #if !defined _NL_CURRENT && HAVE_STRFTIME - format_char = 'p'; + format_char = L_('p'); #endif - /* FALLTHROUGH */ + /* FALLTHROUGH */ - case 'p': - if (change_case) - { - to_uppcase = 0; - to_lowcase = 1; - } + case L_('p'): + if (change_case) + { + to_uppcase = 0; + to_lowcase = 1; + } #if defined _NL_CURRENT || !HAVE_STRFTIME - cpy (ap_len, ampm); - break; + cpy (ap_len, ampm); + break; #else - goto underlying_strftime; + goto underlying_strftime; #endif - case 'R': /* GNU extension. */ - subfmt = "%H:%M"; - goto subformat; + case L_('R'): /* GNU extension. */ + subfmt = L_("%H:%M"); + goto subformat; - case 'r': /* POSIX.2 extension. */ + case L_('r'): /* POSIX.2 extension. */ #ifdef _NL_CURRENT - if (*(subfmt = _NL_CURRENT (LC_TIME, T_FMT_AMPM)) == '\0') + if (*(subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME, + NLW(T_FMT_AMPM))) == L_('\0')) #endif - subfmt = "%I:%M:%S %p"; - goto subformat; + subfmt = L_("%I:%M:%S %p"); + goto subformat; - case 'S': - if (modifier == 'E') - goto bad_format; + case L_('S'): + if (modifier == L_('E')) + goto bad_format; - DO_NUMBER (2, tp->tm_sec); + DO_NUMBER (2, tp->tm_sec); - case 's': /* GNU extension. */ - { - struct tm ltm; - time_t t; + case L_('s'): /* GNU extension. */ + { + struct tm ltm; + time_t t; - ltm = *tp; - t = mktime (<m); + ltm = *tp; + t = mktime (<m); - /* Generate string value for T using time_t arithmetic; - this works even if sizeof (long) < sizeof (time_t). */ + /* 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; + bufp = buf + sizeof (buf) / sizeof (buf[0]); + negative_number = t < 0; - do - { - int d = t % 10; - t /= 10; + do + { + int d = t % 10; + t /= 10; - if (negative_number) - { - d = -d; + if (negative_number) + { + d = -d; - /* Adjust if division truncates to minus infinity. */ - if (0 < -1 % 10 && d < 0) - { - t++; - d += 10; - } - } + /* Adjust if division truncates to minus infinity. */ + if (0 < -1 % 10 && d < 0) + { + t++; + d += 10; + } + } - *--bufp = d + '0'; - } - while (t != 0); + *--bufp = d + L_('0'); + } + while (t != 0); - digits = 1; - goto do_number_sign_and_padding; - } + digits = 1; + goto do_number_sign_and_padding; + } - case 'X': - if (modifier == 'O') - goto bad_format; + case L_('X'): + if (modifier == L_('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; + if (! (modifier == L_('E') + && (*(subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME, + NLW(ERA_T_FMT))) + != L_('\0')))) + subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME, NLW(T_FMT)); + goto subformat; #else # if HAVE_STRFTIME - goto underlying_strftime; + goto underlying_strftime; # else - /* Fall through. */ + /* Fall through. */ # endif #endif - case 'T': /* POSIX.2 extension. */ - subfmt = "%H:%M:%S"; - goto subformat; + case L_('T'): /* POSIX.2 extension. */ + subfmt = L_("%H:%M:%S"); + goto subformat; - case 't': /* POSIX.2 extension. */ - add (1, *p = '\t'); - break; + case L_('t'): /* POSIX.2 extension. */ + add (1, *p = L_('\t')); + break; - case 'u': /* POSIX.2 extension. */ - DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1); + case L_('u'): /* POSIX.2 extension. */ + DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1); - case 'U': - if (modifier == 'E') - goto bad_format; + case L_('U'): + if (modifier == L_('E')) + goto bad_format; - DO_NUMBER (2, (tp->tm_yday - tp->tm_wday + 7) / 7); + 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); + case L_('V'): + case L_('g'): /* GNU extension. */ + case L_('G'): /* GNU extension. */ + if (modifier == L_('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; - } - } + 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); + switch (*f) + { + case L_('g'): + DO_NUMBER (2, (year % 100 + 100) % 100); - case 'G': - DO_NUMBER (1, year); + case L_('G'): + DO_NUMBER (1, year); - default: - DO_NUMBER (2, days / 7 + 1); - } - } + default: + DO_NUMBER (2, days / 7 + 1); + } + } - case 'W': - if (modifier == 'E') - goto bad_format; + case L_('W'): + if (modifier == L_('E')) + goto bad_format; - DO_NUMBER (2, (tp->tm_yday - (tp->tm_wday - 1 + 7) % 7 + 7) / 7); + DO_NUMBER (2, (tp->tm_yday - (tp->tm_wday - 1 + 7) % 7 + 7) / 7); + + case L_('w'): + if (modifier == L_('E')) + goto bad_format; - case 'w': - if (modifier == 'E') - goto bad_format; - - DO_NUMBER (1, tp->tm_wday); + DO_NUMBER (1, tp->tm_wday); - case 'Y': - if (modifier == 'E') - { + case L_('Y'): + if (modifier == 'E') + { #if HAVE_STRUCT_ERA_ENTRY - struct era_entry *era = _nl_get_era_entry (tp); - if (era) - { - subfmt = strchr (era->name_fmt, '\0') + 1; - goto subformat; - } + struct era_entry *era = _nl_get_era_entry (tp); + if (era) + { +# ifdef COMPILE_WIDE + subfmt = era->era_wformat; +# else + subfmt = era->era_format; +# endif + goto subformat; + } #else # if HAVE_STRFTIME - goto underlying_strftime; + goto underlying_strftime; # endif #endif - } - if (modifier == 'O') - goto bad_format; - else - DO_NUMBER (1, tp->tm_year + TM_YEAR_BASE); + } + if (modifier == L_('O')) + goto bad_format; + else + DO_NUMBER (1, tp->tm_year + TM_YEAR_BASE); - case 'y': - if (modifier == 'E') - { + case L_('y'): + if (modifier == L_('E')) + { #if HAVE_STRUCT_ERA_ENTRY - struct era_entry *era = _nl_get_era_entry (tp); - if (era) - { - int delta = tp->tm_year - era->start_date[0]; - DO_NUMBER (1, (era->offset - + (era->direction == '-' ? -delta : delta))); - } + struct era_entry *era = _nl_get_era_entry (tp); + if (era) + { + int delta = tp->tm_year - era->start_date[0]; + DO_NUMBER (1, (era->offset + + delta * era->absolute_direction)); + } #else # if HAVE_STRFTIME - goto underlying_strftime; + goto underlying_strftime; # endif #endif - } - DO_NUMBER (2, (tp->tm_year % 100 + 100) % 100); + } + DO_NUMBER (2, (tp->tm_year % 100 + 100) % 100); - case 'Z': - if (change_case) - { - to_uppcase = 0; - to_lowcase = 1; - } + case L_('Z'): + if (change_case) + { + to_uppcase = 0; + to_lowcase = 1; + } #if HAVE_TZNAME - /* The tzset() call might have changed the value. */ - if (!(zone && *zone) && tp->tm_isdst >= 0) - zone = tzname[tp->tm_isdst]; + /* The tzset() call might have changed the value. */ + if (!(zone && *zone) && tp->tm_isdst >= 0) + zone = tzname[tp->tm_isdst]; #endif - if (! zone) - zone = ""; /* POSIX.2 requires the empty string here. */ + if (! zone) + zone = ""; /* POSIX.2 requires the empty string here. */ - cpy (strlen (zone), zone); - break; +#ifdef COMPILE_WIDE + { + /* The zone string is always given in multibyte form. We have + to transform it first. */ + wchar_t *wczone; + size_t len; + widen (zone, wczone, len); + cpy (len, wczone); + } +#else + cpy (strlen (zone), zone); +#endif + break; - case 'z': /* GNU extension. */ - if (tp->tm_isdst < 0) - break; + case L_('z'): /* GNU extension. */ + if (tp->tm_isdst < 0) + break; - { - int diff; + { + int diff; #if HAVE_TM_GMTOFF - diff = tp->tm_gmtoff; + diff = tp->tm_gmtoff; #else - if (ut) - diff = 0; - else - { - struct tm gtm; - struct tm ltm; - time_t lt; + if (ut) + diff = 0; + else + { + struct tm gtm; + struct tm ltm; + time_t lt; - ltm = *tp; - lt = mktime (<m); + ltm = *tp; + 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; + 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; - if (! my_strftime_localtime_r (<, &tm) - || ((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 (! my_strftime_localtime_r (<, &tm) + || ((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 (! my_strftime_gmtime_r (<, >m)) - break; + if (! my_strftime_gmtime_r (<, >m)) + break; - diff = tm_diff (<m, >m); - } + diff = tm_diff (<m, >m); + } #endif - if (diff < 0) - { - add (1, *p = '-'); - diff = -diff; - } - else - add (1, *p = '+'); + if (diff < 0) + { + add (1, *p = L_('-')); + diff = -diff; + } + else + add (1, *p = L_('+')); - diff /= 60; - DO_NUMBER (4, (diff / 60) * 100 + diff % 60); - } + diff /= 60; + DO_NUMBER (4, (diff / 60) * 100 + diff % 60); + } - case '\0': /* GNU extension: % at end of format. */ - --f; - /* Fall through. */ - 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 = 1; f[1 - flen] != '%'; flen++) - continue; - cpy (flen, &f[1 - flen]); - } - break; - } + case L_('\0'): /* GNU extension: % at end of format. */ + --f; + /* Fall through. */ + 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 = 1; f[1 - flen] != L_('%'); flen++) + continue; + cpy (flen, &f[1 - flen]); + } + break; + } } if (p && maxsize != 0) - *p = '\0'; + *p = L_('\0'); return i; } + + +#ifdef emacs +/* For Emacs we have a separate interface which corresponds to the normal + strftime function and does not have the extra information whether the + TP arguments comes from a `gmtime' call or not. */ +size_t +emacs_strftime (s, maxsize, format, tp) + char *s; + size_t maxsize; + const char *format; + const struct tm *tp; +{ + return my_strftime (s, maxsize, format, tp, 0); +} +#endif +