From e91e6dd766d66117c8de6fa302d11594caeb71fd Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Wed, 8 May 2019 22:29:34 -0700 Subject: [PATCH] Re-enable '%s' in strftime. This was commented out earlier when timezone handling was more in flux, but it's ok to minimally support this now. This fixes src/functional/strftime.c in libc-test. --- libc-top-half/musl/src/time/strftime.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libc-top-half/musl/src/time/strftime.c b/libc-top-half/musl/src/time/strftime.c index 949fede8..cc53d536 100644 --- a/libc-top-half/musl/src/time/strftime.c +++ b/libc-top-half/musl/src/time/strftime.c @@ -122,12 +122,10 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm * case 'R': fmt = "%H:%M"; goto recu_strftime; -#ifdef __wasilibc_unmodified_upstream // timezone data case 's': val = __tm_to_secs(tm) - tm->__tm_gmtoff; width = 1; goto number; -#endif case 'S': val = tm->tm_sec; goto number;