Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/miscutils/flash_eraseall.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/flash_eraseall.c (modified) (6 diffs)

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

@@ -12 +12 @@
 
 //usage:#define flash_eraseall_trivial_usage
-//usage:       "[-jq] MTD_DEVICE"
+//usage:       "[-jNq] MTD_DEVICE"
 //usage:#define flash_eraseall_full_usage "\n\n"
 //usage:       "Erase an MTD device\n"
 //usage:     "\n    -j  Format the device for jffs2"
+//usage:     "\n    -N  Don't skip bad blocks"
 //usage:     "\n    -q  Don't display progress messages"
 
@@ -23 +24 @@
 
 #define OPTION_J  (1 << 0)
-#define OPTION_Q  (1 << 1)
-#define IS_NAND   (1 << 2)
-#define BBTEST    (1 << 3)
+#define OPTION_N  (1 << 1)
+#define OPTION_Q  (1 << 2)
+#define IS_NAND   (1 << 3)
 
 /* mtd/jffs2-user.h used to have this atrocity:
@@ -72 +73 @@
 
     opt_complementary = "=1";
-    flags = BBTEST | getopt32(argv, "jq");
+    flags = getopt32(argv, "jNq");
 
     mtd_name = argv[optind];
@@ -140 +141 @@
     for (erase.start = 0; erase.start < meminfo.size;
          erase.start += meminfo.erasesize) {
-        if (flags & BBTEST) {
+        if (!(flags & OPTION_N)) {
             int ret;
             loff_t offset = erase.start;
@@ -147 +148 @@
             if (ret > 0) {
                 if (!(flags & OPTION_Q))
-                    bb_info_msg("\nSkipping bad block at 0x%08x", erase.start);
+                    printf("\nSkipping bad block at 0x%08x\n", erase.start);
                 continue;
             }
@@ -155 +156 @@
                  */
                 if (errno == EOPNOTSUPP) {
-                    flags &= ~BBTEST;
+                    flags |= OPTION_N;
                     if (flags & IS_NAND)
                         bb_error_msg_and_die("bad block check not available");