From 840e2943e8ae020adfa7eafa7877f004e7ecada1 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 5 Feb 2013 14:40:39 +0100 Subject: Properly handle %W in strptime --- time/strptime_l.c | 4 ++-- time/tst-strptime.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'time') diff --git a/time/strptime_l.c b/time/strptime_l.c index 1f2e8b6..00fc1ef 100644 --- a/time/strptime_l.c +++ b/time/strptime_l.c @@ -1180,8 +1180,8 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM) if (!s.have_yday) tm->tm_yday = ((7 - (tm->tm_wday - w_offset)) % 7 - + (s.week_no - 1) *7 - + save_wday - w_offset); + + (s.week_no - 1) * 7 + + (save_wday - w_offset + 7) % 7); if (!s.have_mday || !s.have_mon) { diff --git a/time/tst-strptime.c b/time/tst-strptime.c index 12b084d..21fbb63 100644 --- a/time/tst-strptime.c +++ b/time/tst-strptime.c @@ -41,6 +41,7 @@ static const struct { "C", "19990502123412", "%Y%m%d%H%M%S", 0, 121, 4, 2 }, { "C", "2001 20 Mon", "%Y %U %a", 1, 140, 4, 21 }, { "C", "2001 21 Mon", "%Y %W %a", 1, 140, 4, 21 }, + { "C", "2012 00 Sun", "%Y %W %a", 0, 0, 0, 1 }, { "ja_JP.EUC-JP", "2000-01-01 08:12:21 AM", "%Y-%m-%d %I:%M:%S %p", 6, 0, 0, 1 }, { "en_US.ISO-8859-1", "2000-01-01 08:12:21 PM", "%Y-%m-%d %I:%M:%S %p", -- cgit v1.1