fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Factor out check for external modifications

Browse Source 
Move the check to compare the stored hashes of the data files with the
current hash to a separate function. This makes the code easier to read
and reusable.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer 2017-09-08 07:41:58 +02:00
parent 9137590e7a
commit ba85d9b6f5
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/io.c
View File

@ -500,6 +500,28 @@ static int resolve_save_conflict(void)
return ret; return ret;
} }
static int io_check_data_files_modified()
{
FILE *fp;
char sha1_new[SHA1_DIGESTLEN * 2 + 1];
if ((fp = fopen(path_apts, "r"))) {
sha1_stream(fp, sha1_new);
fclose(fp);
if (strncmp(sha1_new, apts_sha1, SHA1_DIGESTLEN * 2) != 0)
return 1;
}
if ((fp = fopen(path_todo, "r"))) {
sha1_stream(fp, sha1_new);
fclose(fp);
if (strncmp(sha1_new, todo_sha1, SHA1_DIGESTLEN * 2) != 0)
return 1;
}
return 0;
}
/* Save the calendar data */ /* Save the calendar data */
void io_save_cal(enum save_display display) void io_save_cal(enum save_display display)
{ {
@ -508,28 +530,11 @@ void io_save_cal(enum save_display display)
_("The data files were successfully saved"); _("The data files were successfully saved");
const char *enter = _("Press [ENTER] to continue"); const char *enter = _("Press [ENTER] to continue");
int show_bar; int show_bar;
FILE *fp;
char sha1_new[SHA1_DIGESTLEN * 2 + 1];
int conflict = 0;
if (read_only) if (read_only)
return; return;
if ((fp = fopen(path_apts, "r"))) { if (io_check_data_files_modified() && resolve_save_conflict())
sha1_stream(fp, sha1_new);
fclose(fp);
if (strncmp(sha1_new, apts_sha1, SHA1_DIGESTLEN * 2) != 0)
conflict = 1;
}
if (!conflict && (fp = fopen(path_todo, "r"))) {
sha1_stream(fp, sha1_new);
fclose(fp);
if (strncmp(sha1_new, todo_sha1, SHA1_DIGESTLEN * 2) != 0)
conflict = 1;
}
if (conflict && resolve_save_conflict())
return; return;
run_hook("pre-save"); run_hook("pre-save");