mtd: make the mtd dump call run properly on nand flash

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

diff --git a/package/system/mtd/src/mtd.c b/package/system/mtd/src/mtd.c
index 604ca28ae29e7411739285cf66fc8a1fa97b3cae..db3fc804c9ea680ffb9af0747b36e5c208a3513a 100644 (file)
--- a/package/system/mtd/src/mtd.c
+++ b/package/system/mtd/src/mtd.c
@@ -21,6 +21,7 @@
  * The code is based on the linux-mtd examples.
  */
 
+#define _GNU_SOURCE
 #include <limits.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -67,10 +68,12 @@ int mtd_open(const char *mtd, bool block)
        int i;
        int ret;
        int flags = O_RDWR | O_SYNC;
+       char name[PATH_MAX];
 
+       snprintf(name, sizeof(name), "\"%s\"", mtd);
        if ((fp = fopen("/proc/mtd", "r"))) {
                while (fgets(dev, sizeof(dev), fp)) {
-                       if (sscanf(dev, "mtd%d:", &i) && strstr(dev, mtd)) {
+                       if (sscanf(dev, "mtd%d:", &i) && strstr(dev, name)) {
                                snprintf(dev, sizeof(dev), "/dev/mtd%s/%d", (block ? "block" : ""), i);
                                if ((ret=open(dev, flags))<0) {
                                        snprintf(dev, sizeof(dev), "/dev/mtd%s%d", (block ? "block" : ""), i);
@@ -270,6 +273,55 @@ mtd_erase(const char *mtd)
 
 }
 
+static int
+mtd_dump(const char *mtd, int size)
+{
+       int ret = 0, offset = 0;
+       int fd;
+       char *buf;
+
+       if (quiet < 2)
+               fprintf(stderr, "Dumping %s ...\n", mtd);
+
+       fd = mtd_check_open(mtd);
+       if(fd < 0) {
+               fprintf(stderr, "Could not open mtd device: %s\n", mtd);
+               return -1;
+       }
+
+       if (!size)
+               size = mtdsize;
+
+       buf = malloc(erasesize);
+       if (!buf)
+               return -1;
+
+       do {
+               int len = (size > erasesize) ? (erasesize) : (size);
+               int rlen = read(fd, buf, len);
+
+               if (rlen < 0) {
+                       if (errno == EINTR)
+                               continue;
+                       ret = -1;
+                       goto out;
+               }
+               if (!rlen || rlen != len)
+                       break;
+               if (mtd_block_is_bad(fd, offset)) {
+                       fprintf(stderr, "skipping bad block at 0x%08x\n", offset);
+               } else {
+                       size -= rlen;
+                       write(1, buf, rlen);
+               }
+               offset += rlen;
+       } while (size > 0);
+
+out:
+       close(fd);
+       return ret;
+}
+
 static int
 mtd_verify(const char *mtd, char *file)
 {
@@ -502,7 +554,7 @@ resume:
 
                                if (mtd_block_is_bad(fd, e)) {
                                        if (!quiet)
-                                               fprintf(stderr, "\nSkipping bad block at 0x%08x   ", e);
+                                               fprintf(stderr, "\nSkipping bad block at 0x%08zx   ", e);
 
                                        skip_bad_blocks += erasesize;
                                        e += erasesize;
@@ -560,7 +612,6 @@ resume:
        if (!quiet)
                fprintf(stderr, "\b\b\b\b    ");
 
-done:
        if (quiet < 2)
                fprintf(stderr, "\n");
 
@@ -594,7 +645,7 @@ static void usage(void)
            fprintf(stderr,
        "        fixseama                fix the checksum in a seama header on first boot\n");
        }
-    fprintf(stderr,
+       fprintf(stderr,
        "Following options are available:\n"
        "        -q                      quiet mode (once: no [w] on writing,\n"
        "                                           twice: no status messages)\n"
@@ -605,11 +656,12 @@ static void usage(void)
        "        -d <name>               directory for jffs2write, defaults to \"tmp\"\n"
        "        -j <name>               integrate <file> into jffs2 data when writing an image\n"
        "        -s <number>             skip the first n bytes when appending data to the jffs2 partiton, defaults to \"0\"\n"
-       "        -p                      write beginning at partition offset\n");
+       "        -p                      write beginning at partition offset\n"
+       "        -l <length>             the length of data that we want to dump\n");
        if (mtd_fixtrx) {
            fprintf(stderr,
        "        -o offset               offset of the image header in the partition(for fixtrx)\n");
-    }
+       }
        fprintf(stderr,
 #ifdef FIS_SUPPORT
        "        -F <part>[:<size>[:<entrypoint>]][,<part>...]\n"
@@ -641,7 +693,7 @@ int main (int argc, char **argv)
        int ch, i, boot, imagefd = 0, force, unlocked;
        char *erase[MAX_ARGS], *device = NULL;
        char *fis_layout = NULL;
-       size_t offset = 0, part_offset = 0;
+       size_t offset = 0, part_offset = 0, dump_len = 0;
        enum {
                CMD_ERASE,
                CMD_WRITE,
@@ -650,6 +702,7 @@ int main (int argc, char **argv)
                CMD_FIXTRX,
                CMD_FIXSEAMA,
                CMD_VERIFY,
+               CMD_DUMP,
        } cmd = -1;
 
        erase[0] = NULL;
@@ -663,7 +716,7 @@ int main (int argc, char **argv)
 #ifdef FIS_SUPPORT
                        "F:"
 #endif
-                       "frnqe:d:s:j:p:o:")) != -1)
+                       "frnqe:d:s:j:p:o:l:")) != -1)
                switch (ch) {
                        case 'f':
                                force = 1;
@@ -707,6 +760,14 @@ int main (int argc, char **argv)
                                        usage();
                                }
                                break;
+                       case 'l':
+                               errno = 0;
+                               dump_len = strtoul(optarg, 0, 0);
+                               if (errno) {
+                                       fprintf(stderr, "-l: illegal numeric string\n");
+                                       usage();
+                               }
+                               break;
                        case 'o':
                                if (!mtd_fixtrx) {
                                        fprintf(stderr, "-o: is not available on this platform\n");
@@ -750,6 +811,9 @@ int main (int argc, char **argv)
                cmd = CMD_VERIFY;
                imagefile = argv[1];
                device = argv[2];
+       } else if ((strcmp(argv[0], "dump") == 0) && (argc == 2)) {
+               cmd = CMD_DUMP;
+               device = argv[1];
        } else if ((strcmp(argv[0], "write") == 0) && (argc == 3)) {
                cmd = CMD_WRITE;
                device = argv[2];
@@ -807,6 +871,9 @@ int main (int argc, char **argv)
                case CMD_VERIFY:
                        mtd_verify(device, imagefile);
                        break;
+               case CMD_DUMP:
+                       mtd_dump(device, dump_len);
+                       break;
                case CMD_ERASE:
                        if (!unlocked)
                                mtd_unlock(device);