From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HTML_MESSAGE,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 11182 invoked from network); 29 Oct 2020 14:35:03 -0000 Received: from mother.openwall.net (195.42.179.200) by inbox.vuxu.org with ESMTPUTF8; 29 Oct 2020 14:35:03 -0000 Received: (qmail 3819 invoked by uid 550); 29 Oct 2020 14:35:02 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 21548 invoked from network); 29 Oct 2020 14:03:20 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=padz.net; i=@padz.net; l=11709; q=dns/txt; s=20181113; t=1603980200; x=1635516200; h=from:mime-version:subject:message-id:date:to; bh=IMtc7UcWKZwGnL2POX96pndDh1LB7SLqwLyOqKBVtm4=; b=rlOdRpypbaQi5gabe+KpJahWQ+pfj3V5GeBLGRWHFQdl9PpjfVTK01HY fX7337vGOK8ndi2uSaR9KaGF6rKvb+TJ45sGHEtVrzJCmV1flimwbjr5i sUMjrvOMZPK75gpLbjR2aZ6zpsD+CUTzG3/2V+yvpsTBXtjI4UwkfeWRY 4RA/JdZOA1seEaKgkpa8TvJ2RE4rWH6LTVR2U2Kr3hf+Oejp54Vt0UpA9 mfCflK8cf1y25Or+qwWGmMBSQLYBK7b76EK2qZq5R54CbHpNN2oKax1DK ungEz/5JMRtfc/6dqf0DxdviXvNALRVzl9Mcv1JASoJtKx/1KB184uRYu w==; IronPort-SDR: 6WrxtmrQgwLyYvIkYenHuBQukVI7A+VIXofkh26mzQ4+iwOHLtl8V7mpy0jFAuENUErnJm1JIg xo0qebOHFsAjKZIV4Eo9M5C20OIeKRlZH76jKw0ce/yLb6bGLbjRB8HeTsiG1ge8fvV4yy9DcY qSA1CGkyL8hL+wqyUAVpfZj6tilYsAEO5BdUmfTYidbbButnnpmIBHrG++VhzxFzp0V2spzSes Glo5n/6R/Ta58iEMq1zALzEdixA+GTeT2BLY8KIj+W2/LGRt9Dr84ObWrjsAnq8HQ9xLr+UVuW OfU= X-IPAS-Result: =?us-ascii?q?A2H/TQD2yppf/0WQJkBiH4I7g0QqhRyIJ16JJIJlljGBe?= =?us-ascii?q?wsBAQEBAQEBAQEEGBwEAQGGVSY8Ag0CAwEBAQMCAwEBAQEBBQEBAQEBAQUDA?= =?us-ascii?q?QEBAoYVRYI3IoQgBBaBGQIEhBQBgm0PrwF/M4kqgTIQgTmBUowCgUE/gTgci?= =?us-ascii?q?BWCSjOCLASmfZEcgnaBFIM8ljIDH5JIjx2wIYYKgWRNLgplAYI/PRIZDZ0EJ?= =?us-ascii?q?WsCBgEJAQEDCY5IAQE?= IronPort-PHdr: =?us-ascii?q?9a23=3AneVhPR/c2SvXD/9uRHKM819IXTAuvvDOBiVQ1K?= =?us-ascii?q?B42u0cTK2v8tzYMVDF4r011RmVBNqduqkP17GempujcFRI2YyGvnEGfc4EfD?= =?us-ascii?q?4+ouJSoTYdBtWYA1bwNv/gYn9yNs1DUFh44yPzahANS47xaFLIv3K98yMZFA?= =?us-ascii?q?nhOgppPOT1HZPZg9iq2+yo9JDffgdFiCC5bL58Ixm7ogvcvdQKjIV/Lao81g?= =?us-ascii?q?HHqWZSdeRMwmNoK1OTnxLi6cq14ZVu7Sdete8/+sBZSan1cLg2QrJeDDQ9Lm?= =?us-ascii?q?A6/9brugXZTQuO/XQTTGMbmQdVDgff7RH6WpDxsjbmtud4xSKXM9H6QawyVD?= =?us-ascii?q?+/6apgVR3mhzodNzMh8G/YlsN/gr9YrhyvuRJxxJXZYI6JOPp7ZK7dfc8WSG?= =?us-ascii?q?hHU81MVyJBGIS8b44XAuQPP+ZTspPzqEETohq/GwasAvjvyjxIh3Tr2qA1zu?= =?us-ascii?q?YhERnc0wM9HtMDq2zUo8/oO6YTS+y1yrfHzSnaYv5QxDzy55TGfAo7rvGQQb?= =?us-ascii?q?J/b9DRyU83Gg7bjVict5DoMi+J2uoDsmWV4fRsWPyyh2Antwx8oziiy8cxho?= =?us-ascii?q?TUiIwYyl/J+Cd3zYs7J9C1SlJ3bcKrHZZeqi2XMZZ9TMA6Q2xwuSs3xacKtJ?= =?us-ascii?q?C4cSQQ1ZgqyBHSZ+aGfoWM+h7uVemcLS12iX9mYr6zmhm//Ee6xuD+SsW51k?= =?us-ascii?q?tBoDBfndnWrH8N0gTe6s2ASvRg4EiswS2P1wXP6uFcJkA0iLbbJ4YhwrEukp?= =?us-ascii?q?oTtlzOHirsl0X3iK+abF0k9fK15OXmeLnmoIGTN5NshgH/NKQhhNC/DPw5Pw?= =?us-ascii?q?UBRWSW9+ex2Kf+8UD2T7hGlPw7n63BvJDfP8sbp6q5AwFP0oYk7hayFyqp0N?= =?us-ascii?q?YAnXYdMV1EeQmKj5DzNF7TIfH0F/G/jEqwkDtz3fDJIqXhAonRLnjEiLrheK?= =?us-ascii?q?t961VYyAcoydBf5olUCq0aIP7pXU/xrMLXDhk3MgOux+bnDM9x2Z8ZWWKKUe?= =?us-ascii?q?elN/bXrESMzuYuOPWXIogNtTDiIvwhofXpiCwXg1gYKIWrlaMeZGK1GO9lMg?= =?us-ascii?q?3NbXj0i9sTOX8Dshh4SuH23g7RGQVPbmq/CvpvrgowD5irWN/O?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=McAfee;i="6000,8403,9788"; a="88071" X-IronPort-AV: E=Sophos;i="5.77,430,1596524400"; d="p7s'?scan'208,217";a="88071" X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False From: Dj Padzensky Content-type: multipart/signed; boundary="Apple-Mail=_AF334D59-1691-4E9B-A014-F47D99E18342"; protocol="application/pkcs7-signature"; micalg=sha-256 MIME-version: 1.0 (Mac OS X Mail 14.0 \(3654.0.3.2.82\)) Message-id: <3D3DD419-84C6-437A-930A-EAD6777C0130@padz.net> Date: Thu, 29 Oct 2020 10:02:59 -0400 To: musl@lists.openwall.com X-Mailer: Apple Mail (2.3654.0.3.2.82) Subject: [musl] %l missing in strftime() --Apple-Mail=_AF334D59-1691-4E9B-A014-F47D99E18342 Content-Type: multipart/alternative; boundary="Apple-Mail=_51691735-6A74-46A4-A11D-3455B61FFCF0" --Apple-Mail=_51691735-6A74-46A4-A11D-3455B61FFCF0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Hi there- Long time fan, first time caller=E2=80=A6 :-) I noticed that, despite the man page=E2=80=99s claim, %l (that=E2=80=99s = 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 =3D tm->tm_yday+1; width =3D 3; goto number; + case 'l': + def_pad =3D '_'; + val =3D tm->tm_hour; + if (!val) val =3D 12; + else if (val > 12) val -=3D 12; + goto number; case 'm': val =3D tm->tm_mon+1; goto number; Keep up the great work! =E2=80=94Dj= --Apple-Mail=_51691735-6A74-46A4-A11D-3455B61FFCF0 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8

Hi there-

Long time fan, first = time caller=E2=80=A6  :-)

I noticed that, despite the man = page=E2=80=99s claim, %l (that=E2=80=99s 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 =3D = tm->tm_yday+1;
              =   width =3D 3;
              =   goto number;
+       case = 'l':
+   =             def_pad =3D = '_';
+   =             val =3D = tm->tm_hour;
+   =             if (!val) val =3D = 12;
+   =             else if (val > 12) val = -=3D 12;
+   =             goto = number;
    =     case 'm':
              =   val =3D tm->tm_mon+1;
              =   goto number;


Keep up the great work!

=E2=80=94Dj
= --Apple-Mail=_51691735-6A74-46A4-A11D-3455B61FFCF0-- --Apple-Mail=_AF334D59-1691-4E9B-A014-F47D99E18342 Content-Disposition: attachment; filename=smime.p7s Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgEFADCABgkqhkiG9w0BBwEAAKCCDU0w ggXYMIIDwKADAgECAhBzcjBIMmw/sPCvK5Ylc0xZMA0GCSqGSIb3DQEBCwUAMIGBMQswCQYDVQQG EwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEXMBUGA1UE CgwOQWN0YWxpcyBTLnAuQS4xLDAqBgNVBAMMI0FjdGFsaXMgQ2xpZW50IEF1dGhlbnRpY2F0aW9u IENBIEczMB4XDTIwMDgwNTE2MzE0N1oXDTIxMDgwNTE2MzE0N1owGjEYMBYGA1UEAwwPZGpwYWR6 QHBhZHoubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6X2Ic898MNQKrdxIr2ZA bJEL2ruKr1uihMTGgqp7MqnljoRMgfnufaF5Q5ysOPkPWav3ZGG92Pe3ke3igfzQHkG1TkLfca2T 3q27BaPfk8svuAAttjw4vTX52f0guQXqTWZFpbV1rsJ5Kz7TsPbwHv4Cj9dzkcaegQQCbEJJK7fT rfvI0dgQwxXhMyRfQfWpF1Jzv/P2RDiqD2sjTMR/A85i7tgs7KNMFBzrxai33/2m3PQvI4dWmKHV ugVHeQH7D2ZjZ1PWDmwbVVQN00rgtkgOwl3Iul6Vl9xSyqYHRaZ+3bVfrtySCaD+z/826RIUPcKr zWm2fvi/Rt2DL6aDdQIDAQABo4IBsDCCAawwDAYDVR0TAQH/BAIwADAfBgNVHSMEGDAWgBS+l6mq hL+AvxBTfQky+eEuMhvPdzB+BggrBgEFBQcBAQRyMHAwOwYIKwYBBQUHMAKGL2h0dHA6Ly9jYWNl cnQuYWN0YWxpcy5pdC9jZXJ0cy9hY3RhbGlzLWF1dGNsaWczMDEGCCsGAQUFBzABhiVodHRwOi8v b2NzcDA5LmFjdGFsaXMuaXQvVkEvQVVUSENMLUczMBoGA1UdEQQTMBGBD2RqcGFkekBwYWR6Lm5l dDBHBgNVHSAEQDA+MDwGBiuBHwEYATAyMDAGCCsGAQUFBwIBFiRodHRwczovL3d3dy5hY3RhbGlz Lml0L2FyZWEtZG93bmxvYWQwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMEgGA1UdHwRB MD8wPaA7oDmGN2h0dHA6Ly9jcmwwOS5hY3RhbGlzLml0L1JlcG9zaXRvcnkvQVVUSENMLUczL2dl dExhc3RDUkwwHQYDVR0OBBYEFIV/Zjdzi9QFBIWfHiMiJ2+liUCkMA4GA1UdDwEB/wQEAwIFoDAN BgkqhkiG9w0BAQsFAAOCAgEAehU0lFr5o46cDo4R8vCmW1pQszZVAkSp5u8e72O3AhtOvXY3Rc9M 2ktnpVzsNSL9z3hzDHggmIHkxK4kqS1Yod4swtdTVM8udF8JHUBF0pVlofj/bzuzozuhneNl4A5D J3j1FRq9ifJ8ZqIjjJxnysgJWcSOgdxFYAezP5U8Kkyq9PjmoR67Vbu9JgXtFnRgRZa1fCAXrHOd 59D2eu8nfg6T8dFUApeKoHGDlQ6HUo/9Vxd0jEisP+hwjFFL6heJEDIGPLbZoYFb2rkEOOAknzxT mnb5oxUqRRg0BN1kWCeEXk/pLx9g+8EjeJaTMKQNRlvCVV6L7KR0TJHfZK8+MLP+eFQGoa+P5XZn ysEHs7eZ+iJL19aICQr+82WOEOqXe8P22pJKUWwNk1zno9wtJj8cu+5i9DatXfseGbKuPMtRMK8z E3MmbspNsWDRRrchJTgeogY+eBD5CtSH0n65ZTfBJsATSRSXDsX0QzM7wwO1xISnH4NVNSHyR4z4 FfrgvbnFYOdNX7caLfXUZd5L3P1nQ3BV8vuL/bEHzz2XbfQoPKA7a3uUdaiTD1Ytb5voTJNjOPsM djLTk4mQUuzaKNt2RwtW4R2z4wZcrmeo6PMBaKDBkFM5Ak3vuDq/ZRDDJjsxKi+m8aPLjrMjxCH3 7nWaf+RUP/Re9A1Gn4FZ8HAwggdtMIIFVaADAgECAhAXED7ePYoctcoGUZPnykNrMA0GCSqGSIb3 DQEBCwUAMGsxCzAJBgNVBAYTAklUMQ4wDAYDVQQHDAVNaWxhbjEjMCEGA1UECgwaQWN0YWxpcyBT LnAuQS4vMDMzNTg1MjA5NjcxJzAlBgNVBAMMHkFjdGFsaXMgQXV0aGVudGljYXRpb24gUm9vdCBD QTAeFw0yMDA3MDYwODQ1NDdaFw0zMDA5MjIxMTIyMDJaMIGBMQswCQYDVQQGEwJJVDEQMA4GA1UE CAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEXMBUGA1UECgwOQWN0YWxpcyBT LnAuQS4xLDAqBgNVBAMMI0FjdGFsaXMgQ2xpZW50IEF1dGhlbnRpY2F0aW9uIENBIEczMIICIjAN BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7eaHlqHBpLbtwkJV9z8PDyJgXxPgpkOIhkmReRwb LxpQD9xGAe72ujqGzFFh78QPgAhxKVqtGHzYeq0VJVCzhnCKRBbVX+JwIhL3ULYhUAZrViUp952q DB6qTL5sGeJS9F69VPSR5k6pFNw7mHDTTt0voWFg2aVkG3khomzVXoieJGOiQ4dH76paCtQbLkt5 9joAKz2BnwGLQ4wr09nfumJt5AKx2YxHK2XgSPslVZ4z8G00gimsfA7UtjT/wiekY6Z0b7ksLrEc vODncHQe9VSrNRA149SE3AlkWaZM/joVei/GYfj9K5jkiReinR4mqM353FEceLOeBhSTURpMdQ5w sXLi9DSTGBuNv4aw2Dozb/qBlkhGTvwk92mi0jAecE22Sn3A9UfrU2p1w/uRs+TIteQ0xO0B/J2m Y2caqocsS9SsriIGlQ8b0LT0o6Ob07KGtPa5/lIvMmx572Dv2v+vDiECByxm1Hdgjp8JtE4mdyYP 6GBscJyT71NZw1zXHnFkyCbxReag9qaSR9x4CVVXj1BDmNROCqd5NAfIXUXYTFeZ/jukQigkxXGW hEhfLBC4Ha6pwizz9fq1+wwPKcWaF9P/SZOuBDrG30MiyCZa66G9mEtF5ZLuh4rGfKqxy4Z5Mxec uzt+MZmrSKfKGeXOeED/iuX5Z02M1o7iMS8CAwEAAaOCAfQwggHwMA8GA1UdEwEB/wQFMAMBAf8w HwYDVR0jBBgwFoAUUtiIOsifeGbtifN7OHCUyQICNtAwQQYIKwYBBQUHAQEENTAzMDEGCCsGAQUF BzABhiVodHRwOi8vb2NzcDA1LmFjdGFsaXMuaXQvVkEvQVVUSC1ST09UMEUGA1UdIAQ+MDwwOgYE VR0gADAyMDAGCCsGAQUFBwIBFiRodHRwczovL3d3dy5hY3RhbGlzLml0L2FyZWEtZG93bmxvYWQw HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMIHjBgNVHR8EgdswgdgwgZaggZOggZCGgY1s ZGFwOi8vbGRhcDA1LmFjdGFsaXMuaXQvY24lM2RBY3RhbGlzJTIwQXV0aGVudGljYXRpb24lMjBS b290JTIwQ0EsbyUzZEFjdGFsaXMlMjBTLnAuQS4lMmYwMzM1ODUyMDk2NyxjJTNkSVQ/Y2VydGlm aWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5hcnkwPaA7oDmGN2h0dHA6Ly9jcmwwNS5hY3RhbGlzLml0 L1JlcG9zaXRvcnkvQVVUSC1ST09UL2dldExhc3RDUkwwHQYDVR0OBBYEFL6XqaqEv4C/EFN9CTL5 4S4yG893MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAJpvnG1kNdLMSA+nnVfeE gIXNQsM7YRxXx6bmEt9IIrFlH1qYKeNw4NV8xtop91Rle168wghmYeCTP10FqfuKMZsleNkI8/b3 PBkZLIKOl9p2Dmz2Gc0I3WvcMbAgd/IuBtx998PJX/bBb5dMZuGV2drNmxfz3ar6ytGYLxedfjKC D55Yv8CQcN6e9sW5OUm9TJ3kjt7Wdvd1hcw5s+7bhlND38rWFJBuzump5xqm1NSOggOkFSlKnhSz 6HUjgwBaid6Ypig9L1/TLrkmtEIpx+wpIj7WTA9JqcMMyLJ0rN6jjpetLSGUDk3NCOpQntSy4a8+ 0O+SepzS/Tec1cGdSN6Ni2/A7ewQNd1Rbmb2SM2qVBlfN0e6ZklWo9QYpNZyf0d/d3upsKabE9eN Cg1S4eDnp8sJqdlaQQ7hI/UYCAgDtLIm7/J9+/S2zuwEWtJMPcvaYIBczdjwF9uW+8NJ/Zu/JKb9 8971uua7OsJexPFRBzX7/PnJ2/NXcTdwudShJc/pd9c3IRU7qw+RxRKchIczv3zEuQJMHkSSM8KM 8TbOzi/0v0lU6SSyS9bpGdZZxx19Hd8Qs0cv+R6nyt7ohttizwefkYzQ6GzwIwM9gSjH5Bf/r9Kc 5/JqqpKKUGicxAGy2zKYEGB0Qo761MccIyclBW9mfuNFDbTBeDEyu80xggOFMIIDgQIBATCBljCB gTELMAkGA1UEBhMCSVQxEDAOBgNVBAgMB0JlcmdhbW8xGTAXBgNVBAcMEFBvbnRlIFNhbiBQaWV0 cm8xFzAVBgNVBAoMDkFjdGFsaXMgUy5wLkEuMSwwKgYDVQQDDCNBY3RhbGlzIENsaWVudCBBdXRo ZW50aWNhdGlvbiBDQSBHMwIQc3IwSDJsP7DwryuWJXNMWTANBglghkgBZQMEAgEFAKCCAb8wGAYJ KoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMjAxMDI5MTQwMjU5WjAvBgkq hkiG9w0BCQQxIgQg6NXWNJIPEWZhU3TT0PQ9pep/hKl4+4xZRDXDDOG2K0QwgacGCSsGAQQBgjcQ BDGBmTCBljCBgTELMAkGA1UEBhMCSVQxEDAOBgNVBAgMB0JlcmdhbW8xGTAXBgNVBAcMEFBvbnRl IFNhbiBQaWV0cm8xFzAVBgNVBAoMDkFjdGFsaXMgUy5wLkEuMSwwKgYDVQQDDCNBY3RhbGlzIENs aWVudCBBdXRoZW50aWNhdGlvbiBDQSBHMwIQc3IwSDJsP7DwryuWJXNMWTCBqQYLKoZIhvcNAQkQ AgsxgZmggZYwgYExCzAJBgNVBAYTAklUMRAwDgYDVQQIDAdCZXJnYW1vMRkwFwYDVQQHDBBQb250 ZSBTYW4gUGlldHJvMRcwFQYDVQQKDA5BY3RhbGlzIFMucC5BLjEsMCoGA1UEAwwjQWN0YWxpcyBD bGllbnQgQXV0aGVudGljYXRpb24gQ0EgRzMCEHNyMEgybD+w8K8rliVzTFkwDQYJKoZIhvcNAQEL BQAEggEAphGWFTrcATsfwJGxZZEyELq1AYECCLpK+QoNiXjPumTr3E4RoP4+MYjGKiIdvvY1PniC jAdq+jh9FegXgDvW6A/ZAwUkxJNqBI4o0VhegAFjFaed1h+7hiGgsDp9qLoYTw5hjUmWNPmPxUKx auQSiev9ApLSo/EMwZ48uw3CsvvAd3GJ5ZKyWuQVe6EjzJzxJYuQCUdj3jK7YQECz0Z+X8Je/34H L/58BIp52nmH3tRQimTIWUttKteENJRZGokt8uXUofD1B4KRu0msTf/ieHuUqPp0pEsQnwUnwnEN AJFgYyMoelaqlZQKziEnVcmbgk6Ysq4Oj//FKyBMm0swjQAAAAAAAA== --Apple-Mail=_AF334D59-1691-4E9B-A014-F47D99E18342--