From 4306bb6246d4bdf02c2f8bcfa4e78ef6539ed0bf Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 5 Mar 2022 11:23:01 -0800 Subject: date: fix newly-introduced %%-N bug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * src/date.c (adjust_resolution): Don’t mishandle %%-N. * tests/misc/date.pl (pct-pct): New test. --- src/date.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/date.c b/src/date.c index 163141adc..9a282e2f5 100644 --- a/src/date.c +++ b/src/date.c @@ -310,12 +310,17 @@ adjust_resolution (char const *format) char *copy = NULL; for (char const *f = format; *f; f++) - if (f[0] == '%' && f[1] == '-' && f[2] == 'N') + if (f[0] == '%') { - if (!copy) - copy = xstrdup (format); - copy[f + 1 - format] = '0' + res_width (gettime_res ()); - f += 2; + if (f[1] == '-' && f[2] == 'N') + { + if (!copy) + copy = xstrdup (format); + copy[f + 1 - format] = '0' + res_width (gettime_res ()); + f += 2; + } + else + f += f[1] == '%'; } return copy; -- cgit v1.2.3