diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-29 09:47:42 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-29 09:47:42 +0000 |
| commit | 7e1c65dccdd7fe20e931a06eee37586cf1f534af (patch) | |
| tree | 872b5f315f44aee9bf8835b934b42b15057c52cc | |
| parent | 85f3636e98983e9661f6078ec88572d42dd7cdde (diff) | |
| download | ruby-7e1c65dccdd7fe20e931a06eee37586cf1f534af.tar.gz | |
vsnprintf.c: prefix with precision
* vsnprintf.c (BSD_vfprintf): sign and hex-prefix should not be
counted in precision. [ruby-dev:47714] [Bug #8916]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | strftime.c | 2 | ||||
| -rw-r--r-- | vsnprintf.c | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/strftime.c b/strftime.c index dbb593ae1e..025be94afb 100644 --- a/strftime.c +++ b/strftime.c @@ -582,7 +582,7 @@ rb_strftime_with_timespec(VALUE ftime, const char *format, size_t format_len, goto unknown; } i = snprintf(s, endp - s, (padding == ' ' ? "%+*ld" : "%+.*ld"), - precision + 1, sign * (off / 3600)); + precision + (padding == ' '), sign * (off / 3600)); if (i < 0) goto err; if (sign < 0 && off < 3600) { *(padding == ' ' ? s + i - 2 : s) = '-'; diff --git a/vsnprintf.c b/vsnprintf.c index 9a4f37abe0..f5652e7cec 100644 --- a/vsnprintf.c +++ b/vsnprintf.c @@ -1119,11 +1119,11 @@ number: if ((dprec = prec) >= 0) */ fieldsz = size; long_len: + realsz = dprec > fieldsz ? dprec : fieldsz; if (sign) - fieldsz++; + realsz++; if (flags & HEXPREFIX) - fieldsz += 2; - realsz = dprec > fieldsz ? dprec : fieldsz; + realsz += 2; /* right-adjusting blank padding */ if ((flags & (LADJUST|ZEROPAD)) == 0) @@ -1145,10 +1145,6 @@ long_len: /* leading zeroes from decimal precision */ PAD_L(dprec - fieldsz, zeroes); - if (sign) - fieldsz--; - if (flags & HEXPREFIX) - fieldsz -= 2; /* the string or number proper */ #ifdef FLOATING_POINT |