aboutsummaryrefslogtreecommitdiffstats
path: root/src/io.c
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2014-07-17 11:47:00 +0200
committerLukas Fleischer <calcurse@cryptocrack.de>2014-07-17 12:03:34 +0200
commitae7d2d4c6b53160bfe0beae13dfb36b879451bba (patch)
tree9be18476f7ec7497b2e95643aa1af60f82b07eaf /src/io.c
parent7920e761c9827cbd9d3fb47d663d90596da3c310 (diff)
downloadcalcurse-ae7d2d4c6b53160bfe0beae13dfb36b879451bba.tar.gz
calcurse-ae7d2d4c6b53160bfe0beae13dfb36b879451bba.zip
Only run the merge tool on files with differences
If the backup file and the data file are equal, there is no need to run the merge tool. Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
Diffstat (limited to 'src/io.c')
-rw-r--r--src/io.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/src/io.c b/src/io.c
index 0ea6bbf..116a362 100644
--- a/src/io.c
+++ b/src/io.c
@@ -1333,6 +1333,32 @@ int io_file_is_empty(char *file)
}
/*
+ * Check whether two files are equal.
+ */
+int io_files_equal(const char *file1, const char *file2)
+{
+ FILE *fp1, *fp2;
+ int ret = 0;
+
+ if (!file1 || !file2)
+ return 0;
+
+ fp1 = fopen(file1, "rb");
+ fp2 = fopen(file2, "rb");
+
+ while (!feof(fp1) && !feof(fp2)) {
+ if (fgetc(fp1) != fgetc(fp2))
+ goto cleanup;
+ }
+
+ ret = 1;
+cleanup:
+ fclose(fp1);
+ fclose(fp2);
+ return ret;
+}
+
+/*
* Copy an existing file to a new location.
*/
int io_file_cp(const char *src, const char *dst)