[PATCH v1.1][BZ #4772] Allow strptime read outputs from strftime.
Siddhesh Poyarekar
siddhesh@redhat.com
Tue Nov 19 12:33:00 GMT 2013
On Wed, Oct 16, 2013 at 05:36:32PM +0200, OndÅej BÃlka wrote:
> Here is version with test.
>
>
> [BZ #4772]
> * time/strptime_l.c: Allow modifiers in strptime.
You've corrected the ChangeLog entry in a follow-up email, so that is OK.
>
> diff --git a/time/strptime_l.c b/time/strptime_l.c
> index 00fc1ef..395532d 100644
> --- a/time/strptime_l.c
> +++ b/time/strptime_l.c
> @@ -320,17 +320,14 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM)
> }
>
> ++fmt;
> - if (statep != NULL)
> - {
> - /* In recursive calls silently discard strftime modifiers. */
> - while (*fmt == '-' || *fmt == '_' || *fmt == '0'
> - || *fmt == '^' || *fmt == '#')
> - ++fmt;
> -
> - /* And field width. */
> - while (*fmt >= '0' && *fmt <= '9')
> - ++fmt;
> - }
> + /* We discard strftime modifiers. */
> + while (*fmt == '-' || *fmt == '_' || *fmt == '0'
> + || *fmt == '^' || *fmt == '#')
> + ++fmt;
> +
> + /* And field width. */
> + while (*fmt >= '0' && *fmt <= '9')
> + ++fmt;
>
> #ifndef _NL_CURRENT
> /* We need this for handling the `E' modifier. */
> diff --git a/time/tst-strptime.c b/time/tst-strptime.c
> index 21fbb63..354d3e6 100644
> --- a/time/tst-strptime.c
> +++ b/time/tst-strptime.c
> @@ -41,6 +41,7 @@ static const struct
> { "C", "19990502123412", "%Y%m%d%H%M%S", 0, 121, 4, 2 },
> { "C", "2001 20 Mon", "%Y %U %a", 1, 140, 4, 21 },
> { "C", "2001 21 Mon", "%Y %W %a", 1, 140, 4, 21 },
> + { "C", "2001 21 Mon", "%2000Y %W %a", 1, 140, 4, 21 },
This test is just for the field width, so please add another test for
strftime modifiers. The change itself looks OK to me.
Siddhesh
> { "C", "2012 00 Sun", "%Y %W %a", 0, 0, 0, 1 },
> { "ja_JP.EUC-JP", "2000-01-01 08:12:21 AM", "%Y-%m-%d %I:%M:%S %p",
> 6, 0, 0, 1 },
More information about the Libc-alpha
mailing list