diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-24 21:21:40 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-24 21:21:40 +0000 |
| commit | bbf0fd4e9c9b1efa6b1bf9c8d3eda4c893798220 (patch) | |
| tree | 72f22371d14566e7b5b65bd4451c75bd9af7db3b | |
| parent | df26e9d44e5c4555b5e42f593ab6afe50503f1d6 (diff) | |
| download | ruby-bbf0fd4e9c9b1efa6b1bf9c8d3eda4c893798220.tar.gz | |
* vsnprintf.c (BSD_vfprintf): prec digits fractal part should be
appended to 0 if prec is given. [ruby-dev:42453] #3979
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/test_sprintf.rb | 4 | ||||
| -rw-r--r-- | vsnprintf.c | 4 |
3 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Oct 25 06:21:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vsnprintf.c (BSD_vfprintf): prec digits fractal part should be + appended to 0 if prec is given. [ruby-dev:42453] #3979 + Mon Oct 25 02:57:21 2010 Koichi Sasada <ko1@atdot.net> * common.mk (run.gdb): Quit gdb on 'make gdb' when diff --git a/test/ruby/test_sprintf.rb b/test/ruby/test_sprintf.rb index ad77df19b8..33794c9296 100644 --- a/test/ruby/test_sprintf.rb +++ b/test/ruby/test_sprintf.rb @@ -230,6 +230,10 @@ class TestSprintf < Test::Unit::TestCase assert_equal("0x1.p+0", sprintf("%#.0a", 1), bug3965) assert_equal("0x00000000000000.p+0", sprintf("%#020a", 0), bug3965) assert_equal("0x0000.0000000000p+0", sprintf("%#020.10a", 0), bug3965) + + bug3979 = '[ruby-dev:42453]' + assert_equal(" 0x0.000p+0", sprintf("%20.3a", 0), bug3979) + assert_equal(" 0x1.000p+0", sprintf("%20.3a", 1), bug3979) end BSIZ = 120 diff --git a/vsnprintf.c b/vsnprintf.c index 88a36a102e..ebcb882f89 100644 --- a/vsnprintf.c +++ b/vsnprintf.c @@ -784,8 +784,10 @@ reswitch: switch (ch) { #ifdef FLOATING_POINT case 'a': case 'A': - if (prec >= 0) + if (prec >= 0) { + flags |= ALT; prec++; + } goto fp_begin; case 'e': /* anomalous precision */ case 'E': |