Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/miscutils/nandwrite.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/miscutils/nandwrite.c (modified) (8 diffs)

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

@@ -9 +9 @@
  */
 
-//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))
-
-//kbuild:lib-$(CONFIG_NANDWRITE) += nandwrite.o
-//kbuild:lib-$(CONFIG_NANDDUMP) += nandwrite.o
-
 //config:config NANDWRITE
 //config:   bool "nandwrite"
-//config:   default n
-//config:   depends on PLATFORM_LINUX
+//config:   default y
+//config:   select PLATFORM_LINUX
 //config:   help
 //config:     Write to the specified MTD device, with bad blocks awareness
@@ -24 +18 @@
 //config:config NANDDUMP
 //config:   bool "nanddump"
-//config:   default n
-//config:   depends on PLATFORM_LINUX
+//config:   default y
+//config:   select PLATFORM_LINUX
 //config:   help
 //config:     Dump the content of raw NAND chip
+
+//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))
+
+//kbuild:lib-$(CONFIG_NANDWRITE) += nandwrite.o
+//kbuild:lib-$(CONFIG_NANDDUMP) += nandwrite.o
 
 //usage:#define nandwrite_trivial_usage
@@ -33 +33 @@
 //usage:#define nandwrite_full_usage "\n\n"
 //usage:    "Write to the specified MTD device\n"
-//usage:     "\nOptions:"
 //usage:     "\n    -p  Pad to page size"
 //usage:     "\n    -s ADDR Start address"
@@ -40 +39 @@
 //usage:    "[-o] [-b] [-s ADDR] [-f FILE] MTD_DEVICE"
 //usage:#define nanddump_full_usage "\n\n"
-//usage:    "Dump the sepcified MTD device\n"
-//usage:     "\nOptions:"
-//usage:     "\n    -o  Omit oob data"
+//usage:    "Dump the specified MTD device\n"
+//usage:     "\n    -o  Dump oob data"
 //usage:     "\n    -b  Omit bad block from the dump"
 //usage:     "\n    -s ADDR Start address"
@@ -132 +130 @@
     }
 
-    fd = xopen(argv[0], O_RDWR);
+    fd = xopen(argv[0], IS_NANDWRITE ? O_RDWR : O_RDONLY);
     xioctl(fd, MEMGETINFO, &meminfo);
 
@@ -165 +163 @@
         if (tmp != blockstart) {
             /* bad block(s), advance mtdoffset */
-            if (IS_NANDDUMP & !(opts & OPT_b)) {
+            if (IS_NANDDUMP && !(opts & OPT_b)) {
                 int bad_len = MIN(tmp, end_addr) - mtdoffset;
-                dump_bad(&meminfo, bad_len, !(opts & OPT_o));
+                dump_bad(&meminfo, bad_len, opts & OPT_o);
             }
             mtdoffset = tmp;
@@ -185 +183 @@
             if (IS_NANDWRITE)
                 printf("Writing at 0x%08x\n", mtdoffset);
-            else if (mtdoffset > blockstart) {
+            else if (mtdoffset > blockstart && !(opts & OPT_b)) {
                 int bad_len = MIN(mtdoffset, limit) - blockstart;
-                dump_bad(&meminfo, bad_len, !(opts & OPT_o));
+                dump_bad(&meminfo, bad_len, opts & OPT_o);
             }
             if (mtdoffset >= limit)
@@ -213 +211 @@
         xwrite(output_fd, filebuf, meminfo_writesize);
 
-        if (IS_NANDDUMP && !(opts & OPT_o)) {
+        if (IS_NANDDUMP && (opts & OPT_o)) {
             /* Dump OOB data */
             oob.start = mtdoffset;