From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) by sourceware.org (Postfix) with ESMTPS id 020033858D1E for ; Sat, 22 Oct 2022 05:14:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 020033858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=SystematicSW.ab.ca Authentication-Results: sourceware.org; spf=none smtp.mailfrom=systematicsw.ab.ca Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTP id ltuDon1S2Sp39m6pvoNMwC; Sat, 22 Oct 2022 05:14:19 +0000 Received: from localhost.localdomain ([184.64.124.72]) by cmsmtp with ESMTP id m6puoYN9QiEh7m6puo5uII; Sat, 22 Oct 2022 05:14:19 +0000 X-Authority-Analysis: v=2.4 cv=O9kqATxW c=1 sm=1 tr=0 ts=63537c2b a=oHm12aVswOWz6TMtn9zYKg==:117 a=oHm12aVswOWz6TMtn9zYKg==:17 a=r77TgQKjGQsHNAKrUKIA:9 a=XgIxTd0kgQkbNfibz2kA:9 a=QEXdDO2ut3YA:10 a=0qzFMbyc90MOOLavo9YA:9 a=B2y7HmGcmWMA:10 From: Brian Inglis To: newlib@sourceware.org Subject: [PATCH] strftime.c(__strftime): add %q, %v, tests; tweak %Z doc Date: Fri, 21 Oct 2022 23:13:52 -0600 Message-Id: <20221022051352.2723-1-Brian.Inglis@SystematicSW.ab.ca> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.37.3" Content-Transfer-Encoding: 8bit X-CMAE-Envelope: MS4xfP/1GnWg6y/9DV4xMRSbT5XKFyWY/VTVBP4w+P4b+wLr/xP9Ofka4C8Fc5jQJBXmg8OHkLk4Axj7G1eyLYD8erd6GeH+BRyMrsEu4JWBXffZjpAoLY5d TvZ+D0AIrbFA2KIwY6u0tpIbsUMIBq10POT2j95DDyF4/i9rWI2weYaem2CGJ7XN3EH63sdRhIROyiV0EWiHEG/Ge7ciwnuWbVm+gQSn7JWm7T/H1yIv5Xx2 J7voNap7AmJ0PZho6xwkIkl/3aFnl0ZhmLr4227KoZ4= X-Spam-Status: No, score=-1169.8 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This is a multi-part message in MIME format. --------------2.37.3 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit %q GNU quarter year 1-4 %v BSD/OSX/Ruby VMS/Oracle %e-%b-%Y %Z change time zone *name* to *abbreviation* --- newlib/libc/time/strftime.c | 58 +++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 3 deletions(-) --------------2.37.3 Content-Type: text/x-patch; name="0001-strftime.c-__strftime-add-q-v-tests-tweak-Z-doc.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0001-strftime.c-__strftime-add-q-v-tests-tweak-Z-doc.patch" diff --git a/newlib/libc/time/strftime.c b/newlib/libc/time/strftime.c index 9c884dca9766..420745d90333 100644 --- a/newlib/libc/time/strftime.c +++ b/newlib/libc/time/strftime.c @@ -161,6 +161,10 @@ the current locale. [tm_hour] o %P Same as '<<%p>>', but in lowercase. This is a GNU extension. [tm_hour] +o %q +Quarter of the year (from `<<1>>' to `<<4>>'), with January starting +the first quarter. This is a GNU extension. [tm_mon] + o %r Replaced by the time in a.m. and p.m. notation. In the "C" locale this is equivalent to "%I:%M:%S %p". In locales which don't define a.m./p.m. @@ -198,6 +202,10 @@ The week number, where weeks start on Monday, week 1 contains January 4th, and earlier days are in the previous year. Formatted with two digits (from `<<01>>' to `<<53>>'). See also <<%G>>. [tm_year, tm_wday, tm_yday] +o %v +A string representing the BSD/OSX/Ruby VMS/Oracle date format, in the form +"%e-%b-%Y". Non-POSIX extension. [tm_mday, tm_mon, tm_year] + o %w The weekday as a number, 0-based from Sunday (from `<<0>>' to `<<6>>'). [tm_wday] @@ -235,9 +243,9 @@ savings offset for the current timezone. The offset is determined from the TZ environment variable, as if by calling tzset(). [tm_isdst] o %Z -The time zone name. If tm_isdst is negative, no output is generated. -Otherwise, the time zone name is based on the TZ environment variable, -as if by calling tzset(). [tm_isdst] +The current time zone abbreviation. If tm_isdst is negative, no output +is generated. Otherwise, the time zone abbreviation is based on the TZ +environment variable, as if by calling tzset(). [tm_isdst] o %% A single character, `<<%>>'. @@ -1086,6 +1094,11 @@ recurse: return 0; } break; + case CQ('q'): /* GNU quarter year */ + len = snprintf (&s[count], maxsize - count, CQ("%.1d"), + tim_p->tm_mon / 3 + 1); + CHECK_LENGTH (); + break; case CQ('R'): len = snprintf (&s[count], maxsize - count, CQ("%.2d:%.2d"), tim_p->tm_hour, tim_p->tm_min); @@ -1241,6 +1254,37 @@ recurse: CHECK_LENGTH (); } break; + case CQ('v'): /* BSD/OSX/Ruby extension VMS/Oracle date format + from Arnold Robbins strftime version 3.0 */ + { /* %v is equivalent to "%e-%b-%Y", flags and width can change year + format. Recurse to avoid need to replicate %b and %Y formation. */ + CHAR fmtbuf[32], *fmt = fmtbuf; + STRCPY (fmt, CQ("%e-%b-%")); + fmt += strlen (fmt); + if (pad) /* '0' or '+' */ + *fmt++ = pad; + else + *fmt++ = '+'; + if (!pad) + width = 10; + if (width < 6) + width = 6; + width -= 6; + if (width) + { + len = snprintf (fmt, fmtbuf + 32 - fmt, CQ("%lu"), width); + if (len > 0) + fmt += len; + } + STRCPY (fmt, CQ("Y")); + len = __strftime (&s[count], maxsize - count, fmtbuf, tim_p, + locale, era_info, alt_digits); + if (len > 0) + count += len; + else + return 0; + } + break; case CQ('w'): #ifdef _WANT_C99_TIME_FORMATS if (alt == CQ('O') && *alt_digits) @@ -1531,6 +1575,7 @@ const struct test Vec0[] = { { CQ("%M"), 2+1, EXP(CQ("53")) }, { CQ("%n"), 1+1, EXP(CQ("\n")) }, { CQ("%p"), 2+1, EXP(CQ("AM")) }, + { CQ("%q"), 1+1, EXP(CQ("4")) }, { CQ("%r"), 11+1, EXP(CQ("09:53:47 AM")) }, { CQ("%R"), 5+1, EXP(CQ("09:53")) }, { CQ("%s"), 2+1, EXP(CQ("1230648827")) }, @@ -1540,6 +1585,7 @@ const struct test Vec0[] = { { CQ("%u"), 1+1, EXP(CQ("2")) }, { CQ("%U"), 2+1, EXP(CQ("52")) }, { CQ("%V"), 2+1, EXP(CQ("01")) }, + { CQ("%v"), 11+1, EXP(CQ("30-Dec-2008")) }, { CQ("%w"), 1+1, EXP(CQ("2")) }, { CQ("%W"), 2+1, EXP(CQ("52")) }, { CQ("%x"), 8+1, EXP(CQ("12/30/08")) }, @@ -1592,6 +1638,7 @@ const struct test Vec1[] = { { CQ("%M"), 2+1, EXP(CQ("01")) }, { CQ("%n"), 1+1, EXP(CQ("\n")) }, { CQ("%p"), 2+1, EXP(CQ("PM")) }, + { CQ("%q"), 1+1, EXP(CQ("3")) }, { CQ("%r"), 11+1, EXP(CQ("11:01:13 PM")) }, { CQ("%R"), 5+1, EXP(CQ("23:01")) }, { CQ("%s"), 2+1, EXP(CQ("1215054073")) }, @@ -1601,6 +1648,7 @@ const struct test Vec1[] = { { CQ("%u"), 1+1, EXP(CQ("3")) }, { CQ("%U"), 2+1, EXP(CQ("26")) }, { CQ("%V"), 2+1, EXP(CQ("27")) }, + { CQ("%v"), 11+1, EXP(CQ(" 2-Jul-2008")) }, { CQ("%w"), 1+1, EXP(CQ("3")) }, { CQ("%W"), 2+1, EXP(CQ("26")) }, { CQ("%x"), 8+1, EXP(CQ("07/02/08")) }, @@ -1662,6 +1710,7 @@ const struct test Vecyr0[] = { { CQ("%c"), OUTSIZE, EXP(CQ("Wed Jul 2 23:01:13 ")YEAR) }, { CQ("%D"), OUTSIZE, EXP(CQ("07/02/")Year) }, { CQ("%F"), OUTSIZE, EXP(YEAR CQ("-07-02")) }, + { CQ("%v"), OUTSIZE, EXP(CQ(" 2-Jul-")YEAR) }, { CQ("%x"), OUTSIZE, EXP(CQ("07/02/")Year) }, { CQ("%y"), OUTSIZE, EXP(Year) }, { CQ("%Y"), OUTSIZE, EXP(YEAR) }, @@ -1708,6 +1757,7 @@ const struct test Vecyr1[] = { { CQ("%c"), OUTSIZE, EXP(CQ("Wed Jul 2 23:01:13 ")YEAR) }, { CQ("%D"), OUTSIZE, EXP(CQ("07/02/")Year) }, { CQ("%F"), OUTSIZE, EXP(YEAR CQ("-07-02")) }, + { CQ("%v"), OUTSIZE, EXP(CQ(" 2-Jul-")YEAR) }, { CQ("%x"), OUTSIZE, EXP(CQ("07/02/")Year) }, { CQ("%y"), OUTSIZE, EXP(Year) }, { CQ("%Y"), OUTSIZE, EXP(YEAR) }, @@ -1745,6 +1795,7 @@ const struct test Vecyrzp[] = { { CQ("%c"), OUTSIZE, EXP(CQ("Wed Jul 2 23:01:60 ")YEAR) }, { CQ("%D"), OUTSIZE, EXP(CQ("07/02/")Year) }, { CQ("%F"), OUTSIZE, EXP(YEAR CQ("-07-02")) }, + { CQ("%v"), OUTSIZE, EXP(CQ(" 2-Jul-")YEAR) }, { CQ("%x"), OUTSIZE, EXP(CQ("07/02/")Year) }, { CQ("%y"), OUTSIZE, EXP(Year) }, { CQ("%Y"), OUTSIZE, EXP(YEAR) }, @@ -1780,6 +1831,7 @@ const struct test Vecyrzn[] = { { CQ("%c"), OUTSIZE, EXP(CQ("Wed Jul 2 23:01:00 ")YEAR) }, { CQ("%D"), OUTSIZE, EXP(CQ("07/02/")Year) }, { CQ("%F"), OUTSIZE, EXP(YEAR CQ("-07-02")) }, + { CQ("%v"), OUTSIZE, EXP(CQ(" 2-Jul-")YEAR) }, { CQ("%x"), OUTSIZE, EXP(CQ("07/02/")Year) }, { CQ("%y"), OUTSIZE, EXP(Year) }, { CQ("%Y"), OUTSIZE, EXP(YEAR) }, --------------2.37.3--