From 6099790621b5fe7c12f5b9a3b4ab5b6e3d952e57 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 25 Nov 2008 15:28:22 +0000
Subject: [PATCH] * strftime.c (STRFTIME): should add padding for %[xXrR] etc. 
  [ruby-dev:37185] fix: #792

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog  | 5 +++++
 strftime.c | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b43b00a1b1..96b8c5d47b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 26 00:26:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* strftime.c (STRFTIME): should add padding for %[xXrR] etc.
+	  [ruby-dev:37185] fix: #792
+
 Tue Nov 25 16:26:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_times): taint (and untrust) status should be
diff --git a/strftime.c b/strftime.c
index 7913c792a5..e2c8d5fabd 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 != '%') {