summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/sqfs/block_writer.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/sqfs/block_writer.c b/lib/sqfs/block_writer.c
index 17d045f..69a467a 100644
--- a/lib/sqfs/block_writer.c
+++ b/lib/sqfs/block_writer.c
@@ -187,15 +187,17 @@ static int write_data_block(sqfs_block_writer_t *base, void *user,
int err;
(void)user;
- if (flags & SQFS_BLK_FIRST_BLOCK) {
- wr->start = wr->file->get_size(wr->file);
- wr->file_start = wr->num_blocks;
-
+ if (flags & (SQFS_BLK_FIRST_BLOCK | SQFS_BLK_FRAGMENT_BLOCK)) {
if (flags & SQFS_BLK_ALIGN) {
err = align_file(wr);
if (err)
return err;
}
+
+ if (flags & SQFS_BLK_FIRST_BLOCK) {
+ wr->start = wr->file->get_size(wr->file);
+ wr->file_start = wr->num_blocks;
+ }
}
offset = wr->file->get_size(wr->file);
@@ -217,13 +219,15 @@ static int write_data_block(sqfs_block_writer_t *base, void *user,
wr->blocks_written = wr->num_blocks;
}
- if (flags & SQFS_BLK_LAST_BLOCK) {
- if (flags & SQFS_BLK_ALIGN) {
+ if (flags & SQFS_BLK_ALIGN) {
+ if (flags & (SQFS_BLK_LAST_BLOCK | SQFS_BLK_FRAGMENT_BLOCK)) {
err = align_file(wr);
if (err)
return err;
}
+ }
+ if (flags & SQFS_BLK_LAST_BLOCK) {
count = wr->num_blocks - wr->file_start;
if (count == 0) {