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

Factor out hash computation

Browse Source 
Move code to compute the hash of a data file to a separate function.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer 2017-09-08 20:51:56 +02:00
parent 7a0134204e
commit 380124c7a2
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/io.c
View File

@ -426,6 +426,18 @@ unsigned io_save_keys(void)
return 1; return 1;
} }
static int io_compute_hash(const char *path, char *buf)
{
FILE *fp = fopen(path, "r");
if (!fp)
return 0;
sha1_stream(fp, buf);
fclose(fp);
return 1;
}
static void io_merge_data(void) static void io_merge_data(void)
{ {
char *path_apts_new, *path_todo_new; char *path_apts_new, *path_todo_new;
@ -502,22 +514,17 @@ static int resolve_save_conflict(void)
static int io_check_data_files_modified() static int io_check_data_files_modified()
{ {
FILE *fp;
char sha1_new[SHA1_DIGESTLEN * 2 + 1]; char sha1_new[SHA1_DIGESTLEN * 2 + 1];
int ret = 1; int ret = 1;
io_mutex_lock(); io_mutex_lock();
if ((fp = fopen(path_apts, "r"))) { if (io_compute_hash(path_apts, sha1_new)) {
sha1_stream(fp, sha1_new);
fclose(fp);
if (strncmp(sha1_new, apts_sha1, SHA1_DIGESTLEN * 2) != 0) if (strncmp(sha1_new, apts_sha1, SHA1_DIGESTLEN * 2) != 0)
goto cleanup; goto cleanup;
} }
if ((fp = fopen(path_todo, "r"))) { if (io_compute_hash(path_todo, sha1_new)) {
sha1_stream(fp, sha1_new);
fclose(fp);
if (strncmp(sha1_new, todo_sha1, SHA1_DIGESTLEN * 2) != 0) if (strncmp(sha1_new, todo_sha1, SHA1_DIGESTLEN * 2) != 0)
goto cleanup; goto cleanup;
} }