Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/miscutils/nandwrite.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/miscutils/nandwrite.c (modified) (10 diffs)

branches/3.3/mindi-busybox/miscutils/nandwrite.c

@@ -24 +24 @@
 
 //applet:IF_NANDWRITE(APPLET(nandwrite, BB_DIR_USR_SBIN, BB_SUID_DROP))
-//applet:IF_NANDWRITE(APPLET_ODDNAME(nanddump, nandwrite, BB_DIR_USR_SBIN, BB_SUID_DROP, nanddump))
+//applet:IF_NANDDUMP(APPLET_ODDNAME(nanddump, nandwrite, BB_DIR_USR_SBIN, BB_SUID_DROP, nanddump))
 
 //kbuild:lib-$(CONFIG_NANDWRITE) += nandwrite.o
@@ -30 +30 @@
 
 //usage:#define nandwrite_trivial_usage
-//usage:    "[-p] [-s ADDR] MTD_DEVICE [FILE]"
+//usage:    "[-np] [-s ADDR] MTD_DEVICE [FILE]"
 //usage:#define nandwrite_full_usage "\n\n"
-//usage:    "Write to the specified MTD device\n"
+//usage:    "Write to MTD_DEVICE\n"
+//usage:     "\n    -n  Write without ecc"
 //usage:     "\n    -p  Pad to page size"
 //usage:     "\n    -s ADDR Start address"
 
 //usage:#define nanddump_trivial_usage
-//usage:    "[-o] [-b] [-s ADDR] [-f FILE] MTD_DEVICE"
+//usage:    "[-no]" IF_LONG_OPTS(" [--bb=padbad|skipbad]") " [-s ADDR] [-l LEN] [-f FILE] MTD_DEVICE"
 //usage:#define nanddump_full_usage "\n\n"
-//usage:    "Dump the specified MTD device\n"
+//usage:    "Dump MTD_DEVICE\n"
+//usage:     "\n    -n  Read without ecc"
 //usage:     "\n    -o  Dump oob data"
-//usage:     "\n    -b  Omit bad block from the dump"
 //usage:     "\n    -s ADDR Start address"
 //usage:     "\n    -l LEN  Length"
 //usage:     "\n    -f FILE Dump to file ('-' for stdout)"
+//usage:     IF_LONG_OPTS(
+//usage:     "\n    --bb=METHOD:"
+//usage:     "\n        skipbad: skip bad blocks"
+//usage:     "\n        padbad: substitute bad blocks by 0xff (default)"
+//usage:     )
 
 #include "libbb.h"
@@ -54 +60 @@
 #define OPT_p  (1 << 0) /* nandwrite only */
 #define OPT_o  (1 << 0) /* nanddump only */
-#define OPT_s  (1 << 1)
-#define OPT_b  (1 << 2)
+#define OPT_n  (1 << 1)
+#define OPT_s  (1 << 2)
 #define OPT_f  (1 << 3)
 #define OPT_l  (1 << 4)
+#define OPT_bb (1 << 5) /* must be the last one in the list */
+
+#define BB_PADBAD (1 << 0)
+#define BB_SKIPBAD (1 << 1)
 
 /* helper for writing out 0xff for bad blocks pad */
@@ -65 +75 @@
     unsigned count;
 
-    /* round len to the next page */
-    len = (len | ~(meminfo->writesize - 1)) + 1;
+    /* round len to the next page only if len is not already on a page */
+    len = ((len - 1) | (meminfo->writesize - 1)) + 1;
 
     memset(buf, 0xff, sizeof(buf));
@@ -103 +113 @@
     unsigned char *oobbuf;
     unsigned opts;
+    unsigned bb_method = BB_SKIPBAD;
     int fd;
     ssize_t cnt;
@@ -110 +121 @@
     struct mtd_oob_buf oob;
     unsigned char *filebuf;
-    const char *opt_s = "0", *opt_f = "-", *opt_l;
+    const char *opt_s = "0", *opt_f = "-", *opt_l, *opt_bb;
 
     if (IS_NANDDUMP) {
         opt_complementary = "=1";
-        opts = getopt32(argv, "os:bf:l:", &opt_s, &opt_f, &opt_l);
+#if ENABLE_LONG_OPTS
+        applet_long_options =
+            "bb\0" Required_argument "\xff"; /* no short equivalent */
+#endif
+        opts = getopt32(argv, "ons:f:l:", &opt_s, &opt_f, &opt_l, &opt_bb);
     } else { /* nandwrite */
         opt_complementary = "-1:?2";
-        opts = getopt32(argv, "ps:", &opt_s);
+        opts = getopt32(argv, "pns:", &opt_s);
     }
     argv += optind;
@@ -133 +148 @@
     xioctl(fd, MEMGETINFO, &meminfo);
 
+    if (opts & OPT_n)
+        xioctl(fd, MTDFILEMODE, (void *)MTD_FILE_MODE_RAW);
+
     mtdoffset = xstrtou(opt_s, 0);
     if (IS_NANDDUMP && (opts & OPT_l)) {
@@ -138 +156 @@
         if (length < meminfo.size - mtdoffset)
             end_addr = mtdoffset + length;
+    }
+    if (IS_NANDDUMP && (opts & OPT_bb)) {
+        if (strcmp("skipbad", opt_bb) == 0)
+            bb_method = BB_SKIPBAD;
+        else if (strcmp("padbad", opt_bb) == 0)
+            bb_method = BB_PADBAD;
+        else
+            bb_show_usage();
     }
 
@@ -163 +189 @@
         if (tmp != blockstart) {
             /* bad block(s), advance mtdoffset */
-            if (IS_NANDDUMP && !(opts & OPT_b)) {
-                int bad_len = MIN(tmp, end_addr) - mtdoffset;
-                dump_bad(&meminfo, bad_len, opts & OPT_o);
+            if (IS_NANDDUMP) {
+                if (bb_method == BB_PADBAD) {
+                    int bad_len = MIN(tmp, end_addr) - mtdoffset;
+                    dump_bad(&meminfo, bad_len, opts & OPT_o);
+                }
+                /* with option skipbad, increase the total length */
+                if (bb_method == BB_SKIPBAD) {
+                    end_addr += (tmp - blockstart);
+                }
             }
             mtdoffset = tmp;
@@ -183 +215 @@
             if (IS_NANDWRITE)
                 printf("Writing at 0x%08x\n", mtdoffset);
-            else if (mtdoffset > blockstart && !(opts & OPT_b)) {
-                int bad_len = MIN(mtdoffset, limit) - blockstart;
-                dump_bad(&meminfo, bad_len, opts & OPT_o);
+            else if (mtdoffset > blockstart) {
+                if (bb_method == BB_PADBAD) {
+                    /* dump FF padded bad block */
+                    int bad_len = MIN(mtdoffset, limit) - blockstart;
+                    dump_bad(&meminfo, bad_len, opts & OPT_o);
+                } else if (bb_method == BB_SKIPBAD) {
+                    /* for skipbad, increase the length */
+                    if ((end_addr + mtdoffset - blockstart) > end_addr)
+                        end_addr += (mtdoffset - blockstart);
+                    else
+                        end_addr = ~0;
+                    limit = MIN(meminfo.size, end_addr);
+                }
             }
             if (mtdoffset >= limit)