diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-30 09:23:45 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-30 09:23:45 +0000 |
| commit | 0f4d402df7af7560d028b9a921c8cc8158a43fbd (patch) | |
| tree | 597cec595cb3f3662ce905c9ceae42a142561558 /strftime.c | |
| parent | 0afaa76691a97df596390187b591c0cac32ca739 (diff) | |
| download | ruby-0f4d402df7af7560d028b9a921c8cc8158a43fbd.tar.gz ruby-0f4d402df7af7560d028b9a921c8cc8158a43fbd.tar.xz ruby-0f4d402df7af7560d028b9a921c8cc8158a43fbd.zip | |
merges r20357 from trunk into ruby_1_9_1.
* strftime.c (STRFTIME): should add padding for %[xXrR] etc.
[ruby-dev:37185] fix: #792
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'strftime.c')
| -rw-r--r-- | strftime.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/strftime.c b/strftime.c index 7913c792a..e2c8d5fab 100644 --- a/strftime.c +++ b/strftime.c @@ -295,7 +295,12 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept do { \ i = strftime(s, endp - s, fmt, tm); \ if (!i) return 0; \ - s += i; \ + if (precision > i) {\ + memmove(s + precision - i, s, i);\ + memset(s, padding ? padding : ' ', precision - i); \ + s += precision; \ + }\ + else s += i; \ } while (0) if (*format != '%') { |