[musl] %l missing in strftime()

[musl] %l missing in strftime()

[Dj Padzensky]

[-- Attachment #1.1: Type: text/plain, Size: 858 bytes --]


Hi there-

Long time fan, first time caller…  :-)

I noticed that, despite the man page’s claim, %l (that’s ell) is not implemented in strftime().  This patch should do the job.

diff --git a/src/time/strftime.c b/src/time/strftime.c
index cc53d536..78f12ae0 100644
--- a/src/time/strftime.c
+++ b/src/time/strftime.c
@@ -104,6 +104,12 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *
                val = tm->tm_yday+1;
                width = 3;
                goto number;
+       case 'l':
+               def_pad = '_';
+               val = tm->tm_hour;
+               if (!val) val = 12;
+               else if (val > 12) val -= 12;
+               goto number;
        case 'm':
                val = tm->tm_mon+1;
                goto number;


Keep up the great work!

—Dj

[-- Attachment #1.2: Type: text/html, Size: 3772 bytes --]

[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 4372 bytes --]

Re: [musl] %l missing in strftime()

[Rich Felker]

On Thu, Oct 29, 2020 at 10:02:59AM -0400, Dj Padzensky wrote:
> 
> Hi there-
> 
> Long time fan, first time caller…  :-)
> 
> I noticed that, despite the man page’s claim, %l (that’s ell) is not
> implemented in strftime(). This patch should do the job.
> 
> diff --git a/src/time/strftime.c b/src/time/strftime.c
> index cc53d536..78f12ae0 100644
> --- a/src/time/strftime.c
> +++ b/src/time/strftime.c
> @@ -104,6 +104,12 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *
>                 val = tm->tm_yday+1;
>                 width = 3;
>                 goto number;
> +       case 'l':
> +               def_pad = '_';
> +               val = tm->tm_hour;
> +               if (!val) val = 12;
> +               else if (val > 12) val -= 12;
> +               goto number;
>         case 'm':
>                 val = tm->tm_mon+1;
>                 goto number;

The 'l' format is outside the standard, but might be okay to add if we
can be reasonably sure it's not going to conflict with future standard
development.

Rich