Fix dump of extra page.

On the last page, just the remaining data is dump, ignoring any
padding. However, a page is dumped like in every loop, resulting in an
extra page on the output file. Just dump an entire page when it isn't
the last one.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@cascardo.eti.br>

diff --git a/bootimg.c b/bootimg.c
index 77758c2..9ce6fb8 100644 (file)
--- a/bootimg.c
+++ b/bootimg.c
@@ -48,13 +48,14 @@ static int dump(int fd, size_t len, int pgsz, char *fname)
                                if (r != len)
                                        goto out;
                        }
                                if (r != len)
                                        goto out;
                        }

+               } else {
+                       r = read(fd, page, pgsz);
+                       if (r != pgsz)
+                               goto out;
+                       r = write(out, page, pgsz);
+                       if (r != pgsz)
+                               goto out;

                }
                }

-               r = read(fd, page, pgsz);
-               if (r != pgsz)
-                       goto out;
-               r = write(out, page, pgsz);
-               if (r != pgsz)
-                       goto out;

        }
        free(page);
        close(out);
        }
        free(page);
        close(out);