diff options
Diffstat (limited to 'time/strftime.c')
| -rw-r--r-- | time/strftime.c | 140 |
1 files changed, 117 insertions, 23 deletions
diff --git a/time/strftime.c b/time/strftime.c index 1da36e12d6..fdf0500a92 100644 --- a/time/strftime.c +++ b/time/strftime.c @@ -275,7 +275,7 @@ memcpy_lowcase (dest, src, len) size_t len; { while (len-- > 0) - dest[len] = TOLOWER (src[len]); + dest[len] = TOLOWER ((unsigned char) src[len]); return dest; } @@ -288,7 +288,7 @@ memcpy_uppcase (dest, src, len) size_t len; { while (len-- > 0) - dest[len] = TOUPPER (src[len]); + dest[len] = TOUPPER ((unsigned char) src[len]); return dest; } @@ -348,7 +348,7 @@ iso_week_days (yday, wday) } -#ifndef _NL_CURRENT +#if !(defined _NL_CURRENT || HAVE_STRFTIME) static char const weekday_name[][10] = { "Sunday", "Monday", "Tuesday", "Wednesday", @@ -362,13 +362,27 @@ static char const month_name[][10] = #endif +#ifdef emacs +# define my_strftime emacs_strftime + /* Emacs 20.2 uses `-Dstrftime=emacs_strftime' when compiling, + because that's how strftime used to be configured. + Undo this, since it gets in the way of accessing the underlying strftime, + which is needed for things like %Ec in Solaris. + The following two lines can be removed once Emacs stops compiling with + `-Dstrftime=emacs_strftime'. */ +# undef strftime +size_t strftime __P ((char *, size_t, const char *, const struct tm *)); +#else +# define my_strftime strftime +#endif + #if !defined _LIBC && HAVE_TZNAME && HAVE_TZSET /* 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 *)); size_t - strftime (s, maxsize, format, tp) + my_strftime (s, maxsize, format, tp) char *s; size_t maxsize; const char *format; @@ -378,10 +392,8 @@ static char const month_name[][10] = tmcopy = *tp; return _strftime_copytm (s, maxsize, format, &tmcopy); } -# ifdef strftime -# undef strftime -# endif -# define strftime(S, Maxsize, Format, Tp) \ +# undef my_strftime +# define my_strftime(S, Maxsize, Format, Tp) \ _strftime_copytm (S, Maxsize, Format, Tp) #endif @@ -393,7 +405,7 @@ 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 -strftime (s, maxsize, format, tp) +my_strftime (s, maxsize, format, tp) char *s; size_t maxsize; const char *format; @@ -411,6 +423,7 @@ strftime (s, maxsize, format, tp) size_t am_len = strlen (a_month); size_t ap_len = strlen (ampm); #else +# if !HAVE_STRFTIME 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; @@ -419,9 +432,12 @@ strftime (s, maxsize, format, tp) size_t aw_len = 3; size_t am_len = 3; size_t ap_len = 2; +# endif #endif +#if defined _NL_CURRENT || !HAVE_STRFTIME size_t wkday_len = strlen (f_wkday); size_t month_len = strlen (f_month); +#endif const char *zone; size_t zonelen; size_t i = 0; @@ -475,6 +491,7 @@ strftime (s, maxsize, format, tp) int to_lowcase = 0; int to_uppcase = 0; int change_case = 0; + int format_char; #if DO_MULTIBYTE @@ -603,7 +620,8 @@ strftime (s, maxsize, format, tp) } /* Now do the specified format. */ - switch (*f) + format_char = *f; + switch (format_char) { #define DO_NUMBER(d, v) \ digits = width == -1 ? d : width; \ @@ -626,8 +644,12 @@ strftime (s, maxsize, format, tp) to_uppcase = 1; to_lowcase = 0; } +#if defined _NL_CURRENT || !HAVE_STRFTIME cpy (aw_len, a_wkday); break; +#else + goto underlying_strftime; +#endif case 'A': if (modifier != 0) @@ -637,15 +659,23 @@ strftime (s, maxsize, format, tp) to_uppcase = 1; to_lowcase = 0; } +#if defined _NL_CURRENT || !HAVE_STRFTIME cpy (wkday_len, f_wkday); 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; +#endif case 'B': if (modifier != 0) @@ -655,8 +685,12 @@ strftime (s, maxsize, format, tp) to_uppcase = 1; to_lowcase = 0; } +#if defined _NL_CURRENT || !HAVE_STRFTIME cpy (month_len, f_month); break; +#else + goto underlying_strftime; +#endif case 'c': if (modifier == 'O') @@ -666,32 +700,58 @@ strftime (s, maxsize, format, tp) && *(subfmt = _NL_CURRENT (LC_TIME, ERA_D_T_FMT)) != '\0')) subfmt = _NL_CURRENT (LC_TIME, D_T_FMT); #else +# if HAVE_STRFTIME + goto underlying_strftime; +# else subfmt = "%a %b %e %H:%M:%S %Y"; +# endif #endif subformat: { char *old_start = p; - size_t len = strftime (NULL, maxsize - i, subfmt, tp); + size_t len = my_strftime (NULL, maxsize - i, subfmt, tp); if (len == 0 && *subfmt) return 0; - add (len, strftime (p, maxsize - i, subfmt, tp)); + add (len, my_strftime (p, maxsize - i, subfmt, tp)); if (to_uppcase) while (old_start < p) { - *old_start = TOUPPER (*old_start); + *old_start = TOUPPER ((unsigned char) *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) + return 0; + cpy (len, ubuf); + } + break; +#endif + case 'C': /* POSIX.2 extension. */ if (modifier == 'O') goto bad_format; -#if HAVE_STRUCT_ERA_ENTRY if (modifier == 'E') { +#if HAVE_STRUCT_ERA_ENTRY struct era_entry *era = _nl_get_era_entry (tp); if (era) { @@ -699,8 +759,13 @@ strftime (s, maxsize, format, tp) cpy (len, era->name_fmt); break; } - } +#else +# if HAVE_STRFTIME + goto underlying_strftime; +# endif #endif + } + { int year = tp->tm_year + TM_YEAR_BASE; DO_NUMBER (1, year / 100 - (year % 100 < 0)); @@ -714,8 +779,13 @@ strftime (s, maxsize, format, tp) && *(subfmt = _NL_CURRENT (LC_TIME, ERA_D_FMT)) != '\0')) subfmt = _NL_CURRENT (LC_TIME, D_FMT); goto subformat; -#endif +#else +# if HAVE_STRFTIME + goto underlying_strftime; +# else /* Fall through. */ +# endif +#endif case 'D': /* POSIX.2 extension. */ if (modifier != 0) goto bad_format; @@ -745,9 +815,9 @@ strftime (s, maxsize, format, tp) do_number: /* Format the number according to the MODIFIER flag. */ -#ifdef _NL_CURRENT if (modifier == '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); @@ -761,8 +831,12 @@ strftime (s, maxsize, format, tp) break; } } - } +#else +# if HAVE_STRFTIME + goto underlying_strftime; +# endif #endif + } { unsigned int u = number_value; @@ -852,6 +926,9 @@ strftime (s, maxsize, format, tp) case 'P': to_lowcase = 1; +#if !defined _NL_CURRENT && HAVE_STRFTIME + format_char = 'p'; +#endif /* FALLTHROUGH */ case 'p': @@ -860,8 +937,12 @@ strftime (s, maxsize, format, tp) to_uppcase = 0; to_lowcase = 1; } +#if defined _NL_CURRENT || !HAVE_STRFTIME cpy (ap_len, ampm); break; +#else + goto underlying_strftime; +#endif case 'R': /* GNU extension. */ subfmt = "%H:%M"; @@ -927,8 +1008,13 @@ strftime (s, maxsize, format, tp) && *(subfmt = _NL_CURRENT (LC_TIME, ERA_T_FMT)) != '\0')) subfmt = _NL_CURRENT (LC_TIME, T_FMT); goto subformat; -#endif +#else +# if HAVE_STRFTIME + goto underlying_strftime; +# else /* Fall through. */ +# endif +#endif case 'T': /* POSIX.2 extension. */ subfmt = "%H:%M:%S"; goto subformat; @@ -1000,26 +1086,30 @@ strftime (s, maxsize, format, tp) DO_NUMBER (1, tp->tm_wday); case 'Y': -#if HAVE_STRUCT_ERA_ENTRY 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; } - } +#else +# if HAVE_STRFTIME + goto underlying_strftime; +# endif #endif + } if (modifier == 'O') goto bad_format; else DO_NUMBER (1, tp->tm_year + TM_YEAR_BASE); case 'y': -#if HAVE_STRUCT_ERA_ENTRY if (modifier == 'E') { +#if HAVE_STRUCT_ERA_ENTRY struct era_entry *era = _nl_get_era_entry (tp); if (era) { @@ -1027,8 +1117,12 @@ strftime (s, maxsize, format, tp) DO_NUMBER (1, (era->offset + (era->direction == '-' ? -delta : delta))); } - } +#else +# if HAVE_STRFTIME + goto underlying_strftime; +# endif #endif + } DO_NUMBER (2, (tp->tm_year % 100 + 100) % 100); case 'Z': |