From: Jehan Bing <jehan@orb.com>
Date: Mon, 8 Jun 2009 16:32:38 +0000 (-0700)
Subject: nandwrite: return error if failure when reading from standard input
X-Git-Tag: v1.3.0~35
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=59c537d0fd1af368eaeed5ec27e2336077c18691;p=mtd-utils.git

nandwrite: return error if failure when reading from standard input

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 <jehan@orb.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
---

diff --git a/nandwrite.c b/nandwrite.c
index 9343a02..d745ab0 100644
--- a/nandwrite.c
+++ b/nandwrite.c
@@ -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);
 	}