[git commit] hwclock: use locale-specific date output format

[Denys Vlasenko]

commit: http://git.busybox.net/busybox/commit/?id=319b8bb3558ec4149f8653c1ff147d4ca8ba0217
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 util-linux/hwclock.c |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 3e2c2aa..6b4e29b 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -60,25 +60,31 @@ static void show_clock(const char **pp_rtcname, int utc)
 #if SHOW_HWCLOCK_DIFF
 	struct timeval sys_tv;
 #endif
-	time_t t;
-	char *cp;
+	time_t t = read_rtc(pp_rtcname, &sys_tv, utc);
 
-	t = read_rtc(pp_rtcname, &sys_tv, utc);
-	cp = ctime(&t);
+#if ENABLE_LOCALE_SUPPORT
+	/* Standard hwclock uses locale-specific output format */
+	char cp[64];
+	struct tm *ptm = localtime(&t);
+	strftime(cp, sizeof(cp), "%c", ptm);
+#else
+	char *cp = ctime(&t);
 	strchrnul(cp, '\n')[0] = '\0';
+#endif
+
 #if !SHOW_HWCLOCK_DIFF
 	printf("%s  0.000000 seconds\n", cp);
 #else
 	{
 		long diff = sys_tv.tv_sec - t;
 		if (diff < 0 /*&& tv.tv_usec != 0*/) {
-			/* Why? */
-			/* diff >= 0 is ok:   diff < 0, can't just use tv.tv_usec: */
-			/*   45.520820          43.520820 */
-			/* - 44.000000        - 45.000000 */
-			/* =  1.520820        = -1.479180, not -2.520820! */
+			/* Why we need diff++? */
+			/* diff >= 0 is ok: | diff < 0, can't just use tv.tv_usec: */
+			/*   45.520820      |   43.520820 */
+			/* - 44.000000      | - 45.000000 */
+			/* =  1.520820      | = -1.479180, not -2.520820! */
 			diff++;
-			/* should be 1000000 - tv.tv_usec, but then we must check tv.tv_usec != 0 */
+			/* Should be 1000000 - tv.tv_usec, but then we must check tv.tv_usec != 0 */
 			sys_tv.tv_usec = 999999 - sys_tv.tv_usec;
 		}
 		printf("%s  %ld.%06lu seconds\n", cp, diff, (unsigned long)sys_tv.tv_usec);
-- 
1.7.3.4