From patchwork Mon Jun 8 16:32:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jehan Bing X-Patchwork-Id: 28238 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id CF4D1B708C for ; Tue, 9 Jun 2009 02:38:19 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MDhma-000230-Ge; Mon, 08 Jun 2009 16:33:12 +0000 Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by bombadil.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux)) id 1MDhmQ-00020S-6p for linux-mtd@lists.infradead.org; Mon, 08 Jun 2009 16:33:08 +0000 Received: from list by ciao.gmane.org with local (Exim 4.43) id 1MDhmJ-0006O2-0Q for linux-mtd@lists.infradead.org; Mon, 08 Jun 2009 16:32:55 +0000 Received: from adsl-99-185-243-218.dsl.pltn13.sbcglobal.net ([99.185.243.218]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 08 Jun 2009 16:32:55 +0000 Received: from jehan by adsl-99-185-243-218.dsl.pltn13.sbcglobal.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 08 Jun 2009 16:32:55 +0000 X-Injected-Via-Gmane: http://gmane.org/ To: linux-mtd@lists.infradead.org From: Jehan Bing Subject: Re: [PATH] [MTD-UTILS] Return error if failure when reading from standard input Date: Mon, 08 Jun 2009 09:32:38 -0700 Lines: 35 Message-ID: <4A2D3D26.4090703@orb.com> References: <1244441802.5847.337.camel@localhost.localdomain> Mime-Version: 1.0 X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: adsl-99-185-243-218.dsl.pltn13.sbcglobal.net User-Agent: Thunderbird 2.0.0.21 (Windows/20090302) In-Reply-To: <1244441802.5847.337.camel@localhost.localdomain> X-Spam-Score: -1.0 (-) X-Spam-Report: SpamAssassin version 3.2.5 on bombadil.infradead.org summary: Content analysis details: (-1.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [80.91.229.2 listed in list.dnswl.org] X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Fix nandwrite to return EXIT_FAILURE in case of error when using the standard input instead of a file for input. Signed-off-by: Jehan Bing diff -up mtd-utils.loop/nandwrite.c mtd-utils.failed_patch/nandwrite.c --- mtd-utils.loop/nandwrite.c 2009-06-05 18:32:56.000000000 -0700 +++ mtd-utils.failed_patch/nandwrite.c 2009-06-03 17:25:19.000000000 -0700 @@ -261,6 +261,7 @@ int main(int argc, char * const argv[]) int oobinfochanged = 0; struct nand_oobinfo old_oobinfo; int readcnt = 0; + bool failed = true; process_options(argc, argv); @@ -623,6 +624,8 @@ int main(int argc, char * const argv[]) mtdoffset += meminfo.writesize; } + failed = false; + closeall: close(ifd); @@ -637,7 +640,7 @@ restoreoob: close(fd); - if ((ifd != STDIN_FILENO) && (imglen > 0)) { + if (failed || ((ifd != STDIN_FILENO) && (imglen > 0))) { perror ("Data was only partially written due to error\n"); exit (EXIT_FAILURE); }