X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3a0a80e1294f903c0fc271b1e71dba59007b5f61..60521a7fc852679890332b0d7696c0b0ccb2521e:/package/mtd/src/mtd.c?ds=sidebyside

diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c
index b9b2763af..752547656 100644
--- a/package/mtd/src/mtd.c
+++ b/package/mtd/src/mtd.c
@@ -1,13 +1,12 @@
 /*
  * mtd - simple memory technology device manipulation tool
  *
- * Copyright (C) 2005 Waldemar Brodkorb <wbx@dass-it.de>,
- *	                  Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2005      Waldemar Brodkorb <wbx@dass-it.de>,
+ * Copyright (C) 2005-2009 Felix Fietkau <nbd@openwrt.org>
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU General Public License v2
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -99,13 +98,13 @@ int mtd_check_open(const char *mtd)
 	fd = mtd_open(mtd, false);
 	if(fd < 0) {
 		fprintf(stderr, "Could not open mtd device: %s\n", mtd);
-		return 0;
+		return -1;
 	}
 
 	if(ioctl(fd, MEMGETINFO, &mtdInfo)) {
 		fprintf(stderr, "Could not get MTD device info from %s\n", mtd);
 		close(fd);
-		return 0;
+		return -1;
 	}
 	mtdsize = mtdInfo.size;
 	erasesize = mtdInfo.erasesize;
@@ -163,7 +162,7 @@ static int mtd_check(const char *mtd)
 		}
 
 		fd = mtd_check_open(mtd);
-		if (!fd)
+		if (fd < 0)
 			return 0;
 
 		if (!buf)
@@ -200,7 +199,7 @@ mtd_unlock(const char *mtd)
 		}
 
 		fd = mtd_check_open(mtd);
-		if(fd <= 0) {
+		if(fd < 0) {
 			fprintf(stderr, "Could not open mtd device: %s\n", mtd);
 			exit(1);
 		}
@@ -231,7 +230,7 @@ mtd_erase(const char *mtd)
 		fprintf(stderr, "Erasing %s ...\n", mtd);
 
 	fd = mtd_check_open(mtd);
-	if(fd <= 0) {
+	if(fd < 0) {
 		fprintf(stderr, "Could not open mtd device: %s\n", mtd);
 		exit(1);
 	}
@@ -261,7 +260,7 @@ mtd_refresh(const char *mtd)
 		fprintf(stderr, "Refreshing mtd partition %s ... ", mtd);
 
 	fd = mtd_check_open(mtd);
-	if(fd <= 0) {
+	if(fd < 0) {
 		fprintf(stderr, "Could not open mtd device: %s\n", mtd);
 		exit(1);
 	}
@@ -397,7 +396,7 @@ resume:
 				if (!quiet)
 					fprintf(stderr, "\b\b\b   ");
 				if (quiet < 2)
-					fprintf(stderr, "\nAppending jffs2 data to from %s to %s...", jffs2file, mtd);
+					fprintf(stderr, "\nAppending jffs2 data from %s to %s...", jffs2file, mtd);
 				/* got an EOF marker - this is the place to add some jffs2 data */
 				mtd_replace_jffs2(mtd, fd, e, jffs2file);
 				goto done;