From patchwork Thu Jun 11 18:16:12 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [MTD-UTILS] Fix for perror modifying errno in nandwrite
Date: Thu, 11 Jun 2009 08:16:12 -0000
From: Jehan Bing <jehan@orb.com>
X-Patchwork-Id: 28576
Message-Id: <4A3149EC.5030705@orb.com>
To: linux-mtd@lists.infradead.org

Since perror returns void, I assumed it wouldn't modify errno. I was 
wrong. And since the change was so simple, I didn't test it. Mea culpa. :(

This patch fixes it.
I don't use perror if pwrite fails with EIO because it's not useful. The 
failure of lseek or the message "Erasing failed write ..." implicitly 
says so since it's the only way to reach that code.
There is not such additional message for the MEMERASE error so I use a 
temporary variable instead.


Signed-off-by: Jehan Bing <jehan@orb.com>


--- a/nandwrite.c
+++ b/nandwrite.c
@@ -585,8 +585,8 @@ int main(int argc, char * const argv[])
 			off_t rewind_bytes;
 			erase_info_t erase;
 
-			perror ("pwrite");
 			if (errno != EIO) {
+				perror("pwrite");
 				goto closeall;
 			}
 
@@ -605,8 +605,9 @@ int main(int argc, char * const argv[])
 			fprintf(stderr, "Erasing failed write from %08lx-%08lx\n",
 				(long)erase.start, (long)erase.start+erase.length-1);
 			if (ioctl(fd, MEMERASE, &erase) != 0) {
+				int errno_tmp = errno;
 				perror("MEMERASE");
-				if (errno != EIO) {
+				if (errno_tmp != EIO) {
 					goto closeall;
 				}
 			}