[package] base-files: clear ip addresses on interfaces that are about to be added...

[openwrt.git] / package / mtd / src / mtd.c

diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c
index b180aec..be4c1be 100644 (file)
--- a/package/mtd/src/mtd.c
+++ b/package/mtd/src/mtd.c
@@ -18,7 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id$
  *
  * The code is based on the linux-mtd examples.
  */
@@ -138,7 +137,7 @@ int mtd_write_buffer(int fd, const char *buf, int offset, int length)
 static int
 image_check(int imagefd, const char *mtd)
 {
-       int ret = 0;
+       int ret = 1;
 #ifdef target_brcm
        ret = trx_check(imagefd, mtd, buf, &buflen);
 #endif
@@ -276,10 +275,8 @@ mtd_write(int imagefd, const char *mtd)
                                }
                        }
 
-                       if (r == 0) {
-                               fprintf(stderr, "No more data left\n");
+                       if (r == 0)
                                break;
-                       }
 
                        buflen += r;
                } while (buflen < erasesize);
@@ -288,7 +285,7 @@ mtd_write(int imagefd, const char *mtd)
                        break;
 
                if (jffs2file) {
-                       if (memcmp(buf, JFFS2_EOF, sizeof(JFFS2_EOF)) == 0) {
+                       if (memcmp(buf, JFFS2_EOF, sizeof(JFFS2_EOF) - 1) == 0) {
                                if (!quiet)
                                        fprintf(stderr, "\b\b\b   ");
                                if (quiet < 2)