rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 19:01:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

When reading in text mode adds the block info only if there is a block with a hash.

Browse source
This commit is contained in:
Andrea Mazzoleni 2013-08-21 20:08:11 +02:00
parent 38f814b9bc
commit 9ca2637702
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
state.c
View file

@ -913,7 +913,6 @@ static void state_read_text(struct snapraid_state* state, const char* path, STRE
/* "blk"/""new"/"chg" command */
block_off_t v_pos;
struct snapraid_block* block;
snapraid_info info;
if (!file) {
fprintf(stderr, "Unexpected '%s' specification in '%s' at line %u\n", tag, path, line);
@ -990,12 +989,17 @@ static void state_read_text(struct snapraid_state* state, const char* path, STRE
disk = 0;
}
/* set a fake info block, in case of upgrading from an old version */
/* the real block info will overwrite this */
info = info_make(save_time, 0, 0);
/* if the block has a hash */
if (tag[0] != 'n') {
snapraid_info info;
/* insert the info in the array */
info_set(&state->infoarr, v_pos, info);
/* set a fake info block, in case of upgrading from an old version */
/* the real info, if present, will overwrite this */
info = info_make(save_time, 0, 0);
/* insert the info in the array */
info_set(&state->infoarr, v_pos, info);
}
/* stat */
++count_block;
@ -2820,7 +2824,7 @@ static void state_write_binary(struct snapraid_state* state, STREAM* f)
exit(EXIT_FAILURE);
}
count_block += end - begin;
count_block += v_count;
/* next begin position */
begin = end;