From f8c6ea241da03f9ef5cd7adb8407d601927a7999 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 6 Jan 2000 21:31:48 +0000 Subject: [PATCH] Sync with the GNU C Library. --- lib/strftime.c | 530 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 323 insertions(+), 207 deletions(-) diff --git a/lib/strftime.c b/lib/strftime.c index 18977d178..95e55cba5 100644 --- a/lib/strftime.c +++ b/lib/strftime.c @@ -91,11 +91,35 @@ extern char *tzname[]; # endif #endif -#ifdef _LIBC -# define MEMPCPY(d, s, n) __mempcpy (d, s, n) +#ifdef COMPILE_WIDE +# include +# 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 @@ -157,7 +181,9 @@ extern char *tzname[]; # if ! HAVE_TM_GMTOFF static struct tm *my_strftime_gmtime_r __P ((const time_t *, struct tm *)); static struct tm * -my_strftime_gmtime_r (const time_t *t, struct tm *tp) +my_strftime_gmtime_r (t, tp) + const time_t *t; + struct tm *tp; { struct tm *l = gmtime (t); if (! l) @@ -169,7 +195,9 @@ my_strftime_gmtime_r (const time_t *t, struct tm *tp) static struct tm *my_strftime_localtime_r __P ((const time_t *, struct tm *)); static struct tm * -my_strftime_localtime_r (const time_t *t, struct tm *tp) +my_strftime_localtime_r (t, tp) + const time_t *t; + struct tm *tp; { struct tm *l = localtime (t); if (! l) @@ -185,10 +213,16 @@ my_strftime_localtime_r (const time_t *t, struct tm *tp) 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 { \ @@ -197,7 +231,7 @@ static const char zeroes[16] = /* "0000000000000000" */ do \ { \ int _this = _len > 16 ? 16 : _len; \ - (P) = MEMPCPY ((P), spaces, _this); \ + (P) = MEMPCPY ((P), spaces, _this * sizeof (CHAR_T)); \ _len -= _this; \ } \ while (_len > 0); \ @@ -210,14 +244,19 @@ static const char zeroes[16] = /* "0000000000000000" */ do \ { \ int _this = _len > 16 ? 16 : _len; \ - (P) = MEMPCPY ((P), zeroes, _this); \ + (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) \ @@ -232,7 +271,7 @@ static const char zeroes[16] = /* "0000000000000000" */ { \ if (_delta > 0) \ { \ - if (pad == '0') \ + if (pad == L_('0')) \ memset_zero (p, _delta); \ else \ memset_space (p, _delta); \ @@ -250,40 +289,64 @@ static const char zeroes[16] = /* "0000000000000000" */ else if (to_uppcase) \ memcpy_uppcase (p, (s), _n); \ else \ - memcpy ((PTR) p, (PTR) (s), _n)) - + 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 * -memcpy_lowcase (char *dest, const char *src, size_t len) +static CHAR_T * +memcpy_lowcase (dest, src, len) + 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 * -memcpy_uppcase (char *dest, const char *src, size_t len) +static CHAR_T * +memcpy_uppcase (dest, src, len) + 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; } @@ -294,7 +357,9 @@ memcpy_uppcase (char *dest, const char *src, size_t len) # define tm_diff ftime_tm_diff static int tm_diff __P ((const struct tm *, const struct tm *)); static int -tm_diff (const struct tm *a, const struct tm *b) +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, @@ -329,7 +394,9 @@ static int iso_week_days __P ((int, int)); __inline__ #endif static int -iso_week_days (int yday, int wday) +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; @@ -340,15 +407,16 @@ iso_week_days (int yday, int 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 @@ -359,7 +427,11 @@ static char const month_name[][10] = # 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 @@ -374,9 +446,9 @@ static char const month_name[][10] = 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 { @@ -397,8 +469,12 @@ static char const month_name[][10] = anywhere, so to determine how many characters would be written, use NULL for S and (size_t) UINT_MAX for MAXSIZE. */ size_t -my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp - ut_argument_spec) +my_strftime (s, maxsize, format, tp ut_argument) + CHAR_T *s; + size_t maxsize; + const CHAR_T *format; + const struct tm *tp; + ut_argument_spec { int hour12 = tp->tm_hour; #ifdef _NL_CURRENT @@ -408,22 +484,28 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp 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 aw_len strlen (a_wkday) -# define am_len strlen (a_month) -# define ap_len strlen (ampm) +# 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) #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 ampm (L_("AMPM") + 2 * (tp->tm_hour > 11)) size_t aw_len = 3; size_t am_len = 3; @@ -432,8 +514,8 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp #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 @@ -475,47 +557,48 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp 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))]; + 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) +#if DO_MULTIBYTE && !defined COMPILE_WIDE + switch (*f) { - case '%': + 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 + 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 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. Some old compilers object to - '\a', so don't bother optimizing for it. */ + not be analyzed further. */ add (1, *p = *f); continue; @@ -557,9 +640,10 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp #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 != '%') + /* 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; @@ -573,17 +657,17 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp switch (*++f) { /* This influences the number formats. */ - case '_': - case '-': - case '0': + case L_('_'): + case L_('-'): + case L_('0'): pad = *f; continue; /* This changes textual output. */ - case '^': + case L_('^'): to_uppcase = 1; continue; - case '#': + case L_('#'): change_case = 1; continue; @@ -600,7 +684,7 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp do { width *= 10; - width += *f - '0'; + width += *f - L_('0'); ++f; } while (ISDIGIT (*f)); @@ -609,8 +693,8 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp /* Check for modifiers. */ switch (*f) { - case 'E': - case 'O': + case L_('E'): + case L_('O'): modifier = *f++; break; @@ -630,13 +714,13 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp digits = width == -1 ? d : width; \ number_value = v; goto do_number_spacepad - case '%': + case L_('%'): if (modifier != 0) goto bad_format; add (1, *p = *f); break; - case 'a': + case L_('a'): if (modifier != 0) goto bad_format; if (change_case) @@ -660,14 +744,14 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp to_lowcase = 0; } #if defined _NL_CURRENT || !HAVE_STRFTIME - cpy (strlen (f_wkday), f_wkday); + cpy (STRLEN (f_wkday), f_wkday); break; #else goto underlying_strftime; #endif - case 'b': - case 'h': /* POSIX.2 extension. */ + case L_('b'): + case L_('h'): /* POSIX.2 extension. */ if (modifier != 0) goto bad_format; #if defined _NL_CURRENT || !HAVE_STRFTIME @@ -677,7 +761,7 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp goto underlying_strftime; #endif - case 'B': + case L_('B'): if (modifier != 0) goto bad_format; if (change_case) @@ -686,37 +770,39 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp to_lowcase = 0; } #if defined _NL_CURRENT || !HAVE_STRFTIME - cpy (strlen (f_month), f_month); + cpy (STRLEN (f_month), f_month); break; #else goto underlying_strftime; #endif - case 'c': - if (modifier == 'O') + 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); + && (*(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; # 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; + 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 = TOUPPER ((UCHAR_T) *old_start); ++old_start; } } @@ -744,17 +830,22 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp break; #endif - case 'C': /* POSIX.2 extension. */ - if (modifier == 'O') + case L_('C'): /* POSIX.2 extension. */ + if (modifier == L_('O')) goto bad_format; - if (modifier == 'E') + 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); +# 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 @@ -769,13 +860,15 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp DO_NUMBER (1, year / 100 - (year % 100 < 0)); } - case 'x': - if (modifier == 'O') + 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); + 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 @@ -784,20 +877,20 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp /* Fall through. */ # endif #endif - case 'D': /* POSIX.2 extension. */ + case L_('D'): /* POSIX.2 extension. */ if (modifier != 0) goto bad_format; - subfmt = "%m/%d/%y"; + subfmt = L_("%m/%d/%y"); goto subformat; - case 'd': - if (modifier == 'E') + case L_('d'): + if (modifier == L_('E')) goto bad_format; DO_NUMBER (2, tp->tm_mday); - case 'e': /* POSIX.2 extension. */ - if (modifier == 'E') + case L_('e'): /* POSIX.2 extension. */ + if (modifier == L_('E')) goto bad_format; DO_NUMBER_SPACEPAD (2, tp->tm_mday); @@ -807,22 +900,26 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp do_number_spacepad: /* Force `_' flag unless overwritten by `0' flag. */ - if (pad != '0') - pad = '_'; + if (pad != L_('0')) + pad = L_('_'); 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. */ +# 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); + size_t digitlen = STRLEN (cp); if (digitlen != 0) { cpy (digitlen, cp); @@ -838,103 +935,104 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp { unsigned int u = number_value; - bufp = buf + sizeof (buf); + bufp = buf + sizeof (buf) / sizeof (buf[0]); negative_number = number_value < 0; if (negative_number) u = -u; do - *--bufp = u % 10 + '0'; + *--bufp = u % 10 + L_('0'); while ((u /= 10) != 0); } do_number_sign_and_padding: if (negative_number) - *--bufp = '-'; + *--bufp = L_('-'); - if (pad != '-') + if (pad != L_('-')) { - int padding = digits - (buf + sizeof (buf) - bufp); + int padding = digits - (buf + (sizeof (buf) / sizeof (buf[0])) + - bufp); - if (pad == '_') + if (pad == L_('_')) { while (0 < padding--) - *--bufp = ' '; + *--bufp = L_(' '); } else { bufp += negative_number; while (0 < padding--) - *--bufp = '0'; + *--bufp = L_('0'); if (negative_number) - *--bufp = '-'; + *--bufp = L_('-'); } } - cpy (buf + sizeof (buf) - bufp, bufp); + cpy (buf + sizeof (buf) / sizeof (buf[0]) - bufp, bufp); break; - case 'F': + case L_('F'): if (modifier != 0) goto bad_format; - subfmt = "%Y-%m-%d"; + subfmt = L_("%Y-%m-%d"); goto subformat; - case 'H': - if (modifier == 'E') + case L_('H'): + if (modifier == L_('E')) goto bad_format; DO_NUMBER (2, tp->tm_hour); - case 'I': - if (modifier == 'E') + case L_('I'): + if (modifier == L_('E')) goto bad_format; DO_NUMBER (2, hour12); - case 'k': /* GNU extension. */ - if (modifier == 'E') + case L_('k'): /* GNU extension. */ + if (modifier == L_('E')) goto bad_format; DO_NUMBER_SPACEPAD (2, tp->tm_hour); - case 'l': /* GNU extension. */ - if (modifier == 'E') + case L_('l'): /* GNU extension. */ + if (modifier == L_('E')) goto bad_format; DO_NUMBER_SPACEPAD (2, hour12); - case 'j': - if (modifier == 'E') + case L_('j'): + if (modifier == L_('E')) goto bad_format; DO_NUMBER (3, 1 + tp->tm_yday); - case 'M': - if (modifier == 'E') + case L_('M'): + if (modifier == L_('E')) goto bad_format; DO_NUMBER (2, tp->tm_min); - case 'm': - if (modifier == 'E') + case L_('m'): + if (modifier == L_('E')) goto bad_format; DO_NUMBER (2, tp->tm_mon + 1); - case 'n': /* POSIX.2 extension. */ - add (1, *p = '\n'); + case L_('n'): /* POSIX.2 extension. */ + add (1, *p = L_('\n')); break; - case 'P': + case L_('P'): to_lowcase = 1; #if !defined _NL_CURRENT && HAVE_STRFTIME - format_char = 'p'; + format_char = L_('p'); #endif /* FALLTHROUGH */ - case 'p': + case L_('p'): if (change_case) { to_uppcase = 0; @@ -947,24 +1045,25 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp goto underlying_strftime; #endif - case 'R': /* GNU extension. */ - subfmt = "%H:%M"; + 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"; + subfmt = L_("%I:%M:%S %p"); goto subformat; - case 'S': - if (modifier == 'E') + case L_('S'): + if (modifier == L_('E')) goto bad_format; DO_NUMBER (2, tp->tm_sec); - case 's': /* GNU extension. */ + case L_('s'): /* GNU extension. */ { struct tm ltm; time_t t; @@ -975,7 +1074,7 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp /* Generate string value for T using time_t arithmetic; this works even if sizeof (long) < sizeof (time_t). */ - bufp = buf + sizeof (buf); + bufp = buf + sizeof (buf) / sizeof (buf[0]); negative_number = t < 0; do @@ -995,7 +1094,7 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp } } - *--bufp = d + '0'; + *--bufp = d + L_('0'); } while (t != 0); @@ -1003,13 +1102,15 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp goto do_number_sign_and_padding; } - case 'X': - if (modifier == 'O') + 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); + 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 @@ -1018,27 +1119,27 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp /* Fall through. */ # endif #endif - case 'T': /* POSIX.2 extension. */ - subfmt = "%H:%M:%S"; + case L_('T'): /* POSIX.2 extension. */ + subfmt = L_("%H:%M:%S"); goto subformat; - case 't': /* POSIX.2 extension. */ - add (1, *p = '\t'); + case L_('t'): /* POSIX.2 extension. */ + add (1, *p = L_('\t')); break; - case 'u': /* POSIX.2 extension. */ + case L_('u'): /* POSIX.2 extension. */ DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1); - case 'U': - if (modifier == 'E') + case L_('U'): + if (modifier == L_('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') + 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; @@ -1065,10 +1166,10 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp switch (*f) { - case 'g': + case L_('g'): DO_NUMBER (2, (year % 100 + 100) % 100); - case 'G': + case L_('G'): DO_NUMBER (1, year); default: @@ -1076,26 +1177,30 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp } } - case 'W': - if (modifier == 'E') + case L_('W'): + if (modifier == L_('E')) goto bad_format; DO_NUMBER (2, (tp->tm_yday - (tp->tm_wday - 1 + 7) % 7 + 7) / 7); - case 'w': - if (modifier == 'E') + case L_('w'): + if (modifier == L_('E')) goto bad_format; DO_NUMBER (1, tp->tm_wday); - case 'Y': + 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; +# ifdef COMPILE_WIDE + subfmt = era->era_wformat; +# else + subfmt = era->era_format; +# endif goto subformat; } #else @@ -1104,13 +1209,13 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp # endif #endif } - if (modifier == 'O') + 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); @@ -1118,7 +1223,7 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp { int delta = tp->tm_year - era->start_date[0]; DO_NUMBER (1, (era->offset - + (era->direction == '-' ? -delta : delta))); + + delta * era->absolute_direction)); } #else # if HAVE_STRFTIME @@ -1128,7 +1233,7 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp } DO_NUMBER (2, (tp->tm_year % 100 + 100) % 100); - case 'Z': + case L_('Z'): if (change_case) { to_uppcase = 0; @@ -1143,10 +1248,21 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp if (! zone) zone = ""; /* POSIX.2 requires the empty string here. */ +#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. */ + case L_('z'): /* GNU extension. */ if (tp->tm_isdst < 0) break; @@ -1192,17 +1308,17 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp if (diff < 0) { - add (1, *p = '-'); + add (1, *p = L_('-')); diff = -diff; } else - add (1, *p = '+'); + add (1, *p = L_('+')); diff /= 60; DO_NUMBER (4, (diff / 60) * 100 + diff % 60); } - case '\0': /* GNU extension: % at end of format. */ + case L_('\0'): /* GNU extension: % at end of format. */ --f; /* Fall through. */ default: @@ -1212,7 +1328,7 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp bad_format: { int flen; - for (flen = 1; f[1 - flen] != '%'; flen++) + for (flen = 1; f[1 - flen] != L_('%'); flen++) continue; cpy (flen, &f[1 - flen]); } @@ -1221,7 +1337,7 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp } if (p && maxsize != 0) - *p = '\0'; + *p = L_('\0'); return i; } -- 2.11.4.GIT