From 2d54fb2ff9b32cdd46657a9be2db073a1f74da81 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 2 Sep 2016 15:48:45 +0200 Subject: [PATCH] csync_update: Do not check to exclude .csync_journal.db It is indeed already handled by csync_exclude. --- csync/src/csync_update.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/csync/src/csync_update.c b/csync/src/csync_update.c index 85ebecb370..585a266724 100644 --- a/csync/src/csync_update.c +++ b/csync/src/csync_update.c @@ -740,7 +740,6 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn, } while ((dirent = csync_vio_readdir(ctx, dh))) { - const char *path = NULL; size_t ulen = 0; int flen; int flag; @@ -794,23 +793,6 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn, goto error; } - path = filename + ulen; - - /* skip ".csync_journal.db" and ".csync_journal.db.ctmp" */ - /* Isn't this done via csync_exclude already? */ - if (c_streq(path, ".csync_journal.db") - || c_streq(path, ".csync_journal.db.ctmp") - || c_streq(path, ".csync_journal.db.ctmp-journal") - || c_streq(path, ".csync-progressdatabase") - || c_streq(path, ".csync_journal.db-shm") - || c_streq(path, ".csync_journal.db-wal") - || c_streq(path, ".csync_journal.db-journal")) { - csync_vio_file_stat_destroy(dirent); - dirent = NULL; - SAFE_FREE(filename); - continue; - } - /* Only for the local replica we have to stat(), for the remote one we have all data already */ if (ctx->replica == LOCAL_REPLICA) { res = csync_vio_stat(ctx, filename, dirent);