typo fix

[oweals/busybox.git] / miscutils / nandwrite.c

diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index d0e4397fbde8a1ae84b60b8466c8d703135576ac..f42242687c1b1e4d1ba7151494991d4075d93924 100644 (file)
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -52,7 +52,7 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
        unsigned opts;
        int fd;
        ssize_t cnt;
-       unsigned mtdoffset, meminfo_writesize;
+       unsigned mtdoffset, meminfo_writesize, blockstart;
        struct mtd_info_user meminfo;
        unsigned char *filebuf;
        const char *opt_s = "0";
@@ -72,6 +72,8 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
        xioctl(fd, MEMGETINFO, &meminfo);
 
        mtdoffset = bb_strtou(opt_s, NULL, 0);
+       if (errno)
+               bb_error_msg_and_die("invalid number '%s'", opt_s);
 
        /* Pull it into a CPU register (hopefully) - smaller code that way */
        meminfo_writesize = meminfo.writesize;
@@ -81,9 +83,21 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
 
        filebuf = xmalloc(meminfo_writesize);
 
+       blockstart = mtdoffset & ~(meminfo.erasesize - 1);
+       if (blockstart != mtdoffset) {
+               unsigned tmp;
+               /* mtdoffset is in the middle of an erase block, verify that
+                * this block is OK. Advance mtdoffset only if this block is
+                * bad.
+                */
+               tmp = next_good_eraseblock(fd, &meminfo, blockstart);
+               if (tmp != blockstart) /* bad block(s), advance mtdoffset */
+                       mtdoffset = tmp;
+       }
+
        cnt = -1;
        while (mtdoffset < meminfo.size) {
-               unsigned blockstart = mtdoffset & ~(meminfo.erasesize - 1);
+               blockstart = mtdoffset & ~(meminfo.erasesize - 1);
                if (blockstart == mtdoffset) {
                        /* starting a new eraseblock */
                        mtdoffset = next_good_eraseblock(fd, &meminfo, blockstart);