* strftime.c (rb_strftime_with_timespec): fix padding of time zone

offset.  [ruby-dev:43287][Bug #4458]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35366 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-04-17 13:18:51 +00:00
parent 77321aeed9
commit 43dbbefbdf
3 changed files with 28 additions and 3 deletions

View file

@ -189,6 +189,9 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encodi
char padding;
enum {LEFT, CHCASE, LOWER, UPPER, LOCALE_O, LOCALE_E};
#define BIT_OF(n) (1U<<(n))
#ifdef MAILHEADER_EXT
int sign;
#endif
/* various tables, useful in North America */
static const char days_l[][10] = {
@ -485,11 +488,12 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encodi
}
if (off < 0) {
off = -off;
*s++ = '-';
sign = -1;
} else {
*s++ = '+';
sign = +1;
}
i = snprintf(s, endp - s, (padding == ' ' ? "%*ld" : "%.*ld"), precision, off / 3600);
i = snprintf(s, endp - s, (padding == ' ' ? "%+*ld" : "%+.*ld"),
precision + 1, sign * (off / 3600));
if (i < 0) goto err;
s += i;
off = off % 3600;