diff -r 2f019a4bc78a -r 761dc4867208 dav/sync.h --- a/dav/sync.h Wed Jul 11 15:46:15 2018 +0200 +++ b/dav/sync.h Wed Jul 11 16:40:07 2018 +0200 @@ -63,6 +63,8 @@ pthread_t start_sighandler(pthread_mutex_t *mutex) ; void stop_sighandler(pthread_mutex_t *mutex, pthread_t tid); +void res2map(DavResource *root, UcxMap *map); + int cmd_pull(CmdArgs *args); int cmd_push(CmdArgs *args, DavBool archive); @@ -81,7 +83,13 @@ UcxList* read_changes(SyncDirectory *dir, SyncDatabase *db); LocalResource* local_resource_new(SyncDirectory *dir, SyncDatabase *db, char *path, int *isdir); LocalResource* local_resource_copy(LocalResource *res); -int local_resource_is_changed(SyncDirectory *dir, SyncDatabase *db, LocalResource *res); +int local_resource_is_changed( + SyncDirectory *dir, + SyncDatabase *db, + LocalResource *res, + UcxMap *svrres, + DavBool restore_deleted, + DavBool restore_modified); int remote_resource_is_changed( DavSession *sn, SyncDirectory *dir,