From patchwork Fri Oct 28 08:31:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9401513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A12DE6022E for ; Fri, 28 Oct 2016 08:32:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F196286FA for ; Fri, 28 Oct 2016 08:32:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 829B028D96; Fri, 28 Oct 2016 08:32:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 375E82A63D for ; Fri, 28 Oct 2016 08:32:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759658AbcJ1Ibo (ORCPT ); Fri, 28 Oct 2016 04:31:44 -0400 Received: from mout.web.de ([212.227.17.11]:50278 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752582AbcJ1Ibm (ORCPT ); Fri, 28 Oct 2016 04:31:42 -0400 Received: from [192.168.1.2] ([77.182.172.137]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0M7bUB-1cmvy605mZ-00xHWQ; Fri, 28 Oct 2016 10:31:33 +0200 Subject: [PATCH 01/10] scripts/basic/bin2c: Complete error handling in main() To: linux-kbuild@vger.kernel.org, Michal Marek References: <72e07814-56e9-505a-d660-91ff20b6efea@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <44402655-ef0d-1e2f-0587-f17295a08aa3@users.sourceforge.net> Date: Fri, 28 Oct 2016 10:31:31 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <72e07814-56e9-505a-d660-91ff20b6efea@users.sourceforge.net> X-Provags-ID: V03:K0:ylRcg+1Eh8TeI4r3rVrRQohOtBVVi3SHJoodw4fFe8rNLccSJSN Oh6oMHHXoc+ACDkRHyZdeFLyWASqZ8Q1UoP9QQUk4VzVdhhHxJlYJXrA16ZBrPE2lAXbePL pa11g158DVdZBpoMfHGCyjJRlKyp9lClrk403Lsg9OqrAFNEx4cEvGpmeUbdB8osoOJ1pkT iT9zKeNP49l8P4smCPWKg== X-UI-Out-Filterresults: notjunk:1; V01:K0:EDIMSX3qxEU=:I1rW1X4p2Gc4DlBy1wqFp+ NKFDhckRMBvo4Yu7bkPKqf2BC32Bx0vHzSRD0/oeBfii1aRf8lNe9beTa2DT2rvjOO3en0vDA ++yFv2ScUscoPs5w/CzYCKALx228aq+t0J+JfOBdUCnW4X3svZPiVOAuyPInekVPqdYZ6F4nx M+rmMEQo8LLAK4Qpr3t1telNjGAw7qGgyQpM1EoJ53kMbfcchHEn7/wi9ca5mBXHshs5JIvWX apAL6wfv8c/ZdiwtP/dDtMafUmpJJ5F00FRdgrc0YusyW7Lti0/mLB6HH74FXTW+Q10s577kS sjDJzmQAKq/pxkcJd5Pkuy+xeKGnr6u7M6PjN5ixh/jEjW7PfrvaPd5m1WF5rYQKTFvK9mQ0W kYGjynPT1hUZCIFq0Vs3WHrI/aveaSv7ggAYt4aCwqDQBZf8fwTsGWEqheWakiK/SaE40x3Ip FgRLKuxMCcH34w0ydLVWQBVLJKhh3jSuVA/XBUllrfkqFG6i0oCn52TYgFzwGd+FBVZ7uJ9XX CUwnEijzzy26QHv2VdS8nsRyIJo/JKwmqaSXyN+NQzjztzu6fY4WE8n3M55DPL71vVgDJfRse j0A78wI2CBkBi3MIi0OFknL5DE67+zpdYGgB5vmCkGgFaW8Vx3xRF9HpDmbwZFBYCAUwwRrTc L+yeqK/3/tlRi/+k75v+ZmtPjRw8QVIT1y7m66wHGLREyvK3pzoqLrCybTuymfsmeIunB6KT5 iPfBTw621i7EFmQde45v9Pby9vwbY7DSOY6btc9axQEM4cWk5AlRRC0XcII1dTN+b+cKp6Oy9 NEU6vbY Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Thu, 27 Oct 2016 16:15:04 +0200 Return values were not checked from five calls of the function "printf". This issue was detected also by using the Coccinelle software. * Add a bit of exception handling there. * Optimise this function implementation a bit. - Replace two output calls with the functions "fputs" and "puts". - Use the preincrement operator for the variable "total". Signed-off-by: Markus Elfring --- scripts/basic/bin2c.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/scripts/basic/bin2c.c b/scripts/basic/bin2c.c index c3d7eef..c6c8860 100644 --- a/scripts/basic/bin2c.c +++ b/scripts/basic/bin2c.c @@ -8,29 +8,35 @@ */ #include +#include int main(int argc, char *argv[]) { int ch, total = 0; if (argc > 1) - printf("const char %s[] %s=\n", - argv[1], argc > 2 ? argv[2] : ""); + if (printf("const char %s[] %s=\n", + argv[1], argc > 2 ? argv[2] : "") < 16) + return errno; do { - printf("\t\""); + if (fputs("\t\"", stdout) < 0) + return errno; + while ((ch = getchar()) != EOF) { - total++; - printf("\\x%02x", ch); - if (total % 16 == 0) + if (printf("\\x%02x", ch) < 4) + return errno; + if (++total % 16 == 0) break; } - printf("\"\n"); + + if (puts("\"") < 0) + return errno; } while (ch != EOF); if (argc > 1) - printf("\t;\n\n#include \n\nconst size_t %s_size = %d;\n", - argv[1], total); - + if (printf("\t;\n\n#include \n\nconst size_t %s_size = %d;\n", + argv[1], total) < 54) + return errno; return 0; }