From 149bc75a9b72f6495933819e09de7cf98a407a19 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 2 Nov 2022 15:16:16 -0500 Subject: [PATCH] Bug report from nomas2000: inverted test in check for trailing rubbish. --- tests/date.test | 3 +++ toys/posix/date.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/date.test b/tests/date.test index dfcefb26..9777edb3 100644 --- a/tests/date.test +++ b/tests/date.test @@ -97,3 +97,6 @@ testing "tz + 8 : 8 " \ # Can we parse date's own output format? testing "round trip" 'TZ=$tz date -d "$(TZ=$tz date -d @1598476818)"' \ "Wed Aug 26 23:20:18 CEST 2020\n" "" "" + +toyonly testcmd "-D with -d" "-uD '%s' -d '1234567890'" \ + "Fri Feb 13 23:31:30 UTC 2009\n" "" "" diff --git a/toys/posix/date.c b/toys/posix/date.c index 099064f0..5a0f27e1 100644 --- a/toys/posix/date.c +++ b/toys/posix/date.c @@ -156,7 +156,7 @@ void date_main(void) struct tm tm = {}; char *s = strptime(TT.d, TT.D+(*TT.D=='+'), &tm); - t = (s && *s) ? xvali_date(&tm, s) : xvali_date(0, TT.d); + t = (s && !*s) ? xvali_date(&tm, s) : xvali_date(0, TT.d); } else parse_date(TT.d, &t); } else { struct timespec ts; -- 2.39.2