From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/12868 Path: news.gmane.org!.POSTED!not-for-mail From: Andrei Vagin Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH] printf: handle the L modifier for integers Date: Fri, 1 Jun 2018 00:56:55 +0300 Message-ID: <20180531215655.6662-1-avagin@virtuozzo.com> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1527803729 31369 195.159.176.226 (31 May 2018 21:55:29 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 31 May 2018 21:55:29 +0000 (UTC) Cc: Andrei Vagin To: musl@lists.openwall.com Original-X-From: musl-return-12884-gllmg-musl=m.gmane.org@lists.openwall.com Thu May 31 23:55:24 2018 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1fOVXV-00081P-Mk for gllmg-musl@m.gmane.org; Thu, 31 May 2018 23:55:21 +0200 Original-Received: (qmail 1343 invoked by uid 550); 31 May 2018 21:57:30 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 32686 invoked from network); 31 May 2018 21:57:29 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=60meq66XWECFB2X0tCy3Uvpmcc2YBAA8mdyzM5Hb+tU=; b=TkTEWAaYVXzLVdCX3eq3jb2R+FJv71Mzt8KAOshVUn24lSstjxzQUA86Fpq5AfLp+eeql2N+koCjDbP7gWfoUKlHPuzQpkGbGkYjddGdQBmf+1mQILyctfKriKHE9B6cV9IN3/E1zWilFB8z08ZW4OeHai3erHopaJoR3ZTELXE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=avagin@virtuozzo.com; X-Mailer: git-send-email 2.14.3 X-Originating-IP: [4.16.175.162] X-ClientProxiedBy: MWHPR1401CA0005.namprd14.prod.outlook.com (2603:10b6:301:4b::15) To AM6PR08MB3256.eurprd08.prod.outlook.com (2603:10a6:209:47::21) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020);SRVR:AM6PR08MB3256; X-Microsoft-Exchange-Diagnostics: 1;AM6PR08MB3256;3:v2ftridnnp5uYCTO3R7jP8Q0cPMdBmaQ8PExcbRCm5FKS8T6EtaIQtN9e7RUMrQ+TA9PuRaSLW8WT7fhZqh9ipS0mcQkH7j/2dE5MfJA50Ur2qDNkQSLefgTF5TpgdQ7NynF42C6eW5ZipSxYBtunafL92L2G+7DMbHHX3kV0vfvaRh2eeFQSmEs2de9fjDyGJ9GuE4vmHBqTk38FmVD4/uofOgD/Kz41XUzHq7iKXUD5coEMNk19ut5cM7FKvKP;25:YYNev7CgC3uVBtwl8vxPKKW+tgu2/PU4nU2FtEaVWrTm954QDblCPk1M6f6wJIRSBnQjB0BW3g7RjloV/ed+r0imV/7c3RBx+l0dAczjyEPwbFVNDis/G/9HpRJEZcOndduucgLPewAQFn25Gf3ItHHLZhT8Ib5d5tlT3aBAhjOo7r5+z7XYh2escINcWTzZGinCastWmj37VvSjKbM0YWqxdtxA256WZiEYOC0SljE7ekWlT2m+rNMakAvp5603X8Gd5JD3eFEBl3k/RQjSAGodMFmNDr6WF2+qvZGNSjj2VYVVj3cDmRB6zbi0JUPWpnZqplsryIqVgq6ylXt4wQ==;31:pMHPwBINX76jMZoBThrdC6WmVD8LctEND3Cf8+KcSQ5Kl7MQRZ83F3bNkQxzxVyK9uHjkI6YEI6JgpoXnWdT1qPuEwY8PpYvxjlKlt/4iC9vQzUnLxyxDbHad6/NQzwaICOn4DHcI+c1fmcsiAU+Ny7HT+BSj6tdafBHFz0+J9NVM O0mZVV69pgdjbHkVHNwbBDXMtgjqfixuwQcPGwglUalcUMBIz1mM6ACdT+TBmM= X-MS-TrafficTypeDiagnostic: AM6PR08MB3256: X-Microsoft-Exchange-Diagnostics: 1;AM6PR08MB3256;20:gDXJOhfVv/jzS6isDJ6V25ynIb2by8bHbpJ+J73ymkoFrwZ212MJ/5MG/Qmps1QPSrKwzDzixvnEyeo9+/hyk9fhEBIEqGSnkOoqPtu9NUFLYo5pzTpuCKXDsLFC6JN+blPXFZh49eKySp0GZSE7Nf6zswNZXqdQBuXIsEWA8Ra+hz7io587hi4n5hKXZ3JuULb30wbLUhw3E8rkffnbUxvKYXqmNByMsuLofH7+PcJeZ87UmmJUKLtqpi0C3+S4dKioIXnvAXmzgD7rD9ZiVrXYiXatn/KkDqbb2QMAIITTO931jH3ZwCqSfcsjHB4A/BnbCi4OyR40OIErXhUf09GzZgadtD744RkTCn3LFGuqYflI+91CnAxnXsxsWpqfQAqBk0FFLiUrLlNNGOqk5wM2ZjWA1iAU7dMzZRCRke/JU2KhAcF8F0LV6Bpxgz27Jir77WjrTxDCSov8pncUEi/31pALxFGkAT/nTMUjJcJnt/73ob5iIvVe4r4X/asT;4:eXTjh1Er9xd33s7D3nLEI9cbLISrkQV6eCuL0BNNAEjMIrZMGHwmiCgEPzlad9HkniqdQLDG1IkoR//jUwoQQW2yIEHyZS/Lw8MANxPq0Tpm2G2uJrMLBNDwgrX01f1cpJHQOIvqr8VImkSqb/heSklDDbKDvErK81ZF95ZFCym1MDGw/zshb1E9TuZTM8umkQ1vKsVchTy6TUFw6MrhRy/aq4dYCiIBy4DK+AOs7K2Js+Fg/HMFvSEgC5HvTdO5Stv/dIcRs /XKd2XXscrMAQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(6072148)(201708071742011)(7699016);SRVR:AM6PR08MB3256;BCL:0;PCL:0;RULEID:;SRVR:AM6PR08MB3256; X-Forefront-PRVS: 06891E23FB X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6069001)(39380400002)(39850400004)(376002)(366004)(396003)(346002)(199004)(189003)(6486002)(48376002)(50226002)(4326008)(53936002)(6512007)(2906002)(6666003)(86362001)(8676002)(37156001)(36756003)(97736004)(8936002)(476003)(2616005)(956004)(478600001)(6916009)(50466002)(81166006)(25786009)(107886003)(5660300001)(486006)(305945005)(16586007)(1857600001)(81156014)(316002)(106356001)(66066001)(7736002)(51416003)(16526019)(186003)(105586002)(47776003)(52116002)(26005)(2361001)(6506007)(2351001)(52396003)(68736007)(1076002)(386003)(3846002)(6116002);DIR:OUT;SFP:1102;SCL:1;SRVR:AM6PR08MB3256;H:localhost.localdomain;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AM6PR08MB3256;23:xaow4EzZ3nntepllQPTKUO4CY5BeKvF/cKWs0stpi?= =?us-ascii?Q?/fGrvlZixQjpcLlAbjxakLZQFD29kxPfthdD7hW8tVNk+K+FFPiEF1Nj+gKB?= =?us-ascii?Q?YLw8uAj5unO1JyF/fPeCFqiZ8gxWyT4702DNhXtgRWqzOovb689gDKM2+Ahb?= =?us-ascii?Q?d97tB6EazlyX/CUUQskkUh0MVzfqndDzJYmKD+34z/BLS/inFebxvlH9cJD2?= =?us-ascii?Q?gNsIZRb5rbBy2OgkNt+9ou5Sip5+bLf4ox3gD9yrwfDxD9x1m4oEJp+Q+Fbt?= =?us-ascii?Q?iNeqC5Ib5JbRxSoe+ppXxrEJDD98cxGXAmCYP04qMfNNYtBsNZXC4Ly7HtGK?= =?us-ascii?Q?wz8N25NJ2b7J/SqgQix627e0UEpbK0RvviyCrhc6F8ui+Bg9QyQN9EZbCb7W?= =?us-ascii?Q?0Ep1k9DlfN1lv5KJwQRFRmXuXn73IrjTmfdP5HiWgAxf4btBIWZNqjz6SrEB?= =?us-ascii?Q?seJT+1kd0Szra553wZ8K7cPfI8Hq2YTsX1AEAVhBsNHo2I9zA5hU9HKYWcja?= =?us-ascii?Q?MbK4p34PQFqsSGug4k4fI9SwNaDoOPEbaDG3m9feejbUraZ8z49CvNvU1Gf3?= =?us-ascii?Q?vCGzWJKY/yComeLbjv/2TpEx3JQfub7RD4+0H1W9ns8TrmCyKy4085FMiTnd?= =?us-ascii?Q?PRz8gz X-Microsoft-Antispam-Message-Info: bb1BOR+XD5X3Ijd74eB7NUYw5VSrkZsv2BaReT7BlVjTC3Vfm5FpXkRSHz5TMNdwGtJXB/YYny6rLI47wRqRWEne3RBU3yik0M8He8zJyAv5925jxZKyyNLJnpEAZscqBb5E1C9UjvRxQuORJGorRYehgPkGdovYG3KtZhkBblC9GaAhFD6fMSYgb9Uaioyu X-Microsoft-Exchange-Diagnostics: 1;AM6PR08MB3256;6:djv5NXsTCjIbFDeoPU94lhZxomtktE/OXjdb2LVsqeRWfXtsWzh/rkM2T0tkTpB1UKzVR/2uXB+EPyIBG5nTjQeuoj0sLfunule3nRRCpH71X302xD5RkpoHbPgvLtdcZtE59GyFpjavn4aLWrsDZ9bnN5oK1jaEiX0KTtvBhgYs0rI2jqBouH0nyGlUc/GFU7tMoVOlBJDyG6u84EoEwti/NXONevJQGVLWjbSGWGhjqIHkXSwYci3jQkD7qN6zqRrnpQmUw99AvSZppDQvXoZA7/7m+VXf4MCRJxCbuaUTJZELb9SwRvCwzK3LTqm4d2GCVY4/oDBxi+DVmYepkLCiGVTdgExPEH55EmdMu/cIOZAhbCrQrwnXGE6E1ZrSfY0+AgZvUzWfY++SVaVmDQTKVlYfl432C46dGmgsgOdGVQeCFNbesXwF/q7CSUFG7weA/aQAyi9caMHLBItTjg==;5:4diXbrgbwMuQpJNCfwwwsAlD8/ce3DMjmBJzuyJZUZTNEeUs07xZAoDzNlxXYveRGKF5fjAG/7q4jJvYa8hhh+eqAgSIfsLYODDlLyr5pVTdbpUmZqmaWV7lC7uTLera9c7X6xFiVAzBE0YlmJ7pjdirXP5iJtsJbCehp30d4gY=;24:cYPdJztIz1yS0z1b86ODyMrY8FTmH0cBSsT+SCdxeuICFZKGGlkNt35FTpdfHJ4ZdMAXBvTm0/VDFIotL/AMuTh3/beQQeM/KFPOaSU9YZA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM6PR08MB3256;7:DjAAIMkpxFnETV4tTfcyOMg+fcXpg08QgcAl0merRDOw7deH5QZkKUH7RNkJfasR2ZYrbR9yegY6w0MVZNQvfgZqby2B0qc/ixhWRrA3ck+SuOlUtUiH76oMBC6KFT2czmIMMNcbN6+CbgQcFZoQzRquawtZTOGwCiqlkOVVXs4qOWSXtJyy6w9iVzqSus3f+XlTaW50uHPMFUx75rRJJBnH5578CAzBoo6PcbORNQICVqBPm5khK2gmMMMyRDaL;20:GlwdmKLaBI9lczXZgXOF88wKjupAudaStFhONP/qKZM72B0aitE4FCZPk3gjO9zUqjr8NBQ6x+IrAilA9s1OHGFe3jck+qJ0RCxalDE25gNgQsdxttGiTl7k4nXD9dkScZ8O5juALp/gyCeXL8yeVZgq7Us1PL+Hv1T+KQJ0kx0= X-MS-Office365-Filtering-Correlation-Id: 6d49293b-eef1-4df4-ca04-08d5c74179c2 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2018 21:57:16.5997 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d49293b-eef1-4df4-ca04-08d5c74179c2 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3256 Xref: news.gmane.org gmane.linux.lib.musl.general:12868 Archived-At: The L modifier is usually used for floating-point numbers, but glibc allows to use this modifier for integers too. I think here is nothing wrong if we will be compatible with glibc here. It is not often when a error code of printf is checked, so we may have a situation when a code works with glibc and doesn't work with musl. Signed-off-by: Andrei Vagin --- src/stdio/vfprintf.c | 3 +++ src/stdio/vfwprintf.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c index 50fb55c1..7f6c4f39 100644 --- a/src/stdio/vfprintf.c +++ b/src/stdio/vfprintf.c @@ -82,6 +82,9 @@ static const unsigned char states[]['z'-'A'+1] = { }, { /* 5: L-prefixed */ S('e') = LDBL, S('f') = LDBL, S('g') = LDBL, S('a') = LDBL, S('E') = LDBL, S('F') = LDBL, S('G') = LDBL, S('A') = LDBL, + S('d') = LLONG, S('i') = LLONG, + S('o') = ULLONG, S('u') = ULLONG, + S('x') = ULLONG, S('X') = ULLONG, S('n') = PTR, }, { /* 6: z- or t-prefixed (assumed to be same size) */ S('d') = PDIFF, S('i') = PDIFF, diff --git a/src/stdio/vfwprintf.c b/src/stdio/vfwprintf.c index e87ad42a..c6ce82ea 100644 --- a/src/stdio/vfwprintf.c +++ b/src/stdio/vfwprintf.c @@ -73,6 +73,9 @@ static const unsigned char states[]['z'-'A'+1] = { }, { /* 5: L-prefixed */ S('e') = LDBL, S('f') = LDBL, S('g') = LDBL, S('a') = LDBL, S('E') = LDBL, S('F') = LDBL, S('G') = LDBL, S('A') = LDBL, + S('d') = LLONG, S('i') = LLONG, + S('o') = ULLONG, S('u') = ULLONG, + S('x') = ULLONG, S('X') = ULLONG, S('n') = PTR, }, { /* 6: z- or t-prefixed (assumed to be same size) */ S('d') = PDIFF, S('i') = PDIFF, -- 2.14.3