From 1289b48ee174bda5dc6266df1ed216f172fc5dd4 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Wed, 7 Dec 2016 10:52:08 +0100 Subject: [PATCH] time/stfrtime_l.c: add lowercase support * [BZ #15527] * time/strftime_l.c (__strftime_internal): Implement conversion to all lowercase. * manual/time.texi: Document # and , flags. * time/tst-strftime.c (do_test): Test case conversion. --- manual/time.texi | 8 ++++++++ time/strftime_l.c | 4 +++- time/tst-strftime.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/manual/time.texi b/manual/time.texi index f94cbe4..39ed062 100644 --- a/manual/time.texi +++ b/manual/time.texi @@ -1352,6 +1352,14 @@ with spaces. @item ^ The output uses uppercase characters, but only if this is possible (@pxref{Case Conversion}). + +@item # +The output uses opposite case, but only if this is possible +(@pxref{Case Conversion}). + +@item , +The output uses lowercase characters, but only if this is possible +(@pxref{Case Conversion}). @end table The default action is to pad the number with zeros to keep it a constant diff --git a/time/strftime_l.c b/time/strftime_l.c index 1205035..6ed5f63 100644 --- a/time/strftime_l.c +++ b/time/strftime_l.c @@ -671,7 +671,9 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format, case L_('#'): change_case = 1; continue; - + case L_(','): + to_lowcase = 1; + continue; default: break; } diff --git a/time/tst-strftime.c b/time/tst-strftime.c index af3ff72..258d40a 100644 --- a/time/tst-strftime.c +++ b/time/tst-strftime.c @@ -154,6 +154,36 @@ do_test (void) } } + const struct + { + const char *fmt; + const char *exp; + size_t n; + } ctests[] = + { + { "%^A", "SUNDAY", 6 }, + { "%,A", "sunday", 6 }, + { "%A", "Sunday", 6 }, + }; +#define nctests (sizeof (ctests) / sizeof (ctests[0])) + for (cnt = 0; cnt < nctests; ++cnt) + { + char buf[100]; + size_t r = strftime (buf, sizeof (buf), ctests[cnt].fmt, &ttm); + if (r != ctests[cnt].n) + { + printf ("strftime(\"%s\") returned %zu not %zu\n", + ctests[cnt].fmt, r, ctests[cnt].n); + result = 1; + } + if (strcmp (buf, ctests[cnt].exp) != 0) + { + printf ("strftime(\"%s\") produced \"%s\" not \"%s\"\n", + ctests[cnt].fmt, buf, ctests[cnt].exp); + result = 1; + } + } + return result + do_bz18985 (); } -- 2.5.5