X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrftime.c;h=f2a64c9d7285cf71ff427579f60d9f2375de4e0c;hb=0aaee99cbb17d6508bef411304056c88ef6b3a89;hp=489911f339983f5755f130a7bfb9904078cd9de3;hpb=3b3231a029a148f719f3347a4ec9ab11f7625231;p=gnulib.git diff --git a/lib/strftime.c b/lib/strftime.c index 489911f33..f2a64c9d7 100644 --- a/lib/strftime.c +++ b/lib/strftime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 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. @@ -28,12 +28,15 @@ # define HAVE_STRUCT_ERA_ENTRY 1 # define HAVE_TM_GMTOFF 1 # define HAVE_TM_ZONE 1 +# define HAVE_TZNAME 1 +# define HAVE_TZSET 1 # define MULTIBYTE_IS_FORMAT_SAFE 1 # define STDC_HEADERS 1 # include # include "../locale/localeinfo.h" #endif +#include #include /* Some systems define `time_t' here. */ #ifdef TIME_WITH_SYS_TIME @@ -46,6 +49,9 @@ # include # endif #endif +#if HAVE_TZNAME +extern char *tzname[]; +#endif /* Do multibyte processing if multibytes are supported, unless multibyte sequences are safe in formats. Multibyte sequences are @@ -76,27 +82,31 @@ # include # include #else -# define memcpy(d, s, n) bcopy (s, d, n) +# 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. */ +# 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 +# ifdef __STDC__ +# define PTR void * +# else +# define PTR char * +# endif #endif #ifndef CHAR_BIT -#define CHAR_BIT 8 +# define CHAR_BIT 8 +#endif + +#ifndef NULL +# define NULL 0 #endif #define TYPE_SIGNED(t) ((t) -1 < 0) @@ -114,7 +124,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 @@ -122,11 +132,14 @@ #ifdef _LIBC # define gmtime_r __gmtime_r # define localtime_r __localtime_r +extern int __tz_compute __P ((time_t timer, const struct tm *tm)); +# define tzname __tzname +# define tzset __tzset #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 +# define gmtime_r my_gmtime_r static struct tm *gmtime_r __P ((const time_t *, struct tm *)); static struct tm * gmtime_r (t, tp) @@ -142,7 +155,7 @@ gmtime_r (t, tp) # endif /* ! HAVE_TM_GMTOFF */ /* Approximate localtime_r as best we can in its absence. */ -#define localtime_r my_localtime_r +# define localtime_r my_localtime_r static struct tm *localtime_r __P ((const time_t *, struct tm *)); static struct tm * localtime_r (t, tp) @@ -159,20 +172,95 @@ localtime_r (t, tp) #endif /* ! defined (_LIBC) */ -#define add(n, f) \ +#if !defined (memset) && !defined (HAVE_MEMSET) && !defined (_LIBC) +/* Some systems lack the `memset' function and we don't want to + introduce additional dependencies. */ +static const char spaces[16] = " "; + +# define memset_space(P, Len) \ + do { \ + int _len = (Len); \ + \ + do \ + { \ + int _this = _len > 16 ? 16 : _len; \ + memcpy ((P), spaces, _this); \ + (P) += _this; \ + _len -= _this; \ + } \ + while (_len > 0); \ + } while (0) +#else +# define memset_space(P, Len) memset ((P), ' ', (Len)) +#endif + +#define add(n, f) \ do \ { \ - i += (n); \ - if (i >= maxsize) \ + int _n = (n); \ + int _delta = width - _n; \ + int _incr = _n + (_delta > 0 ? _delta : 0); \ + if (i + _incr >= maxsize) \ return 0; \ - else \ - if (p) \ - { \ - f; \ - p += (n); \ - } \ + if (p) \ + { \ + if (_delta > 0) \ + memset_space (p, _delta); \ + f; \ + p += _n; \ + } \ + i += _incr; \ } while (0) -#define cpy(n, s) add ((n), memcpy((PTR) p, (PTR) (s), (n))) + +#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)) + + + +#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 +/* 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) + +static char *memcpy_lowcase __P ((char *dest, const char *src, size_t len)); + +static char * +memcpy_lowcase (dest, src, len) + char *dest; + const char *src; + size_t len; +{ + while (len-- > 0) + dest[len] = TOLOWER (src[len]); + return dest; +} + +static char *memcpy_uppcase __P ((char *dest, const char *src, size_t len)); + +static char * +memcpy_uppcase (dest, src, len) + char *dest; + const char *src; + size_t len; +{ + while (len-- > 0) + dest[len] = TOUPPER (src[len]); + return dest; +} #if ! HAVE_TM_GMTOFF /* Yield the difference between *A and *B, @@ -241,6 +329,32 @@ static char const month_name[][10] = }; #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) + char *s; + size_t maxsize; + const char *format; + const struct tm *tp; + { + struct tm tmcopy; + tmcopy = *tp; + return _strftime_copytm (s, maxsize, format, &tmcopy); + } +# ifdef strftime +# undef strftime +# endif +# define strftime(S, Maxsize, Format, Tp) \ + _strftime_copytm ((S), (Maxsize), (Format), (Tp)) +#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 @@ -252,7 +366,7 @@ strftime (s, maxsize, format, tp) char *s; size_t maxsize; const char *format; - register const struct tm *tp; + const struct tm *tp; { int hour12 = tp->tm_hour; #ifdef _NL_CURRENT @@ -279,15 +393,30 @@ strftime (s, maxsize, format, tp) 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 + size_t i = 0; + char *p = s; + const char *f; + + zone = NULL; +#if !defined _LIBC && HAVE_TM_ZONE + /* XXX We have some problems here. First, the string pointed to by + tm_zone is dynamically allocated while loading the zone data. But + when another zone is loaded since the information in TP were + computed this would be a stale pointer. + The second problem is the POSIX test suite which assumes setting + the environment variable TZ to a new value before calling strftime() + will influence the result (the %Z format) even if the information in + TP is computed with a totally different time zone. --drepper@gnu */ zone = (const char *) tp->tm_zone; #endif #if HAVE_TZNAME + /* 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. */ +# if HAVE_TZSET + tzset (); +# endif + if (!(zone && *zone) && tp->tm_isdst >= 0) zone = tzname[tp->tm_isdst]; #endif @@ -313,6 +442,9 @@ strftime (s, maxsize, format, tp) char 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; #if DO_MULTIBYTE @@ -387,20 +519,43 @@ strftime (s, maxsize, format, tp) #endif /* ! DO_MULTIBYTE */ - /* Check for flags that can modify a number format. */ - ++f; - switch (*f) + /* Check for flags that can modify a format. */ + pad = 0; + while (1) { - case '_': - case '-': - pad = *f++; - break; + switch (*++f) + { + /* This influences the number formats. */ + case '_': + case '-': + case '0': + pad = *f; + continue; - default: - pad = 0; + /* This changes textual output. */ + case '^': + to_uppcase = 1; + continue; + + 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)); + } + /* Check for modifiers. */ switch (*f) { @@ -461,15 +616,23 @@ strftime (s, maxsize, format, tp) && *(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"; + subfmt = "%a %b %e %H:%M:%S %Y"; #endif subformat: { - size_t len = strftime (p, maxsize - i, subfmt, tp); + char *old_start = p; + size_t len = strftime (NULL, maxsize - i, subfmt, tp); if (len == 0 && *subfmt) return 0; - add (len, ;); + add (len, strftime (p, maxsize - i, subfmt, tp)); + + if (to_uppcase) + while (old_start < p) + { + *old_start = TOUPPER (*old_start); + ++old_start; + } } break; @@ -525,8 +688,9 @@ strftime (s, maxsize, format, tp) jump to one of these two labels. */ do_number_spacepad: - /* Force `_' flag. */ - pad = '_'; + /* Force `_' flag unless overwritten by `0' flag. */ + if (pad != '0') + pad = '_'; do_number: /* Format the number according to the MODIFIER flag. */ @@ -636,6 +800,10 @@ strftime (s, maxsize, format, tp) add (1, *p = '\n'); break; + case 'P': + to_lowcase = 1; + /* FALLTHROUGH */ + case 'p': cpy (ap_len, ampm); break; @@ -809,7 +977,7 @@ strftime (s, maxsize, format, tp) DO_NUMBER (2, (tp->tm_year % 100 + 100) % 100); case 'Z': - cpy(zonelen, zone); + cpy (zonelen, zone); break; case 'z': /* GNU extension. */