@@ -309,6 +309,7 @@ int main(int argc, char * const argv[])
bool eccstats = false;
unsigned char *readbuf = NULL, *oobbuf = NULL;
libmtd_t mtd_desc;
+ ssize_t written;
process_options(argc, argv);
@@ -441,12 +442,25 @@ int main(int argc, char * const argv[])
/* Write out page data */
if (pretty_print) {
for (i = 0; i < bs; i += PRETTY_ROW_SIZE) {
+ size_t to_write;
+
pretty_dump_to_buffer(readbuf + i, PRETTY_ROW_SIZE,
pretty_buf, PRETTY_BUF_LEN, true, canonical, ofs + i);
- write(ofd, pretty_buf, strlen(pretty_buf));
+
+ to_write = strlen(pretty_buf);
+ written = write(ofd, pretty_buf, to_write);
+ if (written != to_write) {
+ sys_errmsg("Unable to write to output");
+ goto closeall;
+ }
}
- } else
- write(ofd, readbuf, bs);
+ } else {
+ written = write(ofd, readbuf, bs);
+ if (written != bs) {
+ sys_errmsg("Unable to write to output");
+ goto closeall;
+ }
+ }
if (omitoob)
continue;
@@ -464,12 +478,25 @@ int main(int argc, char * const argv[])
/* Write out OOB data */
if (pretty_print) {
for (i = 0; i < mtd.oob_size; i += PRETTY_ROW_SIZE) {
+ size_t to_write;
+
pretty_dump_to_buffer(oobbuf + i, mtd.oob_size - i,
pretty_buf, PRETTY_BUF_LEN, false, canonical, 0);
- write(ofd, pretty_buf, strlen(pretty_buf));
+
+ to_write = strlen(pretty_buf);
+ written = write(ofd, pretty_buf, to_write);
+ if (written != to_write) {
+ sys_errmsg("Unable to write to output");
+ goto closeall;
+ }
}
- } else
- write(ofd, oobbuf, mtd.oob_size);
+ } else {
+ written = write(ofd, oobbuf, mtd.oob_size);
+ if (written != mtd.oob_size) {
+ sys_errmsg("Unable to write to output");
+ goto closeall;
+ }
+ }
}
/* Close the output file and MTD device, free memory */
If we're unable to write to the output file, abort and cleary message the user. Otherwise broken/truncated dumps are created and a lot of time will be wasted... Not that I wasted some time with a truncated dump because nandump did not handle -ENOSPC on the customer's target... ;-) Signed-off-by: Richard Weinberger <richard@nod.at> --- nand-utils/nanddump.c | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-)