From 354ff6831412eb88c64e9f497a382d926dc7b9bd Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 19 Oct 2016 20:51:28 -0500 Subject: More touch tests, and a fix found by one. (The three -t formats can only reliably be distinguished by checking length, because %H amd %m and such can match different numbers of digits.) --- toys/posix/touch.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'toys/posix/touch.c') diff --git a/toys/posix/touch.c b/toys/posix/touch.c index 79928cee..c18087a9 100644 --- a/toys/posix/touch.c +++ b/toys/posix/touch.c @@ -54,7 +54,7 @@ void touch_main(void) format = (char *[]){"%Y-%m-%dT%T", "%Y-%m-%d %T", 0}; date = TT.date; } else { - format = (char *[]){"%Y%m%d%H%M", "%m%d%H%M", "%y%m%d%H%M", 0}; + format = (char *[]){"%m%d%H%M", "%y%m%d%H%M", "%C%y%m%d%H%M", 0}; date = TT.time; } @@ -66,6 +66,13 @@ void touch_main(void) } while (*format) { + if (toys.optflags&FLAG_t) { + s = strchr(date, '.'); + if ((s ? s-date : strlen(date)) != strlen(*format)) { + format++; + continue; + } + } localtime_r(&(ts->tv_sec), &tm); // Adjusting for daylight savings time gives the wrong answer. tm.tm_isdst = 0; -- cgit v1.2.3