From 76678fa5730dfced54c95696e77fdbc6c9c9e839 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 1 Oct 2014 19:57:34 -0500 Subject: Bugfix from Ashwini Sharma: Z timezone required by posix for touch but not for libc, so we have to implement it here. --- toys/posix/touch.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/toys/posix/touch.c b/toys/posix/touch.c index 0e0677e5..71ddc434 100644 --- a/toys/posix/touch.c +++ b/toys/posix/touch.c @@ -36,7 +36,7 @@ int fetch(char *file, struct timeval *tv, unsigned flags) { struct stat st; - if (stat(TT.file, &st)) return 1; + if (stat(file, &st)) return 1; if (flags & FLAG_a) { tv[0].tv_sec = st.st_atime; @@ -73,6 +73,12 @@ void touch_main(void) date = TT.date; i = strlen(date); if (i) { + // Trailing Z means UTC timezone, don't expect libc to know this. + if (toupper(date[i-1])=='Z') { + date[i-1] = 0; + setenv("TZ", "UTC0", 1); + localtime_r(&(tv->tv_sec), &tm); + } s = strptime(date, "%Y-%m-%dT%T", &tm); if (s && *s=='.') { sscanf(s, ".%d%n", &i, &len); -- cgit v1.2.3