libsparse: Add .clang-format and reformat to google3 style
Bug: 78793464 Test: compiles Change-Id: I8e44ba77195a12fc2bac7d4276bbc4aa95149b31
This commit is contained in:
parent
5a75507795
commit
7b444f08c1
18 changed files with 1738 additions and 1921 deletions
1
libsparse/.clang-format
Symbolic link
1
libsparse/.clang-format
Symbolic link
|
@ -0,0 +1 @@
|
|||
../.clang-format-2
|
|
@ -25,8 +25,8 @@
|
|||
#include <unistd.h>
|
||||
|
||||
#include <sparse/sparse.h>
|
||||
#include "sparse_file.h"
|
||||
#include "backed_block.h"
|
||||
#include "sparse_file.h"
|
||||
|
||||
#ifndef O_BINARY
|
||||
#define O_BINARY 0
|
||||
|
@ -40,100 +40,98 @@
|
|||
#define off64_t off_t
|
||||
#endif
|
||||
|
||||
void usage()
|
||||
{
|
||||
fprintf(stderr, "Usage: append2simg <output> <input>\n");
|
||||
void usage() {
|
||||
fprintf(stderr, "Usage: append2simg <output> <input>\n");
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
int output;
|
||||
int output_block;
|
||||
char *output_path;
|
||||
struct sparse_file *sparse_output;
|
||||
int main(int argc, char* argv[]) {
|
||||
int output;
|
||||
int output_block;
|
||||
char* output_path;
|
||||
struct sparse_file* sparse_output;
|
||||
|
||||
int input;
|
||||
char *input_path;
|
||||
off64_t input_len;
|
||||
int input;
|
||||
char* input_path;
|
||||
off64_t input_len;
|
||||
|
||||
int tmp_fd;
|
||||
char *tmp_path;
|
||||
int tmp_fd;
|
||||
char* tmp_path;
|
||||
|
||||
int ret;
|
||||
int ret;
|
||||
|
||||
if (argc == 3) {
|
||||
output_path = argv[1];
|
||||
input_path = argv[2];
|
||||
} else {
|
||||
usage();
|
||||
exit(-1);
|
||||
}
|
||||
if (argc == 3) {
|
||||
output_path = argv[1];
|
||||
input_path = argv[2];
|
||||
} else {
|
||||
usage();
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
ret = asprintf(&tmp_path, "%s.append2simg", output_path);
|
||||
if (ret < 0) {
|
||||
fprintf(stderr, "Couldn't allocate filename\n");
|
||||
exit(-1);
|
||||
}
|
||||
ret = asprintf(&tmp_path, "%s.append2simg", output_path);
|
||||
if (ret < 0) {
|
||||
fprintf(stderr, "Couldn't allocate filename\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
output = open(output_path, O_RDWR | O_BINARY);
|
||||
if (output < 0) {
|
||||
fprintf(stderr, "Couldn't open output file (%s)\n", strerror(errno));
|
||||
exit(-1);
|
||||
}
|
||||
output = open(output_path, O_RDWR | O_BINARY);
|
||||
if (output < 0) {
|
||||
fprintf(stderr, "Couldn't open output file (%s)\n", strerror(errno));
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
sparse_output = sparse_file_import_auto(output, false, true);
|
||||
if (!sparse_output) {
|
||||
fprintf(stderr, "Couldn't import output file\n");
|
||||
exit(-1);
|
||||
}
|
||||
sparse_output = sparse_file_import_auto(output, false, true);
|
||||
if (!sparse_output) {
|
||||
fprintf(stderr, "Couldn't import output file\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
input = open(input_path, O_RDONLY | O_BINARY);
|
||||
if (input < 0) {
|
||||
fprintf(stderr, "Couldn't open input file (%s)\n", strerror(errno));
|
||||
exit(-1);
|
||||
}
|
||||
input = open(input_path, O_RDONLY | O_BINARY);
|
||||
if (input < 0) {
|
||||
fprintf(stderr, "Couldn't open input file (%s)\n", strerror(errno));
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
input_len = lseek64(input, 0, SEEK_END);
|
||||
if (input_len < 0) {
|
||||
fprintf(stderr, "Couldn't get input file length (%s)\n", strerror(errno));
|
||||
exit(-1);
|
||||
} else if (input_len % sparse_output->block_size) {
|
||||
fprintf(stderr, "Input file is not a multiple of the output file's block size");
|
||||
exit(-1);
|
||||
}
|
||||
lseek64(input, 0, SEEK_SET);
|
||||
input_len = lseek64(input, 0, SEEK_END);
|
||||
if (input_len < 0) {
|
||||
fprintf(stderr, "Couldn't get input file length (%s)\n", strerror(errno));
|
||||
exit(-1);
|
||||
} else if (input_len % sparse_output->block_size) {
|
||||
fprintf(stderr, "Input file is not a multiple of the output file's block size");
|
||||
exit(-1);
|
||||
}
|
||||
lseek64(input, 0, SEEK_SET);
|
||||
|
||||
output_block = sparse_output->len / sparse_output->block_size;
|
||||
if (sparse_file_add_fd(sparse_output, input, 0, input_len, output_block) < 0) {
|
||||
fprintf(stderr, "Couldn't add input file\n");
|
||||
exit(-1);
|
||||
}
|
||||
sparse_output->len += input_len;
|
||||
output_block = sparse_output->len / sparse_output->block_size;
|
||||
if (sparse_file_add_fd(sparse_output, input, 0, input_len, output_block) < 0) {
|
||||
fprintf(stderr, "Couldn't add input file\n");
|
||||
exit(-1);
|
||||
}
|
||||
sparse_output->len += input_len;
|
||||
|
||||
tmp_fd = open(tmp_path, O_WRONLY | O_CREAT | O_BINARY, 0664);
|
||||
if (tmp_fd < 0) {
|
||||
fprintf(stderr, "Couldn't open temporary file (%s)\n", strerror(errno));
|
||||
exit(-1);
|
||||
}
|
||||
tmp_fd = open(tmp_path, O_WRONLY | O_CREAT | O_BINARY, 0664);
|
||||
if (tmp_fd < 0) {
|
||||
fprintf(stderr, "Couldn't open temporary file (%s)\n", strerror(errno));
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
lseek64(output, 0, SEEK_SET);
|
||||
if (sparse_file_write(sparse_output, tmp_fd, false, true, false) < 0) {
|
||||
fprintf(stderr, "Failed to write sparse file\n");
|
||||
exit(-1);
|
||||
}
|
||||
lseek64(output, 0, SEEK_SET);
|
||||
if (sparse_file_write(sparse_output, tmp_fd, false, true, false) < 0) {
|
||||
fprintf(stderr, "Failed to write sparse file\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
sparse_file_destroy(sparse_output);
|
||||
close(tmp_fd);
|
||||
close(output);
|
||||
close(input);
|
||||
sparse_file_destroy(sparse_output);
|
||||
close(tmp_fd);
|
||||
close(output);
|
||||
close(input);
|
||||
|
||||
ret = rename(tmp_path, output_path);
|
||||
if (ret < 0) {
|
||||
fprintf(stderr, "Failed to rename temporary file (%s)\n", strerror(errno));
|
||||
exit(-1);
|
||||
}
|
||||
ret = rename(tmp_path, output_path);
|
||||
if (ret < 0) {
|
||||
fprintf(stderr, "Failed to rename temporary file (%s)\n", strerror(errno));
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
free(tmp_path);
|
||||
free(tmp_path);
|
||||
|
||||
exit(0);
|
||||
exit(0);
|
||||
}
|
||||
|
|
|
@ -24,382 +24,357 @@
|
|||
#include "sparse_defs.h"
|
||||
|
||||
struct backed_block {
|
||||
unsigned int block;
|
||||
unsigned int len;
|
||||
enum backed_block_type type;
|
||||
union {
|
||||
struct {
|
||||
void *data;
|
||||
} data;
|
||||
struct {
|
||||
char *filename;
|
||||
int64_t offset;
|
||||
} file;
|
||||
struct {
|
||||
int fd;
|
||||
int64_t offset;
|
||||
} fd;
|
||||
struct {
|
||||
uint32_t val;
|
||||
} fill;
|
||||
};
|
||||
struct backed_block *next;
|
||||
unsigned int block;
|
||||
unsigned int len;
|
||||
enum backed_block_type type;
|
||||
union {
|
||||
struct {
|
||||
void* data;
|
||||
} data;
|
||||
struct {
|
||||
char* filename;
|
||||
int64_t offset;
|
||||
} file;
|
||||
struct {
|
||||
int fd;
|
||||
int64_t offset;
|
||||
} fd;
|
||||
struct {
|
||||
uint32_t val;
|
||||
} fill;
|
||||
};
|
||||
struct backed_block* next;
|
||||
};
|
||||
|
||||
struct backed_block_list {
|
||||
struct backed_block *data_blocks;
|
||||
struct backed_block *last_used;
|
||||
unsigned int block_size;
|
||||
struct backed_block* data_blocks;
|
||||
struct backed_block* last_used;
|
||||
unsigned int block_size;
|
||||
};
|
||||
|
||||
struct backed_block *backed_block_iter_new(struct backed_block_list *bbl)
|
||||
{
|
||||
return bbl->data_blocks;
|
||||
struct backed_block* backed_block_iter_new(struct backed_block_list* bbl) {
|
||||
return bbl->data_blocks;
|
||||
}
|
||||
|
||||
struct backed_block *backed_block_iter_next(struct backed_block *bb)
|
||||
{
|
||||
return bb->next;
|
||||
struct backed_block* backed_block_iter_next(struct backed_block* bb) {
|
||||
return bb->next;
|
||||
}
|
||||
|
||||
unsigned int backed_block_len(struct backed_block *bb)
|
||||
{
|
||||
return bb->len;
|
||||
unsigned int backed_block_len(struct backed_block* bb) {
|
||||
return bb->len;
|
||||
}
|
||||
|
||||
unsigned int backed_block_block(struct backed_block *bb)
|
||||
{
|
||||
return bb->block;
|
||||
unsigned int backed_block_block(struct backed_block* bb) {
|
||||
return bb->block;
|
||||
}
|
||||
|
||||
void *backed_block_data(struct backed_block *bb)
|
||||
{
|
||||
assert(bb->type == BACKED_BLOCK_DATA);
|
||||
return bb->data.data;
|
||||
void* backed_block_data(struct backed_block* bb) {
|
||||
assert(bb->type == BACKED_BLOCK_DATA);
|
||||
return bb->data.data;
|
||||
}
|
||||
|
||||
const char *backed_block_filename(struct backed_block *bb)
|
||||
{
|
||||
assert(bb->type == BACKED_BLOCK_FILE);
|
||||
return bb->file.filename;
|
||||
const char* backed_block_filename(struct backed_block* bb) {
|
||||
assert(bb->type == BACKED_BLOCK_FILE);
|
||||
return bb->file.filename;
|
||||
}
|
||||
|
||||
int backed_block_fd(struct backed_block *bb)
|
||||
{
|
||||
assert(bb->type == BACKED_BLOCK_FD);
|
||||
return bb->fd.fd;
|
||||
int backed_block_fd(struct backed_block* bb) {
|
||||
assert(bb->type == BACKED_BLOCK_FD);
|
||||
return bb->fd.fd;
|
||||
}
|
||||
|
||||
int64_t backed_block_file_offset(struct backed_block *bb)
|
||||
{
|
||||
assert(bb->type == BACKED_BLOCK_FILE || bb->type == BACKED_BLOCK_FD);
|
||||
if (bb->type == BACKED_BLOCK_FILE) {
|
||||
return bb->file.offset;
|
||||
} else { /* bb->type == BACKED_BLOCK_FD */
|
||||
return bb->fd.offset;
|
||||
}
|
||||
int64_t backed_block_file_offset(struct backed_block* bb) {
|
||||
assert(bb->type == BACKED_BLOCK_FILE || bb->type == BACKED_BLOCK_FD);
|
||||
if (bb->type == BACKED_BLOCK_FILE) {
|
||||
return bb->file.offset;
|
||||
} else { /* bb->type == BACKED_BLOCK_FD */
|
||||
return bb->fd.offset;
|
||||
}
|
||||
}
|
||||
|
||||
uint32_t backed_block_fill_val(struct backed_block *bb)
|
||||
{
|
||||
assert(bb->type == BACKED_BLOCK_FILL);
|
||||
return bb->fill.val;
|
||||
uint32_t backed_block_fill_val(struct backed_block* bb) {
|
||||
assert(bb->type == BACKED_BLOCK_FILL);
|
||||
return bb->fill.val;
|
||||
}
|
||||
|
||||
enum backed_block_type backed_block_type(struct backed_block *bb)
|
||||
{
|
||||
return bb->type;
|
||||
enum backed_block_type backed_block_type(struct backed_block* bb) {
|
||||
return bb->type;
|
||||
}
|
||||
|
||||
void backed_block_destroy(struct backed_block *bb)
|
||||
{
|
||||
if (bb->type == BACKED_BLOCK_FILE) {
|
||||
free(bb->file.filename);
|
||||
}
|
||||
void backed_block_destroy(struct backed_block* bb) {
|
||||
if (bb->type == BACKED_BLOCK_FILE) {
|
||||
free(bb->file.filename);
|
||||
}
|
||||
|
||||
free(bb);
|
||||
free(bb);
|
||||
}
|
||||
|
||||
struct backed_block_list *backed_block_list_new(unsigned int block_size)
|
||||
{
|
||||
struct backed_block_list *b = reinterpret_cast<backed_block_list*>(
|
||||
calloc(sizeof(struct backed_block_list), 1));
|
||||
b->block_size = block_size;
|
||||
return b;
|
||||
struct backed_block_list* backed_block_list_new(unsigned int block_size) {
|
||||
struct backed_block_list* b =
|
||||
reinterpret_cast<backed_block_list*>(calloc(sizeof(struct backed_block_list), 1));
|
||||
b->block_size = block_size;
|
||||
return b;
|
||||
}
|
||||
|
||||
void backed_block_list_destroy(struct backed_block_list *bbl)
|
||||
{
|
||||
if (bbl->data_blocks) {
|
||||
struct backed_block *bb = bbl->data_blocks;
|
||||
while (bb) {
|
||||
struct backed_block *next = bb->next;
|
||||
backed_block_destroy(bb);
|
||||
bb = next;
|
||||
}
|
||||
}
|
||||
void backed_block_list_destroy(struct backed_block_list* bbl) {
|
||||
if (bbl->data_blocks) {
|
||||
struct backed_block* bb = bbl->data_blocks;
|
||||
while (bb) {
|
||||
struct backed_block* next = bb->next;
|
||||
backed_block_destroy(bb);
|
||||
bb = next;
|
||||
}
|
||||
}
|
||||
|
||||
free(bbl);
|
||||
free(bbl);
|
||||
}
|
||||
|
||||
void backed_block_list_move(struct backed_block_list *from,
|
||||
struct backed_block_list *to, struct backed_block *start,
|
||||
struct backed_block *end)
|
||||
{
|
||||
struct backed_block *bb;
|
||||
void backed_block_list_move(struct backed_block_list* from, struct backed_block_list* to,
|
||||
struct backed_block* start, struct backed_block* end) {
|
||||
struct backed_block* bb;
|
||||
|
||||
if (start == NULL) {
|
||||
start = from->data_blocks;
|
||||
}
|
||||
if (start == NULL) {
|
||||
start = from->data_blocks;
|
||||
}
|
||||
|
||||
if (!end) {
|
||||
for (end = start; end && end->next; end = end->next)
|
||||
;
|
||||
}
|
||||
if (!end) {
|
||||
for (end = start; end && end->next; end = end->next)
|
||||
;
|
||||
}
|
||||
|
||||
if (start == NULL || end == NULL) {
|
||||
return;
|
||||
}
|
||||
if (start == NULL || end == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
from->last_used = NULL;
|
||||
to->last_used = NULL;
|
||||
if (from->data_blocks == start) {
|
||||
from->data_blocks = end->next;
|
||||
} else {
|
||||
for (bb = from->data_blocks; bb; bb = bb->next) {
|
||||
if (bb->next == start) {
|
||||
bb->next = end->next;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
from->last_used = NULL;
|
||||
to->last_used = NULL;
|
||||
if (from->data_blocks == start) {
|
||||
from->data_blocks = end->next;
|
||||
} else {
|
||||
for (bb = from->data_blocks; bb; bb = bb->next) {
|
||||
if (bb->next == start) {
|
||||
bb->next = end->next;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!to->data_blocks) {
|
||||
to->data_blocks = start;
|
||||
end->next = NULL;
|
||||
} else {
|
||||
for (bb = to->data_blocks; bb; bb = bb->next) {
|
||||
if (!bb->next || bb->next->block > start->block) {
|
||||
end->next = bb->next;
|
||||
bb->next = start;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!to->data_blocks) {
|
||||
to->data_blocks = start;
|
||||
end->next = NULL;
|
||||
} else {
|
||||
for (bb = to->data_blocks; bb; bb = bb->next) {
|
||||
if (!bb->next || bb->next->block > start->block) {
|
||||
end->next = bb->next;
|
||||
bb->next = start;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* may free b */
|
||||
static int merge_bb(struct backed_block_list *bbl,
|
||||
struct backed_block *a, struct backed_block *b)
|
||||
{
|
||||
unsigned int block_len;
|
||||
static int merge_bb(struct backed_block_list* bbl, struct backed_block* a, struct backed_block* b) {
|
||||
unsigned int block_len;
|
||||
|
||||
/* Block doesn't exist (possible if one block is the last block) */
|
||||
if (!a || !b) {
|
||||
return -EINVAL;
|
||||
}
|
||||
/* Block doesn't exist (possible if one block is the last block) */
|
||||
if (!a || !b) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
assert(a->block < b->block);
|
||||
assert(a->block < b->block);
|
||||
|
||||
/* Blocks are of different types */
|
||||
if (a->type != b->type) {
|
||||
return -EINVAL;
|
||||
}
|
||||
/* Blocks are of different types */
|
||||
if (a->type != b->type) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Blocks are not adjacent */
|
||||
block_len = a->len / bbl->block_size; /* rounds down */
|
||||
if (a->block + block_len != b->block) {
|
||||
return -EINVAL;
|
||||
}
|
||||
/* Blocks are not adjacent */
|
||||
block_len = a->len / bbl->block_size; /* rounds down */
|
||||
if (a->block + block_len != b->block) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
switch (a->type) {
|
||||
case BACKED_BLOCK_DATA:
|
||||
/* Don't support merging data for now */
|
||||
return -EINVAL;
|
||||
case BACKED_BLOCK_FILL:
|
||||
if (a->fill.val != b->fill.val) {
|
||||
return -EINVAL;
|
||||
}
|
||||
break;
|
||||
case BACKED_BLOCK_FILE:
|
||||
/* Already make sure b->type is BACKED_BLOCK_FILE */
|
||||
if (strcmp(a->file.filename, b->file.filename) ||
|
||||
a->file.offset + a->len != b->file.offset) {
|
||||
return -EINVAL;
|
||||
}
|
||||
break;
|
||||
case BACKED_BLOCK_FD:
|
||||
if (a->fd.fd != b->fd.fd ||
|
||||
a->fd.offset + a->len != b->fd.offset) {
|
||||
return -EINVAL;
|
||||
}
|
||||
break;
|
||||
}
|
||||
switch (a->type) {
|
||||
case BACKED_BLOCK_DATA:
|
||||
/* Don't support merging data for now */
|
||||
return -EINVAL;
|
||||
case BACKED_BLOCK_FILL:
|
||||
if (a->fill.val != b->fill.val) {
|
||||
return -EINVAL;
|
||||
}
|
||||
break;
|
||||
case BACKED_BLOCK_FILE:
|
||||
/* Already make sure b->type is BACKED_BLOCK_FILE */
|
||||
if (strcmp(a->file.filename, b->file.filename) || a->file.offset + a->len != b->file.offset) {
|
||||
return -EINVAL;
|
||||
}
|
||||
break;
|
||||
case BACKED_BLOCK_FD:
|
||||
if (a->fd.fd != b->fd.fd || a->fd.offset + a->len != b->fd.offset) {
|
||||
return -EINVAL;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
/* Blocks are compatible and adjacent, with a before b. Merge b into a,
|
||||
* and free b */
|
||||
a->len += b->len;
|
||||
a->next = b->next;
|
||||
/* Blocks are compatible and adjacent, with a before b. Merge b into a,
|
||||
* and free b */
|
||||
a->len += b->len;
|
||||
a->next = b->next;
|
||||
|
||||
backed_block_destroy(b);
|
||||
backed_block_destroy(b);
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int queue_bb(struct backed_block_list *bbl, struct backed_block *new_bb)
|
||||
{
|
||||
struct backed_block *bb;
|
||||
static int queue_bb(struct backed_block_list* bbl, struct backed_block* new_bb) {
|
||||
struct backed_block* bb;
|
||||
|
||||
if (bbl->data_blocks == NULL) {
|
||||
bbl->data_blocks = new_bb;
|
||||
return 0;
|
||||
}
|
||||
if (bbl->data_blocks == NULL) {
|
||||
bbl->data_blocks = new_bb;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (bbl->data_blocks->block > new_bb->block) {
|
||||
new_bb->next = bbl->data_blocks;
|
||||
bbl->data_blocks = new_bb;
|
||||
return 0;
|
||||
}
|
||||
if (bbl->data_blocks->block > new_bb->block) {
|
||||
new_bb->next = bbl->data_blocks;
|
||||
bbl->data_blocks = new_bb;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Optimization: blocks are mostly queued in sequence, so save the
|
||||
pointer to the last bb that was added, and start searching from
|
||||
there if the next block number is higher */
|
||||
if (bbl->last_used && new_bb->block > bbl->last_used->block)
|
||||
bb = bbl->last_used;
|
||||
else
|
||||
bb = bbl->data_blocks;
|
||||
bbl->last_used = new_bb;
|
||||
/* Optimization: blocks are mostly queued in sequence, so save the
|
||||
pointer to the last bb that was added, and start searching from
|
||||
there if the next block number is higher */
|
||||
if (bbl->last_used && new_bb->block > bbl->last_used->block)
|
||||
bb = bbl->last_used;
|
||||
else
|
||||
bb = bbl->data_blocks;
|
||||
bbl->last_used = new_bb;
|
||||
|
||||
for (; bb->next && bb->next->block < new_bb->block; bb = bb->next)
|
||||
;
|
||||
for (; bb->next && bb->next->block < new_bb->block; bb = bb->next)
|
||||
;
|
||||
|
||||
if (bb->next == NULL) {
|
||||
bb->next = new_bb;
|
||||
} else {
|
||||
new_bb->next = bb->next;
|
||||
bb->next = new_bb;
|
||||
}
|
||||
if (bb->next == NULL) {
|
||||
bb->next = new_bb;
|
||||
} else {
|
||||
new_bb->next = bb->next;
|
||||
bb->next = new_bb;
|
||||
}
|
||||
|
||||
merge_bb(bbl, new_bb, new_bb->next);
|
||||
if (!merge_bb(bbl, bb, new_bb)) {
|
||||
/* new_bb destroyed, point to retained as last_used */
|
||||
bbl->last_used = bb;
|
||||
}
|
||||
merge_bb(bbl, new_bb, new_bb->next);
|
||||
if (!merge_bb(bbl, bb, new_bb)) {
|
||||
/* new_bb destroyed, point to retained as last_used */
|
||||
bbl->last_used = bb;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Queues a fill block of memory to be written to the specified data blocks */
|
||||
int backed_block_add_fill(struct backed_block_list *bbl, unsigned int fill_val,
|
||||
unsigned int len, unsigned int block)
|
||||
{
|
||||
struct backed_block *bb = reinterpret_cast<backed_block*>(calloc(1, sizeof(struct backed_block)));
|
||||
if (bb == NULL) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
int backed_block_add_fill(struct backed_block_list* bbl, unsigned int fill_val, unsigned int len,
|
||||
unsigned int block) {
|
||||
struct backed_block* bb = reinterpret_cast<backed_block*>(calloc(1, sizeof(struct backed_block)));
|
||||
if (bb == NULL) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
bb->block = block;
|
||||
bb->len = len;
|
||||
bb->type = BACKED_BLOCK_FILL;
|
||||
bb->fill.val = fill_val;
|
||||
bb->next = NULL;
|
||||
bb->block = block;
|
||||
bb->len = len;
|
||||
bb->type = BACKED_BLOCK_FILL;
|
||||
bb->fill.val = fill_val;
|
||||
bb->next = NULL;
|
||||
|
||||
return queue_bb(bbl, bb);
|
||||
return queue_bb(bbl, bb);
|
||||
}
|
||||
|
||||
/* Queues a block of memory to be written to the specified data blocks */
|
||||
int backed_block_add_data(struct backed_block_list *bbl, void *data,
|
||||
unsigned int len, unsigned int block)
|
||||
{
|
||||
struct backed_block *bb = reinterpret_cast<backed_block*>(calloc(1, sizeof(struct backed_block)));
|
||||
if (bb == NULL) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
int backed_block_add_data(struct backed_block_list* bbl, void* data, unsigned int len,
|
||||
unsigned int block) {
|
||||
struct backed_block* bb = reinterpret_cast<backed_block*>(calloc(1, sizeof(struct backed_block)));
|
||||
if (bb == NULL) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
bb->block = block;
|
||||
bb->len = len;
|
||||
bb->type = BACKED_BLOCK_DATA;
|
||||
bb->data.data = data;
|
||||
bb->next = NULL;
|
||||
bb->block = block;
|
||||
bb->len = len;
|
||||
bb->type = BACKED_BLOCK_DATA;
|
||||
bb->data.data = data;
|
||||
bb->next = NULL;
|
||||
|
||||
return queue_bb(bbl, bb);
|
||||
return queue_bb(bbl, bb);
|
||||
}
|
||||
|
||||
/* Queues a chunk of a file on disk to be written to the specified data blocks */
|
||||
int backed_block_add_file(struct backed_block_list *bbl, const char *filename,
|
||||
int64_t offset, unsigned int len, unsigned int block)
|
||||
{
|
||||
struct backed_block *bb = reinterpret_cast<backed_block*>(calloc(1, sizeof(struct backed_block)));
|
||||
if (bb == NULL) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
int backed_block_add_file(struct backed_block_list* bbl, const char* filename, int64_t offset,
|
||||
unsigned int len, unsigned int block) {
|
||||
struct backed_block* bb = reinterpret_cast<backed_block*>(calloc(1, sizeof(struct backed_block)));
|
||||
if (bb == NULL) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
bb->block = block;
|
||||
bb->len = len;
|
||||
bb->type = BACKED_BLOCK_FILE;
|
||||
bb->file.filename = strdup(filename);
|
||||
bb->file.offset = offset;
|
||||
bb->next = NULL;
|
||||
bb->block = block;
|
||||
bb->len = len;
|
||||
bb->type = BACKED_BLOCK_FILE;
|
||||
bb->file.filename = strdup(filename);
|
||||
bb->file.offset = offset;
|
||||
bb->next = NULL;
|
||||
|
||||
return queue_bb(bbl, bb);
|
||||
return queue_bb(bbl, bb);
|
||||
}
|
||||
|
||||
/* Queues a chunk of a fd to be written to the specified data blocks */
|
||||
int backed_block_add_fd(struct backed_block_list *bbl, int fd, int64_t offset,
|
||||
unsigned int len, unsigned int block)
|
||||
{
|
||||
struct backed_block *bb = reinterpret_cast<backed_block*>(calloc(1, sizeof(struct backed_block)));
|
||||
if (bb == NULL) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
int backed_block_add_fd(struct backed_block_list* bbl, int fd, int64_t offset, unsigned int len,
|
||||
unsigned int block) {
|
||||
struct backed_block* bb = reinterpret_cast<backed_block*>(calloc(1, sizeof(struct backed_block)));
|
||||
if (bb == NULL) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
bb->block = block;
|
||||
bb->len = len;
|
||||
bb->type = BACKED_BLOCK_FD;
|
||||
bb->fd.fd = fd;
|
||||
bb->fd.offset = offset;
|
||||
bb->next = NULL;
|
||||
bb->block = block;
|
||||
bb->len = len;
|
||||
bb->type = BACKED_BLOCK_FD;
|
||||
bb->fd.fd = fd;
|
||||
bb->fd.offset = offset;
|
||||
bb->next = NULL;
|
||||
|
||||
return queue_bb(bbl, bb);
|
||||
return queue_bb(bbl, bb);
|
||||
}
|
||||
|
||||
int backed_block_split(struct backed_block_list *bbl, struct backed_block *bb,
|
||||
unsigned int max_len)
|
||||
{
|
||||
struct backed_block *new_bb;
|
||||
int backed_block_split(struct backed_block_list* bbl, struct backed_block* bb,
|
||||
unsigned int max_len) {
|
||||
struct backed_block* new_bb;
|
||||
|
||||
max_len = ALIGN_DOWN(max_len, bbl->block_size);
|
||||
max_len = ALIGN_DOWN(max_len, bbl->block_size);
|
||||
|
||||
if (bb->len <= max_len) {
|
||||
return 0;
|
||||
}
|
||||
if (bb->len <= max_len) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
new_bb = reinterpret_cast<backed_block*>(malloc(sizeof(struct backed_block)));
|
||||
if (new_bb == NULL) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
new_bb = reinterpret_cast<backed_block*>(malloc(sizeof(struct backed_block)));
|
||||
if (new_bb == NULL) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
*new_bb = *bb;
|
||||
*new_bb = *bb;
|
||||
|
||||
new_bb->len = bb->len - max_len;
|
||||
new_bb->block = bb->block + max_len / bbl->block_size;
|
||||
new_bb->next = bb->next;
|
||||
bb->next = new_bb;
|
||||
bb->len = max_len;
|
||||
new_bb->len = bb->len - max_len;
|
||||
new_bb->block = bb->block + max_len / bbl->block_size;
|
||||
new_bb->next = bb->next;
|
||||
bb->next = new_bb;
|
||||
bb->len = max_len;
|
||||
|
||||
switch (bb->type) {
|
||||
case BACKED_BLOCK_DATA:
|
||||
new_bb->data.data = (char *)bb->data.data + max_len;
|
||||
break;
|
||||
case BACKED_BLOCK_FILE:
|
||||
new_bb->file.offset += max_len;
|
||||
break;
|
||||
case BACKED_BLOCK_FD:
|
||||
new_bb->fd.offset += max_len;
|
||||
break;
|
||||
case BACKED_BLOCK_FILL:
|
||||
break;
|
||||
}
|
||||
switch (bb->type) {
|
||||
case BACKED_BLOCK_DATA:
|
||||
new_bb->data.data = (char*)bb->data.data + max_len;
|
||||
break;
|
||||
case BACKED_BLOCK_FILE:
|
||||
new_bb->file.offset += max_len;
|
||||
break;
|
||||
case BACKED_BLOCK_FD:
|
||||
new_bb->fd.offset += max_len;
|
||||
break;
|
||||
case BACKED_BLOCK_FILL:
|
||||
break;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -23,42 +23,40 @@ struct backed_block_list;
|
|||
struct backed_block;
|
||||
|
||||
enum backed_block_type {
|
||||
BACKED_BLOCK_DATA,
|
||||
BACKED_BLOCK_FILE,
|
||||
BACKED_BLOCK_FD,
|
||||
BACKED_BLOCK_FILL,
|
||||
BACKED_BLOCK_DATA,
|
||||
BACKED_BLOCK_FILE,
|
||||
BACKED_BLOCK_FD,
|
||||
BACKED_BLOCK_FILL,
|
||||
};
|
||||
|
||||
int backed_block_add_data(struct backed_block_list *bbl, void *data,
|
||||
unsigned int len, unsigned int block);
|
||||
int backed_block_add_fill(struct backed_block_list *bbl, unsigned int fill_val,
|
||||
unsigned int len, unsigned int block);
|
||||
int backed_block_add_file(struct backed_block_list *bbl, const char *filename,
|
||||
int64_t offset, unsigned int len, unsigned int block);
|
||||
int backed_block_add_fd(struct backed_block_list *bbl, int fd,
|
||||
int64_t offset, unsigned int len, unsigned int block);
|
||||
int backed_block_add_data(struct backed_block_list* bbl, void* data, unsigned int len,
|
||||
unsigned int block);
|
||||
int backed_block_add_fill(struct backed_block_list* bbl, unsigned int fill_val, unsigned int len,
|
||||
unsigned int block);
|
||||
int backed_block_add_file(struct backed_block_list* bbl, const char* filename, int64_t offset,
|
||||
unsigned int len, unsigned int block);
|
||||
int backed_block_add_fd(struct backed_block_list* bbl, int fd, int64_t offset, unsigned int len,
|
||||
unsigned int block);
|
||||
|
||||
struct backed_block *backed_block_iter_new(struct backed_block_list *bbl);
|
||||
struct backed_block *backed_block_iter_next(struct backed_block *bb);
|
||||
unsigned int backed_block_len(struct backed_block *bb);
|
||||
unsigned int backed_block_block(struct backed_block *bb);
|
||||
void *backed_block_data(struct backed_block *bb);
|
||||
const char *backed_block_filename(struct backed_block *bb);
|
||||
int backed_block_fd(struct backed_block *bb);
|
||||
int64_t backed_block_file_offset(struct backed_block *bb);
|
||||
uint32_t backed_block_fill_val(struct backed_block *bb);
|
||||
enum backed_block_type backed_block_type(struct backed_block *bb);
|
||||
int backed_block_split(struct backed_block_list *bbl, struct backed_block *bb,
|
||||
unsigned int max_len);
|
||||
struct backed_block* backed_block_iter_new(struct backed_block_list* bbl);
|
||||
struct backed_block* backed_block_iter_next(struct backed_block* bb);
|
||||
unsigned int backed_block_len(struct backed_block* bb);
|
||||
unsigned int backed_block_block(struct backed_block* bb);
|
||||
void* backed_block_data(struct backed_block* bb);
|
||||
const char* backed_block_filename(struct backed_block* bb);
|
||||
int backed_block_fd(struct backed_block* bb);
|
||||
int64_t backed_block_file_offset(struct backed_block* bb);
|
||||
uint32_t backed_block_fill_val(struct backed_block* bb);
|
||||
enum backed_block_type backed_block_type(struct backed_block* bb);
|
||||
int backed_block_split(struct backed_block_list* bbl, struct backed_block* bb, unsigned int max_len);
|
||||
|
||||
struct backed_block *backed_block_iter_new(struct backed_block_list *bbl);
|
||||
struct backed_block *backed_block_iter_next(struct backed_block *bb);
|
||||
struct backed_block* backed_block_iter_new(struct backed_block_list* bbl);
|
||||
struct backed_block* backed_block_iter_next(struct backed_block* bb);
|
||||
|
||||
struct backed_block_list *backed_block_list_new(unsigned int block_size);
|
||||
void backed_block_list_destroy(struct backed_block_list *bbl);
|
||||
struct backed_block_list* backed_block_list_new(unsigned int block_size);
|
||||
void backed_block_list_destroy(struct backed_block_list* bbl);
|
||||
|
||||
void backed_block_list_move(struct backed_block_list *from,
|
||||
struct backed_block_list *to, struct backed_block *start,
|
||||
struct backed_block *end);
|
||||
void backed_block_list_move(struct backed_block_list* from, struct backed_block_list* to,
|
||||
struct backed_block* start, struct backed_block* end);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#ifndef _LIBSPARSE_DEFS_H_
|
||||
|
||||
#ifndef __unused
|
||||
#define __unused __attribute__((__unused__))
|
||||
#define __unused __attribute__((__unused__))
|
||||
#endif
|
||||
|
||||
#endif /* _LIBSPARSE_DEFS_H_ */
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
@ -38,78 +37,76 @@
|
|||
#define off64_t off_t
|
||||
#endif
|
||||
|
||||
void usage()
|
||||
{
|
||||
fprintf(stderr, "Usage: img2simg <raw_image_file> <sparse_image_file> [<block_size>]\n");
|
||||
void usage() {
|
||||
fprintf(stderr, "Usage: img2simg <raw_image_file> <sparse_image_file> [<block_size>]\n");
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
int in;
|
||||
int out;
|
||||
int ret;
|
||||
struct sparse_file *s;
|
||||
unsigned int block_size = 4096;
|
||||
off64_t len;
|
||||
int main(int argc, char* argv[]) {
|
||||
int in;
|
||||
int out;
|
||||
int ret;
|
||||
struct sparse_file* s;
|
||||
unsigned int block_size = 4096;
|
||||
off64_t len;
|
||||
|
||||
if (argc < 3 || argc > 4) {
|
||||
usage();
|
||||
exit(-1);
|
||||
}
|
||||
if (argc < 3 || argc > 4) {
|
||||
usage();
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
if (argc == 4) {
|
||||
block_size = atoi(argv[3]);
|
||||
}
|
||||
if (argc == 4) {
|
||||
block_size = atoi(argv[3]);
|
||||
}
|
||||
|
||||
if (block_size < 1024 || block_size % 4 != 0) {
|
||||
usage();
|
||||
exit(-1);
|
||||
}
|
||||
if (block_size < 1024 || block_size % 4 != 0) {
|
||||
usage();
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "-") == 0) {
|
||||
in = STDIN_FILENO;
|
||||
} else {
|
||||
in = open(argv[1], O_RDONLY | O_BINARY);
|
||||
if (in < 0) {
|
||||
fprintf(stderr, "Cannot open input file %s\n", argv[1]);
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
if (strcmp(argv[1], "-") == 0) {
|
||||
in = STDIN_FILENO;
|
||||
} else {
|
||||
in = open(argv[1], O_RDONLY | O_BINARY);
|
||||
if (in < 0) {
|
||||
fprintf(stderr, "Cannot open input file %s\n", argv[1]);
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
|
||||
if (strcmp(argv[2], "-") == 0) {
|
||||
out = STDOUT_FILENO;
|
||||
} else {
|
||||
out = open(argv[2], O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0664);
|
||||
if (out < 0) {
|
||||
fprintf(stderr, "Cannot open output file %s\n", argv[2]);
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
if (strcmp(argv[2], "-") == 0) {
|
||||
out = STDOUT_FILENO;
|
||||
} else {
|
||||
out = open(argv[2], O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0664);
|
||||
if (out < 0) {
|
||||
fprintf(stderr, "Cannot open output file %s\n", argv[2]);
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
|
||||
len = lseek64(in, 0, SEEK_END);
|
||||
lseek64(in, 0, SEEK_SET);
|
||||
len = lseek64(in, 0, SEEK_END);
|
||||
lseek64(in, 0, SEEK_SET);
|
||||
|
||||
s = sparse_file_new(block_size, len);
|
||||
if (!s) {
|
||||
fprintf(stderr, "Failed to create sparse file\n");
|
||||
exit(-1);
|
||||
}
|
||||
s = sparse_file_new(block_size, len);
|
||||
if (!s) {
|
||||
fprintf(stderr, "Failed to create sparse file\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
sparse_file_verbose(s);
|
||||
ret = sparse_file_read(s, in, false, false);
|
||||
if (ret) {
|
||||
fprintf(stderr, "Failed to read file\n");
|
||||
exit(-1);
|
||||
}
|
||||
sparse_file_verbose(s);
|
||||
ret = sparse_file_read(s, in, false, false);
|
||||
if (ret) {
|
||||
fprintf(stderr, "Failed to read file\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
ret = sparse_file_write(s, out, false, true, false);
|
||||
if (ret) {
|
||||
fprintf(stderr, "Failed to write sparse file\n");
|
||||
exit(-1);
|
||||
}
|
||||
ret = sparse_file_write(s, out, false, true, false);
|
||||
if (ret) {
|
||||
fprintf(stderr, "Failed to write sparse file\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
close(in);
|
||||
close(out);
|
||||
close(in);
|
||||
close(out);
|
||||
|
||||
exit(0);
|
||||
exit(0);
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -25,23 +25,19 @@ extern "C" {
|
|||
|
||||
struct output_file;
|
||||
|
||||
struct output_file *output_file_open_fd(int fd, unsigned int block_size, int64_t len,
|
||||
int gz, int sparse, int chunks, int crc);
|
||||
struct output_file *output_file_open_callback(
|
||||
int (*write)(void *, const void *, size_t),
|
||||
void *priv, unsigned int block_size, int64_t len, int gz, int sparse,
|
||||
int chunks, int crc);
|
||||
int write_data_chunk(struct output_file *out, unsigned int len, void *data);
|
||||
int write_fill_chunk(struct output_file *out, unsigned int len,
|
||||
uint32_t fill_val);
|
||||
int write_file_chunk(struct output_file *out, unsigned int len,
|
||||
const char *file, int64_t offset);
|
||||
int write_fd_chunk(struct output_file *out, unsigned int len,
|
||||
int fd, int64_t offset);
|
||||
int write_skip_chunk(struct output_file *out, int64_t len);
|
||||
void output_file_close(struct output_file *out);
|
||||
struct output_file* output_file_open_fd(int fd, unsigned int block_size, int64_t len, int gz,
|
||||
int sparse, int chunks, int crc);
|
||||
struct output_file* output_file_open_callback(int (*write)(void*, const void*, size_t), void* priv,
|
||||
unsigned int block_size, int64_t len, int gz,
|
||||
int sparse, int chunks, int crc);
|
||||
int write_data_chunk(struct output_file* out, unsigned int len, void* data);
|
||||
int write_fill_chunk(struct output_file* out, unsigned int len, uint32_t fill_val);
|
||||
int write_file_chunk(struct output_file* out, unsigned int len, const char* file, int64_t offset);
|
||||
int write_fd_chunk(struct output_file* out, unsigned int len, int fd, int64_t offset);
|
||||
int write_skip_chunk(struct output_file* out, int64_t len);
|
||||
void output_file_close(struct output_file* out);
|
||||
|
||||
int read_all(int fd, void *buf, size_t len);
|
||||
int read_all(int fd, void* buf, size_t len);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
@ -30,61 +29,58 @@
|
|||
#define O_BINARY 0
|
||||
#endif
|
||||
|
||||
void usage()
|
||||
{
|
||||
void usage() {
|
||||
fprintf(stderr, "Usage: simg2img <sparse_image_files> <raw_image_file>\n");
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
int in;
|
||||
int out;
|
||||
int i;
|
||||
struct sparse_file *s;
|
||||
int main(int argc, char* argv[]) {
|
||||
int in;
|
||||
int out;
|
||||
int i;
|
||||
struct sparse_file* s;
|
||||
|
||||
if (argc < 3) {
|
||||
usage();
|
||||
exit(-1);
|
||||
}
|
||||
if (argc < 3) {
|
||||
usage();
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
out = open(argv[argc - 1], O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0664);
|
||||
if (out < 0) {
|
||||
fprintf(stderr, "Cannot open output file %s\n", argv[argc - 1]);
|
||||
exit(-1);
|
||||
}
|
||||
out = open(argv[argc - 1], O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0664);
|
||||
if (out < 0) {
|
||||
fprintf(stderr, "Cannot open output file %s\n", argv[argc - 1]);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
for (i = 1; i < argc - 1; i++) {
|
||||
if (strcmp(argv[i], "-") == 0) {
|
||||
in = STDIN_FILENO;
|
||||
} else {
|
||||
in = open(argv[i], O_RDONLY | O_BINARY);
|
||||
if (in < 0) {
|
||||
fprintf(stderr, "Cannot open input file %s\n", argv[i]);
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
for (i = 1; i < argc - 1; i++) {
|
||||
if (strcmp(argv[i], "-") == 0) {
|
||||
in = STDIN_FILENO;
|
||||
} else {
|
||||
in = open(argv[i], O_RDONLY | O_BINARY);
|
||||
if (in < 0) {
|
||||
fprintf(stderr, "Cannot open input file %s\n", argv[i]);
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
|
||||
s = sparse_file_import(in, true, false);
|
||||
if (!s) {
|
||||
fprintf(stderr, "Failed to read sparse file\n");
|
||||
exit(-1);
|
||||
}
|
||||
s = sparse_file_import(in, true, false);
|
||||
if (!s) {
|
||||
fprintf(stderr, "Failed to read sparse file\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
if (lseek(out, 0, SEEK_SET) == -1) {
|
||||
perror("lseek failed");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
if (lseek(out, 0, SEEK_SET) == -1) {
|
||||
perror("lseek failed");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (sparse_file_write(s, out, false, false, false) < 0) {
|
||||
fprintf(stderr, "Cannot write output file\n");
|
||||
exit(-1);
|
||||
}
|
||||
sparse_file_destroy(s);
|
||||
close(in);
|
||||
}
|
||||
if (sparse_file_write(s, out, false, false, false) < 0) {
|
||||
fprintf(stderr, "Cannot write output file\n");
|
||||
exit(-1);
|
||||
}
|
||||
sparse_file_destroy(s);
|
||||
close(in);
|
||||
}
|
||||
|
||||
close(out);
|
||||
close(out);
|
||||
|
||||
exit(0);
|
||||
exit(0);
|
||||
}
|
||||
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
@ -33,82 +32,80 @@
|
|||
#define O_BINARY 0
|
||||
#endif
|
||||
|
||||
void usage()
|
||||
{
|
||||
void usage() {
|
||||
fprintf(stderr, "Usage: simg2simg <sparse image file> <sparse_image_file> <max_size>\n");
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
int in;
|
||||
int out;
|
||||
int i;
|
||||
int ret;
|
||||
struct sparse_file *s;
|
||||
int64_t max_size;
|
||||
struct sparse_file **out_s;
|
||||
int files;
|
||||
char filename[4096];
|
||||
int main(int argc, char* argv[]) {
|
||||
int in;
|
||||
int out;
|
||||
int i;
|
||||
int ret;
|
||||
struct sparse_file* s;
|
||||
int64_t max_size;
|
||||
struct sparse_file** out_s;
|
||||
int files;
|
||||
char filename[4096];
|
||||
|
||||
if (argc != 4) {
|
||||
usage();
|
||||
exit(-1);
|
||||
}
|
||||
if (argc != 4) {
|
||||
usage();
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
max_size = atoll(argv[3]);
|
||||
max_size = atoll(argv[3]);
|
||||
|
||||
in = open(argv[1], O_RDONLY | O_BINARY);
|
||||
if (in < 0) {
|
||||
fprintf(stderr, "Cannot open input file %s\n", argv[1]);
|
||||
exit(-1);
|
||||
}
|
||||
in = open(argv[1], O_RDONLY | O_BINARY);
|
||||
if (in < 0) {
|
||||
fprintf(stderr, "Cannot open input file %s\n", argv[1]);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
s = sparse_file_import(in, true, false);
|
||||
if (!s) {
|
||||
fprintf(stderr, "Failed to import sparse file\n");
|
||||
exit(-1);
|
||||
}
|
||||
s = sparse_file_import(in, true, false);
|
||||
if (!s) {
|
||||
fprintf(stderr, "Failed to import sparse file\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
files = sparse_file_resparse(s, max_size, NULL, 0);
|
||||
if (files < 0) {
|
||||
fprintf(stderr, "Failed to resparse\n");
|
||||
exit(-1);
|
||||
}
|
||||
files = sparse_file_resparse(s, max_size, NULL, 0);
|
||||
if (files < 0) {
|
||||
fprintf(stderr, "Failed to resparse\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
out_s = calloc(sizeof(struct sparse_file *), files);
|
||||
if (!out_s) {
|
||||
fprintf(stderr, "Failed to allocate sparse file array\n");
|
||||
exit(-1);
|
||||
}
|
||||
out_s = calloc(sizeof(struct sparse_file*), files);
|
||||
if (!out_s) {
|
||||
fprintf(stderr, "Failed to allocate sparse file array\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
files = sparse_file_resparse(s, max_size, out_s, files);
|
||||
if (files < 0) {
|
||||
fprintf(stderr, "Failed to resparse\n");
|
||||
exit(-1);
|
||||
}
|
||||
files = sparse_file_resparse(s, max_size, out_s, files);
|
||||
if (files < 0) {
|
||||
fprintf(stderr, "Failed to resparse\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
for (i = 0; i < files; i++) {
|
||||
ret = snprintf(filename, sizeof(filename), "%s.%d", argv[2], i);
|
||||
if (ret >= (int)sizeof(filename)) {
|
||||
fprintf(stderr, "Filename too long\n");
|
||||
exit(-1);
|
||||
}
|
||||
for (i = 0; i < files; i++) {
|
||||
ret = snprintf(filename, sizeof(filename), "%s.%d", argv[2], i);
|
||||
if (ret >= (int)sizeof(filename)) {
|
||||
fprintf(stderr, "Filename too long\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
out = open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0664);
|
||||
if (out < 0) {
|
||||
fprintf(stderr, "Cannot open output file %s\n", argv[2]);
|
||||
exit(-1);
|
||||
}
|
||||
out = open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0664);
|
||||
if (out < 0) {
|
||||
fprintf(stderr, "Cannot open output file %s\n", argv[2]);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
ret = sparse_file_write(out_s[i], out, false, true, false);
|
||||
if (ret) {
|
||||
fprintf(stderr, "Failed to write sparse file\n");
|
||||
exit(-1);
|
||||
}
|
||||
close(out);
|
||||
}
|
||||
ret = sparse_file_write(out_s[i], out, false, true, false);
|
||||
if (ret) {
|
||||
fprintf(stderr, "Failed to write sparse file\n");
|
||||
exit(-1);
|
||||
}
|
||||
close(out);
|
||||
}
|
||||
|
||||
close(in);
|
||||
close(in);
|
||||
|
||||
exit(0);
|
||||
exit(0);
|
||||
}
|
||||
|
|
|
@ -22,374 +22,327 @@
|
|||
#include "defs.h"
|
||||
#include "sparse_file.h"
|
||||
|
||||
#include "output_file.h"
|
||||
#include "backed_block.h"
|
||||
#include "output_file.h"
|
||||
#include "sparse_defs.h"
|
||||
#include "sparse_format.h"
|
||||
|
||||
struct sparse_file *sparse_file_new(unsigned int block_size, int64_t len)
|
||||
{
|
||||
struct sparse_file *s = reinterpret_cast<sparse_file*>(calloc(sizeof(struct sparse_file), 1));
|
||||
if (!s) {
|
||||
return NULL;
|
||||
}
|
||||
struct sparse_file* sparse_file_new(unsigned int block_size, int64_t len) {
|
||||
struct sparse_file* s = reinterpret_cast<sparse_file*>(calloc(sizeof(struct sparse_file), 1));
|
||||
if (!s) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
s->backed_block_list = backed_block_list_new(block_size);
|
||||
if (!s->backed_block_list) {
|
||||
free(s);
|
||||
return NULL;
|
||||
}
|
||||
s->backed_block_list = backed_block_list_new(block_size);
|
||||
if (!s->backed_block_list) {
|
||||
free(s);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
s->block_size = block_size;
|
||||
s->len = len;
|
||||
s->block_size = block_size;
|
||||
s->len = len;
|
||||
|
||||
return s;
|
||||
return s;
|
||||
}
|
||||
|
||||
void sparse_file_destroy(struct sparse_file *s)
|
||||
{
|
||||
backed_block_list_destroy(s->backed_block_list);
|
||||
free(s);
|
||||
void sparse_file_destroy(struct sparse_file* s) {
|
||||
backed_block_list_destroy(s->backed_block_list);
|
||||
free(s);
|
||||
}
|
||||
|
||||
int sparse_file_add_data(struct sparse_file *s,
|
||||
void *data, unsigned int len, unsigned int block)
|
||||
{
|
||||
return backed_block_add_data(s->backed_block_list, data, len, block);
|
||||
int sparse_file_add_data(struct sparse_file* s, void* data, unsigned int len, unsigned int block) {
|
||||
return backed_block_add_data(s->backed_block_list, data, len, block);
|
||||
}
|
||||
|
||||
int sparse_file_add_fill(struct sparse_file *s,
|
||||
uint32_t fill_val, unsigned int len, unsigned int block)
|
||||
{
|
||||
return backed_block_add_fill(s->backed_block_list, fill_val, len, block);
|
||||
int sparse_file_add_fill(struct sparse_file* s, uint32_t fill_val, unsigned int len,
|
||||
unsigned int block) {
|
||||
return backed_block_add_fill(s->backed_block_list, fill_val, len, block);
|
||||
}
|
||||
|
||||
int sparse_file_add_file(struct sparse_file *s,
|
||||
const char *filename, int64_t file_offset, unsigned int len,
|
||||
unsigned int block)
|
||||
{
|
||||
return backed_block_add_file(s->backed_block_list, filename, file_offset,
|
||||
len, block);
|
||||
int sparse_file_add_file(struct sparse_file* s, const char* filename, int64_t file_offset,
|
||||
unsigned int len, unsigned int block) {
|
||||
return backed_block_add_file(s->backed_block_list, filename, file_offset, len, block);
|
||||
}
|
||||
|
||||
int sparse_file_add_fd(struct sparse_file *s,
|
||||
int fd, int64_t file_offset, unsigned int len, unsigned int block)
|
||||
{
|
||||
return backed_block_add_fd(s->backed_block_list, fd, file_offset,
|
||||
len, block);
|
||||
int sparse_file_add_fd(struct sparse_file* s, int fd, int64_t file_offset, unsigned int len,
|
||||
unsigned int block) {
|
||||
return backed_block_add_fd(s->backed_block_list, fd, file_offset, len, block);
|
||||
}
|
||||
unsigned int sparse_count_chunks(struct sparse_file *s)
|
||||
{
|
||||
struct backed_block *bb;
|
||||
unsigned int last_block = 0;
|
||||
unsigned int chunks = 0;
|
||||
unsigned int sparse_count_chunks(struct sparse_file* s) {
|
||||
struct backed_block* bb;
|
||||
unsigned int last_block = 0;
|
||||
unsigned int chunks = 0;
|
||||
|
||||
for (bb = backed_block_iter_new(s->backed_block_list); bb;
|
||||
bb = backed_block_iter_next(bb)) {
|
||||
if (backed_block_block(bb) > last_block) {
|
||||
/* If there is a gap between chunks, add a skip chunk */
|
||||
chunks++;
|
||||
}
|
||||
chunks++;
|
||||
last_block = backed_block_block(bb) +
|
||||
DIV_ROUND_UP(backed_block_len(bb), s->block_size);
|
||||
}
|
||||
if (last_block < DIV_ROUND_UP(s->len, s->block_size)) {
|
||||
chunks++;
|
||||
}
|
||||
for (bb = backed_block_iter_new(s->backed_block_list); bb; bb = backed_block_iter_next(bb)) {
|
||||
if (backed_block_block(bb) > last_block) {
|
||||
/* If there is a gap between chunks, add a skip chunk */
|
||||
chunks++;
|
||||
}
|
||||
chunks++;
|
||||
last_block = backed_block_block(bb) + DIV_ROUND_UP(backed_block_len(bb), s->block_size);
|
||||
}
|
||||
if (last_block < DIV_ROUND_UP(s->len, s->block_size)) {
|
||||
chunks++;
|
||||
}
|
||||
|
||||
return chunks;
|
||||
return chunks;
|
||||
}
|
||||
|
||||
static int sparse_file_write_block(struct output_file *out,
|
||||
struct backed_block *bb)
|
||||
{
|
||||
int ret = -EINVAL;
|
||||
static int sparse_file_write_block(struct output_file* out, struct backed_block* bb) {
|
||||
int ret = -EINVAL;
|
||||
|
||||
switch (backed_block_type(bb)) {
|
||||
case BACKED_BLOCK_DATA:
|
||||
ret = write_data_chunk(out, backed_block_len(bb), backed_block_data(bb));
|
||||
break;
|
||||
case BACKED_BLOCK_FILE:
|
||||
ret = write_file_chunk(out, backed_block_len(bb),
|
||||
backed_block_filename(bb),
|
||||
backed_block_file_offset(bb));
|
||||
break;
|
||||
case BACKED_BLOCK_FD:
|
||||
ret = write_fd_chunk(out, backed_block_len(bb),
|
||||
backed_block_fd(bb),
|
||||
backed_block_file_offset(bb));
|
||||
break;
|
||||
case BACKED_BLOCK_FILL:
|
||||
ret = write_fill_chunk(out, backed_block_len(bb),
|
||||
backed_block_fill_val(bb));
|
||||
break;
|
||||
}
|
||||
switch (backed_block_type(bb)) {
|
||||
case BACKED_BLOCK_DATA:
|
||||
ret = write_data_chunk(out, backed_block_len(bb), backed_block_data(bb));
|
||||
break;
|
||||
case BACKED_BLOCK_FILE:
|
||||
ret = write_file_chunk(out, backed_block_len(bb), backed_block_filename(bb),
|
||||
backed_block_file_offset(bb));
|
||||
break;
|
||||
case BACKED_BLOCK_FD:
|
||||
ret = write_fd_chunk(out, backed_block_len(bb), backed_block_fd(bb),
|
||||
backed_block_file_offset(bb));
|
||||
break;
|
||||
case BACKED_BLOCK_FILL:
|
||||
ret = write_fill_chunk(out, backed_block_len(bb), backed_block_fill_val(bb));
|
||||
break;
|
||||
}
|
||||
|
||||
return ret;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int write_all_blocks(struct sparse_file *s, struct output_file *out)
|
||||
{
|
||||
struct backed_block *bb;
|
||||
unsigned int last_block = 0;
|
||||
int64_t pad;
|
||||
int ret = 0;
|
||||
static int write_all_blocks(struct sparse_file* s, struct output_file* out) {
|
||||
struct backed_block* bb;
|
||||
unsigned int last_block = 0;
|
||||
int64_t pad;
|
||||
int ret = 0;
|
||||
|
||||
for (bb = backed_block_iter_new(s->backed_block_list); bb;
|
||||
bb = backed_block_iter_next(bb)) {
|
||||
if (backed_block_block(bb) > last_block) {
|
||||
unsigned int blocks = backed_block_block(bb) - last_block;
|
||||
write_skip_chunk(out, (int64_t)blocks * s->block_size);
|
||||
}
|
||||
ret = sparse_file_write_block(out, bb);
|
||||
if (ret)
|
||||
return ret;
|
||||
last_block = backed_block_block(bb) +
|
||||
DIV_ROUND_UP(backed_block_len(bb), s->block_size);
|
||||
}
|
||||
for (bb = backed_block_iter_new(s->backed_block_list); bb; bb = backed_block_iter_next(bb)) {
|
||||
if (backed_block_block(bb) > last_block) {
|
||||
unsigned int blocks = backed_block_block(bb) - last_block;
|
||||
write_skip_chunk(out, (int64_t)blocks * s->block_size);
|
||||
}
|
||||
ret = sparse_file_write_block(out, bb);
|
||||
if (ret) return ret;
|
||||
last_block = backed_block_block(bb) + DIV_ROUND_UP(backed_block_len(bb), s->block_size);
|
||||
}
|
||||
|
||||
pad = s->len - (int64_t)last_block * s->block_size;
|
||||
assert(pad >= 0);
|
||||
if (pad > 0) {
|
||||
write_skip_chunk(out, pad);
|
||||
}
|
||||
pad = s->len - (int64_t)last_block * s->block_size;
|
||||
assert(pad >= 0);
|
||||
if (pad > 0) {
|
||||
write_skip_chunk(out, pad);
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sparse_file_write(struct sparse_file *s, int fd, bool gz, bool sparse,
|
||||
bool crc)
|
||||
{
|
||||
int ret;
|
||||
int chunks;
|
||||
struct output_file *out;
|
||||
int sparse_file_write(struct sparse_file* s, int fd, bool gz, bool sparse, bool crc) {
|
||||
int ret;
|
||||
int chunks;
|
||||
struct output_file* out;
|
||||
|
||||
chunks = sparse_count_chunks(s);
|
||||
out = output_file_open_fd(fd, s->block_size, s->len, gz, sparse, chunks, crc);
|
||||
chunks = sparse_count_chunks(s);
|
||||
out = output_file_open_fd(fd, s->block_size, s->len, gz, sparse, chunks, crc);
|
||||
|
||||
if (!out)
|
||||
return -ENOMEM;
|
||||
if (!out) return -ENOMEM;
|
||||
|
||||
ret = write_all_blocks(s, out);
|
||||
ret = write_all_blocks(s, out);
|
||||
|
||||
output_file_close(out);
|
||||
output_file_close(out);
|
||||
|
||||
return ret;
|
||||
return ret;
|
||||
}
|
||||
|
||||
int sparse_file_callback(struct sparse_file *s, bool sparse, bool crc,
|
||||
int (*write)(void *priv, const void *data, size_t len), void *priv)
|
||||
{
|
||||
int ret;
|
||||
int chunks;
|
||||
struct output_file *out;
|
||||
int sparse_file_callback(struct sparse_file* s, bool sparse, bool crc,
|
||||
int (*write)(void* priv, const void* data, size_t len), void* priv) {
|
||||
int ret;
|
||||
int chunks;
|
||||
struct output_file* out;
|
||||
|
||||
chunks = sparse_count_chunks(s);
|
||||
out = output_file_open_callback(write, priv, s->block_size, s->len, false,
|
||||
sparse, chunks, crc);
|
||||
chunks = sparse_count_chunks(s);
|
||||
out = output_file_open_callback(write, priv, s->block_size, s->len, false, sparse, chunks, crc);
|
||||
|
||||
if (!out)
|
||||
return -ENOMEM;
|
||||
if (!out) return -ENOMEM;
|
||||
|
||||
ret = write_all_blocks(s, out);
|
||||
ret = write_all_blocks(s, out);
|
||||
|
||||
output_file_close(out);
|
||||
output_file_close(out);
|
||||
|
||||
return ret;
|
||||
return ret;
|
||||
}
|
||||
|
||||
struct chunk_data {
|
||||
void *priv;
|
||||
unsigned int block;
|
||||
unsigned int nr_blocks;
|
||||
int (*write)(void *priv, const void *data, size_t len,
|
||||
unsigned int block, unsigned int nr_blocks);
|
||||
void* priv;
|
||||
unsigned int block;
|
||||
unsigned int nr_blocks;
|
||||
int (*write)(void* priv, const void* data, size_t len, unsigned int block, unsigned int nr_blocks);
|
||||
};
|
||||
|
||||
static int foreach_chunk_write(void *priv, const void *data, size_t len)
|
||||
{
|
||||
struct chunk_data *chk = reinterpret_cast<chunk_data*>(priv);
|
||||
static int foreach_chunk_write(void* priv, const void* data, size_t len) {
|
||||
struct chunk_data* chk = reinterpret_cast<chunk_data*>(priv);
|
||||
|
||||
return chk->write(chk->priv, data, len, chk->block, chk->nr_blocks);
|
||||
return chk->write(chk->priv, data, len, chk->block, chk->nr_blocks);
|
||||
}
|
||||
|
||||
int sparse_file_foreach_chunk(struct sparse_file *s, bool sparse, bool crc,
|
||||
int (*write)(void *priv, const void *data, size_t len, unsigned int block,
|
||||
unsigned int nr_blocks),
|
||||
void *priv)
|
||||
{
|
||||
int ret;
|
||||
int chunks;
|
||||
struct chunk_data chk;
|
||||
struct output_file *out;
|
||||
struct backed_block *bb;
|
||||
int sparse_file_foreach_chunk(struct sparse_file* s, bool sparse, bool crc,
|
||||
int (*write)(void* priv, const void* data, size_t len,
|
||||
unsigned int block, unsigned int nr_blocks),
|
||||
void* priv) {
|
||||
int ret;
|
||||
int chunks;
|
||||
struct chunk_data chk;
|
||||
struct output_file* out;
|
||||
struct backed_block* bb;
|
||||
|
||||
chk.priv = priv;
|
||||
chk.write = write;
|
||||
chk.block = chk.nr_blocks = 0;
|
||||
chunks = sparse_count_chunks(s);
|
||||
out = output_file_open_callback(foreach_chunk_write, &chk,
|
||||
s->block_size, s->len, false, sparse,
|
||||
chunks, crc);
|
||||
chk.priv = priv;
|
||||
chk.write = write;
|
||||
chk.block = chk.nr_blocks = 0;
|
||||
chunks = sparse_count_chunks(s);
|
||||
out = output_file_open_callback(foreach_chunk_write, &chk, s->block_size, s->len, false, sparse,
|
||||
chunks, crc);
|
||||
|
||||
if (!out)
|
||||
return -ENOMEM;
|
||||
if (!out) return -ENOMEM;
|
||||
|
||||
for (bb = backed_block_iter_new(s->backed_block_list); bb;
|
||||
bb = backed_block_iter_next(bb)) {
|
||||
chk.block = backed_block_block(bb);
|
||||
chk.nr_blocks = (backed_block_len(bb) - 1) / s->block_size + 1;
|
||||
ret = sparse_file_write_block(out, bb);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
for (bb = backed_block_iter_new(s->backed_block_list); bb; bb = backed_block_iter_next(bb)) {
|
||||
chk.block = backed_block_block(bb);
|
||||
chk.nr_blocks = (backed_block_len(bb) - 1) / s->block_size + 1;
|
||||
ret = sparse_file_write_block(out, bb);
|
||||
if (ret) return ret;
|
||||
}
|
||||
|
||||
output_file_close(out);
|
||||
output_file_close(out);
|
||||
|
||||
return ret;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int out_counter_write(void *priv, const void *data __unused, size_t len)
|
||||
{
|
||||
int64_t *count = reinterpret_cast<int64_t*>(priv);
|
||||
*count += len;
|
||||
return 0;
|
||||
static int out_counter_write(void* priv, const void* data __unused, size_t len) {
|
||||
int64_t* count = reinterpret_cast<int64_t*>(priv);
|
||||
*count += len;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int64_t sparse_file_len(struct sparse_file *s, bool sparse, bool crc)
|
||||
{
|
||||
int ret;
|
||||
int chunks = sparse_count_chunks(s);
|
||||
int64_t count = 0;
|
||||
struct output_file *out;
|
||||
int64_t sparse_file_len(struct sparse_file* s, bool sparse, bool crc) {
|
||||
int ret;
|
||||
int chunks = sparse_count_chunks(s);
|
||||
int64_t count = 0;
|
||||
struct output_file* out;
|
||||
|
||||
out = output_file_open_callback(out_counter_write, &count,
|
||||
s->block_size, s->len, false, sparse, chunks, crc);
|
||||
if (!out) {
|
||||
return -1;
|
||||
}
|
||||
out = output_file_open_callback(out_counter_write, &count, s->block_size, s->len, false, sparse,
|
||||
chunks, crc);
|
||||
if (!out) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
ret = write_all_blocks(s, out);
|
||||
ret = write_all_blocks(s, out);
|
||||
|
||||
output_file_close(out);
|
||||
output_file_close(out);
|
||||
|
||||
if (ret < 0) {
|
||||
return -1;
|
||||
}
|
||||
if (ret < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return count;
|
||||
return count;
|
||||
}
|
||||
|
||||
unsigned int sparse_file_block_size(struct sparse_file *s)
|
||||
{
|
||||
return s->block_size;
|
||||
unsigned int sparse_file_block_size(struct sparse_file* s) {
|
||||
return s->block_size;
|
||||
}
|
||||
|
||||
static struct backed_block *move_chunks_up_to_len(struct sparse_file *from,
|
||||
struct sparse_file *to, unsigned int len)
|
||||
{
|
||||
int64_t count = 0;
|
||||
struct output_file *out_counter;
|
||||
struct backed_block *last_bb = NULL;
|
||||
struct backed_block *bb;
|
||||
struct backed_block *start;
|
||||
unsigned int last_block = 0;
|
||||
int64_t file_len = 0;
|
||||
int ret;
|
||||
static struct backed_block* move_chunks_up_to_len(struct sparse_file* from, struct sparse_file* to,
|
||||
unsigned int len) {
|
||||
int64_t count = 0;
|
||||
struct output_file* out_counter;
|
||||
struct backed_block* last_bb = NULL;
|
||||
struct backed_block* bb;
|
||||
struct backed_block* start;
|
||||
unsigned int last_block = 0;
|
||||
int64_t file_len = 0;
|
||||
int ret;
|
||||
|
||||
/*
|
||||
* overhead is sparse file header, the potential end skip
|
||||
* chunk and crc chunk.
|
||||
*/
|
||||
int overhead = sizeof(sparse_header_t) + 2 * sizeof(chunk_header_t) +
|
||||
sizeof(uint32_t);
|
||||
len -= overhead;
|
||||
/*
|
||||
* overhead is sparse file header, the potential end skip
|
||||
* chunk and crc chunk.
|
||||
*/
|
||||
int overhead = sizeof(sparse_header_t) + 2 * sizeof(chunk_header_t) + sizeof(uint32_t);
|
||||
len -= overhead;
|
||||
|
||||
start = backed_block_iter_new(from->backed_block_list);
|
||||
out_counter = output_file_open_callback(out_counter_write, &count,
|
||||
to->block_size, to->len, false, true, 0, false);
|
||||
if (!out_counter) {
|
||||
return NULL;
|
||||
}
|
||||
start = backed_block_iter_new(from->backed_block_list);
|
||||
out_counter = output_file_open_callback(out_counter_write, &count, to->block_size, to->len, false,
|
||||
true, 0, false);
|
||||
if (!out_counter) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
for (bb = start; bb; bb = backed_block_iter_next(bb)) {
|
||||
count = 0;
|
||||
if (backed_block_block(bb) > last_block)
|
||||
count += sizeof(chunk_header_t);
|
||||
last_block = backed_block_block(bb) +
|
||||
DIV_ROUND_UP(backed_block_len(bb), to->block_size);
|
||||
for (bb = start; bb; bb = backed_block_iter_next(bb)) {
|
||||
count = 0;
|
||||
if (backed_block_block(bb) > last_block) count += sizeof(chunk_header_t);
|
||||
last_block = backed_block_block(bb) + DIV_ROUND_UP(backed_block_len(bb), to->block_size);
|
||||
|
||||
/* will call out_counter_write to update count */
|
||||
ret = sparse_file_write_block(out_counter, bb);
|
||||
if (ret) {
|
||||
bb = NULL;
|
||||
goto out;
|
||||
}
|
||||
if (file_len + count > len) {
|
||||
/*
|
||||
* If the remaining available size is more than 1/8th of the
|
||||
* requested size, split the chunk. Results in sparse files that
|
||||
* are at least 7/8ths of the requested size
|
||||
*/
|
||||
file_len += sizeof(chunk_header_t);
|
||||
if (!last_bb || (len - file_len > (len / 8))) {
|
||||
backed_block_split(from->backed_block_list, bb, len - file_len);
|
||||
last_bb = bb;
|
||||
}
|
||||
goto move;
|
||||
}
|
||||
file_len += count;
|
||||
last_bb = bb;
|
||||
}
|
||||
/* will call out_counter_write to update count */
|
||||
ret = sparse_file_write_block(out_counter, bb);
|
||||
if (ret) {
|
||||
bb = NULL;
|
||||
goto out;
|
||||
}
|
||||
if (file_len + count > len) {
|
||||
/*
|
||||
* If the remaining available size is more than 1/8th of the
|
||||
* requested size, split the chunk. Results in sparse files that
|
||||
* are at least 7/8ths of the requested size
|
||||
*/
|
||||
file_len += sizeof(chunk_header_t);
|
||||
if (!last_bb || (len - file_len > (len / 8))) {
|
||||
backed_block_split(from->backed_block_list, bb, len - file_len);
|
||||
last_bb = bb;
|
||||
}
|
||||
goto move;
|
||||
}
|
||||
file_len += count;
|
||||
last_bb = bb;
|
||||
}
|
||||
|
||||
move:
|
||||
backed_block_list_move(from->backed_block_list,
|
||||
to->backed_block_list, start, last_bb);
|
||||
backed_block_list_move(from->backed_block_list, to->backed_block_list, start, last_bb);
|
||||
|
||||
out:
|
||||
output_file_close(out_counter);
|
||||
output_file_close(out_counter);
|
||||
|
||||
return bb;
|
||||
return bb;
|
||||
}
|
||||
|
||||
int sparse_file_resparse(struct sparse_file *in_s, unsigned int max_len,
|
||||
struct sparse_file **out_s, int out_s_count)
|
||||
{
|
||||
struct backed_block *bb;
|
||||
struct sparse_file *s;
|
||||
struct sparse_file *tmp;
|
||||
int c = 0;
|
||||
int sparse_file_resparse(struct sparse_file* in_s, unsigned int max_len, struct sparse_file** out_s,
|
||||
int out_s_count) {
|
||||
struct backed_block* bb;
|
||||
struct sparse_file* s;
|
||||
struct sparse_file* tmp;
|
||||
int c = 0;
|
||||
|
||||
tmp = sparse_file_new(in_s->block_size, in_s->len);
|
||||
if (!tmp) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
tmp = sparse_file_new(in_s->block_size, in_s->len);
|
||||
if (!tmp) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
do {
|
||||
s = sparse_file_new(in_s->block_size, in_s->len);
|
||||
do {
|
||||
s = sparse_file_new(in_s->block_size, in_s->len);
|
||||
|
||||
bb = move_chunks_up_to_len(in_s, s, max_len);
|
||||
bb = move_chunks_up_to_len(in_s, s, max_len);
|
||||
|
||||
if (c < out_s_count) {
|
||||
out_s[c] = s;
|
||||
} else {
|
||||
backed_block_list_move(s->backed_block_list, tmp->backed_block_list,
|
||||
NULL, NULL);
|
||||
sparse_file_destroy(s);
|
||||
}
|
||||
c++;
|
||||
} while (bb);
|
||||
if (c < out_s_count) {
|
||||
out_s[c] = s;
|
||||
} else {
|
||||
backed_block_list_move(s->backed_block_list, tmp->backed_block_list, NULL, NULL);
|
||||
sparse_file_destroy(s);
|
||||
}
|
||||
c++;
|
||||
} while (bb);
|
||||
|
||||
backed_block_list_move(tmp->backed_block_list, in_s->backed_block_list,
|
||||
NULL, NULL);
|
||||
backed_block_list_move(tmp->backed_block_list, in_s->backed_block_list, NULL, NULL);
|
||||
|
||||
sparse_file_destroy(tmp);
|
||||
sparse_file_destroy(tmp);
|
||||
|
||||
return c;
|
||||
return c;
|
||||
}
|
||||
|
||||
void sparse_file_verbose(struct sparse_file *s)
|
||||
{
|
||||
s->verbose = true;
|
||||
void sparse_file_verbose(struct sparse_file* s) {
|
||||
s->verbose = true;
|
||||
}
|
||||
|
|
|
@ -47,50 +47,38 @@
|
|||
#include <stdio.h>
|
||||
|
||||
static uint32_t crc32_tab[] = {
|
||||
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
|
||||
0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
|
||||
0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
|
||||
0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
|
||||
0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
|
||||
0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
|
||||
0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
|
||||
0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
|
||||
0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
|
||||
0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
|
||||
0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
|
||||
0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
|
||||
0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
|
||||
0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
|
||||
0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
|
||||
0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
|
||||
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
|
||||
0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
|
||||
0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
|
||||
0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
|
||||
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
|
||||
0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
|
||||
0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
|
||||
0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
|
||||
0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
|
||||
0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
|
||||
0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
|
||||
0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
|
||||
0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
|
||||
0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
|
||||
0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
|
||||
0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
|
||||
0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
|
||||
0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
|
||||
0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
|
||||
0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
|
||||
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
|
||||
0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
|
||||
0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
|
||||
0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
|
||||
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
|
||||
0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
|
||||
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
|
||||
};
|
||||
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
|
||||
0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
|
||||
0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
|
||||
0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
|
||||
0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
|
||||
0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
|
||||
0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
|
||||
0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
|
||||
0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
|
||||
0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
|
||||
0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
|
||||
0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
|
||||
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
|
||||
0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
|
||||
0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
|
||||
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
|
||||
0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
|
||||
0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
|
||||
0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
|
||||
0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
|
||||
0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
|
||||
0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
|
||||
0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
|
||||
0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
|
||||
0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
|
||||
0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
|
||||
0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
|
||||
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
|
||||
0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
|
||||
0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
|
||||
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
|
||||
0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d};
|
||||
|
||||
/*
|
||||
* A function that calculates the CRC-32 based on the table above is
|
||||
|
@ -99,14 +87,11 @@ static uint32_t crc32_tab[] = {
|
|||
* in sys/libkern.h, where it can be inlined.
|
||||
*/
|
||||
|
||||
uint32_t sparse_crc32(uint32_t crc_in, const void *buf, size_t size)
|
||||
{
|
||||
const uint8_t *p = reinterpret_cast<const uint8_t*>(buf);
|
||||
uint32_t crc;
|
||||
uint32_t sparse_crc32(uint32_t crc_in, const void* buf, size_t size) {
|
||||
const uint8_t* p = reinterpret_cast<const uint8_t*>(buf);
|
||||
uint32_t crc;
|
||||
|
||||
crc = crc_in ^ ~0U;
|
||||
while (size--)
|
||||
crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8);
|
||||
return crc ^ ~0U;
|
||||
crc = crc_in ^ ~0U;
|
||||
while (size--) crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8);
|
||||
return crc ^ ~0U;
|
||||
}
|
||||
|
||||
|
|
|
@ -19,6 +19,6 @@
|
|||
|
||||
#include <stdint.h>
|
||||
|
||||
uint32_t sparse_crc32(uint32_t crc, const void *buf, size_t size);
|
||||
uint32_t sparse_crc32(uint32_t crc, const void* buf, size_t size);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -39,11 +39,14 @@ typedef unsigned int u32;
|
|||
typedef unsigned short int u16;
|
||||
typedef unsigned char u8;
|
||||
|
||||
#define DIV_ROUND_UP(x, y) (((x) + (y) - 1)/(y))
|
||||
#define ALIGN(x, y) ((y) * DIV_ROUND_UP((x), (y)))
|
||||
#define DIV_ROUND_UP(x, y) (((x) + (y)-1) / (y))
|
||||
#define ALIGN(x, y) ((y)*DIV_ROUND_UP((x), (y)))
|
||||
#define ALIGN_DOWN(x, y) ((y) * ((x) / (y)))
|
||||
|
||||
#define error(fmt, args...) do { fprintf(stderr, "error: %s: " fmt "\n", __func__, ## args); } while (0)
|
||||
#define error(fmt, args...) \
|
||||
do { \
|
||||
fprintf(stderr, "error: %s: " fmt "\n", __func__, ##args); \
|
||||
} while (0)
|
||||
#define error_errno(s, args...) error(s ": %s", ##args, strerror(errno))
|
||||
|
||||
#endif
|
||||
|
|
|
@ -20,14 +20,13 @@
|
|||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
|
||||
void sparse_default_print(const char *fmt, ...)
|
||||
{
|
||||
va_list argp;
|
||||
void sparse_default_print(const char* fmt, ...) {
|
||||
va_list argp;
|
||||
|
||||
va_start(argp, fmt);
|
||||
vfprintf(stderr, fmt, argp);
|
||||
va_end(argp);
|
||||
va_start(argp, fmt);
|
||||
vfprintf(stderr, fmt, argp);
|
||||
va_end(argp);
|
||||
}
|
||||
|
||||
void (*sparse_print_error)(const char *fmt, ...) = sparse_default_print;
|
||||
void (*sparse_print_verbose)(const char *fmt, ...) = sparse_default_print;
|
||||
void (*sparse_print_error)(const char* fmt, ...) = sparse_default_print;
|
||||
void (*sparse_print_verbose)(const char* fmt, ...) = sparse_default_print;
|
||||
|
|
|
@ -24,12 +24,12 @@ extern "C" {
|
|||
#include <sparse/sparse.h>
|
||||
|
||||
struct sparse_file {
|
||||
unsigned int block_size;
|
||||
int64_t len;
|
||||
bool verbose;
|
||||
unsigned int block_size;
|
||||
int64_t len;
|
||||
bool verbose;
|
||||
|
||||
struct backed_block_list *backed_block_list;
|
||||
struct output_file *out;
|
||||
struct backed_block_list* backed_block_list;
|
||||
struct output_file* out;
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
@ -23,31 +23,31 @@ extern "C" {
|
|||
#endif
|
||||
|
||||
typedef struct sparse_header {
|
||||
__le32 magic; /* 0xed26ff3a */
|
||||
__le16 major_version; /* (0x1) - reject images with higher major versions */
|
||||
__le16 minor_version; /* (0x0) - allow images with higer minor versions */
|
||||
__le16 file_hdr_sz; /* 28 bytes for first revision of the file format */
|
||||
__le16 chunk_hdr_sz; /* 12 bytes for first revision of the file format */
|
||||
__le32 blk_sz; /* block size in bytes, must be a multiple of 4 (4096) */
|
||||
__le32 total_blks; /* total blocks in the non-sparse output image */
|
||||
__le32 total_chunks; /* total chunks in the sparse input image */
|
||||
__le32 image_checksum; /* CRC32 checksum of the original data, counting "don't care" */
|
||||
/* as 0. Standard 802.3 polynomial, use a Public Domain */
|
||||
/* table implementation */
|
||||
__le32 magic; /* 0xed26ff3a */
|
||||
__le16 major_version; /* (0x1) - reject images with higher major versions */
|
||||
__le16 minor_version; /* (0x0) - allow images with higer minor versions */
|
||||
__le16 file_hdr_sz; /* 28 bytes for first revision of the file format */
|
||||
__le16 chunk_hdr_sz; /* 12 bytes for first revision of the file format */
|
||||
__le32 blk_sz; /* block size in bytes, must be a multiple of 4 (4096) */
|
||||
__le32 total_blks; /* total blocks in the non-sparse output image */
|
||||
__le32 total_chunks; /* total chunks in the sparse input image */
|
||||
__le32 image_checksum; /* CRC32 checksum of the original data, counting "don't care" */
|
||||
/* as 0. Standard 802.3 polynomial, use a Public Domain */
|
||||
/* table implementation */
|
||||
} sparse_header_t;
|
||||
|
||||
#define SPARSE_HEADER_MAGIC 0xed26ff3a
|
||||
#define SPARSE_HEADER_MAGIC 0xed26ff3a
|
||||
|
||||
#define CHUNK_TYPE_RAW 0xCAC1
|
||||
#define CHUNK_TYPE_FILL 0xCAC2
|
||||
#define CHUNK_TYPE_DONT_CARE 0xCAC3
|
||||
#define CHUNK_TYPE_CRC32 0xCAC4
|
||||
#define CHUNK_TYPE_RAW 0xCAC1
|
||||
#define CHUNK_TYPE_FILL 0xCAC2
|
||||
#define CHUNK_TYPE_DONT_CARE 0xCAC3
|
||||
#define CHUNK_TYPE_CRC32 0xCAC4
|
||||
|
||||
typedef struct chunk_header {
|
||||
__le16 chunk_type; /* 0xCAC1 -> raw; 0xCAC2 -> fill; 0xCAC3 -> don't care */
|
||||
__le16 reserved1;
|
||||
__le32 chunk_sz; /* in blocks in output image */
|
||||
__le32 total_sz; /* in bytes of chunk input file including chunk header and data */
|
||||
__le16 chunk_type; /* 0xCAC1 -> raw; 0xCAC2 -> fill; 0xCAC3 -> don't care */
|
||||
__le16 reserved1;
|
||||
__le32 chunk_sz; /* in blocks in output image */
|
||||
__le32 total_sz; /* in bytes of chunk input file including chunk header and data */
|
||||
} chunk_header_t;
|
||||
|
||||
/* Following a Raw or Fill or CRC32 chunk is data.
|
||||
|
|
|
@ -17,16 +17,16 @@
|
|||
#define _FILE_OFFSET_BITS 64
|
||||
#define _LARGEFILE64_SOURCE 1
|
||||
|
||||
#include <algorithm>
|
||||
#include <inttypes.h>
|
||||
#include <fcntl.h>
|
||||
#include <inttypes.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <string>
|
||||
#include <unistd.h>
|
||||
#include <algorithm>
|
||||
#include <string>
|
||||
|
||||
#include <sparse/sparse.h>
|
||||
|
||||
|
@ -37,563 +37,541 @@
|
|||
#include "sparse_file.h"
|
||||
#include "sparse_format.h"
|
||||
|
||||
|
||||
#if defined(__APPLE__) && defined(__MACH__)
|
||||
#define lseek64 lseek
|
||||
#define off64_t off_t
|
||||
#endif
|
||||
|
||||
#define SPARSE_HEADER_MAJOR_VER 1
|
||||
#define SPARSE_HEADER_LEN (sizeof(sparse_header_t))
|
||||
#define SPARSE_HEADER_LEN (sizeof(sparse_header_t))
|
||||
#define CHUNK_HEADER_LEN (sizeof(chunk_header_t))
|
||||
|
||||
static constexpr int64_t COPY_BUF_SIZE = 1024 * 1024;
|
||||
static char *copybuf;
|
||||
static char* copybuf;
|
||||
|
||||
static std::string ErrorString(int err)
|
||||
{
|
||||
if (err == -EOVERFLOW) return "EOF while reading file";
|
||||
if (err == -EINVAL) return "Invalid sparse file format";
|
||||
if (err == -ENOMEM) return "Failed allocation while reading file";
|
||||
return android::base::StringPrintf("Unknown error %d", err);
|
||||
static std::string ErrorString(int err) {
|
||||
if (err == -EOVERFLOW) return "EOF while reading file";
|
||||
if (err == -EINVAL) return "Invalid sparse file format";
|
||||
if (err == -ENOMEM) return "Failed allocation while reading file";
|
||||
return android::base::StringPrintf("Unknown error %d", err);
|
||||
}
|
||||
|
||||
class SparseFileSource {
|
||||
public:
|
||||
/* Seeks the source ahead by the given offset. */
|
||||
virtual void Seek(int64_t offset) = 0;
|
||||
public:
|
||||
/* Seeks the source ahead by the given offset. */
|
||||
virtual void Seek(int64_t offset) = 0;
|
||||
|
||||
/* Return the current offset. */
|
||||
virtual int64_t GetOffset() = 0;
|
||||
/* Return the current offset. */
|
||||
virtual int64_t GetOffset() = 0;
|
||||
|
||||
/* Set the current offset. Return 0 if successful. */
|
||||
virtual int SetOffset(int64_t offset) = 0;
|
||||
/* Set the current offset. Return 0 if successful. */
|
||||
virtual int SetOffset(int64_t offset) = 0;
|
||||
|
||||
/* Adds the given length from the current offset of the source to the file at the given
|
||||
* block. Return 0 if successful. */
|
||||
virtual int AddToSparseFile(struct sparse_file *s, int64_t len, unsigned int block) = 0;
|
||||
/* Adds the given length from the current offset of the source to the file at the given block.
|
||||
* Return 0 if successful. */
|
||||
virtual int AddToSparseFile(struct sparse_file* s, int64_t len, unsigned int block) = 0;
|
||||
|
||||
/* Get data of fixed size from the current offset and seek len bytes.
|
||||
* Return 0 if successful. */
|
||||
virtual int ReadValue(void *ptr, int len) = 0;
|
||||
/* Get data of fixed size from the current offset and seek len bytes. Return 0 if successful. */
|
||||
virtual int ReadValue(void* ptr, int len) = 0;
|
||||
|
||||
/* Find the crc32 of the next len bytes and seek ahead len bytes. Return 0 if successful. */
|
||||
virtual int GetCrc32(uint32_t *crc32, int64_t len) = 0;
|
||||
/* Find the crc32 of the next len bytes and seek ahead len bytes. Return 0 if successful. */
|
||||
virtual int GetCrc32(uint32_t* crc32, int64_t len) = 0;
|
||||
|
||||
virtual ~SparseFileSource() {};
|
||||
virtual ~SparseFileSource(){};
|
||||
};
|
||||
|
||||
class SparseFileFdSource : public SparseFileSource {
|
||||
private:
|
||||
int fd;
|
||||
public:
|
||||
SparseFileFdSource(int fd) : fd(fd) {}
|
||||
~SparseFileFdSource() override {}
|
||||
private:
|
||||
int fd;
|
||||
|
||||
void Seek(int64_t off) override {
|
||||
lseek64(fd, off, SEEK_CUR);
|
||||
}
|
||||
public:
|
||||
SparseFileFdSource(int fd) : fd(fd) {}
|
||||
~SparseFileFdSource() override {}
|
||||
|
||||
int64_t GetOffset() override {
|
||||
return lseek64(fd, 0, SEEK_CUR);
|
||||
}
|
||||
void Seek(int64_t off) override { lseek64(fd, off, SEEK_CUR); }
|
||||
|
||||
int SetOffset(int64_t offset) override {
|
||||
return lseek64(fd, offset, SEEK_SET) == offset ? 0 : -errno;
|
||||
}
|
||||
int64_t GetOffset() override { return lseek64(fd, 0, SEEK_CUR); }
|
||||
|
||||
int AddToSparseFile(struct sparse_file *s, int64_t len, unsigned int block) override {
|
||||
return sparse_file_add_fd(s, fd, GetOffset(), len, block);
|
||||
}
|
||||
int SetOffset(int64_t offset) override {
|
||||
return lseek64(fd, offset, SEEK_SET) == offset ? 0 : -errno;
|
||||
}
|
||||
|
||||
int ReadValue(void *ptr, int len) override {
|
||||
return read_all(fd, ptr, len);
|
||||
}
|
||||
int AddToSparseFile(struct sparse_file* s, int64_t len, unsigned int block) override {
|
||||
return sparse_file_add_fd(s, fd, GetOffset(), len, block);
|
||||
}
|
||||
|
||||
int GetCrc32(uint32_t *crc32, int64_t len) override {
|
||||
int chunk;
|
||||
int ret;
|
||||
while (len) {
|
||||
chunk = std::min(len, COPY_BUF_SIZE);
|
||||
ret = read_all(fd, copybuf, chunk);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
*crc32 = sparse_crc32(*crc32, copybuf, chunk);
|
||||
len -= chunk;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
int ReadValue(void* ptr, int len) override { return read_all(fd, ptr, len); }
|
||||
|
||||
int GetCrc32(uint32_t* crc32, int64_t len) override {
|
||||
int chunk;
|
||||
int ret;
|
||||
while (len) {
|
||||
chunk = std::min(len, COPY_BUF_SIZE);
|
||||
ret = read_all(fd, copybuf, chunk);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
*crc32 = sparse_crc32(*crc32, copybuf, chunk);
|
||||
len -= chunk;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
|
||||
class SparseFileBufSource : public SparseFileSource {
|
||||
private:
|
||||
char *buf;
|
||||
int64_t offset;
|
||||
public:
|
||||
SparseFileBufSource(char *buf) : buf(buf), offset(0) {}
|
||||
~SparseFileBufSource() override {}
|
||||
private:
|
||||
char* buf;
|
||||
int64_t offset;
|
||||
|
||||
void Seek(int64_t off) override {
|
||||
buf += off;
|
||||
offset += off;
|
||||
}
|
||||
public:
|
||||
SparseFileBufSource(char* buf) : buf(buf), offset(0) {}
|
||||
~SparseFileBufSource() override {}
|
||||
|
||||
int64_t GetOffset() override {
|
||||
return offset;
|
||||
}
|
||||
void Seek(int64_t off) override {
|
||||
buf += off;
|
||||
offset += off;
|
||||
}
|
||||
|
||||
int SetOffset(int64_t off) override {
|
||||
buf += off - offset;
|
||||
offset = off;
|
||||
return 0;
|
||||
}
|
||||
int64_t GetOffset() override { return offset; }
|
||||
|
||||
int AddToSparseFile(struct sparse_file *s, int64_t len, unsigned int block) override {
|
||||
return sparse_file_add_data(s, buf, len, block);
|
||||
}
|
||||
int SetOffset(int64_t off) override {
|
||||
buf += off - offset;
|
||||
offset = off;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int ReadValue(void *ptr, int len) override {
|
||||
memcpy(ptr, buf, len);
|
||||
Seek(len);
|
||||
return 0;
|
||||
}
|
||||
int AddToSparseFile(struct sparse_file* s, int64_t len, unsigned int block) override {
|
||||
return sparse_file_add_data(s, buf, len, block);
|
||||
}
|
||||
|
||||
int GetCrc32(uint32_t *crc32, int64_t len) override {
|
||||
*crc32 = sparse_crc32(*crc32, buf, len);
|
||||
Seek(len);
|
||||
return 0;
|
||||
}
|
||||
int ReadValue(void* ptr, int len) override {
|
||||
memcpy(ptr, buf, len);
|
||||
Seek(len);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int GetCrc32(uint32_t* crc32, int64_t len) override {
|
||||
*crc32 = sparse_crc32(*crc32, buf, len);
|
||||
Seek(len);
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
|
||||
static void verbose_error(bool verbose, int err, const char *fmt, ...)
|
||||
{
|
||||
if (!verbose) return;
|
||||
static void verbose_error(bool verbose, int err, const char* fmt, ...) {
|
||||
if (!verbose) return;
|
||||
|
||||
std::string msg = ErrorString(err);
|
||||
if (fmt) {
|
||||
msg += " at ";
|
||||
va_list argp;
|
||||
va_start(argp, fmt);
|
||||
android::base::StringAppendV(&msg, fmt, argp);
|
||||
va_end(argp);
|
||||
}
|
||||
sparse_print_verbose("%s\n", msg.c_str());
|
||||
std::string msg = ErrorString(err);
|
||||
if (fmt) {
|
||||
msg += " at ";
|
||||
va_list argp;
|
||||
va_start(argp, fmt);
|
||||
android::base::StringAppendV(&msg, fmt, argp);
|
||||
va_end(argp);
|
||||
}
|
||||
sparse_print_verbose("%s\n", msg.c_str());
|
||||
}
|
||||
|
||||
static int process_raw_chunk(struct sparse_file *s, unsigned int chunk_size,
|
||||
SparseFileSource *source, unsigned int blocks, unsigned int block,
|
||||
uint32_t *crc32)
|
||||
{
|
||||
int ret;
|
||||
int64_t len = blocks * s->block_size;
|
||||
static int process_raw_chunk(struct sparse_file* s, unsigned int chunk_size,
|
||||
SparseFileSource* source, unsigned int blocks, unsigned int block,
|
||||
uint32_t* crc32) {
|
||||
int ret;
|
||||
int64_t len = blocks * s->block_size;
|
||||
|
||||
if (chunk_size % s->block_size != 0) {
|
||||
return -EINVAL;
|
||||
}
|
||||
if (chunk_size % s->block_size != 0) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (chunk_size / s->block_size != blocks) {
|
||||
return -EINVAL;
|
||||
}
|
||||
if (chunk_size / s->block_size != blocks) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
ret = source->AddToSparseFile(s, len, block);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
ret = source->AddToSparseFile(s, len, block);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (crc32) {
|
||||
ret = source->GetCrc32(crc32, len);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
} else {
|
||||
source->Seek(len);
|
||||
}
|
||||
if (crc32) {
|
||||
ret = source->GetCrc32(crc32, len);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
} else {
|
||||
source->Seek(len);
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int process_fill_chunk(struct sparse_file *s, unsigned int chunk_size,
|
||||
SparseFileSource *source, unsigned int blocks, unsigned int block, uint32_t *crc32)
|
||||
{
|
||||
int ret;
|
||||
int chunk;
|
||||
int64_t len = (int64_t)blocks * s->block_size;
|
||||
uint32_t fill_val;
|
||||
uint32_t *fillbuf;
|
||||
unsigned int i;
|
||||
static int process_fill_chunk(struct sparse_file* s, unsigned int chunk_size,
|
||||
SparseFileSource* source, unsigned int blocks, unsigned int block,
|
||||
uint32_t* crc32) {
|
||||
int ret;
|
||||
int chunk;
|
||||
int64_t len = (int64_t)blocks * s->block_size;
|
||||
uint32_t fill_val;
|
||||
uint32_t* fillbuf;
|
||||
unsigned int i;
|
||||
|
||||
if (chunk_size != sizeof(fill_val)) {
|
||||
return -EINVAL;
|
||||
}
|
||||
if (chunk_size != sizeof(fill_val)) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
ret = source->ReadValue(&fill_val, sizeof(fill_val));
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
ret = source->ReadValue(&fill_val, sizeof(fill_val));
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = sparse_file_add_fill(s, fill_val, len, block);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
ret = sparse_file_add_fill(s, fill_val, len, block);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (crc32) {
|
||||
/* Fill copy_buf with the fill value */
|
||||
fillbuf = (uint32_t *)copybuf;
|
||||
for (i = 0; i < (COPY_BUF_SIZE / sizeof(fill_val)); i++) {
|
||||
fillbuf[i] = fill_val;
|
||||
}
|
||||
if (crc32) {
|
||||
/* Fill copy_buf with the fill value */
|
||||
fillbuf = (uint32_t*)copybuf;
|
||||
for (i = 0; i < (COPY_BUF_SIZE / sizeof(fill_val)); i++) {
|
||||
fillbuf[i] = fill_val;
|
||||
}
|
||||
|
||||
while (len) {
|
||||
chunk = std::min(len, COPY_BUF_SIZE);
|
||||
*crc32 = sparse_crc32(*crc32, copybuf, chunk);
|
||||
len -= chunk;
|
||||
}
|
||||
}
|
||||
while (len) {
|
||||
chunk = std::min(len, COPY_BUF_SIZE);
|
||||
*crc32 = sparse_crc32(*crc32, copybuf, chunk);
|
||||
len -= chunk;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int process_skip_chunk(struct sparse_file *s, unsigned int chunk_size,
|
||||
SparseFileSource *source __unused, unsigned int blocks,
|
||||
unsigned int block __unused, uint32_t *crc32)
|
||||
{
|
||||
if (chunk_size != 0) {
|
||||
return -EINVAL;
|
||||
}
|
||||
static int process_skip_chunk(struct sparse_file* s, unsigned int chunk_size,
|
||||
SparseFileSource* source __unused, unsigned int blocks,
|
||||
unsigned int block __unused, uint32_t* crc32) {
|
||||
if (chunk_size != 0) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (crc32) {
|
||||
int64_t len = (int64_t)blocks * s->block_size;
|
||||
memset(copybuf, 0, COPY_BUF_SIZE);
|
||||
if (crc32) {
|
||||
int64_t len = (int64_t)blocks * s->block_size;
|
||||
memset(copybuf, 0, COPY_BUF_SIZE);
|
||||
|
||||
while (len) {
|
||||
int chunk = std::min(len, COPY_BUF_SIZE);
|
||||
*crc32 = sparse_crc32(*crc32, copybuf, chunk);
|
||||
len -= chunk;
|
||||
}
|
||||
}
|
||||
while (len) {
|
||||
int chunk = std::min(len, COPY_BUF_SIZE);
|
||||
*crc32 = sparse_crc32(*crc32, copybuf, chunk);
|
||||
len -= chunk;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int process_crc32_chunk(SparseFileSource *source, unsigned int chunk_size, uint32_t *crc32)
|
||||
{
|
||||
uint32_t file_crc32;
|
||||
static int process_crc32_chunk(SparseFileSource* source, unsigned int chunk_size, uint32_t* crc32) {
|
||||
uint32_t file_crc32;
|
||||
|
||||
if (chunk_size != sizeof(file_crc32)) {
|
||||
return -EINVAL;
|
||||
}
|
||||
if (chunk_size != sizeof(file_crc32)) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
int ret = source->ReadValue(&file_crc32, sizeof(file_crc32));
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
int ret = source->ReadValue(&file_crc32, sizeof(file_crc32));
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (crc32 != NULL && file_crc32 != *crc32) {
|
||||
return -EINVAL;
|
||||
}
|
||||
if (crc32 != NULL && file_crc32 != *crc32) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int process_chunk(struct sparse_file *s, SparseFileSource *source,
|
||||
unsigned int chunk_hdr_sz, chunk_header_t *chunk_header,
|
||||
unsigned int cur_block, uint32_t *crc_ptr)
|
||||
{
|
||||
int ret;
|
||||
unsigned int chunk_data_size;
|
||||
int64_t offset = source->GetOffset();
|
||||
static int process_chunk(struct sparse_file* s, SparseFileSource* source, unsigned int chunk_hdr_sz,
|
||||
chunk_header_t* chunk_header, unsigned int cur_block, uint32_t* crc_ptr) {
|
||||
int ret;
|
||||
unsigned int chunk_data_size;
|
||||
int64_t offset = source->GetOffset();
|
||||
|
||||
chunk_data_size = chunk_header->total_sz - chunk_hdr_sz;
|
||||
chunk_data_size = chunk_header->total_sz - chunk_hdr_sz;
|
||||
|
||||
switch (chunk_header->chunk_type) {
|
||||
case CHUNK_TYPE_RAW:
|
||||
ret = process_raw_chunk(s, chunk_data_size, source,
|
||||
chunk_header->chunk_sz, cur_block, crc_ptr);
|
||||
if (ret < 0) {
|
||||
verbose_error(s->verbose, ret, "data block at %" PRId64, offset);
|
||||
return ret;
|
||||
}
|
||||
return chunk_header->chunk_sz;
|
||||
case CHUNK_TYPE_FILL:
|
||||
ret = process_fill_chunk(s, chunk_data_size, source,
|
||||
chunk_header->chunk_sz, cur_block, crc_ptr);
|
||||
if (ret < 0) {
|
||||
verbose_error(s->verbose, ret, "fill block at %" PRId64, offset);
|
||||
return ret;
|
||||
}
|
||||
return chunk_header->chunk_sz;
|
||||
case CHUNK_TYPE_DONT_CARE:
|
||||
ret = process_skip_chunk(s, chunk_data_size, source,
|
||||
chunk_header->chunk_sz, cur_block, crc_ptr);
|
||||
if (chunk_data_size != 0) {
|
||||
if (ret < 0) {
|
||||
verbose_error(s->verbose, ret, "skip block at %" PRId64, offset);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
return chunk_header->chunk_sz;
|
||||
case CHUNK_TYPE_CRC32:
|
||||
ret = process_crc32_chunk(source, chunk_data_size, crc_ptr);
|
||||
if (ret < 0) {
|
||||
verbose_error(s->verbose, -EINVAL, "crc block at %" PRId64,
|
||||
offset);
|
||||
return ret;
|
||||
}
|
||||
return 0;
|
||||
default:
|
||||
verbose_error(s->verbose, -EINVAL, "unknown block %04X at %" PRId64,
|
||||
chunk_header->chunk_type, offset);
|
||||
}
|
||||
switch (chunk_header->chunk_type) {
|
||||
case CHUNK_TYPE_RAW:
|
||||
ret =
|
||||
process_raw_chunk(s, chunk_data_size, source, chunk_header->chunk_sz, cur_block, crc_ptr);
|
||||
if (ret < 0) {
|
||||
verbose_error(s->verbose, ret, "data block at %" PRId64, offset);
|
||||
return ret;
|
||||
}
|
||||
return chunk_header->chunk_sz;
|
||||
case CHUNK_TYPE_FILL:
|
||||
ret = process_fill_chunk(s, chunk_data_size, source, chunk_header->chunk_sz, cur_block,
|
||||
crc_ptr);
|
||||
if (ret < 0) {
|
||||
verbose_error(s->verbose, ret, "fill block at %" PRId64, offset);
|
||||
return ret;
|
||||
}
|
||||
return chunk_header->chunk_sz;
|
||||
case CHUNK_TYPE_DONT_CARE:
|
||||
ret = process_skip_chunk(s, chunk_data_size, source, chunk_header->chunk_sz, cur_block,
|
||||
crc_ptr);
|
||||
if (chunk_data_size != 0) {
|
||||
if (ret < 0) {
|
||||
verbose_error(s->verbose, ret, "skip block at %" PRId64, offset);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
return chunk_header->chunk_sz;
|
||||
case CHUNK_TYPE_CRC32:
|
||||
ret = process_crc32_chunk(source, chunk_data_size, crc_ptr);
|
||||
if (ret < 0) {
|
||||
verbose_error(s->verbose, -EINVAL, "crc block at %" PRId64, offset);
|
||||
return ret;
|
||||
}
|
||||
return 0;
|
||||
default:
|
||||
verbose_error(s->verbose, -EINVAL, "unknown block %04X at %" PRId64, chunk_header->chunk_type,
|
||||
offset);
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sparse_file_read_sparse(struct sparse_file *s, SparseFileSource *source, bool crc)
|
||||
{
|
||||
int ret;
|
||||
unsigned int i;
|
||||
sparse_header_t sparse_header;
|
||||
chunk_header_t chunk_header;
|
||||
uint32_t crc32 = 0;
|
||||
uint32_t *crc_ptr = 0;
|
||||
unsigned int cur_block = 0;
|
||||
static int sparse_file_read_sparse(struct sparse_file* s, SparseFileSource* source, bool crc) {
|
||||
int ret;
|
||||
unsigned int i;
|
||||
sparse_header_t sparse_header;
|
||||
chunk_header_t chunk_header;
|
||||
uint32_t crc32 = 0;
|
||||
uint32_t* crc_ptr = 0;
|
||||
unsigned int cur_block = 0;
|
||||
|
||||
if (!copybuf) {
|
||||
copybuf = (char *)malloc(COPY_BUF_SIZE);
|
||||
}
|
||||
if (!copybuf) {
|
||||
copybuf = (char*)malloc(COPY_BUF_SIZE);
|
||||
}
|
||||
|
||||
if (!copybuf) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
if (!copybuf) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
if (crc) {
|
||||
crc_ptr = &crc32;
|
||||
}
|
||||
if (crc) {
|
||||
crc_ptr = &crc32;
|
||||
}
|
||||
|
||||
ret = source->ReadValue(&sparse_header, sizeof(sparse_header));
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
ret = source->ReadValue(&sparse_header, sizeof(sparse_header));
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (sparse_header.magic != SPARSE_HEADER_MAGIC) {
|
||||
return -EINVAL;
|
||||
}
|
||||
if (sparse_header.magic != SPARSE_HEADER_MAGIC) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (sparse_header.major_version != SPARSE_HEADER_MAJOR_VER) {
|
||||
return -EINVAL;
|
||||
}
|
||||
if (sparse_header.major_version != SPARSE_HEADER_MAJOR_VER) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (sparse_header.file_hdr_sz < SPARSE_HEADER_LEN) {
|
||||
return -EINVAL;
|
||||
}
|
||||
if (sparse_header.file_hdr_sz < SPARSE_HEADER_LEN) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (sparse_header.chunk_hdr_sz < sizeof(chunk_header)) {
|
||||
return -EINVAL;
|
||||
}
|
||||
if (sparse_header.chunk_hdr_sz < sizeof(chunk_header)) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (sparse_header.file_hdr_sz > SPARSE_HEADER_LEN) {
|
||||
/* Skip the remaining bytes in a header that is longer than
|
||||
* we expected.
|
||||
*/
|
||||
source->Seek(sparse_header.file_hdr_sz - SPARSE_HEADER_LEN);
|
||||
}
|
||||
if (sparse_header.file_hdr_sz > SPARSE_HEADER_LEN) {
|
||||
/* Skip the remaining bytes in a header that is longer than
|
||||
* we expected.
|
||||
*/
|
||||
source->Seek(sparse_header.file_hdr_sz - SPARSE_HEADER_LEN);
|
||||
}
|
||||
|
||||
for (i = 0; i < sparse_header.total_chunks; i++) {
|
||||
ret = source->ReadValue(&chunk_header, sizeof(chunk_header));
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
for (i = 0; i < sparse_header.total_chunks; i++) {
|
||||
ret = source->ReadValue(&chunk_header, sizeof(chunk_header));
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (sparse_header.chunk_hdr_sz > CHUNK_HEADER_LEN) {
|
||||
/* Skip the remaining bytes in a header that is longer than
|
||||
* we expected.
|
||||
*/
|
||||
source->Seek(sparse_header.chunk_hdr_sz - CHUNK_HEADER_LEN);
|
||||
}
|
||||
if (sparse_header.chunk_hdr_sz > CHUNK_HEADER_LEN) {
|
||||
/* Skip the remaining bytes in a header that is longer than
|
||||
* we expected.
|
||||
*/
|
||||
source->Seek(sparse_header.chunk_hdr_sz - CHUNK_HEADER_LEN);
|
||||
}
|
||||
|
||||
ret = process_chunk(s, source, sparse_header.chunk_hdr_sz, &chunk_header,
|
||||
cur_block, crc_ptr);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
ret = process_chunk(s, source, sparse_header.chunk_hdr_sz, &chunk_header, cur_block, crc_ptr);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
cur_block += ret;
|
||||
}
|
||||
cur_block += ret;
|
||||
}
|
||||
|
||||
if (sparse_header.total_blks != cur_block) {
|
||||
return -EINVAL;
|
||||
}
|
||||
if (sparse_header.total_blks != cur_block) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sparse_file_read_normal(struct sparse_file *s, int fd)
|
||||
{
|
||||
int ret;
|
||||
uint32_t *buf = (uint32_t *)malloc(s->block_size);
|
||||
unsigned int block = 0;
|
||||
int64_t remain = s->len;
|
||||
int64_t offset = 0;
|
||||
unsigned int to_read;
|
||||
unsigned int i;
|
||||
bool sparse_block;
|
||||
static int sparse_file_read_normal(struct sparse_file* s, int fd) {
|
||||
int ret;
|
||||
uint32_t* buf = (uint32_t*)malloc(s->block_size);
|
||||
unsigned int block = 0;
|
||||
int64_t remain = s->len;
|
||||
int64_t offset = 0;
|
||||
unsigned int to_read;
|
||||
unsigned int i;
|
||||
bool sparse_block;
|
||||
|
||||
if (!buf) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
if (!buf) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
while (remain > 0) {
|
||||
to_read = std::min(remain, (int64_t)(s->block_size));
|
||||
ret = read_all(fd, buf, to_read);
|
||||
if (ret < 0) {
|
||||
error("failed to read sparse file");
|
||||
free(buf);
|
||||
return ret;
|
||||
}
|
||||
while (remain > 0) {
|
||||
to_read = std::min(remain, (int64_t)(s->block_size));
|
||||
ret = read_all(fd, buf, to_read);
|
||||
if (ret < 0) {
|
||||
error("failed to read sparse file");
|
||||
free(buf);
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (to_read == s->block_size) {
|
||||
sparse_block = true;
|
||||
for (i = 1; i < s->block_size / sizeof(uint32_t); i++) {
|
||||
if (buf[0] != buf[i]) {
|
||||
sparse_block = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
sparse_block = false;
|
||||
}
|
||||
if (to_read == s->block_size) {
|
||||
sparse_block = true;
|
||||
for (i = 1; i < s->block_size / sizeof(uint32_t); i++) {
|
||||
if (buf[0] != buf[i]) {
|
||||
sparse_block = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
sparse_block = false;
|
||||
}
|
||||
|
||||
if (sparse_block) {
|
||||
/* TODO: add flag to use skip instead of fill for buf[0] == 0 */
|
||||
sparse_file_add_fill(s, buf[0], to_read, block);
|
||||
} else {
|
||||
sparse_file_add_fd(s, fd, offset, to_read, block);
|
||||
}
|
||||
if (sparse_block) {
|
||||
/* TODO: add flag to use skip instead of fill for buf[0] == 0 */
|
||||
sparse_file_add_fill(s, buf[0], to_read, block);
|
||||
} else {
|
||||
sparse_file_add_fd(s, fd, offset, to_read, block);
|
||||
}
|
||||
|
||||
remain -= to_read;
|
||||
offset += to_read;
|
||||
block++;
|
||||
}
|
||||
remain -= to_read;
|
||||
offset += to_read;
|
||||
block++;
|
||||
}
|
||||
|
||||
free(buf);
|
||||
return 0;
|
||||
free(buf);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sparse_file_read(struct sparse_file *s, int fd, bool sparse, bool crc)
|
||||
{
|
||||
if (crc && !sparse) {
|
||||
return -EINVAL;
|
||||
}
|
||||
int sparse_file_read(struct sparse_file* s, int fd, bool sparse, bool crc) {
|
||||
if (crc && !sparse) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (sparse) {
|
||||
SparseFileFdSource source(fd);
|
||||
return sparse_file_read_sparse(s, &source, crc);
|
||||
} else {
|
||||
return sparse_file_read_normal(s, fd);
|
||||
}
|
||||
if (sparse) {
|
||||
SparseFileFdSource source(fd);
|
||||
return sparse_file_read_sparse(s, &source, crc);
|
||||
} else {
|
||||
return sparse_file_read_normal(s, fd);
|
||||
}
|
||||
}
|
||||
|
||||
int sparse_file_read_buf(struct sparse_file *s, char *buf, bool crc)
|
||||
{
|
||||
SparseFileBufSource source(buf);
|
||||
return sparse_file_read_sparse(s, &source, crc);
|
||||
int sparse_file_read_buf(struct sparse_file* s, char* buf, bool crc) {
|
||||
SparseFileBufSource source(buf);
|
||||
return sparse_file_read_sparse(s, &source, crc);
|
||||
}
|
||||
|
||||
static struct sparse_file *sparse_file_import_source(SparseFileSource *source, bool verbose, bool crc)
|
||||
{
|
||||
int ret;
|
||||
sparse_header_t sparse_header;
|
||||
int64_t len;
|
||||
struct sparse_file *s;
|
||||
static struct sparse_file* sparse_file_import_source(SparseFileSource* source, bool verbose,
|
||||
bool crc) {
|
||||
int ret;
|
||||
sparse_header_t sparse_header;
|
||||
int64_t len;
|
||||
struct sparse_file* s;
|
||||
|
||||
ret = source->ReadValue(&sparse_header, sizeof(sparse_header));
|
||||
if (ret < 0) {
|
||||
verbose_error(verbose, ret, "header");
|
||||
return NULL;
|
||||
}
|
||||
ret = source->ReadValue(&sparse_header, sizeof(sparse_header));
|
||||
if (ret < 0) {
|
||||
verbose_error(verbose, ret, "header");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (sparse_header.magic != SPARSE_HEADER_MAGIC) {
|
||||
verbose_error(verbose, -EINVAL, "header magic");
|
||||
return NULL;
|
||||
}
|
||||
if (sparse_header.magic != SPARSE_HEADER_MAGIC) {
|
||||
verbose_error(verbose, -EINVAL, "header magic");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (sparse_header.major_version != SPARSE_HEADER_MAJOR_VER) {
|
||||
verbose_error(verbose, -EINVAL, "header major version");
|
||||
return NULL;
|
||||
}
|
||||
if (sparse_header.major_version != SPARSE_HEADER_MAJOR_VER) {
|
||||
verbose_error(verbose, -EINVAL, "header major version");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (sparse_header.file_hdr_sz < SPARSE_HEADER_LEN) {
|
||||
return NULL;
|
||||
}
|
||||
if (sparse_header.file_hdr_sz < SPARSE_HEADER_LEN) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (sparse_header.chunk_hdr_sz < sizeof(chunk_header_t)) {
|
||||
return NULL;
|
||||
}
|
||||
if (sparse_header.chunk_hdr_sz < sizeof(chunk_header_t)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
len = (int64_t)sparse_header.total_blks * sparse_header.blk_sz;
|
||||
s = sparse_file_new(sparse_header.blk_sz, len);
|
||||
if (!s) {
|
||||
verbose_error(verbose, -EINVAL, NULL);
|
||||
return NULL;
|
||||
}
|
||||
len = (int64_t)sparse_header.total_blks * sparse_header.blk_sz;
|
||||
s = sparse_file_new(sparse_header.blk_sz, len);
|
||||
if (!s) {
|
||||
verbose_error(verbose, -EINVAL, NULL);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ret = source->SetOffset(0);
|
||||
if (ret < 0) {
|
||||
verbose_error(verbose, ret, "seeking");
|
||||
sparse_file_destroy(s);
|
||||
return NULL;
|
||||
}
|
||||
ret = source->SetOffset(0);
|
||||
if (ret < 0) {
|
||||
verbose_error(verbose, ret, "seeking");
|
||||
sparse_file_destroy(s);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
s->verbose = verbose;
|
||||
s->verbose = verbose;
|
||||
|
||||
ret = sparse_file_read_sparse(s, source, crc);
|
||||
if (ret < 0) {
|
||||
sparse_file_destroy(s);
|
||||
return NULL;
|
||||
}
|
||||
ret = sparse_file_read_sparse(s, source, crc);
|
||||
if (ret < 0) {
|
||||
sparse_file_destroy(s);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return s;
|
||||
return s;
|
||||
}
|
||||
|
||||
struct sparse_file *sparse_file_import(int fd, bool verbose, bool crc) {
|
||||
SparseFileFdSource source(fd);
|
||||
return sparse_file_import_source(&source, verbose, crc);
|
||||
struct sparse_file* sparse_file_import(int fd, bool verbose, bool crc) {
|
||||
SparseFileFdSource source(fd);
|
||||
return sparse_file_import_source(&source, verbose, crc);
|
||||
}
|
||||
|
||||
struct sparse_file *sparse_file_import_buf(char* buf, bool verbose, bool crc) {
|
||||
SparseFileBufSource source(buf);
|
||||
return sparse_file_import_source(&source, verbose, crc);
|
||||
struct sparse_file* sparse_file_import_buf(char* buf, bool verbose, bool crc) {
|
||||
SparseFileBufSource source(buf);
|
||||
return sparse_file_import_source(&source, verbose, crc);
|
||||
}
|
||||
|
||||
struct sparse_file *sparse_file_import_auto(int fd, bool crc, bool verbose)
|
||||
{
|
||||
struct sparse_file *s;
|
||||
int64_t len;
|
||||
int ret;
|
||||
struct sparse_file* sparse_file_import_auto(int fd, bool crc, bool verbose) {
|
||||
struct sparse_file* s;
|
||||
int64_t len;
|
||||
int ret;
|
||||
|
||||
s = sparse_file_import(fd, verbose, crc);
|
||||
if (s) {
|
||||
return s;
|
||||
}
|
||||
s = sparse_file_import(fd, verbose, crc);
|
||||
if (s) {
|
||||
return s;
|
||||
}
|
||||
|
||||
len = lseek64(fd, 0, SEEK_END);
|
||||
if (len < 0) {
|
||||
return NULL;
|
||||
}
|
||||
len = lseek64(fd, 0, SEEK_END);
|
||||
if (len < 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
lseek64(fd, 0, SEEK_SET);
|
||||
lseek64(fd, 0, SEEK_SET);
|
||||
|
||||
s = sparse_file_new(4096, len);
|
||||
if (!s) {
|
||||
return NULL;
|
||||
}
|
||||
s = sparse_file_new(4096, len);
|
||||
if (!s) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ret = sparse_file_read_normal(s, fd);
|
||||
if (ret < 0) {
|
||||
sparse_file_destroy(s);
|
||||
return NULL;
|
||||
}
|
||||
ret = sparse_file_read_normal(s, fd);
|
||||
if (ret < 0) {
|
||||
sparse_file_destroy(s);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return s;
|
||||
return s;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue