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

Fixes the count of new files.

Browse source
This commit is contained in:
Andrea Mazzoleni 2012-02-03 19:16:14 +01:00
parent 45e54685da
commit f14ab1aa3b
2 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
HISTORY
View file

@ -3,6 +3,7 @@ SnapRAID HISTORY
1.9 2012/2
===========
* Fixed the count of new files.
1.8 2012/1
===========

52
scan.c
View file

@ -218,6 +218,8 @@ static void scan_file(struct snapraid_scan* scan, struct snapraid_state* state,
/* nothing more to do */
return;
} else {
/* here if the file is changed */
/* do a safety check to ensure that the common ext4 case of zeroing */
/* the size of a file after a crash doesn't propagate to the backup */
if (file->size != 0 && st->st_size == 0) {
@ -264,6 +266,19 @@ static void scan_file(struct snapraid_scan* scan, struct snapraid_state* state,
/* and continue to reinsert it */
}
} else {
/* create the new file */
++scan->count_insert;
if (state->gui) {
fprintf(stderr, "scan:add:%s:%s\n", disk->name, sub);
fflush(stderr);
}
if (output) {
printf("Add '%s%s'\n", disk->dir, sub);
}
/* and continue to insert it */
}
/* insert it */
@ -354,6 +369,19 @@ static void scan_link(struct snapraid_scan* scan, struct snapraid_state* state,
/* nothing more to do */
return;
}
} else {
/* create the new link */
++scan->count_insert;
if (state->gui) {
fprintf(stderr, "scan:add:%s:%s\n", disk->name, sub);
fflush(stderr);
}
if (output) {
printf("Add '%s%s'\n", disk->dir, sub);
}
/* and continue to insert it */
}
/* insert it */
@ -587,17 +615,6 @@ void state_scan(struct snapraid_state* state, int output)
/* next node */
node = node->next;
/* create the new file */
++scan->count_insert;
if (state->gui) {
fprintf(stderr, "scan:add:%s:%s\n", disk->name, file->sub);
fflush(stderr);
}
if (output) {
printf("Add '%s%s'\n", disk->dir, file->sub);
}
/* insert it */
scan_file_insert(state, disk, file);
}
@ -610,17 +627,6 @@ void state_scan(struct snapraid_state* state, int output)
/* next node */
node = node->next;
/* create the new link */
++scan->count_insert;
if (state->gui) {
fprintf(stderr, "scan:add:%s:%s\n", disk->name, link->sub);
fflush(stderr);
}
if (output) {
printf("Add '%s%s'\n", disk->dir, link->sub);
}
/* insert it */
scan_link_insert(state, disk, link);
}
@ -678,7 +684,7 @@ void state_scan(struct snapraid_state* state, int output)
if (output) {
if (!total.count_moved && !total.count_change && !total.count_remove && !total.count_insert) {
printf("No difference\n");
printf("No difference.\n");
}
}
}