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

Makes a backup copy of the content file.

Browse source 
Before overwriting the existing content file, rename it
adding the .backup extension, but only if such content file
was read and validated.
This commit is contained in:
Andrea Mazzoleni 2014-06-13 18:23:24 +02:00
parent 68042d528d
commit da08ca4497
8 changed files with 49 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmdline/elem.c
View file

@ -298,6 +298,16 @@ int filter_content(tommy_list* contentlist, const char* path)
pathprint(tmp, sizeof(tmp), "%s.tmp", content->content);
if (pathcmp(tmp, path) == 0)
return -1;
/* exclude also the ".backup" copy */
pathprint(tmp, sizeof(tmp), "%s.backup", content->content);
if (pathcmp(tmp, path) == 0)
return -1;
/* exclude also the ".lock" file */
pathprint(tmp, sizeof(tmp), "%s.lock", content->content);
if (pathcmp(tmp, path) == 0)
return -1;
}
return 0;

23
cmdline/state.c
View file

@ -4008,6 +4008,9 @@ void state_read(struct snapraid_state* state)
state_map(state);
state_content_check(state, path);
/* mark that we read the content file, and it passed all the checks */
state->checked_read = 1;
}
void state_write(struct snapraid_state* state)
@ -4087,6 +4090,24 @@ void state_write(struct snapraid_state* state)
while (i) {
struct snapraid_content* content = i->data;
char tmp[PATH_MAX];
char backup[PATH_MAX];
/* if the content file was checked reading it, it's a good candidate */
/* to be renamed as backup copy */
if (state->checked_read) {
pathprint(backup, sizeof(backup), "%s.backup", content->content);
if (rename(content->content, backup) != 0) {
/* ignore the error for not existing */
if (errno != ENOENT) {
/* LCOV_EXCL_START */
fprintf(stderr, "Error renaming the content file '%s' to '%s' in rename(). %s.\n", content->content, backup, strerror(errno));
exit(EXIT_FAILURE);
/* LCOV_EXCL_STOP */
}
}
}
/* now renames the just written copy with the correct name */
pathprint(tmp, sizeof(tmp), "%s.tmp", content->content);
if (rename(tmp, content->content) != 0) {
/* LCOV_EXCL_START */
@ -4094,10 +4115,12 @@ void state_write(struct snapraid_state* state)
exit(EXIT_FAILURE);
/* LCOV_EXCL_STOP */
}
i = i->next;
}
state->need_write = 0; /* no write needed anymore */
state->checked_read = 0; /* what we wrote is not checked in read */
}
void state_filter(struct snapraid_state* state, tommy_list* filterlist_file, tommy_list* filterlist_disk, int filter_missing, int filter_error)

1
cmdline/state.h
View file

@ -91,6 +91,7 @@ struct snapraid_state {
int filter_hidden; /**< Filter out hidden files. */
uint64_t autosave; /**< Autosave after the specified amount of data. 0 to disable. */
int need_write; /**< If the state is changed. */
int checked_read; /**< If the state was read and checked. */
uint32_t block_size; /**< Block size in bytes. */
unsigned raid_mode; /**< Raid mode to use. RAID_MODE_DEFAULT or RAID_MODE_ALTERNATE. */
char parity_path[LEV_MAX][PATH_MAX]; /**< Path of the parity file. One for each parity. */