From patchwork Fri Jan 11 04:49:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TAMUKI Shoichi X-Patchwork-Id: 1023383 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-99170-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linet.gr.jp Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="NsAR8y5f"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43bVmk206vz9sCX for ; Fri, 11 Jan 2019 15:50:46 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:from:date:to:subject:in-reply-to :references:mime-version:content-type; q=dns; s=default; b=b7HGk +4AvbcG0ZgsVsekfWOgMmupGb0JPLaVsvDDXUy+P1EfUZQzkOSxBsFxNcfvJqBRK WVfmJL63EZTO+tPVSk0yVCqujGeeCiJS5V/aqEL+3P94QcOM2v9y1G6gdn9e00Il YKJXapl1zTes/82UUycKJUBBZxqcHG4QupDLVU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:from:date:to:subject:in-reply-to :references:mime-version:content-type; s=default; bh=GKrFlkHOLyw NVxNyv7MR2NyG91c=; b=NsAR8y5f0ON8u43hWQvptbgkmjTHniN9BBM5B/oQ8Sm eHZ60uahwXZiLnodgFmflZVawFX3mXCfOiqWAvKYeE4JAZaNgzvP74MBkaU020OS qapYlljPczR7AQprnFeATKkq6S/V8nyUKS3u+c5x8O4idsocBHpOO3pV75CLnT60 = Received: (qmail 77673 invoked by alias); 11 Jan 2019 04:50:41 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 77664 invoked by uid 89); 11 Jan 2019 04:50:40 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=lasts, Major, calendar, japanese X-HELO: mail.linet.jp Message-Id: <201901110449.AA04174@tamuki.linet.gr.jp> From: TAMUKI Shoichi Date: Fri, 11 Jan 2019 13:49:56 +0900 To: libc-alpha@sourceware.org Subject: [PATCH v6 1/2] strftime: Set the default width of "%Ey" to 2 [BZ #23758] In-Reply-To: <201901110447.AA04173@tamuki.linet.gr.jp> References: <201901110447.AA04173@tamuki.linet.gr.jp> MIME-Version: 1.0 The Japanese era name is scheduled to be changed on May 1, 2019. Prior to this, change the alternative representation for year in strftime to pad the number with zero to keep it constant width, so that prevent the trouble we saw in the past from becoming obvious again from the year after the era name changes onward. Since only one Japanese era name is used by each emperor's reign as lately, it is rare that the year ends in one digit or lasts more than three digits. In addition, the default width of month, day, hour, minute, and second is 2, so adjust the default width of year the same as them, and then the whole display balance is improved. Therefore, it would be reasonable to set the default width padding with zero of "%Ey" to 2. ChangeLog: [BZ #23758] * NEWS: Mention the change. * manual/time.texi (strftime): Document the desctiption for "%Ey". Also, fix the wording to "alternative" rather than "alternate". * time/strftime_l.c (__strftime_internal): Set the default width padding with zero of "%Ey" to 2. --- NEWS | 4 ++++ manual/time.texi | 11 ++++++++--- time/strftime_l.c | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index cc20102fda4..00fab6e8825 100644 --- a/NEWS +++ b/NEWS @@ -52,6 +52,10 @@ Major new features: - C-SKY ABIV2 soft-float little-endian - C-SKY ABIV2 hard-float little-endian +* Improve the width of alternative representation for year in + strftime. For %Ey conversion specifier, the default action is now + to pad the number with zero to keep minimum 2 digits, similar to %y. + Deprecated and removed features, and other changes affecting compatibility: * The glibc.tune tunable namespace has been renamed to glibc.cpu and the diff --git a/manual/time.texi b/manual/time.texi index 9e981314876..ab544e590c8 100644 --- a/manual/time.texi +++ b/manual/time.texi @@ -1339,7 +1339,7 @@ POSIX.2-1992 and by @w{ISO C99}, are: @table @code @item E -Use the locale's alternate representation for date and time. This +Use the locale's alternative representation for date and time. This modifier applies to the @code{%c}, @code{%C}, @code{%x}, @code{%X}, @code{%y} and @code{%Y} format specifiers. In a Japanese locale, for example, @code{%Ex} might yield a date format based on the Japanese @@ -1347,7 +1347,7 @@ Emperors' reigns. @item O With all format specifiers that produce numbers: use the locale's -alternate numeric symbols. +alternative numeric symbols. With @code{%B}, @code{%b}, and @code{%h}: use the grammatical form for month names that is appropriate when the month is named by itself, @@ -1355,7 +1355,7 @@ rather than the form that is appropriate when the month is used as part of a complete date. This is a GNU extension. @end table -If the format supports the modifier but no alternate representation +If the format supports the modifier but no alternative representation is available, it is ignored. The conversion specifier ends with a format specifier taken from the @@ -1568,6 +1568,11 @@ The preferred time of day representation for the current locale. The year without a century as a decimal number (range @code{00} through @code{99}). This is equivalent to the year modulo 100. +If the @code{E} modifier is specified (@code{%Ey}), the locale's +alternative representation for year (the era year) is used instead. +The default action is to pad the number with zero to keep minimum 2 +digits, similar to @code{%y}. + @item %Y The year as a decimal number, using the Gregorian calendar. Years before the year @code{1} are numbered @code{0}, @code{-1}, and so on. diff --git a/time/strftime_l.c b/time/strftime_l.c index 7ba4179de3e..cbe08e7afb4 100644 --- a/time/strftime_l.c +++ b/time/strftime_l.c @@ -1294,7 +1294,7 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format, if (era) { int delta = tp->tm_year - era->start_date[0]; - DO_NUMBER (1, (era->offset + DO_NUMBER (2, (era->offset + delta * era->absolute_direction)); } #else From patchwork Fri Jan 11 04:52:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TAMUKI Shoichi X-Patchwork-Id: 1023384 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-99171-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linet.gr.jp Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="p2sA6hT8"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43bVqd3VmXz9sLw for ; Fri, 11 Jan 2019 15:53:17 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:from:date:to:subject:in-reply-to :references:mime-version:content-type; q=dns; s=default; b=qzxht 7asUxWpwg+Kmb5A5IN544PW6Ea59W86rDp6KToXXhYYH+KUrL4pwmYFZZQlHfLCn 5ZTJDOQe+h9yHW6ZtbLV725qHwxrpvd6XKhuAXbgWnCAUQwmo4C12wWFSTmUILxa 7ifis5/7aksvNTqg3mTqtAKPJcww/K7NFKBrrI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:from:date:to:subject:in-reply-to :references:mime-version:content-type; s=default; bh=8CWG1HVCYVg v/LIbDOa/GZQkZoE=; b=p2sA6hT88qj6C+D41wW/paahoSWzfLlzT6PqskXaMN5 RUq4gj53ZhTxA4kVIYIcDTQboZY7IWhtPoc+6Un4cFskGwprJSmOvnlRia4F6Kge 3ruPLpuch5hNzuPK8gvYxHkzvsfB1k8AB+m9+2ID2buQCgtZSLA3fwKVhhhlmUns = Received: (qmail 115995 invoked by alias); 11 Jan 2019 04:53:11 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 115818 invoked by uid 89); 11 Jan 2019 04:53:11 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=japan, Japan, obtained, christian X-HELO: mail.linet.jp Message-Id: <201901110452.AA04175@tamuki.linet.gr.jp> From: TAMUKI Shoichi Date: Fri, 11 Jan 2019 13:52:12 +0900 To: libc-alpha@sourceware.org Subject: [PATCH v6 2/2] strftime: Pass the additional flags from "%EY" to "%Ey" [BZ #23758] In-Reply-To: <201901110447.AA04173@tamuki.linet.gr.jp> References: <201901110447.AA04173@tamuki.linet.gr.jp> MIME-Version: 1.0 For the output string of the conversion specifier "%EY", an optional flag is given to the conversion specifier so that it can be also used the current non-padding format, and the padding format can be controlled. To achieve this, when an optional flag is given to the conversion specifier "%EY", the "%Ey" included in the combined conversion specifier is interpreted as if decorated with the appropriate flag. Currently in glibc, besides ja_JP (Japan) locale, the locales using the conversion specifier "%Ey" are lo_LA (Laos) and th_TH (Thailand). In these locales, they use the Buddhist era. The Buddhist era is a value obtained by adding 543 to the Christian era, so they are not affected by the change of the conversion specifier "%Ey". ChangeLog: [BZ #23758] * NEWS: Mention the change. * manual/time.texi (strftime): Document the desctiption for "%EC" and "%EY". * time/Makefile: Add tst-strftime2 to tests. Also add ja_JP.UTF-8, lo_LA.UTF-8, and th_TH.UTF-8 to LOCALES. * time/strftime_l.c (__strftime_internal): Add argument yr_spec to override padding for "%Ey". If an optional flag ('_' or '-') is specified to "%EY", the "%Ey" in subformat is interpreted as if decorated with the appropriate flag. * time/tst-strftime2.c: New file. --- NEWS | 3 ++ manual/time.texi | 10 ++++ time/Makefile | 5 +- time/strftime_l.c | 20 +++++--- time/tst-strftime2.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 161 insertions(+), 9 deletions(-) create mode 100644 time/tst-strftime2.c diff --git a/NEWS b/NEWS index 00fab6e8825..82c1cdf9b3d 100644 --- a/NEWS +++ b/NEWS @@ -55,6 +55,9 @@ Major new features: * Improve the width of alternative representation for year in strftime. For %Ey conversion specifier, the default action is now to pad the number with zero to keep minimum 2 digits, similar to %y. + Also, the optional flag (either _ or -) can be used for %EY, so that + the internal %Ey is interpreted as if decorated with the appropriate + flag. Deprecated and removed features, and other changes affecting compatibility: diff --git a/manual/time.texi b/manual/time.texi index ab544e590c8..9dcb35fed14 100644 --- a/manual/time.texi +++ b/manual/time.texi @@ -1393,6 +1393,9 @@ The preferred calendar time representation for the current locale. The century of the year. This is equivalent to the greatest integer not greater than the year divided by 100. +If the @code{E} modifier is specified (@code{%EC}), the locale's +alternative representation for year (the era name) is used instead. + This format was first standardized by POSIX.2-1992 and by @w{ISO C99}. @item %d @@ -1577,6 +1580,13 @@ digits, similar to @code{%y}. The year as a decimal number, using the Gregorian calendar. Years before the year @code{1} are numbered @code{0}, @code{-1}, and so on. +If the @code{E} modifier is specified (@code{%EY}), the locale's +alternative representation for year (generally the combination of +@code{%EC} and @code{%Ey}) is used instead. In this case, the +optional flag (either @code{_} or @code{-}) can be used, so that the +internal @code{%Ey} is interpreted as if decorated with the +appropriate flag. + @item %z @w{RFC 822}/@w{ISO 8601:1988} style numeric time zone (e.g., @code{-0600} or @code{+0100}), or nothing if no time zone is diff --git a/time/Makefile b/time/Makefile index d23ba2dee6e..5c6304ece1d 100644 --- a/time/Makefile +++ b/time/Makefile @@ -43,13 +43,14 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \ tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \ tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \ tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \ - tst-tzname tst-y2039 bug-mktime4 + tst-tzname tst-y2039 bug-mktime4 tst-strftime2 include ../Rules ifeq ($(run-built-tests),yes) LOCALES := de_DE.ISO-8859-1 en_US.ISO-8859-1 ja_JP.EUC-JP fr_FR.UTF-8 \ - es_ES.UTF-8 pl_PL.UTF-8 ru_RU.UTF-8 + es_ES.UTF-8 pl_PL.UTF-8 ru_RU.UTF-8 \ + ja_JP.UTF-8 lo_LA.UTF-8 th_TH.UTF-8 include ../gen-locales.mk $(objpfx)tst-ftime_l.out: $(gen-locales) diff --git a/time/strftime_l.c b/time/strftime_l.c index cbe08e7afb4..12d7c0e8744 100644 --- a/time/strftime_l.c +++ b/time/strftime_l.c @@ -434,7 +434,7 @@ static CHAR_T const month_name[][10] = #endif static size_t __strftime_internal (CHAR_T *, size_t, const CHAR_T *, - const struct tm *, bool * + const struct tm *, int *, bool * ut_argument_spec LOCALE_PARAM) __THROW; @@ -456,8 +456,9 @@ my_strftime (CHAR_T *s, size_t maxsize, const CHAR_T *format, tmcopy = *tp; tp = &tmcopy; #endif + int yr_spec = 0; /* Override padding for "%Ey". */ bool tzset_called = false; - return __strftime_internal (s, maxsize, format, tp, &tzset_called + return __strftime_internal (s, maxsize, format, tp, &yr_spec, &tzset_called ut_argument LOCALE_ARG); } #ifdef _LIBC @@ -466,7 +467,7 @@ libc_hidden_def (my_strftime) static size_t __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format, - const struct tm *tp, bool *tzset_called + const struct tm *tp, int *yr_spec, bool *tzset_called ut_argument_spec LOCALE_PARAM) { #if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL @@ -838,11 +839,12 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format, { CHAR_T *old_start = p; size_t len = __strftime_internal (NULL, (size_t) -1, subfmt, - tp, tzset_called ut_argument - LOCALE_ARG); + tp, yr_spec, tzset_called + ut_argument LOCALE_ARG); add (len, __strftime_internal (p, maxsize - i, subfmt, - tp, tzset_called ut_argument - LOCALE_ARG)); + tp, yr_spec, tzset_called + ut_argument LOCALE_ARG)); + *yr_spec = 0; if (to_uppcase) while (old_start < p) @@ -1273,6 +1275,8 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format, # else subfmt = era->era_format; # endif + if (pad != 0) + *yr_spec = pad; goto subformat; } #else @@ -1294,6 +1298,8 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format, if (era) { int delta = tp->tm_year - era->start_date[0]; + if (*yr_spec != 0) + pad = *yr_spec; DO_NUMBER (2, (era->offset + delta * era->absolute_direction)); } diff --git a/time/tst-strftime2.c b/time/tst-strftime2.c new file mode 100644 index 00000000000..57d2144c83c --- /dev/null +++ b/time/tst-strftime2.c @@ -0,0 +1,132 @@ +/* Verify the behavior of strftime on alternative representation for + year. + + Copyright (C) 2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include + +static const char *locales[] = { "ja_JP.UTF-8", "lo_LA.UTF-8", "th_TH.UTF-8" }; + +static const char *formats[] = { "%EY", "%_EY", "%-EY" }; + +static const struct +{ + const int d, m, y; +} dates[] = + { + { 1, 3, 88 }, + { 7, 0, 89 }, + { 8, 0, 89 }, + { 1, 3, 90 }, + { 1, 3, 97 }, + { 1, 3, 98 } + }; + +static char ref[3][3][6][100]; + +static void +mkreftable (void) +{ + int i, j, k; + char era[10]; + static const int yrj[] = { 63, 64, 1, 2, 9, 10 }; + static const int yrb[] = { 2531, 2532, 2532, 2533, 2540, 2541 }; + + for (i = 0; i < array_length (locales); i++) + for (j = 0; j < array_length (formats); j++) + for (k = 0; k < array_length (dates); k++) + { + if (i == 0) + { + sprintf (era, "%s", (k < 2) ? "\xe6\x98\xad\xe5\x92\x8c" + : "\xe5\xb9\xb3\xe6\x88\x90"); + if (yrj[k] == 1) + sprintf (ref[i][j][k], "%s\xe5\x85\x83\xe5\xb9\xb4", era); + else + { + if (j == 0) + sprintf (ref[i][j][k], "%s%02d\xe5\xb9\xb4", era, yrj[k]); + else if (j == 1) + sprintf (ref[i][j][k], "%s%2d\xe5\xb9\xb4", era, yrj[k]); + else + sprintf (ref[i][j][k], "%s%d\xe5\xb9\xb4", era, yrj[k]); + } + } + else if (i == 1) + { + sprintf (era, "\xe0\xba\x9e\x2e\xe0\xba\xaa\x2e "); + sprintf (ref[i][j][k], "%s%d", era, yrb[k]); + } + else + { + sprintf (era, "\xe0\xb8\x9e\x2e\xe0\xb8\xa8\x2e "); + sprintf (ref[i][j][k], "%s%d", era, yrb[k]); + } + } +} + +static int +do_test (void) +{ + int i, j, k, result = 0; + struct tm ttm; + char date[11], buf[100]; + size_t r, e; + + mkreftable (); + for (i = 0; i < array_length (locales); i++) + { + if (setlocale (LC_ALL, locales[i]) == NULL) + { + printf ("locale %s does not exist, skipping...\n", locales[i]); + continue; + } + printf ("[%s]\n", locales[i]); + for (j = 0; j < array_length (formats); j++) + { + for (k = 0; k < array_length (dates); k++) + { + ttm.tm_mday = dates[k].d; + ttm.tm_mon = dates[k].m; + ttm.tm_year = dates[k].y; + strftime (date, sizeof (date), "%F", &ttm); + r = strftime (buf, sizeof (buf), formats[j], &ttm); + e = strlen (ref[i][j][k]); + printf ("%s\t\"%s\"\t\"%s\"", date, formats[j], buf); + if (strcmp (buf, ref[i][j][k]) != 0) + { + printf ("\tshould be \"%s\"", ref[i][j][k]); + if (r != e) + printf ("\tgot: %zu, expected: %zu", r, e); + result = 1; + } + else + printf ("\tOK"); + putchar ('\n'); + } + putchar ('\n'); + } + } + return result; +} + +#include