VERSION.cmake: Fix year

VERSION.cmake: 2.3.2 rc1
2026-04-03 09:11:33 +02:00 · 2017-04-24 13:42:05 +02:00 · 2017-04-24 13:37:45 +02:00
615 changed files with 59971 additions and 71679 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,63 +0,0 @@
-# Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
-#
-# You may use this file under the terms of the 3-clause BSD license.
-# See the file LICENSE from this package for details.
-
-# This is the clang-format configuration style to be used by Qt,
-# based on the rules from https://wiki.qt.io/Qt_Coding_Style and
-# https://wiki.qt.io/Coding_Conventions
-
---
-# Webkit style was loosely based on the Qt style
-BasedOnStyle: WebKit
-
-Standard: Cpp11
-ColumnLimit: 0
-
-# Disable reflow of qdoc comments: indentation rules are different.
-# Translation comments are also excluded
-CommentPragmas: "^!|^:"
-
-# We want a space between the type and the star for pointer types
-PointerBindsToType: false
-
-# We want to break before the operators, but not before a '='
-BreakBeforeBinaryOperators: NonAssignment
-
-# Braces are usually attached, but not after functions or classes declaration
-BreakBeforeBraces: Custom
-BraceWrapping:
-    AfterClass: true
-    AfterControlStatement: false
-    AfterEnum: false
-    AfterFunction: true
-    AfterNamespace: false
-    AfterObjCDeclaration: false
-    AfterStruct: true
-    AfterUnion: false
-    BeforeCatch: false
-    BeforeElse: false
-    IndentBraces: false
-
-# The coding style does not specify the following, but this is what gives
-# results closest to the existing code.
-AlignAfterOpenBracket: DontAlign
-AlwaysBreakTemplateDeclarations: true
-
-# Ideally we should also allow less short function in a single line, but
-# clang-format does not handle that
-AllowShortFunctionsOnASingleLine: Inline
-
-# The coding style specifies some include order categories, but also tells to
-# separate categories with an empty line. It does not specify the order within
-# the categories. Since the SortInclude feature of clang-format does not
-# re-order includes separated by empty lines, the feature is not used.
-SortIncludes: false
-
-# macros for which the opening brace stays attached
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
-
-# Allow two empty lines for structuring
-MaxEmptyLinesToKeep: 2
-KeepEmptyLinesAtTheStartOfBlocks: false
-
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,91 +0,0 @@
-#
-# We are building GCC with make and Clang with ninja, the combinations are more
-# or less arbitrarily chosen. We just want to check that both compilers and both
-# CMake generators work. It's unlikely that a specific generator only breaks
-# with a specific compiler.
-#
-
-workspace:
-  base: /drone
-  path: src/github.com/owncloud/client
-
-branches:
-  - master
-  - 2.4
-
-clone:
-  git:
-    image: plugins/git
-    pull: true
-    tags: false
-
-pipeline:
-  prepare-clang:
-    image: owncloudci/client:latest
-    pull: true
-    environment:
-      - LC_ALL=C.UTF-8
-    commands:
-      - mkdir clang-build
-      - cd clang-build
-      - cmake -GNinja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE="Debug" -DUNIT_TESTING=1 ..
-
-  building-clang:
-    image: owncloudci/client:latest
-    pull: true
-    environment:
-      - LC_ALL=C.UTF-8
-    commands:
-      - cd clang-build
-      - ninja -j4
-
-  testing-clang:
-    image: owncloudci/client:latest
-    pull: true
-    environment:
-      - LC_ALL=C.UTF-8
-    commands:
-      - cd clang-build
-      - useradd -m -s /bin/bash tester
-      - chown -R tester:tester .
-      - su-exec tester ctest --output-on-failure
-
-  prepare-gcc:
-    image: owncloudci/client:latest
-    pull: true
-    environment:
-      - LC_ALL=C.UTF-8
-    commands:
-      - mkdir gcc-build
-      - cd gcc-build
-      - cmake -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE="Debug" -DUNIT_TESTING=1 ..
-
-  building-gcc:
-    image: owncloudci/client:latest
-    pull: true
-    environment:
-      - LC_ALL=C.UTF-8
-    commands:
-      - cd gcc-build
-      - make -j4
-
-  testing-gcc:
-    image: owncloudci/client:latest
-    pull: true
-    environment:
-      - LC_ALL=C.UTF-8
-    commands:
-      - cd gcc-build
-      - useradd -m -s /bin/bash tester
-      - chown -R tester:tester .
-      - su-exec tester ctest --output-on-failure
-
-  notify-slack:
-    image: plugins/slack
-    pull: true
-    secrets: [ slack_webhook ]
-    channel: desktop
-    when:
-      local: false
-      status: [ changed, failure ]
-      event: [ push ]
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1 +0,0 @@
-c8d0f788e00bdae125a26d9159ce9efdd6325cd2 # Initial application of clang-format
--- a/.github/release_template.md
+++ b/.github/release_template.md
@@ -1,108 +0,0 @@
-<!--
-This is the template for new release issues.
-(originated from https://github.com/owncloud/client/wiki/Release%20Checklist%20Template)
-->
-
-Copy below text into a task and tick the items:
-
-```
-Some weeks before the release:
-* [ ] Check if we should update the bundled sqlite3 (https://github.com/owncloud/client/tree/master/src/3rdparty/sqlite3)
-* [ ] Check if we should update Sparkle on build machine (https://github.com/sparkle-project/Sparkle/releases)
-* [ ] Ensure NSIS is up to date on the build machine
-* [ ] Ensure up-to-date dependencies (e.g. [latest Qt version](http://qt-project.org/downloads#qt-lib) is installed on the machine and picked up (cmake output)
-* [ ] Ensure the crash reporter server is up
-* [ ] Check crash reporter for bad crashes
-* [ ] Ensure Windows Overlay DLLs are rebuilt
-* [ ] Check nightly builds are up and running, that is Jenkins jobs ownCloud-client-linux, ownCloud-client-osx and ownCloud-client-win32 all green.
-* [ ] Ensure Linux nightlies are built too for all distros https://build.opensuse.org/package/show/isv:ownCloud:community:nightly/owncloud-client
-* [ ] Build branded clients through the scripting machine and smoke test one or two branded clients (especially with predefined url)
-* [ ] Upload a nightly build of the windows version to virustotal.com
-  * Contact AV vendors whom's engine reports a virus
-* [ ] Documentation should be online before the release http://doc.owncloud.org/desktop/1.X/
-* [ ] QA goes over https://github.com/owncloud/mirall/wiki/Testing-Scenarios
-* [ ] Make sure to have `client/ChangeLog` updated
- * use `git log --format=oneline v<lastrelease>...master` if your memory fails you
-* [ ] check if enterprise issues are fixed
-
-One week before the release:
-* [ ] Communicate the release schedule on mailinglist release-coordination@owncloud.com. Give a high level overview of the upcoming new features, changes etc.
-* [ ] Ensure marketing is aware (marketing@owncloud.com) and prepared for the release (social, .com website, cust. communications)
-* [ ] Inform GCX knows the next version is about 1 week out (gcx@owncloud.com)
-
-For all Betas and RCs:
-* [ ] Branch off a release branch called VERSION-rcX or VERSION-betaX  (without v, v is for tags)
-* [ ] Edit ```VERSION.cmake``` to set the suffix to beta1, beta2 etc. Commit the result to the release branch only
-* [ ] Create build for Windows using rotor job owncloud-client-win32 (uncheck the "nightly build" checkbox, check the "sign package" checkboxes) both themes 'ownCloud' and 'testpilotcould'
-* [ ] Create build for Mac using rotor, job owncloud-client-osx (uncheck the "nightly build" checkbox, check the "sign package" checkboxes) both themes 'ownCloud' and 'testpilotcould'
-* [ ] Create the beta tarball using Jenkins job ownCloud-client-source
-* [ ] Create Linux builds using rotor job owncloud-client-linux building (this magically interacts with the ownCloud-client-source job)
-  * [ ] theme 'ownCloud' -> isv:ownCloud:community:testing
-  * [ ] theme 'testpilotcould' -> isv:ownCloud:testpilot:testing
-* [ ] Copy builds from ```daily``` to ```testing``` on download.owncloud.com, double check the download links.
-* [ ] Create a pull request to the owncloud.org repository to update the install page (strings.php, page-desktop.php) and the changelog on owncloud.org. From now on download packages from the staging webserver.
-* [ ] Inform community mailinglists devel@owncloud.org and testpilots@owncloud.org
-* [ ] Announce on https://central.owncloud.org
-* [ ] Create a signed tag using ```git tag -u E94E7B37 tagname``` (https://github.com/owncloud/enterprise/wiki/Desktop-Signing-Knowledge)
-* [ ] Check crash reporter
-
-For first Beta of a Major or Minor release:
-* [ ] branch off master to new version branch (e.g. master -> 2.1, when releasing 2.1)
-* [ ] Adjust `VERSION.cmake` in master and count up (e.g. 2.2)
-* [ ] Adjust translation jobs for [client](https://ci.owncloud.org/view/translation-sync/job/translation-sync-client/) and [NSIS](https://ci.owncloud.org/view/translation-sync/job/translation-sync-client-nsis/) to point to the release branch (e.g. 2.1).
-* [ ] Make sure there is a job for the docs of the new master branch and the current release branch on rotor.
-
-Day before Release:
-* [ ] Check the translations coming from transifex: All synchronized?
-* [ ] Run the tx.pl scripts on the final code tag
-* [ ] Run ```make test```
-* [ ] Run smashbox on the final code tag
-* [ ] Inform product management and marketing that we are 1 day out
-
-On Release Day (for final release):
-* [ ] Branch off a release branch called like the version (without v, v is for tags)
-* [ ] Double check ```VERSION.cmake```: Check the version number settings and suffix (beta etc.) to be removed. Commit change to release branch only!
-* [ ] Make sure to increase the version number of the branched of release, e.g. if you release 2.3.2 then you should change VERSION.cmake in 2.3 to 2.3.3 since that branch now will be 2.3.3
-* [ ] Add last updates to Changelog in the client source repository.
-* [ ] Create tar ball (automated by `ownCloud-client-source` jenkins job) and **immediately** sign it (asc file). (https://github.com/owncloud/enterprise/wiki/Desktop-Signing-Knowledge)
-* [ ] Create build for Windows using rotor job owncloud-client-win32 (uncheck the "nightly build" checkbox, check the "sign package" checkboxes) both themes 'ownCloud' and 'testpilotcould'
-* [ ] Create build for Mac using rotor, job owncloud-client-osx (uncheck the "nightly build" checkbox, check the "sign package" checkboxes) both themes 'ownCloud' and 'testpilotcould'
-* [ ] Stop publishing on OBS
-* [ ] Branch isv:ownCloud:desktop to isv:ownCloud:desktop:client-X.Y.Z before overwriting https://github.com/owncloud/administration/blob/master/jenkins/obs_integration/obs-backup-prj.sh
-* [ ] Create Linux builds using rotor job owncloud-client-linux (this magically interacts with the ownCloud-client-source job)
-  * Check if patches still apply in the linux packages
-  * Update [OBS repository](https://build.opensuse.org/project/show?project=isv%3AownCloud%3Adesktop) `isv:ownCloud:desktop`
-  * [ ] theme 'ownCloud' -> isv:ownCloud:desktop
-  * [ ] theme 'testpilotcloud' -> isv:ownCloud:testpilot
-* [ ] Linux: Update the testing repository to the latest stable version.
-* [ ] Inform GCX that a new tarball is available.
-* [ ] Copy builds and source tar ball from ```daily``` to ```stable``` on download.owncloud.com, double check the download links.
-* [ ] Check if the following packages are on download.owncloud.com/desktop/stable:
-  * Windows binary package
-  * Mac binary package
-  * source tarballs
-* [ ] Create a pull request to the owncloud.org repository to update the install page (strings.php, page-desktop.php) and the changelog on owncloud.org. From now on download packages from the staging webserver.
-* [ ] Re-download Mac builds and check signature. Interactive in installer window
-* [ ] Re-download Win build check signature. From Mac or Linux: ```osslsigncode verify ownCloud-version-setup.exe```
-* [ ] Mac: Perform smoke test (Install, make sure it does not explode, and check if all version indicators are correct)
-* [ ] Win: Perform smoke test (Install, make sure it does not explode, and check if all version indicators are correct)
-* [ ] Linux: Smoke test 
-* [ ] Linux: Re-enable OBS publishing
-  * Let obs build and publish exactly once. then
-  * [ ] disable publishing and rebuild for the owncloud-client package and all its dependencies.
-  * [ ] double-check that there are no _aggregatepac from other projects, if so disable rebuilding there too.
-* [ ] Update ASCII Changelog on http://download.owncloud.com/download/changelog-client
-* [ ] Announce on https://central.owncloud.org
-* [ ] Announce on announcements@owncloud.org
-* [ ] Create git signed tag in client repository using ```git tag -u E94E7B37 tagname```
-* [ ] Send out Social (tweet, blog, other)
-* [ ] Send out customer communication (if any)
-* [ ] Inform GCX that the new version is released (gcx@owncloud.com)
-* [ ] Inform release-coordination@owncloud.com
-* [ ] Ensure marketing is aware (marketing@owncloud.com)
-* [ ] Take pride and celebrate!
-* [ ] Also update the testpilotcloud builds for that release version and make sure they show up on the download page
-* [ ] Days later: Update the updater script ```clientupdater.php``` (check the crash reporter if auto update is a good idea or we need a new release)
-* [ ] Tell GCX to increment the minimum supported version for enterprise customers
-* [ ] Check if minimum.supported.desktop.version (https://github.com/owncloud/core/blob/master/config/config.sample.php#L1152) needs to be updated in server
-```
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
+[submodule "doc/ocdoc"]
+	path = doc/ocdoc
+	url = https://github.com/owncloud/documentation
 [submodule "src/3rdparty/qtmacgoodies"]
 	path = src/3rdparty/qtmacgoodies
 	url = https://github.com/guruz/qtmacgoodies.git
@@ -7,3 +10,6 @@
 [submodule "src/3rdparty/libcrashreporter-qt"]
 	path = src/3rdparty/libcrashreporter-qt
 	url = git://github.com/dschmidt/libcrashreporter-qt.git
+[submodule "src/3rdparty/qtkeychain"]
+	path = src/3rdparty/qtkeychain
+	url = https://github.com/frankosterfeld/qtkeychain.git
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,37 @@
+sudo: required
+
+language: cpp
+
+services:
+  - docker
+
+branches:
+  only:
+  - coverity_scan 
+
+before_install:
+- sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- sudo sh -c "echo 'deb-src http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/Ubuntu_14.04/Release.key
+- sudo apt-key add - < Release.key
+- sudo apt-get update
+- sudo apt-get -y build-dep owncloud-client
+- checkout=$(git show-ref --head --hash head)
+- cd ../
+- wget https://scan.coverity.com/download/linux-64 --post-data "token=$token&project=owncloud%2Fmirall" -O coverity_tool.tgz
+- mkdir coverity
+- tar -xvf coverity_tool.tgz -C coverity --strip-components=1
+- export PATH=$PATH:$PWD/coverity/bin/
+- cd $TRAVIS_BUILD_DIR
+
+install:
+- cd ../
+- mkdir client-build
+- cd client-build
+- cmake -DCMAKE_BUILD_TYPE="Debug" $TRAVIS_BUILD_DIR
+- cov-build --dir cov-int make
+- tar czvf client.tgz cov-int 
+- curl --form token=$token --form email=lukas@statuscode.ch --form file=@$PWD/client.tgz --form version="$checkout" --form description="$checkout" https://scan.coverity.com/builds?project=owncloud%2Fmirall
+
+# Hack to stop processing
+script: true
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,19 +22,16 @@ else()
    set(APPLICATION_REV_DOMAIN_INSTALLER ${APPLICATION_REV_DOMAIN})
 endif()

+if (NOT DEFINED APPLICATION_SHORTNAME)
+     set ( APPLICATION_SHORTNAME ${APPLICATION_NAME} )
+endif()
+
 # For usage in XML files we preprocess
 string(REPLACE "&" "&amp;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME}")
 string(REPLACE "<" "&lt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")
 string(REPLACE ">" "&gt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")

-if (NOT DEFINED LINUX_PACKAGE_SHORTNAME)
-    set(LINUX_PACKAGE_SHORTNAME "${APPLICATION_SHORTNAME}")
-endif()
-
-if (NOT DEFINED PACKAGE)
-    set(PACKAGE "${LINUX_PACKAGE_SHORTNAME}-client")
-endif()
-
+set(PACKAGE "${APPLICATION_SHORTNAME}-client")
 set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )

 if(NOT CRASHREPORTER_EXECUTABLE)
@@ -44,13 +41,7 @@ endif()
 include(Warnings)

 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
-# For config.h
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
-# Allows includes based on src/ like #include "common/utility.h" or #include "csync/csync.h"
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/src
-    ${CMAKE_CURRENT_BINARY_DIR}/src
-)

 # disable the crashreporter if libcrashreporter-qt is not available or we're building for ARM
 if( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/libcrashreporter-qt/CMakeLists.txt")
@@ -129,22 +120,7 @@ if(NO_MSG_HANDLER)
   add_definitions(-DNO_MSG_HANDLER=1)
 endif()

-# this option builds the shell integration
-option(BUILD_SHELL_INTEGRATION "BUILD_SHELL_INTEGRATION" ON)
-
-# this option builds/installs the generic shell integration icons
-option(BUILD_SHELL_INTEGRATION_ICONS "BUILD_SHELL_INTEGRATION_ICONS" ON)
-
-# this options builds the dolphin integration plugin
-option(BUILD_SHELL_INTEGRATION_DOLPHIN "BUILD_SHELL_INTEGRATION_DOLPHIN" ON)
-
-# this options builds the nautilus (like) integration plugins
-option(BUILD_SHELL_INTEGRATION_NAUTILUS "BUILD_SHELL_INTEGRATION_NAUTILUS" ON)
-
-# this option builds the client
-option(BUILD_CLIENT "BUILD_CLIENT" ON)
-
-# this option creates only libocsync and libowncloudsync (NOTE: BUILD_CLIENT needs to be on)
+# this option creates only libocsync and libowncloudsync
 option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF)

 # When this option is enabled, 5xx errors are not added to the blacklist
@@ -177,34 +153,34 @@ if(APPLE)
  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
 endif()

-if(BUILD_CLIENT)
-    if(APPLE)
-        find_package(Sparkle)
-    endif(APPLE)
+find_package(OpenSSL 1.0.0 REQUIRED)

-    if(UNIX)
-        find_package(INotify REQUIRED)
-    else()
-        find_package(INotify)
+if(APPLE)
+  find_package(Sparkle)
+endif(APPLE)
+
+if(UNIX)
+  find_package(INotify REQUIRED)
+else()
+  find_package(INotify)
+endif()
+find_package(Sphinx)
+find_package(PdfLatex)
+
+find_package(SQLite3 3.8.0 REQUIRED)
+# On some OS, we want to use our own, not the system sqlite
+if (USE_OUR_OWN_SQLITE3)
+    include_directories(BEFORE ${SQLITE3_INCLUDE_DIR})
+    if (WIN32)
+        add_definitions(-DSQLITE_API=__declspec\(dllimport\))
    endif()
-    find_package(Sphinx)
-    find_package(PdfLatex)
-
-    find_package(SQLite3 3.8.0 REQUIRED)
-    # On some OS, we want to use our own, not the system sqlite
-    if (USE_OUR_OWN_SQLITE3)
-        include_directories(BEFORE ${SQLITE3_INCLUDE_DIR})
-        if (WIN32)
-            add_definitions(-DSQLITE_API=__declspec\(dllimport\))
-        endif()
-    endif()
-
-   find_package(ZLIB REQUIRED)
 endif()

-if (NOT DEFINED APPLICATION_ICON_NAME)
-    set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME})
-endif()
+find_package(ZLIB)
+
+configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
+configure_file(test/test_journal.db "${CMAKE_BINARY_DIR}/test/test_journal.db" COPYONLY)

 include(OwnCloudCPack.cmake)

@@ -215,46 +191,18 @@ add_definitions( -D__USE_MINGW_ANSI_STDIO=1 )
 add_definitions( -DNOMINMAX )
 endif( WIN32 )

-include(QtVersionAbstraction)
-setup_qt()
-if (${Qt5Core_VERSION_MAJOR} EQUAL "5")
-    if (${Qt5Core_VERSION_MINOR} EQUAL "6" OR ${Qt5Core_VERSION_MINOR} GREATER 6)
-    else()
-      message(STATUS "If possible compile me with Qt 5.6 or higher.")
-    endif()
-    if (${Qt5Core_VERSION_MINOR} EQUAL "9" OR ${Qt5Core_VERSION_MINOR} GREATER 9)
-    else()
-      message(STATUS "For HTTP2 use Qt 5.9.2 or higher.")
-    endif()
-endif()
-message("Qt ${Qt5Core_VERSION} at ${Qt5Core_INCLUDE_DIRS}")
-
-if (APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-endif()
-
 # Handle Translations, pick all client_* files from trans directory.
 file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/client_*.ts)
 set(TRANSLATIONS ${TRANS_FILES})

-# Make sure we set this before recursing into child folders.
-set(WITH_TESTING ${UNIT_TESTING})
-
-if(BUILD_CLIENT)
-    add_subdirectory(src)
-    if(NOT BUILD_LIBRARIES_ONLY)
-        add_subdirectory(man)
-        add_subdirectory(doc)
-        add_subdirectory(doc/dev)
-        if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin)
-            add_subdirectory(admin)
-        endif(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin)
-    endif(NOT BUILD_LIBRARIES_ONLY)
-endif()
-
-if(BUILD_SHELL_INTEGRATION)
-    add_subdirectory(shell_integration)
-endif()
+add_subdirectory(csync)
+add_subdirectory(src)
+if(NOT BUILD_LIBRARIES_ONLY)
+add_subdirectory(shell_integration)
+add_subdirectory(doc)
+add_subdirectory(doc/dev)
+add_subdirectory(admin)
+endif(NOT BUILD_LIBRARIES_ONLY)

 if(UNIT_TESTING)
    include(CTest)
@@ -262,13 +210,10 @@ if(UNIT_TESTING)
    add_subdirectory(test)
 endif(UNIT_TESTING)

-configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
-
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
    install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
    configure_file(sync-exclude.lst bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
-elseif(BUILD_CLIENT)
+else()
    install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
    configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
 endif()
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,7 +23,7 @@ If your issue appears to be a bug, and hasn't been reported, open a new issue.
 Help us to maximize the effort we can spend fixing issues and adding new
 features, by not reporting duplicate issues.

-[template]: https://raw.github.com/owncloud/client/master/.github/issue_template.md
+[template]: https://raw.github.com/owncloud/client/master/issue_template.md
 [mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud
 [forum]: http://forum.owncloud.org/
 [irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4
--- a/156
+++ b/156
@@ -1,163 +1,11 @@
 ChangeLog
 =========

-version 2.4.2 (2018-06-xx)
-* Linux: Tray workarounds (#6545)
-* Fix nautilus/nemo shell issues (#6393, #6406)
-* Updater: Add update channel feature (#6259)
-* Updater: Support EXE->MSI upgrade
-* SyncJournal: Fixes for sync folders on removable media (#6049, #6049)
-* SslButton: Add HTTP/2 info (#3146)
-* Fix assert when using ownCloud server 5 (which you should not) (#6403)
-* Normalize local path (#4424)
-* Blacklisting must prevent parent etag updates (#6411)
-* macdeployqt: Adjust minimum version based on our Qt (#5932)
-* macOS: Unload the Finder extension on exit (#5382, #3819)
-* Upload: Adjust timeout for final job based on file size (#6527)
-* Sync: When detecting a local move, keep the local mtime (#6629)
-* Credentials: Retry fetching from the keychain in case the keychain is still starting (#4274, #6522)
-* OAuth2: Try to refresh the token even if the credentials weren't ready (#6522)
-
-version 2.4.1 (2018-02-xx)
-* Ignore files with file names that can't be encoded for the filesystem (#6287, #5676, #5719)
-* Issues: Speed up insertion and add hard upper limit (#6272)
-* Notifications: Fix "Dismiss" action
-* Notifications: Fix timer invocation on macOS
-* Notifications: Immediately poll when account online
-* Protocol: Remove entries for auto resolved conflicts (#6316)
-* owncloudcmd: Set proxy before capabilities call (#6281)
-* owncloudcmd: Do not do the capability call when --nonshib is passed
-* Avatars: Use old location for servers <10 (#6279)
-* Link shares: Change default share name (#6298)
-* Sharing: Use maximum allowed permissions for new share (#6346)
-* Nautilus integration: Work with python2 and python3
-* Windows: Don't delete contents behind directory junctions (#6322)
-* SyncJournal: Don't use LIKE with paths (#6322)
-* Fix setting launch-on-startup when the first account is set up (#6347)
-* HTTP2: Only allow with Qt 5.9.4 (#6285)
-* Crash fixes
-
-version 2.4.0 (2017-12-21)
-* If you're using 2.4.0 alpha1, please upgrade as previous alphas/rcs had an issue with hidden files and renames!
-* OAuth2 authentication support by opening external browser (#5668)
-* Shibboleth: Change to use OAuth2 if supported (#6198)
-* Sharing: Add support for multiple public link shares (#5655)
-* Sharing: Add option to copy/email private links (#5023, #5627)
-* Sharing: Add option "show file listing" (#5837)
-* Sharing: Show warning that links are public (#5747)
-* Sharing: Sharing dialog redesign: multiple share links support (#5695)
-* Sharing: Make "can edit" partially checked sometimes (#5642)
-* Sharing: Trigger a sync for folder affected by a change of sharing (#6098)
-* Wizard: Never propose an existing folder for syncing (#5597)
-* Wizard: Don't show last page anymore, go to settings directly (#5726)
-* Wizard: Handle url-shortener redirects (#5954)
-* Wizard: Resolve url/ redirects only if url/status.php not found (#5954)
-* Wizard: Add explanation text when server error is shown (#6157)
-* Wizard: Update the window size on high dpi screen (#6156)
-* Wizard: Don't report confusing error message (#6116)
-* Gui: Display the user server avatar (#5482)
-* Gui: Use display name of user, not internal name
-* Server URL: Update configuration in case of permanent redirection (#5972)
-* Gui: Allow to add multiple sync folder connection of the same folder (#6032)
-* Tray Menu: More detailed status messages
-* Tray Menu: Shibboleth: raise the browser when clicking on the tray (#6105)
-* Activity: Link errors from the account tab, allow filtering by account/folder (#5861)
-* Activity: Present conflicts more prominently (#5894)
-* Activity: Allow sorting the columns in issues and protocol tabs (#6093, #6086)
-* Selective Sync: Open sub folder context menu (#5596)
-* Selective Sync: Skip excluded folders when reading db (#5772)
-* Selective Sync: Remove local files of unselected folder despite other modified files (#5783)
-* Excludes: Remove .htaccess form list of excluded files (#5701)
-* Excludes: Hardcode desktop.ini
-* Excludes: Allow escaping "#" (#6012)
-* Excludes: Use faster matching via QRegularExpression (#6063)
-* Discovery: Increase the MAX_DEPTH and show deep folders as ignored (#1067)
-* Discovery: General speed improvements
-* Downloads: Remove empty temporary if disk space full (#5746)
-* Downloads: Read Content-MD5 header for object store setups
-* Checksums: Add global disable environment variable (#5017)
-* Quota: PropagateUpload: Model of remote quota, avoid some uploads (#5537)
-* Create favorite also in folder wizard (#455)
-* Windows: Use the application icon for the Windows 8 sidebar favorite (#2446, #5690)
-* macOS: Finder sidebar icon (#296)
-* Overlay Icons: Consider also the "shared by me" as shared (#4788)
-* Overlay Icons: Update right after sharing (#6115)
-* Overlay Icons: Fix different case paths not matching (#5257)
-* Overlay Icons: Detect changes in the shared flag (#6098)
-* Windows Overlay Icons: Potential hang fixes
-* Linux Overlay Icons: fix branded nemo and caja shell integration (#5966)
-* Credentials: Fix behavior for bad password (#5989)
-* Credentials: Don't create empty client cert keychain entries (#5752)
-* Credentials: Namespace windows cred keys (#6125)
-* Credentials: Use per-account keychain entries (#5830, #6126)
-* AccountSettings: Triggering log in re-ask about previously rejected certificates (#5819)
-* owncloudcmd: Added bandwidth limit parameter (#5707)
-* owncloudcmd: Fix timestamps, Fix --logdebug
-* AccountSettings: Sync with clean discovery on Ctrl-F6 (#5666)
-* Sync: Dynamic sizing of chunks in chunked uploads for improved big file upload performance (#5852)
-* Sync: Introduce overall errors that are not tied to a file (#5746)
-* Sync: Better messaging for 507 Insufficient Storage (#5537)
-* Sync: Create conflicts by comparing the hash of files with identical mtime/size (#5589)
-* Sync: Avoid downloads by comparing the hash of files with identical mtime/size (#6153)
-* Sync: Upload conflict files if OWNCLOUD_UPLOAD_CONFLICT_FILES environment variable is set (#6038)
-* Sync: Blacklist: Don't let errors become warnings (#5516)
-* Sync: Check etag again after active sync (#4116)
-* Sync: Rename handling fixes: duplicate file ids (#6096, #6212)
-* Sync: Rename handling fixes: File size must be equal
-* Sync: Rename handling: Fix duplicate files on abort/resume sync (#5949)
-* Sync: Add capability for invalid filename regexes (#6092)
-* SyncJournalDB: Fall back to DELETE journal mode if WAL mode does not seem to work (#5723)
-* SyncJournalDB: Don't crash if the db file is readonly (#6050)
-* SyncJournalDB: DB close error is not fatal
-* Fix at least one memory leak
-* Documentation improvements
-* Logging improvements (With Qt logging categories) (#5671)
-* Logging filtering per account (#5672)
-* Crash fixes
-* Test improvements
-* Small UI layout fixes
-* Performance improvements
-* Maintenance Mode: Detect maintenance mode (#4485)
-* Maintenance Mode: Add a 1 to 5 min reconnection delay (#5872)
-* HTTP: Send a unique X-Request-ID with each request (#5853)
-* HTTP: Support HTTP2 when built and running with Qt 5.9.x (Official packages still on Qt 5.6.x) (#5659)
-* owncloudcmd: Don't start if connection or auth fails (#5692)
-* csync: Switch build from C to C++ (#6033)
-* csync: Refactor a lot to use common data structures to save memory and memory copying
-* csync: Switch some data structures to Qt data structures
-* csync: Switch to using upper layer SyncJournalDB (#6087)
-* Switch 3rdparty/json usage to Qt5's QJson (#5710)
-* OpenSSL: Don't require directly, only via Qt (#5833)
-* Remove iconv dependency, use Qt for file system locale encoding/decoding (emoji filename support on macOS) (#5875)
-* Compilation: Remove Qt 4 code (#6025, #5702, #5505)
-* Harmonize source code style with clang-format (#5732)
-* Switch over to Qt 5 function pointer signal/slot syntax (#6041)
-* Compile with stack-smashing protection
-* Updater: Rudimentary support for beta channel (#6048)
-
-version 2.3.4 (2017-11-02)
-* Checksums: Use addData function to avoid endless loop CPU load issues with Office files
-* Packaging: Require ZLIB
-
-version 2.3.3 (2017-08-29)
-* Chunking NG: Don't use old chunking on new DAV endpoint (#5855)
-* Selective Sync: Skip excluded folders when reading DB, don't let them show errors (#5772)
-* Settings: Make window bigger so Qt version is always visible (#5760)
-* Share links: Show warning that public link shares are public (#5786)
-* Downloads: Re-trigger folder discovery on HTTP 404 (#5799)
-* Overlay Icons: Fix potential hangs on Windows
-* SyncJournalDB: Don't use ._ as filename pattern if that does not work because of SMB storage settings (#5844)
-* SyncJournalDB: Log reason for sqlite3 opening errors
-* Notifications: Proapgate "Dismiss" button action to server (#5922)
-* Switch Linux build also to Qt 5.6.2 (#5470)
-* Stopped maintaining Qt 4 buildability
-
-version 2.3.2 (2017-05-08)
+version 2.3.2 (2017-04-xx)
 * Fix more crashes (thanks to everyone submitting to our crash reporter!)
 * Improve compatibility with server 10.0 (#5691, X-OC-Total-Size)
 * Share dialog: UI improvements, Bring to front on tray click
 * owncloudcmd: Align process return value with sync return value (#3936)
-* Fix disk free check on Windows when opening the local DB

 version 2.3.1 (2017-03-21)
 * Fix several crashes (thanks to everyone submitting to our crash reporter!)
@@ -266,6 +114,7 @@ version 2.2.0 (release 2016-05-12)
 * Documentation Improvements, ie. about overlay icons
 * Translation fixes
 * Countless other bugfixes
+ * Sqlite Update to recent version
 * Update of QtKeyChain to support Windows credential store
 * Packaging of dolphin overlay icon module for bleeding edge distros

@@ -336,6 +185,7 @@ version 2.1 (release 2015-12-03)
 * Fixed getting size for selective sync (#3986)
 * Re-added close button in the settings window (#3713)
 * Added abililty to handle storage limitations gracefully (#3736)
+ * Updated 3rdparty dependencies: sqlite version 3.9.1
 * Organized patches to our base Qt version into admin/qt/patches
 * Plus: A lot of unmentioned improvements and fixes

--- a/58
+++ b/58
@@ -0,0 +1,58 @@
+#!groovy
+
+node('CLIENT') {
+    stage 'Checkout'
+        checkout scm
+        sh '''git submodule update --init'''
+
+    stage 'Qt4'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DUNIT_TESTING=1 -DBUILD_WITH_QT4=ON ..
+		make
+		ctest --output-on-failure'''
+
+    stage 'Qt4 - clang'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DBUILD_WITH_QT4=ON ..
+		make
+		ctest --output-on-failure'''
+
+    stage 'Qt5'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DUNIT_TESTING=1 -DBUILD_WITH_QT4=OFF ..
+		make
+		ctest --output-on-failure'''
+
+    stage 'Qt5 - clang'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DBUILD_WITH_QT4=OFF ..
+		make
+		ctest --output-on-failure'''
+
+
+    stage 'Win32'
+	def win32 = docker.image('guruz/docker-owncloud-client-win32:latest')
+	win32.pull() // make sure we have the latest available from Docker Hub
+	win32.inside {
+		sh '''
+		rm -rf build-win32
+		mkdir build-win32
+		cd build-win32
+		../admin/win/download_runtimes.sh
+		cmake .. -DCMAKE_TOOLCHAIN_FILE=../admin/win/Toolchain-mingw32-openSUSE.cmake -DWITH_CRASHREPORTER=ON
+		make -j4
+		make package
+		ctest .
+		'''
+	}
+}
+
+
--- a/OWNCLOUD.cmake
+++ b/OWNCLOUD.cmake
@@ -1,12 +1,8 @@
 set( APPLICATION_NAME       "ownCloud" )
-set( APPLICATION_SHORTNAME  "ownCloud" )
 set( APPLICATION_EXECUTABLE "owncloud" )
 set( APPLICATION_DOMAIN     "owncloud.com" )
 set( APPLICATION_VENDOR     "ownCloud" )
 set( APPLICATION_UPDATE_URL "https://updates.owncloud.com/client/" CACHE string "URL for updater" )
-set( APPLICATION_ICON_NAME  "owncloud" )
-
-set( LINUX_PACKAGE_SHORTNAME "owncloud" )

 set( THEME_CLASS            "ownCloudTheme" )
 set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" )
@@ -19,4 +15,4 @@ set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-back

 option( WITH_CRASHREPORTER "Build crashreporter" OFF )
 set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" )
-
+set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
--- a/OwnCloudCPack.cmake
+++ b/OwnCloudCPack.cmake
@@ -48,7 +48,7 @@ if(WIN32)
    set( CPACK_PACKAGE_DESCRIPTION_FILE  "${CMAKE_SOURCE_DIR}/README.md" ) # File used as a description of a project     /path/to/project/ReadMe.txt
    set( CPACK_PACKAGE_DESCRIPTION_SUMMARY  "${APPLICATION_NAME} Syncing Client" ) #  Description summary of a project
    # CPACK_PACKAGE_EXECUTABLES   List of pairs of executables and labels. Used by the NSIS generator to create Start Menu shortcuts.     ccmake;CMake
-    set( CPACK_PACKAGE_INSTALL_DIRECTORY  ${APPLICATION_SHORTNAME} )     # Installation directory on the target system -> C:\Program Files\${APPLICATION_SHORTNAME}
+    set( CPACK_PACKAGE_INSTALL_DIRECTORY  ${APPLICATION_SHORTNAME} )     # Installation directory on the target system -> C:\Program Files\fellody
    set( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APPLICATION_SHORTNAME} )  # Registry key used when installing this project  CMake 2.5.0
    set( CPACK_PACKAGE_NAME  ${APPLICATION_NAME} ) # Package name, defaults to the project name
    set( CPACK_PACKAGE_VENDOR  "http://${APPLICATION_DOMAIN}" )   # Package vendor name
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
 # ownCloud Desktop Client

-[![Build Status](https://drone.owncloud.com/api/badges/owncloud/client/status.svg)](https://drone.owncloud.com/owncloud/client)
+| Job                               | State                                                                                                                                                             |
+|-----------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| client-build-matrix               | [![Build Status](https://ci.owncloud.org/job/client-build-matrix-linux/badge/icon)](https://ci.owncloud.org/job/client-build-matrix-linux/)                       |
+| client-test-matrix-linux-no-build | [![Build Status](https://ci.owncloud.org/buildStatus/icon?job=client-test-matrix-linux-no-build)](https://ci.owncloud.org/job/client-test-matrix-linux-no-build/) |
+| coverity_scan | [![Build Status](https://img.shields.io/coverity/scan/2482.svg)](https://scan.coverity.com/projects/owncloud-mirall)

 ## Introduction

@@ -23,7 +27,7 @@ https://github.com/owncloud/client.

 ## Building the source code

-[Building the Client](http://doc.owncloud.org/desktop/2.3/building.html)
+[Building the Client](http://doc.owncloud.org/desktop/2.2/building.html)
 in the ownCloud Desktop Client manual.

 ## Maintainers and Contributors
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,7 +1,7 @@
 set( MIRALL_VERSION_MAJOR 2 )
-set( MIRALL_VERSION_MINOR 4 )
+set( MIRALL_VERSION_MINOR 3 )
 set( MIRALL_VERSION_PATCH 2 )
-set( MIRALL_VERSION_YEAR  2018 )
+set( MIRALL_VERSION_YEAR  2017 )
 set( MIRALL_SOVERSION 0 )

 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
--- a/admin/linux/clean_tarball.sh
+++ b/admin/linux/clean_tarball.sh
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-rm -vrf admin/
-rm -vrf src/3rdparty/sqlite3   # FIXME: For CentOS6 we have to use our bundled sqlite
-rm -vrf binary/
-rm -vrf src/3rdparty/libcrashreporter-qt
-rm -vrf shell_integration/windows
-rm -vrf shell_integration/MacOSX
--- a/admin/osx/CMakeLists.txt
+++ b/admin/osx/CMakeLists.txt
@@ -11,7 +11,6 @@ else()
  set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
 endif()

-find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
 configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
 configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
 configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
--- a/admin/osx/create_mac_pkg.sh.cmake
+++ b/admin/osx/create_mac_pkg.sh.cmake
@@ -23,7 +23,7 @@ identity="$3"
 prjfile=$build_path/admin/osx/macosx.pkgproj

 # The name of the installer package
-installer="@APPLICATION_SHORTNAME@-qt@Qt5Core_VERSION@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
+installer="@APPLICATION_SHORTNAME@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
 installer_file="$installer.pkg"
 installer_file_tar="$installer.pkg.tar"
 installer_file_tar_bz2="$installer.pkg.tar.bz2"
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -22,7 +22,6 @@ import subprocess
 import commands
 import sys
 from glob import glob
-from distutils.version import LooseVersion

 def QueryQMake(attrib):
    return subprocess.check_output([qmake_path, '-query', attrib]).rstrip('\n')
@@ -93,8 +92,6 @@ commands.append(['mkdir', '-p', resources_dir])
 plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns')
 binaries = [i for i in glob(os.path.join(bundle_dir, 'Contents', 'MacOS', "*")) if is_exe(i)];

-qt_version = QueryQMake('QT_VERSION')
-print "Using Qt", qt_version

 fixed_libraries = []
 fixed_frameworks = []
@@ -337,19 +334,9 @@ def FindQtPlugin(name):
 for binary in binaries:
  FixBinary(binary)

-
-if LooseVersion(qt_version) >= LooseVersion("5.10.0"):
-  QT_PLUGINS.append('styles/libqmacstyle.dylib')
 for plugin in QT_PLUGINS:
  FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))

-if LooseVersion(qt_version) >= LooseVersion("5.10.0"):
-  args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.10.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
-  commands.append(args)
-else:
-  args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.7.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
-  commands.append(args)
-
 if len(sys.argv) <= 2:
  print 'Will run %d commands:' % len(commands)
  for command in commands:
--- a/admin/osx/macosx.pkgproj
+++ b/admin/osx/macosx.pkgproj
@@ -506,6 +506,536 @@
 			<key>UUID</key>
 			<string>7D7219B7-1897-48C3-8533-842BDEC46F71</string>
 		</dict>
+		<dict>
+			<key>PACKAGE_FILES</key>
+			<dict>
+				<key>DEFAULT_INSTALL_LOCATION</key>
+				<string>/</string>
+				<key>HIERARCHY</key>
+				<dict>
+					<key>CHILDREN</key>
+					<array>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Utilities</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Applications</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>509</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Application Support</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Documentation</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Filesystems</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Frameworks</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Input Methods</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Internet Plug-Ins</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchAgents</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchDaemons</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PreferencePanes</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Preferences</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Printers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PrivilegedHelperTools</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickLook</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickTime</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Screen Savers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>Library/ScriptingAdditions/SyncStateFinder.osax/Contents</string>
+													<key>PATH_TYPE</key>
+													<integer>3</integer>
+													<key>PERMISSIONS</key>
+													<integer>493</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+											</array>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>PATH</key>
+											<string>SyncStateFinder.osax</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>2</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>ScriptingAdditions</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>2</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Scripts</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Services</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Widgets</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>Library</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array/>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>PATH</key>
+											<string>Extensions</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>1</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Library</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>System</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Shared</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>1023</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Users</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>GID</key>
+					<integer>0</integer>
+					<key>PATH</key>
+					<string>/</string>
+					<key>PATH_TYPE</key>
+					<integer>0</integer>
+					<key>PERMISSIONS</key>
+					<integer>493</integer>
+					<key>TYPE</key>
+					<integer>1</integer>
+					<key>UID</key>
+					<integer>0</integer>
+				</dict>
+				<key>PAYLOAD_TYPE</key>
+				<integer>0</integer>
+				<key>VERSION</key>
+				<integer>2</integer>
+			</dict>
+			<key>PACKAGE_SCRIPTS</key>
+			<dict>
+				<key>POSTINSTALL_PATH</key>
+				<dict/>
+				<key>PREINSTALL_PATH</key>
+				<dict/>
+				<key>RESOURCES</key>
+				<array/>
+			</dict>
+			<key>PACKAGE_SETTINGS</key>
+			<dict>
+				<key>AUTHENTICATION</key>
+				<integer>1</integer>
+				<key>CONCLUSION_ACTION</key>
+				<integer>0</integer>
+				<key>IDENTIFIER</key>
+				<string>com.ownCloud.finderPlugin</string>
+				<key>LOCATION</key>
+				<integer>0</integer>
+				<key>NAME</key>
+				<string>Legacy Finder Plugin (OS X 10.9 or older)</string>
+				<key>OVERWRITE_PERMISSIONS</key>
+				<false/>
+				<key>VERSION</key>
+				<string>@MIRALL_VERSION_FULL@</string>
+			</dict>
+			<key>TYPE</key>
+			<integer>0</integer>
+			<key>UUID</key>
+			<string>39F61FCD-6EAA-4F3A-81C6-25E3F667DFB5</string>
+		</dict>
 	</array>
 	<key>PROJECT</key>
 	<dict>
@@ -573,6 +1103,49 @@
 								<key>UUID</key>
 								<string>9647ADC0-BD53-4D7D-A561-73D383AACDE1</string>
 							</dict>
+							<dict>
+								<key>DESCRIPTION</key>
+								<array/>
+								<key>OPTIONS</key>
+								<dict>
+									<key>HIDDEN</key>
+									<false/>
+									<key>STATE</key>
+									<integer>1</integer>
+								</dict>
+								<key>PACKAGE_UUID</key>
+								<string>39F61FCD-6EAA-4F3A-81C6-25E3F667DFB5</string>
+								                                                                <key>REQUIREMENTS</key>
+								                                                               <array>
+								                                                                       <dict>
+								                                                                               <key>BEHAVIOR</key>
+								                                                                               <integer>1</integer>
+								                                                                               <key>DICTIONARY</key>
+								                                                                               <dict>
+								                                                                                       <key>IC_REQUIREMENT_JAVASCRIPT_FUNCTION</key>
+								                                                                                       <string>olderOsx</string>
+								                                                                                       <key>IC_REQUIREMENT_JAVASCRIPT_PARAMETERS</key>
+								                                                                                       <array/>
+								                                                                               </dict>
+								                                                                               <key>IDENTIFIER</key>
+								                                                                               <string>fr.whitebox.Packages.requirement.javascript</string>
+								                                                                               <key>MESSAGE</key>
+								                                                                               <array/>
+								                                                                               <key>NAME</key>
+								                                                                               <string>JavaScript</string>
+								                                                                               <key>STATE</key>
+							                                                                                <true/>
+								                                                                       </dict>
+								                                                               </array>								
+								<key>TITLE</key>
+								<array/>
+								<key>TOOLTIP</key>
+								<array/>
+								<key>TYPE</key>
+								<integer>0</integer>
+								<key>UUID</key>
+								<string>1D2C47E0-5FD3-4623-B934-1347C66782D0</string>
+							</dict>
 						</array>
 						<key>REMOVED</key>
 						<dict/>
@@ -877,6 +1450,18 @@
 			<string>@CMAKE_INSTALL_DIR@</string>
 		</dict>
 	</dict>
+	        <key>SHARED_GLOBAL_DATA</key>
+	        <dict>
+	                <key>IC_REQUIREMENT_JAVASCRIPT_SHARED_SOURCE_CODE</key>
+	                <string>
+	function olderOsx() {
+   if(system.compareVersions(system.version.ProductVersion, '10.10') == -1) {
+	    return true;
+	}
+	return false;
+	}
+	</string>
+	        </dict>	
 	<key>TYPE</key>
 	<integer>0</integer>
 	<key>VERSION</key>
--- a/admin/osx/pre_install.sh.cmake
+++ b/admin/osx/pre_install.sh.cmake
@@ -3,4 +3,7 @@
 # kill the old version. see issue #2044
 killall @APPLICATION_EXECUTABLE@

+# Unload the Finder plugin. see issue #2105
+killall Finder
+
 exit 0
--- a/admin/win/docker/Dockerfile
+++ b/admin/win/docker/Dockerfile
@@ -8,7 +8,7 @@ ENV HOME /root
 ENV REFRESHED_AT 20160421

 RUN zypper --non-interactive --gpg-auto-import-keys refresh
-RUN zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_Leap_42.1/windows:mingw.repo
+RUN zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_42.1/windows:mingw.repo
 RUN zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/repositories/isv:ownCloud:toolchains:mingw:win32:2.3/openSUSE_Leap_42.1/isv:ownCloud:toolchains:mingw:win32:2.3.repo
 RUN zypper --non-interactive --gpg-auto-import-keys install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \
                      mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \
--- a/admin/win/nsi/l10n/Estonian.nsh
+++ b/admin/win/nsi/l10n/Estonian.nsh
@@ -9,7 +9,6 @@ StrCpy $PageReinstall_NEW_Field_3 "
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Juba paigaldatud"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Vali, kuidas sa soovid paigaldada ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Uuem versioon ${APPLICATION_NAME} on juba paigaldatud! Vanema versiooni paigaldus ei ole soovitatav. Kui tõesti tahad paigaldada vanemat versiooni, siis on parem esmalt eemaldada olemasolev. Vali tehtav toiming ning kliki Jätka."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} on juba paigaldatud.$\n$\nVali toiming, mida sa tahad sooritada ning kliki jätkamiseks nuppu Next."
 StrCpy $PageReinstall_SAME_Field_2 "Lisa/Taaspaigalda komponente"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalli ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalli ${APPLICATION_NAME}"
@@ -41,3 +40,4 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "See desinstallija vajab admini ligip
 StrCpy $UAC_ERROR_LOGON_SERVICE "Sisselogimisteenus ei tööta, katkestamine!"
 StrCpy $INIT_UNINSTALLER_RUNNING "See desinstallija on juba käimas."
 StrCpy $SectionGroup_Shortcuts "Otseteed"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
--- a/admin/win/nsi/l10n/Norwegian.nsh
+++ b/admin/win/nsi/l10n/Norwegian.nsh
@@ -3,7 +3,7 @@ StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Vis versjonsmerknader"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Fant ${APPLICATION_EXECUTABLE}-prosess(er) som må stoppes.$\nVil du at installasjonsprogrammet skal stoppe dem for deg?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Terminerer ${APPLICATION_EXECUTABLE}-prosesser."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Fant ikke prosess som skulle termineres!"
-StrCpy $PageReinstall_NEW_Field_1 "En eldre versjon av ${APPLICATION_NAME} er installert på systemet ditt. Det anbefales at du avinstallerer den versjonen før installering av ny versjon. Velg hva du vil gjøre og klikk Neste for å fortsette."
+StrCpy $PageReinstall_NEW_Field_1 "En eldre versjon av ${APPLICATION_NAME} er installert på systemet ditt. Det anbefales at du avnistallerer den versjonen før installering av ny versjon. Velg hva du vil gjøre og klikk Neste for å fortsette."
 StrCpy $PageReinstall_NEW_Field_2 "Avinstaller før installering"
 StrCpy $PageReinstall_NEW_Field_3 "Ikke avinstaller"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Allerede installert"
--- a/admin/win/nsi/l10n/Portuguese.nsh
+++ b/admin/win/nsi/l10n/Portuguese.nsh
@@ -18,7 +18,7 @@ StrCpy $SEC_APPLICATION_DETAILS "A instalar o essencial de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integração para Windows Explorer"
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "A instalar integração para Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Atalho  do progama no Menu Iniciar"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "A adicionar o atalho de ${APPLICATION_NAME} no Menu Iniciar."
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "A adicionar o atalho de ${APPLICATION_NAME} ao Menu Inicial."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Atalho da área de trabalho"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "A criar atalhos na área de trabalho"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atalho de início rápido"
--- a/admin/win/nsi/l10n/Spanish.nsh
+++ b/admin/win/nsi/l10n/Spanish.nsh
@@ -1,9 +1,9 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar las notas de la versión"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "El/los proceso(s) ${APPLICATION_EXECUTABLE} debe(n) ser detenido(s).$\n¿Quiere que el instalador lo haga por usted?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Deteniendo el/los proceso(s) ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "El/los proceso/s ${APPLICATION_EXECUTABLE} debe/n ser detenidos.$\n¿Quiere que el instalador lo haga por usted?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Deteniendo el/los proceso/s ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "¡Proceso a finalizar no encontrado!"
-StrCpy $PageReinstall_NEW_Field_1 "Una versión anterior de ${APPLICATION_NAME} se encuentra instalada en el sistema. Se recomienda desinstalar la versión actual antes de instalar la nueva. Seleccione la operacion deseada y haga click en Siguiente para continuar."
+StrCpy $PageReinstall_NEW_Field_1 "Una versión anterior de ${APPLICATION_NAME} se encuentra instalada en el sistema. Se recomienda de instalar la versión actual antes de instalar la nueva. Seleccione la operacion deseada y haga click en Siguiente para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "No desinstalar"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ya está instalado"
@@ -17,13 +17,13 @@ StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Elija la opcion de mantenim
 StrCpy $SEC_APPLICATION_DETAILS "Instalando  ${APPLICATION_NAME} esenciales."
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integración para Windows Explorer"
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalando la integración para Windows Explorer"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso directo al programa en Menú de Inicio"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso directo al programa Menú de Inicio"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Añadiendo accesos directos para ${APPLICATION_NAME} en el Menú de Inicio."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Acceso directo de Escritorio"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creando accesos directos de escritorio"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atajo de acceso rápido"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atajo de accceso rápido"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creando un Acceso Directo al Lanzador Rápido"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} esenciales."
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} esencial."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Acceso Directo de ${APPLICATION_NAME}"
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Acceso Directo de Escritorio para ${APPLICATION_NAME}"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Lanzador Rápido de Accesos Director para ${APPLICATION_NAME}."
--- a/admin/win/nsi/page_header.bmp
+++ b/admin/win/nsi/page_header.bmp
--- a/2
+++ b/2
--- a/cmake/modules/AddAppIconMacro.cmake
+++ b/cmake/modules/AddAppIconMacro.cmake
@@ -70,64 +70,45 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
        endif(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
    endif(WIN32)
    if (APPLE)
-        file(GLOB_RECURSE files "${pattern}")
-        file(MAKE_DIRECTORY ${appsources}.iconset)
+        # first convert image to a tiff using the Mac OS X "sips" utility,
+        # then use tiff2icns to convert to an icon
+        find_program(SIPS_EXECUTABLE NAMES sips)
+        find_program(TIFF2ICNS_EXECUTABLE NAMES tiff2icns)
+        if (SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
+            file(GLOB_RECURSE files  "${pattern}")
+            # we can only test for the 128-icon like that - we don't use patterns anymore
+            foreach (it ${files})
+                if (it MATCHES ".*128.*" )
+                    set (_icon ${it})
+                endif (it MATCHES ".*128.*")
+            endforeach (it)

-        # List from:
-        # https://developer.apple.com/library/content/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/Optimizing/Optimizing.html#//apple_ref/doc/uid/TP40012302-CH7-SW4
-        foreach (it ${files})
-            if (it MATCHES ".*icon-16.*")
-                configure_file(${it} ${appsources}.iconset/icon_16x16.png COPYONLY)
-            elseif (it MATCHES ".*icon-32.*")
-                configure_file(${it} ${appsources}.iconset/icon_16x16@2x.png COPYONLY)
-                configure_file(${it} ${appsources}.iconset/icon_32x32.png COPYONLY)
-            elseif (it MATCHES ".*icon-64.*")
-                configure_file(${it} ${appsources}.iconset/icon_32x32@2x.png COPYONLY)
-            elseif (it MATCHES ".*icon-128.*")
-                configure_file(${it} ${appsources}.iconset/icon_128x128.png COPYONLY)
-            elseif (it MATCHES ".*icon-256.*")
-                configure_file(${it} ${appsources}.iconset/icon_128x128@2x.png COPYONLY)
-                configure_file(${it} ${appsources}.iconset/icon_256x256.png COPYONLY)
-            elseif (it MATCHES ".*icon-512.*")
-                configure_file(${it} ${appsources}.iconset/icon_256x256@2x.png COPYONLY)
-                configure_file(${it} ${appsources}.iconset/icon_512x512.png COPYONLY)
-            elseif (it MATCHES ".*icon-1024.*")
-                configure_file(${it} ${appsources}.iconset/icon_512x512@2x.png COPYONLY)
-            endif()
-        endforeach (it)
+            if (_icon)
+                
+                # first, get the basename of our app icon
+                add_custom_command(OUTPUT ${_outfilename}.icns ${outfilename}.tiff
+                                   COMMAND ${SIPS_EXECUTABLE} -s format tiff ${_icon} --out ${outfilename}.tiff
+                                   COMMAND ${TIFF2ICNS_EXECUTABLE} ${outfilename}.tiff ${_outfilename}.icns
+                                   DEPENDS ${_icon}
+                                   )

-        # Copy the sidebar icons in the main app bundle for the FinderSync extension to pick.
-        # https://developer.apple.com/library/content/documentation/General/Conceptual/ExtensibilityPG/Finder.html#//apple_ref/doc/uid/TP40014214-CH15-SW15
-        foreach (it ${files})
-            if (it MATCHES ".*sidebar-16.*")
-                configure_file(${it} ${appsources}.iconset/sidebar_16x16.png COPYONLY)
-            elseif (it MATCHES ".*sidebar-18.*")
-                configure_file(${it} ${appsources}.iconset/sidebar_18x18.png COPYONLY)
-            elseif (it MATCHES ".*sidebar-32.*")
-                configure_file(${it} ${appsources}.iconset/sidebar_16x16@2x.png COPYONLY)
-                configure_file(${it} ${appsources}.iconset/sidebar_32x32.png COPYONLY)
-            elseif (it MATCHES ".*sidebar-36.*")
-                configure_file(${it} ${appsources}.iconset/sidebar_18x18@2x.png COPYONLY)
-            elseif (it MATCHES ".*sidebar-64.*")
-                configure_file(${it} ${appsources}.iconset/sidebar_32x32@2x.png COPYONLY)
-            endif()
-        endforeach (it)
+                # This will register the icon into the bundle
+                set(MACOSX_BUNDLE_ICON_FILE ${appsources}.icns)

-        add_custom_command(OUTPUT ${_outfilename}.icns
-                           COMMAND echo === Building bundle icns with iconset:
-                           COMMAND ls -1 ${appsources}.iconset
-                           COMMAND iconutil -c icns -o ${_outfilename}.icns ${appsources}.iconset
-                           DEPENDS ${files}
-                           )
+                # Append the icns file to the sources list so it will be a dependency to the
+                # main target
+                list(APPEND ${appsources} ${_outfilename}.icns)

-        # This will register the icon into the bundle
-        set(MACOSX_BUNDLE_ICON_FILE ${appsources}.icns)
+                # Install the icon into the Resources dir in the bundle
+                set_source_files_properties(${_outfilename}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)

-        # Append the icns file to the sources list so it will be a dependency to the
-        # main target
-        list(APPEND ${appsources} ${_outfilename}.icns)
+            else(_icon)
+                # TODO - try to scale a non-128 icon...? Try to convert an SVG on the fly?
+                message(STATUS "Unable to find an 128x128 icon that matches pattern ${pattern} for variable ${appsources} - application will not have an application icon!")
+            endif(_icon)

-        # Install the icon into the Resources dir in the bundle
-        set_source_files_properties(${_outfilename}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+        else(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
+            message(STATUS "Unable to find the sips and tiff2icns utilities - application will not have an application icon!")
+        endif(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
    endif(APPLE)
 endmacro (KDE4_ADD_APP_ICON)
--- a/cmake/modules/FindIconv.cmake
+++ b/cmake/modules/FindIconv.cmake
@@ -0,0 +1,82 @@
+# - Try to find Iconv
+# Once done this will define
+#
+#  ICONV_FOUND - system has Iconv
+#  ICONV_INCLUDE_DIRS - the Iconv include directory
+#  ICONV_LIBRARIES - Link these to use Iconv
+#  ICONV_DEFINITIONS - Compiler switches required for using Iconv
+#
+#  Copyright (c) 2013 Andreas Schneider <asn@cryptomilk.org>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+include(CheckIncludeFile)
+include(CheckFunctionExists)
+include(CheckLibraryExists)
+include(CheckPrototypeDefinition)
+
+find_path(ICONV_INCLUDE_DIR
+    NAMES
+        iconv.h sys/iconv.h
+)
+
+set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
+check_include_file(iconv.h HAVE_ICONV_H)
+check_include_file(sys/iconv.h HAVE_SYS_ICONV_H)
+set(CMAKE_REQUIRED_INCLUDES)
+
+find_library(ICONV_LIBRARY
+    NAMES
+        iconv
+        libiconv
+    PATHS
+)
+
+if (ICONV_LIBRARY)
+    get_filename_component(_ICONV_NAME ${ICONV_LIBRARY} NAME)
+    get_filename_component(_ICONV_PATH ${ICONV_LIBRARY} PATH)
+    check_library_exists(${_ICONV_NAME} iconv ${_ICONV_PATH} HAVE_ICONV)
+else()
+    check_function_exists(iconv HAVE_ICONV)
+endif()
+
+if (HAVE_ICONV_H OR HAVE_SYS_ICONV_H)
+    if (HAVE_ICONV_H)
+        set(_ICONV_PROTO_INCLUDE "iconv.h")
+    endif (HAVE_ICONV_H)
+    if (HAVE_SYS_ICONV_H)
+        set(_ICONV_PROTO_INCLUDE "sys/iconv.h")
+    endif (HAVE_SYS_ICONV_H)
+
+    set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
+    check_prototype_definition(iconv
+        "size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)"
+        "-1"
+        ${_ICONV_PROTO_INCLUDE}
+        HAVE_ICONV_CONST)
+    set(CMAKE_REQUIRED_INCLUDES)
+endif (HAVE_ICONV_H OR HAVE_SYS_ICONV_H)
+
+set(ICONV_INCLUDE_DIRS
+    ${ICONV_INCLUDE_DIR}
+)
+
+if (ICONV_LIBRARY)
+    set(ICONV_LIBRARIES
+        ${ICONV_LIBRARIES}
+        ${ICONV_LIBRARY}
+    )
+endif (ICONV_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+if (ICONV_LIBRARIES)
+    find_package_handle_standard_args(Iconv DEFAULT_MSG ICONV_LIBRARIES ICONV_INCLUDE_DIRS)
+else()
+    find_package_handle_standard_args(Iconv DEFAULT_MSG ICONV_INCLUDE_DIRS)
+endif()
+
+# show the ICONV_INCLUDE_DIRS and ICONV_LIBRARIES variables only in the advanced view
+mark_as_advanced(ICONV_INCLUDE_DIRS ICONV_LIBRARIES)
--- a/cmake/modules/FindOpenSSLCross.cmake
+++ b/cmake/modules/FindOpenSSLCross.cmake
@@ -0,0 +1,306 @@
+# - Try to find the OpenSSL encryption library
+# Once done this will define
+#
+#  OPENSSL_ROOT_DIR - Set this variable to the root installation of OpenSSL
+#
+# Read-Only variables:
+#  OPENSSL_FOUND - system has the OpenSSL library
+#  OPENSSL_INCLUDE_DIR - the OpenSSL include directory
+#  OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
+#  OPENSSL_VERSION - This is set to $major.$minor.$revision$path (eg. 0.9.8s)
+
+#=============================================================================
+# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
+# Copyright 2009-2011 Mathieu Malaterre <mathieu.malaterre@gmail.com>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+if (UNIX)
+  find_package(PkgConfig QUIET)
+  pkg_check_modules(_OPENSSL QUIET openssl)
+endif (UNIX)
+
+# http://www.slproweb.com/products/Win32OpenSSL.html
+SET(_OPENSSL_ROOT_HINTS
+  $ENV{OPENSSL_ROOT_DIR}
+  ${OPENSSL_ROOT_DIR}
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
+  )
+SET(_OPENSSL_ROOT_PATHS
+  "$ENV{PROGRAMFILES}/OpenSSL"
+  "$ENV{PROGRAMFILES}/OpenSSL-Win32"
+  "$ENV{PROGRAMFILES}/OpenSSL-Win64"
+  "C:/OpenSSL/"
+  "C:/OpenSSL-Win32/"
+  "C:/OpenSSL-Win64/"
+  )
+SET(_OPENSSL_ROOT_HINTS_AND_PATHS
+  HINTS ${_OPENSSL_ROOT_HINTS}
+  PATHS ${_OPENSSL_ROOT_PATHS}
+  )
+
+FIND_PATH(OPENSSL_INCLUDE_DIR
+  NAMES
+    openssl/ssl.h
+  HINTS
+    ${_OPENSSL_INCLUDEDIR}
+  ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+  PATH_SUFFIXES
+    include
+)
+
+IF(WIN32 AND NOT CYGWIN)
+  # MINGW should go here too
+  IF(MSVC)
+    # /MD and /MDd are the standard values - if someone wants to use
+    # others, the libnames have to change here too
+    # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
+    # TODO: handle /MT and static lib
+    # In Visual C++ naming convention each of these four kinds of Windows libraries has it's standard suffix:
+    #   * MD for dynamic-release
+    #   * MDd for dynamic-debug
+    #   * MT for static-release
+    #   * MTd for static-debug
+
+    # Implementation details:
+    # We are using the libraries located in the VC subdir instead of the parent directory eventhough :
+    # libeay32MD.lib is identical to ../libeay32.lib, and
+    # ssleay32MD.lib is identical to ../ssleay32.lib
+    FIND_LIBRARY(LIB_EAY_DEBUG
+      NAMES
+        libeay32MDd
+        libeay32
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "VC"
+        "lib/VC"
+    )
+
+    FIND_LIBRARY(LIB_EAY_RELEASE
+      NAMES
+        libeay32MD
+        libeay32
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "VC"
+        "lib/VC"
+    )
+
+    FIND_LIBRARY(SSL_EAY_DEBUG
+      NAMES
+        ssleay32MDd
+        ssleay32
+        ssl
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "VC"
+        "lib/VC"
+    )
+
+    FIND_LIBRARY(SSL_EAY_RELEASE
+      NAMES
+        ssleay32MD
+        ssleay32
+        ssl
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "VC"
+        "lib/VC"
+    )
+
+    if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
+      set( OPENSSL_LIBRARIES
+        optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG}
+        optimized ${LIB_EAY_RELEASE} debug ${LIB_EAY_DEBUG}
+        )
+    else()
+      set( OPENSSL_LIBRARIES ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} )
+    endif()
+    MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE)
+    MARK_AS_ADVANCED(LIB_EAY_DEBUG LIB_EAY_RELEASE)
+  ELSEIF(MINGW)
+    # same player, for MingW
+    FIND_LIBRARY(LIB_EAY
+      NAMES
+        libeay32
+        crypto
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "lib/MinGW"
+    )
+
+    FIND_LIBRARY(SSL_EAY
+      NAMES
+        ssleay32
+        ssl
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "lib/MinGW"
+    )
+
+    MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
+    set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
+  ELSE(MSVC)
+    # Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
+    FIND_LIBRARY(LIB_EAY
+      NAMES
+        libeay32
+      HINTS
+        ${_OPENSSL_LIBDIR}
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        lib
+    )
+
+    FIND_LIBRARY(SSL_EAY
+      NAMES
+        ssleay32
+      HINTS
+        ${_OPENSSL_LIBDIR}
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        lib
+    )
+
+    MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
+    set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
+  ENDIF(MSVC)
+ELSE(WIN32 AND NOT CYGWIN)
+
+  FIND_LIBRARY(OPENSSL_SSL_LIBRARY
+    NAMES
+      ssl
+      ssleay32
+      ssleay32MD
+    HINTS
+      ${_OPENSSL_LIBDIR}
+    ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES
+      lib
+  )
+
+  FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARY
+    NAMES
+      crypto
+    HINTS
+      ${_OPENSSL_LIBDIR}
+    ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES
+      lib
+  )
+
+  MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARY OPENSSL_SSL_LIBRARY)
+
+  # compat defines
+  SET(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY})
+  SET(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
+
+  SET(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
+
+ENDIF(WIN32 AND NOT CYGWIN)
+
+function(from_hex HEX DEC)
+  string(TOUPPER "${HEX}" HEX)
+  set(_res 0)
+  string(LENGTH "${HEX}" _strlen)
+
+  while (_strlen GREATER 0)
+    math(EXPR _res "${_res} * 16")
+    string(SUBSTRING "${HEX}" 0 1 NIBBLE)
+    string(SUBSTRING "${HEX}" 1 -1 HEX)
+    if (NIBBLE STREQUAL "A")
+      math(EXPR _res "${_res} + 10")
+    elseif (NIBBLE STREQUAL "B")
+      math(EXPR _res "${_res} + 11")
+    elseif (NIBBLE STREQUAL "C")
+      math(EXPR _res "${_res} + 12")
+    elseif (NIBBLE STREQUAL "D")
+      math(EXPR _res "${_res} + 13")
+    elseif (NIBBLE STREQUAL "E")
+      math(EXPR _res "${_res} + 14")
+    elseif (NIBBLE STREQUAL "F")
+      math(EXPR _res "${_res} + 15")
+    else()
+      math(EXPR _res "${_res} + ${NIBBLE}")
+    endif()
+
+    string(LENGTH "${HEX}" _strlen)
+  endwhile()
+
+  set(${DEC} ${_res} PARENT_SCOPE)
+endfunction(from_hex)
+
+if (OPENSSL_INCLUDE_DIR)
+  if (_OPENSSL_VERSION)
+    set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
+  elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+    file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
+         REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+
+    # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
+    # The status gives if this is a developer or prerelease and is ignored here.
+    # Major, minor, and fix directly translate into the version numbers shown in
+    # the string. The patch field translates to the single character suffix that
+    # indicates the bug fix state, which 00 -> nothing, 01 -> a, 02 -> b and so
+    # on.
+
+    string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F]).*$"
+           "\\1;\\2;\\3;\\4;\\5" OPENSSL_VERSION_LIST "${openssl_version_str}")
+    list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
+    list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)
+    from_hex("${OPENSSL_VERSION_MINOR}" OPENSSL_VERSION_MINOR)
+    list(GET OPENSSL_VERSION_LIST 2 OPENSSL_VERSION_FIX)
+    from_hex("${OPENSSL_VERSION_FIX}" OPENSSL_VERSION_FIX)
+    list(GET OPENSSL_VERSION_LIST 3 OPENSSL_VERSION_PATCH)
+
+    if (NOT OPENSSL_VERSION_PATCH STREQUAL "00")
+      from_hex("${OPENSSL_VERSION_PATCH}" _tmp)
+      # 96 is the ASCII code of 'a' minus 1
+      math(EXPR OPENSSL_VERSION_PATCH_ASCII "${_tmp} + 96")
+      unset(_tmp)
+      # Once anyone knows how OpenSSL would call the patch versions beyond 'z'
+      # this should be updated to handle that, too. This has not happened yet
+      # so it is simply ignored here for now.
+      string(ASCII "${OPENSSL_VERSION_PATCH_ASCII}" OPENSSL_VERSION_PATCH_STRING)
+    endif (NOT OPENSSL_VERSION_PATCH STREQUAL "00")
+
+    set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
+  endif (_OPENSSL_VERSION)
+endif (OPENSSL_INCLUDE_DIR)
+
+include(FindPackageHandleStandardArgs)
+
+if (OPENSSL_VERSION)
+  find_package_handle_standard_args(OpenSSL
+    REQUIRED_VARS
+      OPENSSL_LIBRARIES
+      OPENSSL_INCLUDE_DIR
+    VERSION_VAR
+      OPENSSL_VERSION
+    FAIL_MESSAGE
+      "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
+  )
+else (OPENSSL_VERSION)
+  find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
+    OPENSSL_LIBRARIES
+    OPENSSL_INCLUDE_DIR
+  )
+endif (OPENSSL_VERSION)
+
+MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
--- a/cmake/modules/FindQt5Keychain.cmake
+++ b/cmake/modules/FindQt5Keychain.cmake
@@ -9,19 +9,9 @@
 #  QTKEYCHAIN_LIBRARIES - The libraries needed to use QtKeychain
 #  QTKEYCHAIN_DEFINITIONS - Compiler switches required for using LibXml2

-# When we build our own Qt we also need to build QtKeychain with it
-# so that it doesn't pull a different Qt version. For that reason
-# first look in the Qt lib directory for QtKeychain.
-get_target_property(_QTCORE_LIB_PATH Qt5::Core IMPORTED_LOCATION_RELEASE)
-
-# Use PATH here because Debian 7.0 has CMake 2.8.9 and DIRECTORY is only available from 2.8.12+
-get_filename_component(QT_LIB_DIR "${_QTCORE_LIB_PATH}" PATH)
-
 find_path(QTKEYCHAIN_INCLUDE_DIR
            NAMES
              keychain.h
-            HINTS
-               ${QT_LIB_DIR}/../include
            PATH_SUFFIXES
              qt5keychain
            )
@@ -30,8 +20,6 @@ find_library(QTKEYCHAIN_LIBRARY
            NAMES
              qt5keychain
              lib5qtkeychain
-            HINTS
-               ${QT_LIB_DIR}
            PATHS
               /usr/lib
               /usr/lib/${CMAKE_ARCH_TRIPLET}
--- a/cmake/modules/FindQtKeychain.cmake
+++ b/cmake/modules/FindQtKeychain.cmake
@@ -0,0 +1,39 @@
+# (c) 2014 Copyright ownCloud GmbH
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
+# - Try to find QtKeychain
+# Once done this will define
+#  QTKEYCHAIN_FOUND - System has QtKeychain
+#  QTKEYCHAIN_INCLUDE_DIRS - The QtKeychain include directories
+#  QTKEYCHAIN_LIBRARIES - The libraries needed to use QtKeychain
+#  QTKEYCHAIN_DEFINITIONS - Compiler switches required for using LibXml2
+
+find_path(QTKEYCHAIN_INCLUDE_DIR
+            NAMES
+                keychain.h
+            PATH_SUFFIXES
+                qtkeychain
+    )
+
+
+find_library(QTKEYCHAIN_LIBRARY
+            NAMES
+              qtkeychain
+              libqtkeychain
+            PATHS
+               /usr/lib
+               /usr/lib/${CMAKE_ARCH_TRIPLET}
+               /usr/local/lib
+               /opt/local/lib
+               ${CMAKE_LIBRARY_PATH}
+               ${CMAKE_INSTALL_PREFIX}/lib
+            )
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set QTKEYCHAIN_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(QtKeychain  DEFAULT_MSG
+	QTKEYCHAIN_LIBRARY QTKEYCHAIN_INCLUDE_DIR)
+
+mark_as_advanced(QTKEYCHAIN_INCLUDE_DIR QTKEYCHAIN_LIBRARY)
--- a/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/cmake/modules/MacOSXBundleInfo.plist.in
@@ -27,9 +27,11 @@
        <key>CFBundleShortVersionString</key>
        <string>@MIRALL_VERSION_STRING@</string>
        <key>NSHumanReadableCopyright</key>
-        <string>(C) 2014-2018 @APPLICATION_VENDOR@</string>
+        <string>(C) 2014-2016 @APPLICATION_VENDOR@</string>
        <key>SUShowReleaseNotes</key>
        <false/>
+        <key>LSMinimumBundleVersion</key>
+        <string>10.7.0</string>
        <key>SUPublicDSAKeyFile</key>
        <string>dsa_pub.pem</string>
 </dict>
--- a/cmake/modules/QtVersionAbstraction.cmake
+++ b/cmake/modules/QtVersionAbstraction.cmake
@@ -5,47 +5,67 @@
 include (MacroOptionalFindPackage)
 include (MacroLogFeature)

-find_package(Qt5Core REQUIRED)
-find_package(Qt5Network REQUIRED)
-find_package(Qt5Xml REQUIRED)
-find_package(Qt5Concurrent REQUIRED)
-if(UNIT_TESTING)
-    find_package(Qt5Test REQUIRED)
-endif()
+option(BUILD_WITH_QT4 "Build with Qt4 no matter if Qt5 was found" OFF)

-if(NOT TOKEN_AUTH_ONLY)
-    find_package(Qt5Widgets REQUIRED)
-    if(APPLE)
-        find_package(Qt5MacExtras REQUIRED)
-    endif(APPLE)
+if( BUILD_WITH_QT4 )
+    message(STATUS "Search for Qt5 was disabled by option BUILD_WITH_QT4")
+else( BUILD_WITH_QT4 )
+    find_package(Qt5Core QUIET)
+endif( BUILD_WITH_QT4 )

-    if(NOT NO_SHIBBOLETH)
-        find_package(Qt5WebKitWidgets)
-        find_package(Qt5WebKit)
-        if(NOT Qt5WebKitWidgets_FOUND)
-            message(FATAL_ERROR "Qt5WebKit required for Shibboleth. Use -DNO_SHIBBOLETH=1 to disable it.")
+if( Qt5Core_FOUND )
+    message(STATUS "Found Qt5 core, checking for further dependencies...")
+    find_package(Qt5Network REQUIRED)
+    find_package(Qt5Xml REQUIRED)
+    find_package(Qt5Concurrent REQUIRED)
+    if(UNIT_TESTING)
+        find_package(Qt5Test REQUIRED)
+    endif()
+    if(NOT TOKEN_AUTH_ONLY)
+        find_package(Qt5Widgets REQUIRED)
+        if(APPLE)
+           find_package(Qt5MacExtras REQUIRED)
+        endif(APPLE)
+
+        if(NOT NO_SHIBBOLETH)
+            find_package(Qt5WebKitWidgets)
+            find_package(Qt5WebKit)
+            if(NOT Qt5WebKitWidgets_FOUND)
+                message(FATAL_ERROR "Qt5WebKit required for Shibboleth. Use -DNO_SHIBBOLETH=1 to disable it.")
+            endif()
        endif()
    endif()
-endif()

-# We need this to find the paths to qdbusxml2cpp and co
-if (WITH_DBUS)
-    find_package(Qt5DBus REQUIRED)
-    include_directories(${Qt5DBus_INCLUDES})
-    add_definitions(${Qt5DBus_DEFINITIONS})
-endif (WITH_DBUS)
-include_directories(${Qt5Core_INCLUDES})
-add_definitions(${Qt5Core_DEFINITIONS})
-if (NOT WIN32) #implied on Win32
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-endif(NOT WIN32)
+else( Qt5Core_FOUND )
+    if(WIN32 OR APPLE)
+    if (NOT BUILD_WITH_QT4)
+	message(FATAL_ERROR "Qt 5 not found, but application depends on Qt5 on Windows and Mac OS X")
+    endif ()
+    endif(WIN32 OR APPLE)
+endif( Qt5Core_FOUND )
+
+
+if( Qt5Core_FOUND )
+    message(STATUS "Using Qt 5!")
+
+    # We need this to find the paths to qdbusxml2cpp and co
+    if (WITH_DBUS)
+	find_package(Qt5DBus REQUIRED)
+	include_directories(${Qt5DBus_INCLUDES})
+	add_definitions(${Qt5DBus_DEFINITIONS})
+    endif (WITH_DBUS)
+    include_directories(${Qt5Core_INCLUDES})
+    add_definitions(${Qt5Core_DEFINITIONS})
+    if (NOT WIN32) #implied on Win32
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+    endif(NOT WIN32)
 #        set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")

-if(APPLE AND NOT TOKEN_AUTH_ONLY)
-    include_directories(${Qt5MacExtras_INCLUDE_DIRS})
-    add_definitions(${Qt5MacExtras_DEFINITIONS})
-    set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
-endif()
+    if(APPLE AND NOT TOKEN_AUTH_ONLY)
+	include_directories(${Qt5MacExtras_INCLUDE_DIRS})
+	add_definitions(${Qt5MacExtras_DEFINITIONS})
+	set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
+    endif()

 if(NOT BUILD_LIBRARIES_ONLY)
    macro(qt_wrap_ui)
@@ -56,9 +76,9 @@ else()
    SET(QT_UIC_EXECUTABLE "") 
 endif()

-macro(qt_add_resources)
-    qt5_add_resources(${ARGN})
-endmacro()
+    macro(qt_add_resources)
+	qt5_add_resources(${ARGN})
+    endmacro()

 if(NOT TOKEN_AUTH_ONLY)
    find_package(Qt5LinguistTools)
@@ -75,30 +95,103 @@ else()
    endmacro()
 endif()

-macro(qt_add_dbus_interface)
-    qt5_add_dbus_interface(${ARGN})
-endmacro()
+    macro(qt_add_dbus_interface)
+	qt5_add_dbus_interface(${ARGN})
+    endmacro()

-macro(qt_add_dbus_adaptor)
-    qt5_add_dbus_adaptor(${ARGN})
-endmacro()
+    macro(qt_add_dbus_adaptor)
+	qt5_add_dbus_adaptor(${ARGN})
+    endmacro()

-macro(qt_wrap_cpp)
-    qt5_wrap_cpp(${ARGN})
-endmacro()
+    macro(qt_wrap_cpp)
+	qt5_wrap_cpp(${ARGN})
+    endmacro()

-macro(install_qt_executable)
-    install_qt5_executable(${ARGN})
-endmacro()
+    macro(install_qt_executable)
+	install_qt5_executable(${ARGN})
+    endmacro()

-macro(setup_qt)
-endmacro()
+    macro(setup_qt)
+    endmacro()

-set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")
+    set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")

-#Enable deprecated symbols
-add_definitions("-DQT_DISABLE_DEPRECATED_BEFORE=0")
+    #Enable deprecated symbols
+    add_definitions("-DQT_DISABLE_DEPRECATED_BEFORE=0")

-add_definitions("-DQT_USE_QSTRINGBUILDER") #optimize string concatenation
-add_definitions("-DQT_MESSAGELOGCONTEXT") #enable function name and line number in debug output
+    add_definitions("-DQT_USE_QSTRINGBUILDER") #optimize string concatenation
+    add_definitions("-DQT_MESSAGELOGCONTEXT") #enable function name and line number in debug output
+endif( Qt5Core_FOUND )

+if(NOT Qt5Core_FOUND)
+    message(STATUS "Could not find Qt5, searching for Qt4 instead...")
+
+    set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork" "QtGui" "QtWebkit")
+    if( BUILD_TESTS )
+        list(APPEND NEEDED_QT4_COMPONENTS "QtTest")
+    endif()
+
+    find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
+    macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://www.qt-project.org" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n     qtwebkit-devel package and whatever contains QtUiTools is installed too")
+
+    macro(qt5_use_modules)
+    endmacro()
+
+    macro(qt_wrap_ui)
+        qt4_wrap_ui(${ARGN})
+    endmacro()
+
+    macro(qt_add_resources)
+        qt4_add_resources(${ARGN})
+    endmacro()
+
+    macro(qt_add_translation)
+        qt4_add_translation(${ARGN})
+    endmacro()
+
+    macro(qt_add_dbus_interface)
+      qt4_add_dbus_interface(${ARGN})
+    endmacro()
+
+    macro(qt_add_dbus_adaptor)
+        qt4_add_dbus_adaptor(${ARGN})
+    endmacro()
+
+    macro(qt_wrap_cpp)
+        qt4_wrap_cpp(${ARGN})
+    endmacro()
+
+    macro(install_qt_executable)
+        install_qt4_executable(${ARGN})
+    endmacro()
+
+    macro(setup_qt)
+        set(QT_USE_QTGUI TRUE)
+        set(QT_USE_QTSQL TRUE)
+        set(QT_USE_QTNETWORK TRUE)
+        set(QT_USE_QTXML TRUE)
+        set(QT_USE_QTWEBKIT TRUE)
+        set(QT_USE_QTDBUS TRUE)
+
+        include( ${QT_USE_FILE} )
+    endmacro()
+
+    if (CMAKE_COMPILER_IS_GNUCC)
+        execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                OUTPUT_VARIABLE GCC_VERSION)
+        if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
+            add_definitions("-DQ_DECL_OVERRIDE=override")
+        else()
+            add_definitions("-DQ_DECL_OVERRIDE=")
+        endif()
+    else() #clang or others
+        add_definitions("-DQ_DECL_OVERRIDE=override")
+    endif()
+
+endif()
+
+if( Qt5Core_DIR )
+    set( HAVE_QT5 TRUE )
+else( Qt5Core_DIR )
+    set( HAVE_QT5 FALSE )
+endif( Qt5Core_DIR )
--- a/cmake/modules/Warnings.cmake
+++ b/cmake/modules/Warnings.cmake
@@ -3,7 +3,7 @@
 # For details see the accompanying COPYING* file.

 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long -Wno-gnu-zero-variadic-macro-arguments")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")

    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
--- a/config.h.in
+++ b/config.h.in
@@ -17,13 +17,12 @@
 #cmakedefine APPLICATION_SHORTNAME "@APPLICATION_SHORTNAME@"
 #cmakedefine APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@"
 #cmakedefine APPLICATION_UPDATE_URL "@APPLICATION_UPDATE_URL@"
-#cmakedefine APPLICATION_ICON_NAME "@APPLICATION_ICON_NAME@"

 #cmakedefine ZLIB_FOUND @ZLIB_FOUND@

 #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
 #cmakedefine SHAREDIR "@SHAREDIR@"

-#cmakedefine WITH_TESTING 1
+#cmakedefine WITH_UNIT_TESTING 1

 #endif
--- a/src/csync/AUTHORS
+++ b/src/csync/AUTHORS
--- a/csync/CMakeLists.txt
+++ b/csync/CMakeLists.txt
@@ -0,0 +1,55 @@
+
+
+# global needed variables
+set(APPLICATION_NAME "ocsync")
+
+set(LIBRARY_VERSION ${MIRALL_VERSION})
+set(LIBRARY_SOVERSION "0")
+
+# add definitions
+include(DefineCMakeDefaults)
+include(DefinePlatformDefaults)
+include(DefineCompilerFlags)
+include(DefineOptions.cmake)
+
+include(DefineInstallationPaths)
+
+# add macros
+include(MacroAddPlugin)
+include(MacroCopyFile)
+
+if (NOT WIN32)
+    find_package(Iconv)
+endif (NOT WIN32)
+
+find_package(SQLite3 3.8.0 REQUIRED)
+
+include(ConfigureChecks.cmake)
+
+
+set(SOURCE_DIR ${CMAKE_SOURCE_DIR})
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake)
+
+if (MEM_NULL_TESTS)
+  add_definitions(-DCSYNC_MEM_NULL_TESTS)
+endif (MEM_NULL_TESTS)
+
+add_subdirectory(src)
+
+if (UNIT_TESTING)
+    set(WITH_TESTING ON)
+
+    find_package(CMocka)
+    if (CMOCKA_FOUND)
+        include(AddCMockaTest)
+        add_subdirectory(tests)
+    endif (CMOCKA_FOUND)
+endif (UNIT_TESTING)
+
+configure_file(config_csync.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_csync.h)
+configure_file(config_test.h.cmake  ${CMAKE_CURRENT_BINARY_DIR}/config_test.h)
+
+
--- a/src/csync/COPYING
+++ b/src/csync/COPYING
--- a/csync/CTestConfig.cmake
+++ b/csync/CTestConfig.cmake
@@ -0,0 +1,12 @@
+set(UPDATE_TYPE "true")
+
+set(MEMORYCHECK_SUPPRESSIONS_FILE ${CMAKE_SOURCE_DIR}/tests/valgrind-csync.supp)
+
+set(CTEST_PROJECT_NAME "csync")
+set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
+
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "mock.cryptomilk.org")
+set(CTEST_DROP_LOCATION "/submit.php?project=${CTEST_PROJECT_NAME}")
+set(CTEST_DROP_SITE_CDASH TRUE)
+
--- a/csync/CTestCustom.cmake
+++ b/csync/CTestCustom.cmake
@@ -0,0 +1,4 @@
+set(CTEST_CUSTOM_MEMCHECK_IGNORE
+  ${CTEST_CUSTOM_MEMCHECK_IGNORE}
+  check_std_c_jhash
+)
--- a/src/csync/ChangeLog
+++ b/src/csync/ChangeLog
--- a/src/csync/ConfigureChecks.cmake
+++ b/src/csync/ConfigureChecks.cmake
--- a/src/csync/DefineOptions.cmake
+++ b/src/csync/DefineOptions.cmake
@@ -1,2 +1,5 @@
+if ( NOT WIN32 )
+    option(WITH_ICONV "Build csync with iconv support" ON)
+endif()
 option(UNIT_TESTING "Build with unit tests" OFF)
 option(MEM_NULL_TESTS "Enable NULL memory testing" OFF)
--- a/src/csync/INSTALL
+++ b/src/csync/INSTALL
--- a/src/csync/README
+++ b/src/csync/README
--- a/src/csync/config_csync.h.cmake
+++ b/src/csync/config_csync.h.cmake
@@ -9,14 +9,19 @@
 #cmakedefine HAVE_CLOCK_GETTIME

 #cmakedefine WITH_LOG4C 1
+#cmakedefine WITH_ICONV 1

 #cmakedefine HAVE_ARGP_H 1
+#cmakedefine HAVE_ICONV_H 1
+#cmakedefine HAVE_SYS_ICONV_H 1

 #cmakedefine HAVE_TIMEGM 1
 #cmakedefine HAVE_STRERROR_R 1
 #cmakedefine HAVE_UTIMES 1
 #cmakedefine HAVE_LSTAT 1
 #cmakedefine HAVE_FNMATCH 1
+#cmakedefine HAVE_ICONV 1
+#cmakedefine HAVE_ICONV_CONST 1

 #cmakedefine HAVE___MINGW_ASPRINTF 1
 #cmakedefine HAVE_ASPRINTF 1
--- a/csync/config_test.h.cmake
+++ b/csync/config_test.h.cmake
@@ -0,0 +1,7 @@
+
+/* mind to have trailing slashes! */
+
+#define TESTFILES_DIR "@SOURCE_DIR@/csync/tests/ownCloud/testfiles/"
+
+#define TEST_CONFIG_DIR "@SOURCE_DIR@/csync/tests/ownCloud/"
+
--- a/csync/src/CMakeLists.txt
+++ b/csync/src/CMakeLists.txt
@@ -1,33 +1,4 @@
 project(libcsync)
-set(CMAKE_AUTOMOC TRUE)
-# global needed variables
-set(APPLICATION_NAME "ocsync")
-
-set(LIBRARY_VERSION ${MIRALL_VERSION})
-set(LIBRARY_SOVERSION "0")
-
-# add definitions
-include(DefineCMakeDefaults)
-include(DefinePlatformDefaults)
-include(DefineCompilerFlags)
-include(DefineOptions.cmake)
-
-include(DefineInstallationPaths)
-
-# add macros
-include(MacroAddPlugin)
-include(MacroCopyFile)
-
-find_package(SQLite3 3.8.0 REQUIRED)
-
-include(ConfigureChecks.cmake)
-include(../common/common.cmake)
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-if (MEM_NULL_TESTS)
-  add_definitions(-DCSYNC_MEM_NULL_TESTS)
-endif (MEM_NULL_TESTS)

 add_subdirectory(std)

@@ -57,6 +28,11 @@ set(CSYNC_LINK_LIBRARIES
  ${SQLITE3_LIBRARIES}
 )

+if(HAVE_ICONV AND WITH_ICONV)
+    list(APPEND CSYNC_PRIVATE_INCLUDE_DIRS ${ICONV_INCLUDE_DIR})
+    list(APPEND CSYNC_LINK_LIBRARIES ${ICONV_LIBRARIES})
+endif()
+
 # Specific option for builds tied to servers that do not support renaming extensions
 set(NO_RENAME_EXTENSION 0 CACHE BOOL "Do not issue rename if the extension changes")
 if(NO_RENAME_EXTENSION)
@@ -64,28 +40,30 @@ if(NO_RENAME_EXTENSION)
 endif()

 set(csync_SRCS
-  csync.cpp
-  csync_exclude.cpp
-  csync_log.cpp
+  csync.c
+  csync_exclude.c
+  csync_log.c
+  csync_statedb.c
  csync_time.c
-  csync_util.cpp
-  csync_misc.cpp
+  csync_util.c
+  csync_misc.c

-  csync_update.cpp
-  csync_reconcile.cpp
+  csync_update.c
+  csync_reconcile.c

-  csync_rename.cpp
+  csync_rename.cc

-  vio/csync_vio.cpp
+  vio/csync_vio.c
+  vio/csync_vio_file_stat.c
 )

 if (WIN32)
    list(APPEND csync_SRCS
-        vio/csync_vio_local_win.cpp
+        vio/csync_vio_local_win.c
    )
 else()
    list(APPEND csync_SRCS
-        vio/csync_vio_local_unix.cpp
+        vio/csync_vio_local_unix.c
    )
 endif()

@@ -117,10 +95,11 @@ include_directories(
  ${CSYNC_PRIVATE_INCLUDE_DIRS}
 )

-add_library(${CSYNC_LIBRARY} SHARED ${common_SOURCES} ${csync_SRCS})
+add_library(${CSYNC_LIBRARY} SHARED ${csync_SRCS})
 #add_library(${CSYNC_LIBRARY}_static STATIC ${csync_SRCS})

 generate_export_header( ${CSYNC_LIBRARY}
+  BASE_NAME ${CSYNC_LIBRARY}
  EXPORT_MACRO_NAME OCSYNC_EXPORT
  EXPORT_FILE_NAME ocsynclib.h
 )
@@ -128,21 +107,6 @@ generate_export_header( ${CSYNC_LIBRARY}
 target_link_libraries(${CSYNC_LIBRARY} ${CSYNC_LINK_LIBRARIES})
 #target_link_libraries(${CSYNC_LIBRARY}_static ${CSYNC_LINK_LIBRARIES})

-if(ZLIB_FOUND)
-  target_link_libraries(${CSYNC_LIBRARY} ${ZLIB_LIBRARIES})
-  include_directories(${ZLIB_INCLUDE_DIRS})
-endif(ZLIB_FOUND)
-
-find_package(Qt5Core REQUIRED)
-qt5_use_modules(${CSYNC_LIBRARY} Core Concurrent)
-
-# For src/common/utility_mac.cpp
-if (APPLE)
-    find_library(FOUNDATION_LIBRARY NAMES Foundation)
-    find_library(CORESERVICES_LIBRARY NAMES CoreServices)
-    target_link_libraries(${CSYNC_LIBRARY} ${FOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY})
-endif()
-
 set_target_properties(
  ${CSYNC_LIBRARY}
    PROPERTIES
@@ -177,4 +141,4 @@ else()
  )
 endif()

-configure_file(config_csync.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_csync.h)
+
--- a/csync/src/csync.c
+++ b/csync/src/csync.c
@@ -0,0 +1,676 @@
+/*
+ * libcsync -- a library to sync a directory with another
+ *
+ * Copyright (c) 2008-2013 by Andreas Schneider <asn@cryptomilk.org>
+ * Copyright (c) 2012-2013 by Klaas Freitag <freitag@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config_csync.h"
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <sys/types.h>
+#include <stdbool.h>
+
+#ifdef HAVE_ICONV_H
+#include <iconv.h>
+#endif
+#ifdef HAVE_SYS_ICONV_H
+#include <sys/iconv.h>
+#endif
+
+#include "c_lib.h"
+#include "csync_private.h"
+#include "csync_exclude.h"
+#include "csync_statedb.h"
+#include "csync_time.h"
+#include "csync_util.h"
+#include "csync_misc.h"
+#include "std/c_private.h"
+
+#include "csync_update.h"
+#include "csync_reconcile.h"
+
+#include "vio/csync_vio.h"
+
+#include "csync_log.h"
+#include "csync_rename.h"
+#include "c_jhash.h"
+
+static int _key_cmp(const void *key, const void *data) {
+  uint64_t a;
+  csync_file_stat_t *b;
+
+  a = *(uint64_t *) (key);
+  b = (csync_file_stat_t *) data;
+
+  if (a < b->phash) {
+    return -1;
+  } else if (a > b->phash) {
+    return 1;
+  }
+
+  return 0;
+}
+
+static int _data_cmp(const void *key, const void *data) {
+  csync_file_stat_t *a, *b;
+
+  a = (csync_file_stat_t *) key;
+  b = (csync_file_stat_t *) data;
+
+  if (a->phash < b->phash) {
+    return -1;
+  } else if (a->phash > b->phash) {
+    return 1;
+  }
+
+  return 0;
+}
+
+void csync_create(CSYNC **csync, const char *local) {
+  CSYNC *ctx;
+  size_t len = 0;
+
+  ctx = c_malloc(sizeof(CSYNC));
+
+  ctx->status_code = CSYNC_STATUS_OK;
+
+  /* remove trailing slashes */
+  len = strlen(local);
+  while(len > 0 && local[len - 1] == '/') --len;
+
+  ctx->local.uri = c_strndup(local, len);
+
+  ctx->status_code = CSYNC_STATUS_OK;
+
+  ctx->current_fs = NULL;
+
+  ctx->abort = false;
+
+  ctx->ignore_hidden_files = true;
+
+  *csync = ctx;
+}
+
+void csync_init(CSYNC *ctx, const char *db_file) {
+  assert(ctx);
+  /* Do not initialize twice */
+
+  assert(!(ctx->status & CSYNC_STATUS_INIT));
+  ctx->status_code = CSYNC_STATUS_OK;
+
+  ctx->local.type = LOCAL_REPLICA;
+
+  ctx->remote.type = REMOTE_REPLICA;
+
+  SAFE_FREE(ctx->statedb.file);
+  ctx->statedb.file = c_strdup(db_file);
+
+  c_rbtree_create(&ctx->local.tree, _key_cmp, _data_cmp);
+  c_rbtree_create(&ctx->remote.tree, _key_cmp, _data_cmp);
+
+  ctx->remote.root_perms = 0;
+
+  ctx->status = CSYNC_STATUS_INIT;
+
+  /* initialize random generator */
+  srand(time(NULL));
+}
+
+int csync_update(CSYNC *ctx) {
+  int rc = -1;
+  struct timespec start, finish;
+
+  if (ctx == NULL) {
+    errno = EBADF;
+    return -1;
+  }
+  ctx->status_code = CSYNC_STATUS_OK;
+
+  /* Path of database file is set in csync_init */
+  if (csync_statedb_load(ctx, ctx->statedb.file, &ctx->statedb.db) < 0) {
+      rc = -1;
+      return rc;
+  }
+
+  ctx->status_code = CSYNC_STATUS_OK;
+
+  csync_memstat_check();
+
+  if (!ctx->excludes) {
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "No exclude file loaded or defined!");
+  }
+
+  /* update detection for local replica */
+  csync_gettime(&start);
+  ctx->current = LOCAL_REPLICA;
+  ctx->replica = ctx->local.type;
+
+  rc = csync_ftw(ctx, ctx->local.uri, csync_walker, MAX_DEPTH);
+  if (rc < 0) {
+    if(ctx->status_code == CSYNC_STATUS_OK) {
+        ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_UPDATE_ERROR);
+    }
+    goto out;
+  }
+
+  csync_gettime(&finish);
+
+  CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
+            "Update detection for local replica took %.2f seconds walking %zu files.",
+            c_secdiff(finish, start), c_rbtree_size(ctx->local.tree));
+  csync_memstat_check();
+
+  /* update detection for remote replica */
+  csync_gettime(&start);
+  ctx->current = REMOTE_REPLICA;
+  ctx->replica = ctx->remote.type;
+
+  rc = csync_ftw(ctx, "", csync_walker, MAX_DEPTH);
+  if (rc < 0) {
+      if(ctx->status_code == CSYNC_STATUS_OK) {
+          ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_UPDATE_ERROR);
+      }
+      goto out;
+  }
+
+  csync_gettime(&finish);
+
+  CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
+            "Update detection for remote replica took %.2f seconds "
+            "walking %zu files.",
+            c_secdiff(finish, start), c_rbtree_size(ctx->remote.tree));
+  csync_memstat_check();
+
+  ctx->status |= CSYNC_STATUS_UPDATE;
+
+  rc = 0;
+
+out:
+  csync_statedb_close(ctx);
+  return rc;
+}
+
+int csync_reconcile(CSYNC *ctx) {
+  int rc = -1;
+  struct timespec start, finish;
+
+  if (ctx == NULL) {
+    errno = EBADF;
+    return -1;
+  }
+  ctx->status_code = CSYNC_STATUS_OK;
+
+  /* Reconciliation for local replica */
+  csync_gettime(&start);
+
+  if (csync_statedb_load(ctx, ctx->statedb.file, &ctx->statedb.db) < 0) {
+    rc = -1;
+    return rc;
+  }
+
+  ctx->current = LOCAL_REPLICA;
+  ctx->replica = ctx->local.type;
+
+  rc = csync_reconcile_updates(ctx);
+
+  csync_gettime(&finish);
+
+  CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
+      "Reconciliation for local replica took %.2f seconds visiting %zu files.",
+      c_secdiff(finish, start), c_rbtree_size(ctx->local.tree));
+
+  if (rc < 0) {
+      if (!CSYNC_STATUS_IS_OK(ctx->status_code)) {
+          ctx->status_code = csync_errno_to_status( errno, CSYNC_STATUS_RECONCILE_ERROR );
+      }
+      goto out;
+  }
+
+  /* Reconciliation for remote replica */
+  csync_gettime(&start);
+
+  ctx->current = REMOTE_REPLICA;
+  ctx->replica = ctx->remote.type;
+
+  rc = csync_reconcile_updates(ctx);
+
+  csync_gettime(&finish);
+
+  CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
+      "Reconciliation for remote replica took %.2f seconds visiting %zu files.",
+      c_secdiff(finish, start), c_rbtree_size(ctx->remote.tree));
+
+  if (rc < 0) {
+      if (!CSYNC_STATUS_IS_OK(ctx->status_code)) {
+          ctx->status_code = csync_errno_to_status(errno,  CSYNC_STATUS_RECONCILE_ERROR );
+      }
+      goto out;
+  }
+
+  ctx->status |= CSYNC_STATUS_RECONCILE;
+
+  rc = 0;
+
+out:
+  csync_statedb_close(ctx);
+  return 0;
+}
+
+/*
+ * local visitor which calls the user visitor with repacked stat info.
+ */
+static int _csync_treewalk_visitor(void *obj, void *data) {
+    int rc = 0;
+    csync_file_stat_t *cur         = NULL;
+    CSYNC *ctx                     = NULL;
+    c_rbtree_visit_func *visitor   = NULL;
+    _csync_treewalk_context *twctx = NULL;
+    TREE_WALK_FILE trav;
+    c_rbtree_t *other_tree = NULL;
+    c_rbnode_t *other_node = NULL;
+
+    cur = (csync_file_stat_t *) obj;
+    ctx = (CSYNC *) data;
+
+    if (ctx == NULL) {
+      return -1;
+    }
+
+    /* we need the opposite tree! */
+    switch (ctx->current) {
+    case LOCAL_REPLICA:
+        other_tree = ctx->remote.tree;
+        break;
+    case REMOTE_REPLICA:
+        other_tree = ctx->local.tree;
+        break;
+    default:
+        break;
+    }
+
+    other_node = c_rbtree_find(other_tree, &cur->phash);
+
+    if (!other_node) {
+        /* Check the renamed path as well. */
+        int len;
+        uint64_t h = 0;
+        char *renamed_path = csync_rename_adjust_path(ctx, cur->path);
+
+        if (!c_streq(renamed_path, cur->path)) {
+            len = strlen( renamed_path );
+            h = c_jhash64((uint8_t *) renamed_path, len, 0);
+            other_node = c_rbtree_find(other_tree, &h);
+        }
+        SAFE_FREE(renamed_path);
+    }
+
+    if (!other_node) {
+        /* Check the source path as well. */
+        int len;
+        uint64_t h = 0;
+        char *renamed_path = csync_rename_adjust_path_source(ctx, cur->path);
+
+        if (!c_streq(renamed_path, cur->path)) {
+            len = strlen( renamed_path );
+            h = c_jhash64((uint8_t *) renamed_path, len, 0);
+            other_node = c_rbtree_find(other_tree, &h);
+        }
+        SAFE_FREE(renamed_path);
+    }
+
+    if (obj == NULL || data == NULL) {
+      ctx->status_code = CSYNC_STATUS_PARAM_ERROR;
+      return -1;
+    }
+    ctx->status_code = CSYNC_STATUS_OK;
+
+    twctx = (_csync_treewalk_context*) ctx->callbacks.userdata;
+    if (twctx == NULL) {
+      ctx->status_code = CSYNC_STATUS_PARAM_ERROR;
+      return -1;
+    }
+
+    if (twctx->instruction_filter > 0 &&
+        !(twctx->instruction_filter & cur->instruction) ) {
+        return 0;
+    }
+
+    visitor = (c_rbtree_visit_func*)(twctx->user_visitor);
+    if (visitor != NULL) {
+      trav.path         = cur->path;
+      trav.size         = cur->size;
+      trav.modtime      = cur->modtime;
+      trav.mode         = cur->mode;
+      trav.type         = cur->type;
+      trav.instruction  = cur->instruction;
+      trav.rename_path  = cur->destpath;
+      trav.etag         = cur->etag;
+      trav.file_id      = cur->file_id;
+      trav.remotePerm = cur->remotePerm;
+      trav.directDownloadUrl = cur->directDownloadUrl;
+      trav.directDownloadCookies = cur->directDownloadCookies;
+      trav.inode        = cur->inode;
+
+      trav.error_status = cur->error_status;
+      trav.has_ignored_files = cur->has_ignored_files;
+      trav.checksum = cur->checksum;
+      trav.checksumTypeId = cur->checksumTypeId;
+
+      if( other_node ) {
+          csync_file_stat_t *other_stat = (csync_file_stat_t*)other_node->data;
+          trav.other.etag = other_stat->etag;
+          trav.other.file_id = other_stat->file_id;
+          trav.other.instruction = other_stat->instruction;
+          trav.other.modtime = other_stat->modtime;
+          trav.other.size = other_stat->size;
+      } else {
+          trav.other.etag = 0;
+          trav.other.file_id = 0;
+          trav.other.instruction = CSYNC_INSTRUCTION_NONE;
+          trav.other.modtime = 0;
+          trav.other.size = 0;
+      }
+
+      rc = (*visitor)(&trav, twctx->userdata);
+      cur->instruction = trav.instruction;
+      if (trav.etag != cur->etag) { // FIXME It would be nice to have this documented
+          SAFE_FREE(cur->etag);
+          cur->etag = c_strdup(trav.etag);
+      }
+
+      return rc;
+    }
+    ctx->status_code = CSYNC_STATUS_PARAM_ERROR;
+    return -1;
+}
+
+/*
+ * treewalk function, called from its wrappers below.
+ *
+ * it encapsulates the user visitor function, the filter and the userdata
+ * into a treewalk_context structure and calls the rb treewalk function,
+ * which calls the local _csync_treewalk_visitor in this module.
+ * The user visitor is called from there.
+ */
+static int _csync_walk_tree(CSYNC *ctx, c_rbtree_t *tree, csync_treewalk_visit_func *visitor, int filter)
+{
+    _csync_treewalk_context tw_ctx;
+    int rc = -1;
+
+    if (ctx == NULL) {
+        errno = EBADF;
+        return rc;
+    }
+
+    if (visitor == NULL || tree == NULL) {
+        ctx->status_code = CSYNC_STATUS_PARAM_ERROR;
+        return rc;
+    }
+    
+    tw_ctx.userdata = ctx->callbacks.userdata;
+    tw_ctx.user_visitor = visitor;
+    tw_ctx.instruction_filter = filter;
+
+    ctx->callbacks.userdata = &tw_ctx;
+
+    rc = c_rbtree_walk(tree, (void*) ctx, _csync_treewalk_visitor);
+    if( rc < 0 ) {
+      if( ctx->status_code == CSYNC_STATUS_OK )
+          ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_TREE_ERROR);
+    }
+    ctx->callbacks.userdata = tw_ctx.userdata;
+
+    return rc;
+}
+
+/*
+ * wrapper function for treewalk on the remote tree
+ */
+int csync_walk_remote_tree(CSYNC *ctx,  csync_treewalk_visit_func *visitor, int filter)
+{
+    c_rbtree_t *tree = NULL;
+    int rc = -1;
+
+    if(ctx != NULL) {
+        ctx->status_code = CSYNC_STATUS_OK;
+        ctx->current = REMOTE_REPLICA;
+        tree = ctx->remote.tree;
+    }
+
+    /* all error handling in the called function */
+    rc = _csync_walk_tree(ctx, tree, visitor, filter);
+    return rc;
+}
+
+/*
+ * wrapper function for treewalk on the local tree
+ */
+int csync_walk_local_tree(CSYNC *ctx, csync_treewalk_visit_func *visitor, int filter)
+{
+    c_rbtree_t *tree = NULL;
+    int rc = -1;
+
+    if (ctx != NULL) {
+        ctx->status_code = CSYNC_STATUS_OK;
+        ctx->current = LOCAL_REPLICA;
+        tree = ctx->local.tree;
+    }
+
+    /* all error handling in the called function */
+    rc = _csync_walk_tree(ctx, tree, visitor, filter);
+    return rc;  
+}
+
+static void _tree_destructor(void *data) {
+  csync_file_stat_t *freedata = NULL;
+
+  freedata = (csync_file_stat_t *) data;
+  csync_file_stat_free(freedata);
+}
+
+/* reset all the list to empty.
+ * used by csync_commit and csync_destroy */
+static void _csync_clean_ctx(CSYNC *ctx)
+{
+    /* destroy the rbtrees */
+    if (c_rbtree_size(ctx->local.tree) > 0) {
+        c_rbtree_destroy(ctx->local.tree, _tree_destructor);
+    }
+
+    if (c_rbtree_size(ctx->remote.tree) > 0) {
+        c_rbtree_destroy(ctx->remote.tree, _tree_destructor);
+    }
+
+    csync_rename_destroy(ctx);
+
+    /* free memory */
+    c_rbtree_free(ctx->local.tree);
+    c_rbtree_free(ctx->remote.tree);
+
+    SAFE_FREE(ctx->remote.root_perms);
+}
+
+int csync_commit(CSYNC *ctx) {
+  int rc = 0;
+
+  if (ctx == NULL) {
+    return -1;
+  }
+
+  ctx->status_code = CSYNC_STATUS_OK;
+
+  if (ctx->statedb.db != NULL
+      && csync_statedb_close(ctx) < 0) {
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "ERR: closing of statedb failed.");
+    rc = -1;
+  }
+  ctx->statedb.db = NULL;
+
+  _csync_clean_ctx(ctx);
+
+  ctx->remote.read_from_db = 0;
+  ctx->read_remote_from_db = true;
+  ctx->db_is_empty = false;
+
+
+  /* Create new trees */
+  c_rbtree_create(&ctx->local.tree, _key_cmp, _data_cmp);
+  c_rbtree_create(&ctx->remote.tree, _key_cmp, _data_cmp);
+
+
+  ctx->status = CSYNC_STATUS_INIT;
+  SAFE_FREE(ctx->error_string);
+
+  rc = 0;
+  return rc;
+}
+
+int csync_destroy(CSYNC *ctx) {
+  int rc = 0;
+
+  if (ctx == NULL) {
+    errno = EBADF;
+    return -1;
+  }
+  ctx->status_code = CSYNC_STATUS_OK;
+
+  if (ctx->statedb.db != NULL
+      && csync_statedb_close(ctx) < 0) {
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "ERR: closing of statedb failed.");
+    rc = -1;
+  }
+  ctx->statedb.db = NULL;
+
+  _csync_clean_ctx(ctx);
+
+  SAFE_FREE(ctx->statedb.file);
+  SAFE_FREE(ctx->local.uri);
+  SAFE_FREE(ctx->error_string);
+
+#ifdef WITH_ICONV
+  c_close_iconv();
+#endif
+
+  SAFE_FREE(ctx);
+
+  return rc;
+}
+
+void *csync_get_userdata(CSYNC *ctx) {
+  if (ctx == NULL) {
+    return NULL;
+  }
+  return ctx->callbacks.userdata;
+}
+
+int csync_set_userdata(CSYNC *ctx, void *userdata) {
+  if (ctx == NULL) {
+    return -1;
+  }
+
+  ctx->callbacks.userdata = userdata;
+
+  return 0;
+}
+
+csync_auth_callback csync_get_auth_callback(CSYNC *ctx) {
+  if (ctx == NULL) {
+    return NULL;
+  }
+
+  return ctx->callbacks.auth_function;
+}
+
+int csync_set_status(CSYNC *ctx, int status) {
+  if (ctx == NULL || status < 0) {
+    return -1;
+  }
+
+  ctx->status = status;
+
+  return 0;
+}
+
+CSYNC_STATUS csync_get_status(CSYNC *ctx) {
+  if (ctx == NULL) {
+    return -1;
+  }
+
+  return ctx->status_code;
+}
+
+const char *csync_get_status_string(CSYNC *ctx)
+{
+  return csync_vio_get_status_string(ctx);
+}
+
+#ifdef WITH_ICONV
+int csync_set_iconv_codec(const char *from)
+{
+  c_close_iconv();
+
+  if (from != NULL) {
+    c_setup_iconv(from);
+  }
+
+  return 0;
+}
+#endif
+
+void csync_request_abort(CSYNC *ctx)
+{
+  if (ctx != NULL) {
+    ctx->abort = true;
+  }
+}
+
+void csync_resume(CSYNC *ctx)
+{
+  if (ctx != NULL) {
+    ctx->abort = false;
+  }
+}
+
+int  csync_abort_requested(CSYNC *ctx)
+{
+  if (ctx != NULL) {
+    return ctx->abort;
+  } else {
+    return (1 == 0);
+  }
+}
+
+void csync_file_stat_free(csync_file_stat_t *st)
+{
+  if (st) {
+    SAFE_FREE(st->directDownloadUrl);
+    SAFE_FREE(st->directDownloadCookies);
+    SAFE_FREE(st->etag);
+    SAFE_FREE(st->destpath);
+    SAFE_FREE(st->checksum);
+    SAFE_FREE(st);
+  }
+}
--- a/csync/src/csync.h
+++ b/csync/src/csync.h
@@ -34,22 +34,14 @@

 #include "std/c_private.h"
 #include "ocsynclib.h"
-#include "common/syncjournalfilerecord.h"
-
 #include <sys/stat.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <config_csync.h>
-#include <memory>
-#include <QByteArray>
-#include "common/remotepermissions.h"

-#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG) && (__GNUC__ * 100 + __GNUC_MINOR__ < 408)
-// openSuse 12.3 didn't like enum bitfields.
-#define BITFIELD(size)
-#else
-#define BITFIELD(size) :size
+#ifdef __cplusplus
+extern "C" {
 #endif

 enum csync_status_codes_e {
@@ -65,6 +57,7 @@ enum csync_status_codes_e {
  CSYNC_STATUS_TIMESKEW,           /* OBSOLETE */
  CSYNC_STATUS_FILESYSTEM_UNKNOWN, /* UNUSED */
  CSYNC_STATUS_TREE_ERROR,         /* csync trees could not be created */
+  CSYNC_STATUS_MEMORY_ERROR,       /* not enough memory problem */
  CSYNC_STATUS_PARAM_ERROR,        /* parameter is zero where not expected */
  CSYNC_STATUS_UPDATE_ERROR,       /* general update or discovery error */
  CSYNC_STATUS_RECONCILE_ERROR,    /* general reconcile error */
@@ -106,10 +99,7 @@ enum csync_status_codes_e {
    CSYNC_STATUS_INDIVIDUAL_EXCLUDE_HIDDEN,
    CSYNC_STATUS_INVALID_CHARACTERS,
    CSYNC_STATUS_INDIVIDUAL_STAT_FAILED,
-    CSYNC_STATUS_FORBIDDEN,
-    CSYNC_STATUS_INDIVIDUAL_TOO_DEEP,
-    CSYNC_STATUS_INDIVIDUAL_IS_CONFLICT_FILE,
-    CSYNC_STATUS_INDIVIDUAL_CANNOT_ENCODE
+    CSYNC_STATUS_FORBIDDEN
 };

 typedef enum csync_status_codes_e CSYNC_STATUS;
@@ -161,66 +151,131 @@ enum csync_ftw_type_e {
 // currently specified at https://github.com/owncloud/core/issues/8322 are 9 to 10
 #define REMOTE_PERM_BUF_SIZE 15

-typedef struct csync_file_stat_s csync_file_stat_t;
+typedef struct csync_vio_file_stat_s csync_vio_file_stat_t;
+
+enum csync_vio_file_flags_e {
+  CSYNC_VIO_FILE_FLAGS_NONE = 0,
+  CSYNC_VIO_FILE_FLAGS_SYMLINK = 1 << 0,
+  CSYNC_VIO_FILE_FLAGS_HIDDEN = 1 << 1
+};
+
+enum csync_vio_file_type_e {
+  CSYNC_VIO_FILE_TYPE_UNKNOWN,
+  CSYNC_VIO_FILE_TYPE_REGULAR,
+  CSYNC_VIO_FILE_TYPE_DIRECTORY,
+  CSYNC_VIO_FILE_TYPE_FIFO,
+  CSYNC_VIO_FILE_TYPE_SOCKET,
+  CSYNC_VIO_FILE_TYPE_CHARACTER_DEVICE,
+  CSYNC_VIO_FILE_TYPE_BLOCK_DEVICE,
+  CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK
+};
+
+enum csync_vio_file_stat_fields_e {
+  CSYNC_VIO_FILE_STAT_FIELDS_NONE = 0,
+  CSYNC_VIO_FILE_STAT_FIELDS_TYPE = 1 << 0,
+  CSYNC_VIO_FILE_STAT_FIELDS_MODE = 1 << 1, // local POSIX mode
+  CSYNC_VIO_FILE_STAT_FIELDS_FLAGS = 1 << 2,
+//  CSYNC_VIO_FILE_STAT_FIELDS_DEVICE = 1 << 3,
+  CSYNC_VIO_FILE_STAT_FIELDS_INODE = 1 << 4,
+//  CSYNC_VIO_FILE_STAT_FIELDS_LINK_COUNT = 1 << 5,
+  CSYNC_VIO_FILE_STAT_FIELDS_SIZE = 1 << 6,
+//  CSYNC_VIO_FILE_STAT_FIELDS_BLOCK_COUNT = 1 << 7, /* will be removed */
+//  CSYNC_VIO_FILE_STAT_FIELDS_BLOCK_SIZE = 1 << 8,  /* will be removed */
+  CSYNC_VIO_FILE_STAT_FIELDS_ATIME = 1 << 9,
+  CSYNC_VIO_FILE_STAT_FIELDS_MTIME = 1 << 10,
+  CSYNC_VIO_FILE_STAT_FIELDS_CTIME = 1 << 11,
+//  CSYNC_VIO_FILE_STAT_FIELDS_SYMLINK_NAME = 1 << 12,
+//  CSYNC_VIO_FILE_STAT_FIELDS_CHECKSUM = 1 << 13,
+//  CSYNC_VIO_FILE_STAT_FIELDS_ACL = 1 << 14,
+//  CSYNC_VIO_FILE_STAT_FIELDS_UID = 1 << 15,
+//  CSYNC_VIO_FILE_STAT_FIELDS_GID = 1 << 16,
+  CSYNC_VIO_FILE_STAT_FIELDS_ETAG = 1 << 17,
+  CSYNC_VIO_FILE_STAT_FIELDS_FILE_ID = 1 << 18,
+  CSYNC_VIO_FILE_STAT_FIELDS_DIRECTDOWNLOADURL = 1 << 19,
+  CSYNC_VIO_FILE_STAT_FIELDS_DIRECTDOWNLOADCOOKIES = 1 << 20,
+  CSYNC_VIO_FILE_STAT_FIELDS_PERM = 1 << 21 // remote oC perm
+
+};
+
+
+struct csync_vio_file_stat_s {
+  char *name;
+  char *etag; // FIXME: Should this be inlined like file_id and perm?
+  char file_id[FILE_ID_BUF_SIZE+1];
+  char *directDownloadUrl;
+  char *directDownloadCookies;
+  char remotePerm[REMOTE_PERM_BUF_SIZE+1];
+
+  time_t atime;
+  time_t mtime;
+  time_t ctime;

-struct OCSYNC_EXPORT csync_file_stat_s {
-  time_t modtime;
  int64_t size;
+
+  mode_t mode;
+
  uint64_t inode;

-  OCC::RemotePermissions remotePerm;
-  enum csync_ftw_type_e type BITFIELD(4);
-  bool child_modified BITFIELD(1);
-  bool has_ignored_files BITFIELD(1); // Specify that a directory, or child directory contains ignored files.
-  bool is_hidden BITFIELD(1); // Not saved in the DB, only used during discovery for local files.
+  int fields; // actually enum csync_vio_file_stat_fields_e fields;
+  enum csync_vio_file_type_e type;

-  QByteArray path;
-  QByteArray rename_path;
-  QByteArray etag;
-  QByteArray file_id;
-  QByteArray directDownloadUrl;
-  QByteArray directDownloadCookies;
-  QByteArray original_path; // only set if locale conversion fails
+  enum csync_vio_file_flags_e flags;

-  // In the local tree, this can hold a checksum and its type if it is
-  //   computed during discovery for some reason.
-  // In the remote tree, this will have the server checksum, if available.
-  // In both cases, the format is "SHA1:baff".
-  QByteArray checksumHeader;
-
-  CSYNC_STATUS error_status;
-
-  enum csync_instructions_e instruction; /* u32 */
-
-  csync_file_stat_s()
-    : modtime(0)
-    , size(0)
-    , inode(0)
-    , type(CSYNC_FTW_TYPE_SKIP)
-    , child_modified(false)
-    , has_ignored_files(false)
-    , is_hidden(false)
-    , error_status(CSYNC_STATUS_OK)
-    , instruction(CSYNC_INSTRUCTION_NONE)
-  { }
-
-  static std::unique_ptr<csync_file_stat_t> fromSyncJournalFileRecord(const OCC::SyncJournalFileRecord &rec)
-  {
-    std::unique_ptr<csync_file_stat_t> st(new csync_file_stat_t);
-    st->path = rec._path;
-    st->inode = rec._inode;
-    st->modtime = rec._modtime;
-    st->type = static_cast<csync_ftw_type_e>(rec._type);
-    st->etag = rec._etag;
-    st->file_id = rec._fileId;
-    st->remotePerm = rec._remotePerm;
-    st->size = rec._fileSize;
-    st->has_ignored_files = rec._serverHasIgnoredFiles;
-    st->checksumHeader = rec._checksumHeader;
-    return st;
-  }
+  char *original_name; // only set if locale conversion fails
 };

+csync_vio_file_stat_t OCSYNC_EXPORT *csync_vio_file_stat_new(void);
+csync_vio_file_stat_t OCSYNC_EXPORT *csync_vio_file_stat_copy(csync_vio_file_stat_t *file_stat);
+
+void OCSYNC_EXPORT csync_vio_file_stat_destroy(csync_vio_file_stat_t *fstat);
+
+void OCSYNC_EXPORT csync_vio_file_stat_set_file_id( csync_vio_file_stat_t* dst, const char* src );
+
+void OCSYNC_EXPORT csync_vio_set_file_id(char* dst, const char *src );
+
+
+/**
+ * CSync File Traversal structure.
+ *
+ * This structure is passed to the visitor function for every file
+ * which is seen.
+ *
+ */
+
+struct csync_tree_walk_file_s {
+    const char *path;
+    int64_t     size;
+    int64_t     inode;
+    time_t      modtime;
+    mode_t      mode;
+    enum csync_ftw_type_e     type;
+    enum csync_instructions_e instruction;
+
+    /* For directories: Does it have children that were ignored (hidden or ignore pattern) */
+    int         has_ignored_files;
+
+    const char *rename_path;
+    const char *etag;
+    const char *file_id;
+    const char *remotePerm;
+    char *directDownloadUrl;
+    char *directDownloadCookies;
+
+    const char *checksum;
+    uint32_t checksumTypeId;
+
+    struct {
+        int64_t     size;
+        time_t      modtime;
+        const char *etag;
+        const char *file_id;
+        enum csync_instructions_e instruction;
+    } other;
+
+    CSYNC_STATUS error_status;
+};
+typedef struct csync_tree_walk_file_s TREE_WALK_FILE;
+
 /**
 * csync handle
 */
@@ -231,7 +286,8 @@ typedef int (*csync_auth_callback) (const char *prompt, char *buf, size_t len,

 typedef void (*csync_log_callback) (int verbosity,
                                    const char *function,
-                                    const char *buffer);
+                                    const char *buffer,
+                                    void *userdata);

 typedef void (*csync_update_callback) (bool local,
                                    const char *dirUrl,
@@ -240,14 +296,32 @@ typedef void (*csync_update_callback) (bool local,
 typedef void csync_vio_handle_t;
 typedef csync_vio_handle_t* (*csync_vio_opendir_hook) (const char *url,
                                    void *userdata);
-typedef std::unique_ptr<csync_file_stat_t> (*csync_vio_readdir_hook) (csync_vio_handle_t *dhhandle,
+typedef csync_vio_file_stat_t* (*csync_vio_readdir_hook) (csync_vio_handle_t *dhhandle,
                                                              void *userdata);
 typedef void (*csync_vio_closedir_hook) (csync_vio_handle_t *dhhandle,
                                                              void *userdata);
+typedef int (*csync_vio_stat_hook) (csync_vio_handle_t *dhhandle,
+                                                              void *userdata);

 /* Compute the checksum of the given \a checksumTypeId for \a path. */
-typedef QByteArray (*csync_checksum_hook)(
-    const QByteArray &path, const QByteArray &otherChecksumHeader, void *userdata);
+typedef const char* (*csync_checksum_hook) (
+        const char *path, uint32_t checksumTypeId, void *userdata);
+
+/**
+ * @brief Allocate a csync context.
+ *
+ * @param csync  The context variable to allocate.
+ */
+void OCSYNC_EXPORT csync_create(CSYNC **csync, const char *local);
+
+/**
+ * @brief Initialize the file synchronizer.
+ *
+ * This function loads the configuration
+ *
+ * @param ctx  The context to initialize.
+ */
+void OCSYNC_EXPORT csync_init(CSYNC *ctx, const char *db_file);

 /**
 * @brief Update detection
@@ -267,6 +341,26 @@ int OCSYNC_EXPORT csync_update(CSYNC *ctx);
 */
 int OCSYNC_EXPORT csync_reconcile(CSYNC *ctx);

+/**
+ * @brief Re-initializes the csync context
+ *
+ * @param ctx  The context to commit.
+ *
+ * @return  0 on success, less than 0 if an error occurred.
+ */
+int OCSYNC_EXPORT csync_commit(CSYNC *ctx);
+
+/**
+ * @brief Destroy the csync context
+ *
+ * frees the memory.
+ *
+ * @param ctx  The context to destroy.
+ *
+ * @return  0 on success, less than 0 if an error occurred.
+ */
+int OCSYNC_EXPORT csync_destroy(CSYNC *ctx);
+
 /**
 * @brief Get the userdata saved in the context.
 *
@@ -343,13 +437,29 @@ csync_log_callback OCSYNC_EXPORT csync_get_log_callback(void);
 */
 int OCSYNC_EXPORT csync_set_log_callback(csync_log_callback cb);

+/**
+ * @brief get the userdata set for the logging callback.
+ *
+ * @return              The userdata or NULL.
+ */
+void OCSYNC_EXPORT *csync_get_log_userdata(void);
+
+/**
+ * @brief Set the userdata passed to the logging callback.
+ *
+ * @param[in]  data     The userdata to set.
+ *
+ * @return              0 on success, less than 0 if an error occurred.
+ */
+int OCSYNC_EXPORT csync_set_log_userdata(void *data);
+
 /* Used for special modes or debugging */
 CSYNC_STATUS OCSYNC_EXPORT csync_get_status(CSYNC *ctx);

 /* Used for special modes or debugging */
 int OCSYNC_EXPORT csync_set_status(CSYNC *ctx, int status);

-typedef int csync_treewalk_visit_func(csync_file_stat_t *cur, csync_file_stat_t *other, void*);
+typedef int csync_treewalk_visit_func(TREE_WALK_FILE* ,void*);

 /**
 * @brief Walk the local file tree and call a visitor function for each file.
@@ -382,6 +492,17 @@ int OCSYNC_EXPORT csync_walk_remote_tree(CSYNC *ctx, csync_treewalk_visit_func *
 */
 const char OCSYNC_EXPORT *csync_get_status_string(CSYNC *ctx);

+#ifdef WITH_ICONV
+/**
+ * @brief Set iconv source codec for filenames.
+ *
+ * @param from          Source codec.
+ *
+ * @return              0 on success, or an iconv error number.
+ */
+int OCSYNC_EXPORT csync_set_iconv_codec(const char *from);
+#endif
+
 /**
 * @brief Aborts the current sync run as soon as possible. Can be called from another thread.
 *
@@ -403,8 +524,13 @@ void OCSYNC_EXPORT csync_resume(CSYNC *ctx);
 */
 int  OCSYNC_EXPORT csync_abort_requested(CSYNC *ctx);

+char OCSYNC_EXPORT *csync_normalize_etag(const char *);
 time_t OCSYNC_EXPORT oc_httpdate_parse( const char *date );

+#ifdef __cplusplus
+}
+#endif
+
 /**
 * }@
 */
--- a/src/csync/csync_exclude.cpp
+++ b/src/csync/csync_exclude.cpp
@@ -31,16 +31,11 @@

 #include "c_lib.h"
 #include "c_private.h"
-#include "c_utf8.h"

 #include "csync_private.h"
 #include "csync_exclude.h"
 #include "csync_misc.h"

-#include "common/utility.h"
-
-#include <QString>
-
 #ifdef _WIN32
 #include <io.h>
 #else
@@ -76,7 +71,7 @@ int _csync_exclude_add(c_strlist_t **inList, const char *string) {
 static const char *csync_exclude_expand_escapes(const char * input)
 {
    size_t i_len = strlen(input) + 1;
-    char *out = (char*)c_malloc(i_len); // out can only be shorter
+    char *out = c_malloc(i_len); // out can only be shorter

    size_t i = 0;
    size_t o = 0;
@@ -88,7 +83,6 @@ static const char *csync_exclude_expand_escapes(const char * input)
            case '"': out[o++] = '"'; break;
            case '?': out[o++] = '?'; break;
            case '\\': out[o++] = '\\'; break;
-            case '#': out[o++] = '#'; break;
            case 'a': out[o++] = '\a'; break;
            case 'b': out[o++] = '\b'; break;
            case 'f': out[o++] = '\f'; break;
@@ -147,7 +141,7 @@ int csync_exclude_load(const char *fname, c_strlist_t **list) {
    rc = 0;
    goto out;
  }
-  buf = (char*)c_malloc(size + 1);
+  buf = c_malloc(size + 1);
  if (read(fd, buf, size) != size) {
    rc = -1;
    goto out;
@@ -186,18 +180,18 @@ out:
 // See http://support.microsoft.com/kb/74496 and
 // https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx
 // Additionally, we ignore '$Recycle.Bin', see https://github.com/owncloud/client/issues/2955
-static const char *win_reserved_words_3[] = { "CON", "PRN", "AUX", "NUL" };
-static const char *win_reserved_words_4[] = {
-    "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
-    "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"
-};
-static const char *win_reserved_words_n[] = { "CLOCK$", "$Recycle.Bin" };
+static const char* win_reserved_words[] = {"CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5",
+                                           "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4",
+                                           "LPT5", "LPT6", "LPT7", "LPT8", "LPT9", "CLOCK$", "$Recycle.Bin" };

-bool csync_is_windows_reserved_word(const char *filename)
-{
-    size_t len_filename = strlen(filename);
+bool csync_is_windows_reserved_word(const char* filename) {

-    // Drive letters
+  size_t win_reserve_words_len = sizeof(win_reserved_words) / sizeof(char*);
+  size_t j;
+
+  for (j = 0; j < win_reserve_words_len; j++) {
+    int len_reserved_word = strlen(win_reserved_words[j]);
+    int len_filename = strlen(filename);
    if (len_filename == 2 && filename[1] == ':') {
        if (filename[0] >= 'a' && filename[0] <= 'z') {
            return true;
@@ -206,41 +200,26 @@ bool csync_is_windows_reserved_word(const char *filename)
            return true;
        }
    }
-
-    if (len_filename == 3 || (len_filename > 3 && filename[3] == '.')) {
-        for (const char *word : win_reserved_words_3) {
-            if (c_strncasecmp(filename, word, 3) == 0) {
-                return true;
-            }
+    if (c_strncasecmp(filename, win_reserved_words[j], len_reserved_word) == 0) {
+        if (len_filename == len_reserved_word) {
+            return true;
        }
-    }
-
-    if (len_filename == 4 || (len_filename > 4 && filename[4] == '.')) {
-        for (const char *word : win_reserved_words_4) {
-            if (c_strncasecmp(filename, word, 4) == 0) {
-                return true;
-            }
-        }
-    }
-
-    for (const char *word : win_reserved_words_n) {
-        size_t len_word = strlen(word);
-        if (len_word == len_filename && c_strncasecmp(filename, word, len_word) == 0) {
+        if ((len_filename > len_reserved_word) && (filename[len_reserved_word] == '.')) {
            return true;
        }
    }
-
-    return false;
+  }
+  return false;
 }

 static CSYNC_EXCLUDE_TYPE _csync_excluded_common(c_strlist_t *excludes, const char *path, int filetype, bool check_leading_dirs) {
    size_t i = 0;
    const char *bname = NULL;
    size_t blen = 0;
+    char *conflict = NULL;
    int rc = -1;
    CSYNC_EXCLUDE_TYPE match = CSYNC_NOT_EXCLUDED;
    CSYNC_EXCLUDE_TYPE type  = CSYNC_NOT_EXCLUDED;
-    c_strlist_t *path_components = NULL;

    /* split up the path */
    bname = strrchr(path, '/');
@@ -251,28 +230,15 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(c_strlist_t *excludes, const ch
    }
    blen = strlen(bname);

-    // 9 = strlen(".sync_.db")
-    if (blen >= 9 && bname[0] == '.') {
-        rc = csync_fnmatch("._sync_*.db*", bname, 0);
-        if (rc == 0) {
-            match = CSYNC_FILE_SILENTLY_EXCLUDED;
-            goto out;
-        }
-        rc = csync_fnmatch(".sync_*.db*", bname, 0);
-        if (rc == 0) {
-            match = CSYNC_FILE_SILENTLY_EXCLUDED;
-            goto out;
-        }
-        rc = csync_fnmatch(".csync_journal.db*", bname, 0);
-        if (rc == 0) {
-            match = CSYNC_FILE_SILENTLY_EXCLUDED;
-            goto out;
-        }
-        rc = csync_fnmatch(".owncloudsync.log*", bname, 0);
-        if (rc == 0) {
-            match = CSYNC_FILE_SILENTLY_EXCLUDED;
-            goto out;
-        }
+    rc = csync_fnmatch("._sync_*.db*", bname, 0);
+    if (rc == 0) {
+        match = CSYNC_FILE_SILENTLY_EXCLUDED;
+        goto out;
+    }
+    rc = csync_fnmatch(".csync_journal.db*", bname, 0);
+    if (rc == 0) {
+        match = CSYNC_FILE_SILENTLY_EXCLUDED;
+        goto out;
    }

    // check the strlen and ignore the file if its name is longer than 254 chars.
@@ -303,7 +269,8 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(c_strlist_t *excludes, const ch
    }

    // Filter out characters not allowed in a filename on windows
-    for (const char *p = path; *p; p++) {
+    const char *p = NULL;
+    for (p = path; *p; p++) {
        switch (*p) {
        case '\\':
        case ':':
@@ -321,24 +288,38 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(c_strlist_t *excludes, const ch
    }
 #endif

-    /* We create a desktop.ini on Windows for the sidebar icon, make sure we don't sync them. */
-    rc = csync_fnmatch("Desktop.ini", bname, 0);
+    rc = csync_fnmatch(".owncloudsync.log*", bname, 0);
    if (rc == 0) {
        match = CSYNC_FILE_SILENTLY_EXCLUDED;
        goto out;
    }

-    if (!OCC::Utility::shouldUploadConflictFiles()) {
-        if (OCC::Utility::isConflictFile(bname)) {
-            match = CSYNC_FILE_EXCLUDE_CONFLICT;
+    /* Always ignore conflict files, not only via the exclude list */
+    rc = csync_fnmatch("*_conflict-*", bname, 0);
+    if (rc == 0) {
+        match = CSYNC_FILE_SILENTLY_EXCLUDED;
+        goto out;
+    }
+
+    if (getenv("CSYNC_CONFLICT_FILE_USERNAME")) {
+        rc = asprintf(&conflict, "*_conflict_%s-*", getenv("CSYNC_CONFLICT_FILE_USERNAME"));
+        if (rc < 0) {
            goto out;
        }
+        rc = csync_fnmatch(conflict, path, 0);
+        if (rc == 0) {
+            match = CSYNC_FILE_SILENTLY_EXCLUDED;
+            SAFE_FREE(conflict);
+            goto out;
+        }
+        SAFE_FREE(conflict);
    }

    if( ! excludes ) {
        goto out;
    }

+    c_strlist_t *path_components = NULL;
    if (check_leading_dirs) {
        /* Build a list of path components to check. */
        path_components = c_strlist_new(32);
@@ -434,90 +415,8 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(c_strlist_t *excludes, const ch
    return match;
 }

-/* Only for bnames (not paths) */
-static QString convertToBnameRegexpSyntax(QString exclude)
-{
-    QString s = QRegularExpression::escape(exclude).replace("\\*", ".*").replace("\\?", ".");
-    return s;
-}
-
-void csync_exclude_traversal_prepare(CSYNC *ctx)
-{
-    ctx->parsed_traversal_excludes.prepare(ctx->excludes);
-}
-
-void csync_s::TraversalExcludes::prepare(c_strlist_t *excludes)
-{
-    c_strlist_destroy(list_patterns_fnmatch);
-    list_patterns_fnmatch = nullptr;
-
-    // Start out with regexes that would match nothing
-    QString exclude_only = "a^";
-    QString exclude_and_remove = "a^";
-
-    size_t exclude_count = excludes ? excludes->count : 0;
-    for (unsigned int i = 0; i < exclude_count; i++) {
-        char *exclude = excludes->vector[i];
-        QString *builderToUse = & exclude_only;
-        if (exclude[0] == '\n') continue; // empty line
-        if (exclude[0] == '\r') continue; // empty line
-
-        /* If an exclude entry contains some fnmatch-ish characters, we use the C-style codepath without QRegularEpression */
-        if (strchr(exclude, '/') || strchr(exclude, '[') || strchr(exclude, '{') || strchr(exclude, '\\')) {
-            _csync_exclude_add(&list_patterns_fnmatch, exclude);
-            continue;
-        }
-
-        /* Those will attempt to use QRegularExpression */
-        if (exclude[0] == ']'){
-            exclude++;
-            builderToUse = &exclude_and_remove;
-        }
-        if (builderToUse->size() > 0) {
-            builderToUse->append("|");
-        }
-        builderToUse->append(convertToBnameRegexpSyntax(exclude));
-    }
-
-    QString pattern = "^(" + exclude_only + ")$|^(" + exclude_and_remove + ")$";
-    regexp_exclude.setPattern(pattern);
-    QRegularExpression::PatternOptions patternOptions = QRegularExpression::OptimizeOnFirstUsageOption;
-    if (OCC::Utility::fsCasePreserving())
-        patternOptions |= QRegularExpression::CaseInsensitiveOption;
-    regexp_exclude.setPatternOptions(patternOptions);
-    regexp_exclude.optimize();
-}
-
-CSYNC_EXCLUDE_TYPE csync_excluded_traversal(CSYNC *ctx, const char *path, int filetype) {
-    CSYNC_EXCLUDE_TYPE match = CSYNC_NOT_EXCLUDED;
-
-    /* Check only static patterns and only with the reduced list which is empty usually */
-    match = _csync_excluded_common(ctx->parsed_traversal_excludes.list_patterns_fnmatch, path, filetype, false);
-    if (match != CSYNC_NOT_EXCLUDED) {
-        return match;
-    }
-
-    if (ctx->excludes) {
-        /* Now check with our optimized regexps */
-        const char *bname = NULL;
-        /* split up the path */
-        bname = strrchr(path, '/');
-        if (bname) {
-            bname += 1; // don't include the /
-        } else {
-            bname = path;
-        }
-        QString p = QString::fromUtf8(bname);
-        auto m = ctx->parsed_traversal_excludes.regexp_exclude.match(p);
-        if (m.hasMatch()) {
-            if (!m.captured(1).isEmpty()) {
-                match = CSYNC_FILE_EXCLUDE_LIST;
-            } else if (!m.captured(2).isEmpty()) {
-                match = CSYNC_FILE_EXCLUDE_AND_REMOVE;
-            }
-        }
-    }
-    return match;
+CSYNC_EXCLUDE_TYPE csync_excluded_traversal(c_strlist_t *excludes, const char *path, int filetype) {
+  return _csync_excluded_common(excludes, path, filetype, false);
 }

 CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path, int filetype) {
--- a/csync/src/csync_exclude.h
+++ b/csync/src/csync_exclude.h
@@ -32,9 +32,7 @@ enum csync_exclude_type_e {
  CSYNC_FILE_EXCLUDE_TRAILING_SPACE,
  CSYNC_FILE_EXCLUDE_LONG_FILENAME,
  CSYNC_FILE_EXCLUDE_HIDDEN,
-  CSYNC_FILE_EXCLUDE_STAT_FAILED,
-  CSYNC_FILE_EXCLUDE_CONFLICT,
-  CSYNC_FILE_EXCLUDE_CANNOT_ENCODE
+  CSYNC_FILE_EXCLUDE_STAT_FAILED
 };
 typedef enum csync_exclude_type_e CSYNC_EXCLUDE_TYPE;

@@ -52,15 +50,6 @@ int OCSYNC_EXPORT _csync_exclude_add(c_strlist_t **inList, const char *string);
 */
 int OCSYNC_EXPORT csync_exclude_load(const char *fname, c_strlist_t **list);

-/**
- * @brief When all list loads and list are done
- *
- * Used to initialize internal data structures that build upon the loaded excludes.
- *
- * @param ctx
- */
-void OCSYNC_EXPORT csync_exclude_traversal_prepare(CSYNC *ctx);
-
 /**
 * @brief Check if the given path should be excluded in a traversal situation.
 *
@@ -76,11 +65,10 @@ void OCSYNC_EXPORT csync_exclude_traversal_prepare(CSYNC *ctx);
 *
 * @return  2 if excluded and needs cleanup, 1 if excluded, 0 if not.
 */
-CSYNC_EXCLUDE_TYPE OCSYNC_EXPORT csync_excluded_traversal(CSYNC *ctx, const char *path, int filetype);
+CSYNC_EXCLUDE_TYPE csync_excluded_traversal(c_strlist_t *excludes, const char *path, int filetype);

 /**
- * @brief Checks all path components if the whole path should be excluded
- *
+ * @brief csync_excluded_no_ctx
 * @param excludes
 * @param path
 * @param filetype
--- a/src/csync/csync_log.cpp
+++ b/src/csync/csync_log.cpp
@@ -29,22 +29,48 @@

 CSYNC_THREAD int csync_log_level;
 CSYNC_THREAD csync_log_callback csync_log_cb;
+CSYNC_THREAD void *csync_log_userdata;
+
+static void csync_log_stderr(int verbosity,
+                             const char *function,
+                             const char *buffer)
+{
+    fprintf(stderr, "[%d] %s", verbosity, function);
+    fprintf(stderr, "  %s\n", buffer);
+}
+static void csync_log_function(int verbosity,
+                               const char *function,
+                               const char *buffer)
+{
+    csync_log_callback log_fn = csync_get_log_callback();
+    if (log_fn) {
+        char buf[1024];
+
+        snprintf(buf, sizeof(buf), "%s: %s", function, buffer);
+
+        log_fn(verbosity,
+               function,
+               buf,
+               csync_get_log_userdata());
+        return;
+    }
+
+    csync_log_stderr(verbosity, function, buffer);
+}
+

 void csync_log(int verbosity,
               const char *function,
               const char *format, ...)
 {
-    csync_log_callback log_fn = csync_get_log_callback();
-    if (log_fn && verbosity <= csync_get_log_level()) {
-        char buffer[1024];
-        va_list va;
- 
+    char buffer[1024];
+    va_list va;
+
+    if (verbosity <= csync_get_log_level()) {
        va_start(va, format);
        vsnprintf(buffer, sizeof(buffer), format, va);
        va_end(va);
-
-        log_fn(verbosity, function, buffer);
-        return;
+        csync_log_function(verbosity, function, buffer);
    }
 }

@@ -75,3 +101,16 @@ int csync_set_log_callback(csync_log_callback cb) {
 csync_log_callback csync_get_log_callback(void) {
  return csync_log_cb;
 }
+
+void *csync_get_log_userdata(void)
+{
+    return csync_log_userdata;
+}
+
+int csync_set_log_userdata(void *data)
+{
+    csync_log_userdata = data;
+
+    return 0;
+}
+
--- a/csync/src/csync_log.h
+++ b/csync/src/csync_log.h
--- a/csync/src/csync_macros.h
+++ b/csync/src/csync_macros.h
--- a/src/csync/csync_misc.cpp
+++ b/src/csync/csync_misc.cpp
@@ -170,3 +170,37 @@ CSYNC_STATUS csync_errno_to_status(int error, CSYNC_STATUS default_status)

  return status;
 }
+
+/* Remove possible quotes, and also the -gzip at the end
+ * Remove "-gzip" at the end (cf. https://github.comowncloud/client/issues/1195)
+ * The caller must take ownership of the resulting string.
+ */
+char *csync_normalize_etag(const char *etag)
+{
+    int len = 0;
+    char *buf = NULL;
+    if (!etag)
+        return NULL;
+
+    len = strlen(etag);
+    /* strip "XXXX-gzip" */
+    if(len >= 7 && etag[0] == '"' && c_streq(etag + len - 6, "-gzip\"")) {
+        etag++;
+        len -= 7;
+    }
+    /* strip leading -gzip */
+    if(len >= 5 && c_streq(etag + len - 5, "-gzip")) {
+        len -= 5;
+    }
+    /* strip normal quotes */
+    if (etag[0] == '"' && etag[len-1] == '"') {
+        etag++;
+        len -= 2;
+    }
+
+    buf = c_malloc( len+1 );
+    strncpy( buf, etag, len );
+    buf[len] = '\0';
+    return buf;
+}
+
--- a/csync/src/csync_misc.h
+++ b/csync/src/csync_misc.h
--- a/csync/src/csync_private.h
+++ b/csync/src/csync_private.h
@@ -0,0 +1,229 @@
+/*
+ * cynapses libc functions
+ *
+ * Copyright (c) 2008-2013 by Andreas Schneider <asn@cryptomilk.org>
+ * Copyright (c) 2012-2013 by Klaas Freitag <freitag@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file csync_private.h
+ *
+ * @brief Private interface of csync
+ *
+ * @defgroup csyncInternalAPI csync internal API
+ *
+ * @{
+ */
+
+#ifndef _CSYNC_PRIVATE_H
+#define _CSYNC_PRIVATE_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <sqlite3.h>
+
+#include "config_csync.h"
+#include "std/c_lib.h"
+#include "std/c_private.h"
+#include "csync.h"
+#include "csync_misc.h"
+
+#ifdef WITH_ICONV
+#include <iconv.h>
+#endif
+
+#ifdef HAVE_ICONV_H
+#include <iconv.h>
+#endif
+#ifdef HAVE_SYS_ICONV_H
+#include <sys/iconv.h>
+#endif
+
+#include "csync_macros.h"
+
+/**
+ * How deep to scan directories.
+ */
+#define MAX_DEPTH 50
+
+#define CSYNC_STATUS_INIT 1 << 0
+#define CSYNC_STATUS_UPDATE 1 << 1
+#define CSYNC_STATUS_RECONCILE 1 << 2
+#define CSYNC_STATUS_PROPAGATE 1 << 3
+
+#define CSYNC_STATUS_DONE (CSYNC_STATUS_INIT | \
+                           CSYNC_STATUS_UPDATE | \
+                           CSYNC_STATUS_RECONCILE | \
+                           CSYNC_STATUS_PROPAGATE)
+
+enum csync_replica_e {
+  LOCAL_REPLICA,
+  REMOTE_REPLICA
+};
+
+typedef struct csync_file_stat_s csync_file_stat_t;
+
+/**
+ * @brief csync public structure
+ */
+struct csync_s {
+  struct {
+      csync_auth_callback auth_function;
+      void *userdata;
+      csync_update_callback update_callback;
+      void *update_callback_userdata;
+
+      /* hooks for checking the white list (uses the update_callback_userdata) */
+      int (*checkSelectiveSyncBlackListHook)(void*, const char*);
+      int (*checkSelectiveSyncNewFolderHook)(void*, const char* /* path */, const char* /* remotePerm */);
+
+
+      csync_vio_opendir_hook remote_opendir_hook;
+      csync_vio_readdir_hook remote_readdir_hook;
+      csync_vio_closedir_hook remote_closedir_hook;
+      void *vio_userdata;
+
+      /* hook for comparing checksums of files during discovery */
+      csync_checksum_hook checksum_hook;
+      void *checksum_userdata;
+
+  } callbacks;
+  c_strlist_t *excludes;
+  
+  struct {
+    char *file;
+    sqlite3 *db;
+    int exists;
+
+    sqlite3_stmt* by_hash_stmt;
+    sqlite3_stmt* by_fileid_stmt;
+    sqlite3_stmt* by_inode_stmt;
+
+    int lastReturnValue;
+  } statedb;
+
+  struct {
+    char *uri;
+    c_rbtree_t *tree;
+    enum csync_replica_e type;
+  } local;
+
+  struct {
+    c_rbtree_t *tree;
+    enum csync_replica_e type;
+    int  read_from_db;
+    const char *root_perms; /* Permission of the root folder. (Since the root folder is not in the db tree, we need to keep a separate entry.) */
+  } remote;
+
+
+#if defined(HAVE_ICONV) && defined(WITH_ICONV)
+  struct {
+    iconv_t iconv_cd;
+  } options;
+#endif
+
+  /* replica we are currently walking */
+  enum csync_replica_e current;
+
+  /* replica we want to work on */
+  enum csync_replica_e replica;
+
+  /* Used in the update phase so changes in the sub directories can be notified to
+     parent directories */
+  csync_file_stat_t *current_fs;
+
+  /* csync error code */
+  enum csync_status_codes_e status_code;
+
+  char *error_string;
+
+  int status;
+  volatile int abort;
+  void *rename_info;
+
+  /**
+   * Specify if it is allowed to read the remote tree from the DB (default to enabled)
+   */
+  bool read_remote_from_db;
+
+  /**
+   * If true, the DB is considered empty and all reads are skipped. (default is false)
+   * This is useful during the initial local discovery as it speeds it up significantly.
+   */
+  bool db_is_empty;
+
+  bool ignore_hidden_files;
+};
+
+
+#ifdef _MSC_VER
+#pragma pack(1)
+#endif
+struct csync_file_stat_s {
+  uint64_t phash;   /* u64 */
+  time_t modtime;   /* u64 */
+  int64_t size;       /* u64 */
+  size_t pathlen;   /* u64 */
+  uint64_t inode;   /* u64 */
+  mode_t mode;      /* u32 */
+  unsigned int type                   : 4;
+  unsigned int child_modified         : 1;
+  unsigned int has_ignored_files      : 1; /* specify that a directory, or child directory contains ignored files */
+
+  char *destpath;   /* for renames */
+  const char *etag;
+  char file_id[FILE_ID_BUF_SIZE+1];  /* the ownCloud file id is fixed width in ownCloud. */
+  char *directDownloadUrl;
+  char *directDownloadCookies;
+  char remotePerm[REMOTE_PERM_BUF_SIZE+1];
+
+  const char *checksum;
+  uint32_t checksumTypeId;
+
+  CSYNC_STATUS error_status;
+
+  enum csync_instructions_e instruction; /* u32 */
+  char path[1]; /* u8 */
+}
+#if !defined(__SUNPRO_C) && !defined(_MSC_VER)
+__attribute__ ((packed))
+#endif
+#ifdef _MSC_VER
+#pragma pack()
+#endif
+;
+
+OCSYNC_EXPORT void csync_file_stat_free(csync_file_stat_t *st);
+
+/*
+ * context for the treewalk function
+ */
+struct _csync_treewalk_context_s
+{
+    csync_treewalk_visit_func *user_visitor;
+    int instruction_filter;
+    void *userdata;
+};
+typedef struct _csync_treewalk_context_s _csync_treewalk_context;
+
+void set_errno_from_http_errcode( int err );
+
+/**
+ * }@
+ */
+#endif /* _CSYNC_PRIVATE_H */
+/* vim: set ft=c.doxygen ts=8 sw=2 et cindent: */
--- a/csync/src/csync_reconcile.c
+++ b/csync/src/csync_reconcile.c
@@ -0,0 +1,385 @@
+/*
+ * libcsync -- a library to sync a directory with another
+ *
+ * Copyright (c) 2008-2013 by Andreas Schneider <asn@cryptomilk.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config_csync.h"
+
+#include <assert.h>
+#include "csync_private.h"
+#include "csync_reconcile.h"
+#include "csync_util.h"
+#include "csync_statedb.h"
+#include "csync_rename.h"
+#include "c_jhash.h"
+
+#define CSYNC_LOG_CATEGORY_NAME "csync.reconciler"
+#include "csync_log.h"
+
+#include "inttypes.h"
+
+/* Check if a file is ignored because one parent is ignored.
+ * return the node of the ignored directoy if it's the case, or NULL if it is not ignored */
+static c_rbnode_t *_csync_check_ignored(c_rbtree_t *tree, const char *path, int pathlen) {
+    uint64_t h = 0;
+    c_rbnode_t *node = NULL;
+
+    /* compute the size of the parent directory */
+    int parentlen = pathlen - 1;
+    while (parentlen > 0 && path[parentlen] != '/') {
+        parentlen--;
+    }
+    if (parentlen <= 0) {
+        return NULL;
+    }
+
+    h = c_jhash64((uint8_t *) path, parentlen, 0);
+    node = c_rbtree_find(tree, &h);
+    if (node) {
+        csync_file_stat_t *n = (csync_file_stat_t*)node->data;
+        if (n->instruction == CSYNC_INSTRUCTION_IGNORE) {
+            /* Yes, we are ignored */
+            return node;
+        } else {
+            /* Not ignored */
+            return NULL;
+        }
+    } else {
+        /* Try if the parent itself is ignored */
+        return _csync_check_ignored(tree, path, parentlen);
+    }
+}
+
+/**
+ * The main function in the reconcile pass.
+ *
+ * It's called for each entry in the local and remote rbtrees by
+ * csync_reconcile()
+ *
+ * Before the reconcile phase the trees already know about changes
+ * relative to the sync journal. This function's job is to spot conflicts
+ * between local and remote changes and adjust the nodes accordingly.
+ *
+ * See doc/dev/sync-algorithm.md for an overview.
+ *
+ *
+ * Older detail comment:
+ *
+ * We merge replicas at the file level. The merged replica contains the
+ * superset of files that are on the local machine and server copies of
+ * the replica. In the case where the same file is in both the local
+ * and server copy, the file that was modified most recently is used.
+ * This means that new files are not deleted, and updated versions of
+ * existing files are not overwritten.
+ *
+ * When a file is updated, the merge algorithm compares the destination
+ * file with the the source file. If the destination file is newer
+ * (timestamp is newer), it is not overwritten. If both files, on the
+ * source and the destination, have been changed, the newer file wins.
+ */
+static int _csync_merge_algorithm_visitor(void *obj, void *data) {
+    csync_file_stat_t *cur = NULL;
+    csync_file_stat_t *other = NULL;
+    csync_file_stat_t *tmp = NULL;
+    uint64_t h = 0;
+    int len = 0;
+
+    CSYNC *ctx = NULL;
+    c_rbtree_t *tree = NULL;
+    c_rbnode_t *node = NULL;
+
+    cur = (csync_file_stat_t *) obj;
+    ctx = (CSYNC *) data;
+
+    /* we need the opposite tree! */
+    switch (ctx->current) {
+    case LOCAL_REPLICA:
+        tree = ctx->remote.tree;
+        break;
+    case REMOTE_REPLICA:
+        tree = ctx->local.tree;
+        break;
+    default:
+        break;
+    }
+
+    node = c_rbtree_find(tree, &cur->phash);
+
+    if (!node) {
+        /* Check the renamed path as well. */
+        char *renamed_path = csync_rename_adjust_path(ctx, cur->path);
+        if (!c_streq(renamed_path, cur->path)) {
+            len = strlen( renamed_path );
+            h = c_jhash64((uint8_t *) renamed_path, len, 0);
+            node = c_rbtree_find(tree, &h);
+        }
+        SAFE_FREE(renamed_path);
+    }
+    if (!node) {
+        /* Check if it is ignored */
+        node = _csync_check_ignored(tree, cur->path, cur->pathlen);
+        /* If it is ignored, other->instruction will be  IGNORE so this one will also be ignored */
+    }
+
+    /* file only found on current replica */
+    if (node == NULL) {
+        switch(cur->instruction) {
+        /* file has been modified */
+        case CSYNC_INSTRUCTION_EVAL:
+            cur->instruction = CSYNC_INSTRUCTION_NEW;
+            break;
+            /* file has been removed on the opposite replica */
+        case CSYNC_INSTRUCTION_NONE:
+        case CSYNC_INSTRUCTION_UPDATE_METADATA:
+            if (cur->has_ignored_files) {
+                /* Do not remove a directory that has ignored files */
+                break;
+            }
+            if (cur->child_modified) {
+                /* re-create directory that has modified contents */
+                cur->instruction = CSYNC_INSTRUCTION_NEW;
+                break;
+            }
+            cur->instruction = CSYNC_INSTRUCTION_REMOVE;
+            break;
+        case CSYNC_INSTRUCTION_EVAL_RENAME:
+            if(ctx->current == LOCAL_REPLICA ) {
+                /* use the old name to find the "other" node */
+                tmp = csync_statedb_get_stat_by_inode(ctx, cur->inode);
+                CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Finding opposite temp through inode %" PRIu64 ": %s",
+                          cur->inode, tmp ? "true":"false");
+            } else if( ctx->current == REMOTE_REPLICA ) {
+                tmp = csync_statedb_get_stat_by_file_id(ctx, cur->file_id);
+                CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Finding opposite temp through file ID %s: %s",
+                          cur->file_id, tmp ? "true":"false");
+            } else {
+                CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Unknown replica...");
+            }
+
+            if( tmp ) {
+                len = strlen( tmp->path );
+                if( len > 0 ) {
+                    h = c_jhash64((uint8_t *) tmp->path, len, 0);
+                    /* First, check that the file is NOT in our tree (another file with the same name was added) */
+                    node = c_rbtree_find(ctx->current == REMOTE_REPLICA ? ctx->remote.tree : ctx->local.tree, &h);
+                    if (node) {
+                        CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Origin found in our tree : %s", tmp->path);
+                    } else {
+                        /* Find the temporar file in the other tree. */
+                        node = c_rbtree_find(tree, &h);
+                        CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "PHash of temporary opposite (%s): %" PRIu64 " %s",
+                                tmp->path , h, node ? "found": "not found" );
+                        if (node) {
+                            other = (csync_file_stat_t*)node->data;
+                        } else {
+                            /* the renamed file could not be found in the opposite tree. That is because it
+                            * is not longer existing there, maybe because it was renamed or deleted.
+                            * The journal is cleaned up later after propagation.
+                            */
+                        }
+                    }
+                }
+
+                if(!other) {
+                    cur->instruction = CSYNC_INSTRUCTION_NEW;
+                } else if (other->instruction == CSYNC_INSTRUCTION_NONE
+                           || other->instruction == CSYNC_INSTRUCTION_UPDATE_METADATA
+                           || cur->type == CSYNC_FTW_TYPE_DIR) {
+                    other->instruction = CSYNC_INSTRUCTION_RENAME;
+                    other->destpath = c_strdup( cur->path );
+                    if( !c_streq(cur->file_id, "") ) {
+                        csync_vio_set_file_id( other->file_id, cur->file_id );
+                    }
+                    other->inode = cur->inode;
+                    cur->instruction = CSYNC_INSTRUCTION_NONE;
+                } else if (other->instruction == CSYNC_INSTRUCTION_REMOVE) {
+                    other->instruction = CSYNC_INSTRUCTION_RENAME;
+                    other->destpath = c_strdup( cur->path );
+
+                    if( !c_streq(cur->file_id, "") ) {
+                        csync_vio_set_file_id( other->file_id, cur->file_id );
+                    }
+                    other->inode = cur->inode;
+                    cur->instruction = CSYNC_INSTRUCTION_NONE;
+                } else if (other->instruction == CSYNC_INSTRUCTION_NEW) {
+                    CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "OOOO=> NEW detected in other tree!");
+                    cur->instruction = CSYNC_INSTRUCTION_CONFLICT;
+                } else {
+                    assert(other->type != CSYNC_FTW_TYPE_DIR);
+                    cur->instruction = CSYNC_INSTRUCTION_NONE;
+                    other->instruction = CSYNC_INSTRUCTION_SYNC;
+                }
+                csync_file_stat_free(tmp);
+           }
+
+            break;
+        default:
+            break;
+        }
+    } else {
+        bool is_conflict = true;
+        /*
+     * file found on the other replica
+     */
+        other = (csync_file_stat_t *) node->data;
+
+        switch (cur->instruction) {
+        case CSYNC_INSTRUCTION_UPDATE_METADATA:
+            if (other->instruction == CSYNC_INSTRUCTION_UPDATE_METADATA && ctx->current == LOCAL_REPLICA) {
+                // Remote wins, the SyncEngine will pick relevant local metadata since the remote tree is walked last.
+                cur->instruction = CSYNC_INSTRUCTION_NONE;
+            }
+            break;
+        case CSYNC_INSTRUCTION_EVAL_RENAME:
+            /* If the file already exist on the other side, we have a conflict.
+               Abort the rename and consider it is a new file. */
+            cur->instruction = CSYNC_INSTRUCTION_NEW;
+            /* fall trough */
+        /* file on current replica is changed or new */
+        case CSYNC_INSTRUCTION_EVAL:
+        case CSYNC_INSTRUCTION_NEW:
+            // This operation is usually a no-op and will by default return false
+            if (csync_file_locked_or_open(ctx->local.uri, cur->path)) {
+                CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "[Reconciler] IGNORING file %s/%s since it is locked / open", ctx->local.uri, cur->path);
+                cur->instruction = CSYNC_INSTRUCTION_ERROR;
+                if (cur->error_status == CSYNC_STATUS_OK) // don't overwrite error
+                    cur->error_status = CYSNC_STATUS_FILE_LOCKED_OR_OPEN;
+                break;
+            } else {
+                //CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "[Reconciler] not ignoring file %s/%s", ctx->local.uri, cur->path);
+            }
+            switch (other->instruction) {
+            /* file on other replica is changed or new */
+            case CSYNC_INSTRUCTION_NEW:
+            case CSYNC_INSTRUCTION_EVAL:
+                if (other->type == CSYNC_FTW_TYPE_DIR &&
+                        cur->type == CSYNC_FTW_TYPE_DIR) {
+                    // Folders of the same path are always considered equals
+                    is_conflict = false;
+                } else {
+                    is_conflict = ((other->size != cur->size) || (other->modtime != cur->modtime));
+                    // FIXME: do a binary comparision of the file here because of the following
+                    // edge case:
+                    // The files could still have different content, even though the mtime
+                    // and size are the same.
+                }
+                if (ctx->current == REMOTE_REPLICA) {
+                    // If the files are considered equal, only update the DB with the etag from remote
+                    cur->instruction = is_conflict ? CSYNC_INSTRUCTION_CONFLICT : CSYNC_INSTRUCTION_UPDATE_METADATA;
+                    other->instruction = CSYNC_INSTRUCTION_NONE;
+                } else {
+                    cur->instruction = CSYNC_INSTRUCTION_NONE;
+                    other->instruction = is_conflict ? CSYNC_INSTRUCTION_CONFLICT : CSYNC_INSTRUCTION_UPDATE_METADATA;
+                }
+
+                break;
+                /* file on the other replica has not been modified */
+            case CSYNC_INSTRUCTION_NONE:
+            case CSYNC_INSTRUCTION_UPDATE_METADATA:
+                if (cur->type != other->type) {
+                    // If the type of the entity changed, it's like NEW, but
+                    // needs to delete the other entity first.
+                    cur->instruction = CSYNC_INSTRUCTION_TYPE_CHANGE;
+                    other->instruction = CSYNC_INSTRUCTION_NONE;
+                } else if (cur->type == CSYNC_FTW_TYPE_DIR) {
+                    cur->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
+                    other->instruction = CSYNC_INSTRUCTION_NONE;
+                } else {
+                    cur->instruction = CSYNC_INSTRUCTION_SYNC;
+                    other->instruction = CSYNC_INSTRUCTION_NONE;
+                }
+                break;
+            case CSYNC_INSTRUCTION_IGNORE:
+                cur->instruction = CSYNC_INSTRUCTION_IGNORE;
+            break;
+            default:
+                break;
+            }
+        default:
+            break;
+        }
+    }
+
+    //hide instruction NONE messages when log level is set to debug,
+    //only show these messages on log level trace
+    const char *repo = ctx->current == REMOTE_REPLICA ? "server" : "client";
+    if(cur->instruction ==CSYNC_INSTRUCTION_NONE)
+    {
+        if(cur->type == CSYNC_FTW_TYPE_DIR)
+        {
+            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,
+                      "%-30s %s dir:  %s",
+                      csync_instruction_str(cur->instruction),
+                      repo,
+                      cur->path);
+        }
+        else
+        {
+            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,
+                      "%-30s %s file: %s",
+                      csync_instruction_str(cur->instruction),
+                      repo,
+                      cur->path);
+        }
+    }
+    else
+    {
+        if(cur->type == CSYNC_FTW_TYPE_DIR)
+        {
+            CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
+                      "%-30s %s dir:  %s",
+                      csync_instruction_str(cur->instruction),
+                      repo,
+                      cur->path);
+        }
+        else
+        {
+            CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
+                      "%-30s %s file: %s",
+                      csync_instruction_str(cur->instruction),
+                      repo,
+                      cur->path);
+        }
+    }
+
+    return 0;
+}
+
+int csync_reconcile_updates(CSYNC *ctx) {
+  int rc;
+  c_rbtree_t *tree = NULL;
+
+  switch (ctx->current) {
+    case LOCAL_REPLICA:
+      tree = ctx->local.tree;
+      break;
+    case REMOTE_REPLICA:
+      tree = ctx->remote.tree;
+      break;
+    default:
+      break;
+  }
+
+  rc = c_rbtree_walk(tree, (void *) ctx, _csync_merge_algorithm_visitor);
+  if( rc < 0 ) {
+    ctx->status_code = CSYNC_STATUS_RECONCILE_ERROR;
+  }
+  return rc;
+}
+
+/* vim: set ts=8 sw=2 et cindent: */
--- a/csync/src/csync_reconcile.h
+++ b/csync/src/csync_reconcile.h
--- a/csync/src/csync_rename.cc
+++ b/csync/src/csync_rename.cc
@@ -0,0 +1,102 @@
+/*
+ * libcsync -- a library to sync a directory with another
+ *
+ * Copyright (c) 2012      by Olivier Goffart <ogoffart@woboq.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+extern "C" {
+#include "csync_private.h"
+#include "csync_rename.h"
+}
+
+#include <map>
+#include <string>
+#include <vector>
+#include <algorithm>
+
+static std::string _parentDir(const std::string &path) {
+    int len = path.length();
+    while(len > 0 && path[len-1]!='/') len--;
+    while(len > 0 && path[len-1]=='/') len--;
+    return path.substr(0, len);
+}
+
+struct csync_rename_s {
+    static csync_rename_s *get(CSYNC *ctx) {
+        if (!ctx->rename_info) {
+            ctx->rename_info = new csync_rename_s;
+        }
+        return reinterpret_cast<csync_rename_s *>(ctx->rename_info);
+    }
+
+    std::map<std::string, std::string> folder_renamed_to; // map from->to
+    std::map<std::string, std::string> folder_renamed_from; // map to->from
+
+    struct renameop {
+        csync_file_stat_t *st;
+        bool operator<(const renameop &other) const {
+            return strlen(st->destpath) < strlen(other.st->destpath);
+        }
+    };
+    std::vector<renameop> todo;
+};
+
+extern "C" {
+void csync_rename_destroy(CSYNC* ctx)
+{
+    delete reinterpret_cast<csync_rename_s *>(ctx->rename_info);
+    ctx->rename_info = 0;
+}
+
+void csync_rename_record(CSYNC* ctx, const char* from, const char* to)
+{
+    csync_rename_s::get(ctx)->folder_renamed_to[from] = to;
+    csync_rename_s::get(ctx)->folder_renamed_from[to] = from;
+}
+
+char* csync_rename_adjust_path(CSYNC* ctx, const char* path)
+{
+    csync_rename_s* d = csync_rename_s::get(ctx);
+    for (std::string p = _parentDir(path); !p.empty(); p = _parentDir(p)) {
+        std::map< std::string, std::string >::iterator it = d->folder_renamed_to.find(p);
+        if (it != d->folder_renamed_to.end()) {
+            std::string rep = it->second + (path + p.length());
+            return c_strdup(rep.c_str());
+        }
+    }
+    return c_strdup(path);
+}
+
+char* csync_rename_adjust_path_source(CSYNC* ctx, const char* path)
+{
+    csync_rename_s* d = csync_rename_s::get(ctx);
+    for (std::string p = _parentDir(path); !p.empty(); p = _parentDir(p)) {
+        std::map< std::string, std::string >::iterator it = d->folder_renamed_from.find(p);
+        if (it != d->folder_renamed_from.end()) {
+            std::string rep = it->second + (path + p.length());
+            return c_strdup(rep.c_str());
+        }
+    }
+    return c_strdup(path);
+}
+
+bool csync_rename_count(CSYNC *ctx) {
+    csync_rename_s* d = csync_rename_s::get(ctx);
+    return d->folder_renamed_from.size();
+}
+
+}
--- a/csync/src/csync_rename.h
+++ b/csync/src/csync_rename.h
@@ -22,19 +22,19 @@

 #include "csync.h"

-/* Return the final destination path of a given patch in case of renames
- *
- * Does only map the parent directories. If the directory "A" is renamed to
- * "B" then this function will not map "A" to "B". Only "A/foo" -> "B/foo".
-*/
-QByteArray OCSYNC_EXPORT csync_rename_adjust_parent_path(CSYNC *ctx, const QByteArray &path);
+#ifdef __cplusplus
+extern "C" {
+#endif

+/* Return the final destination path of a given patch in case of renames */
+char OCSYNC_EXPORT *csync_rename_adjust_path(CSYNC *ctx, const char *path);
 /* Return the source of a given path in case of renames */
-QByteArray OCSYNC_EXPORT csync_rename_adjust_parent_path_source(CSYNC *ctx, const QByteArray &path);
-
-/* like the parent_path variant, but applying to the full path */
-QByteArray OCSYNC_EXPORT csync_rename_adjust_full_path_source(CSYNC *ctx, const QByteArray &path);
-
-void OCSYNC_EXPORT csync_rename_record(CSYNC *ctx, const QByteArray &from, const QByteArray &to);
+char OCSYNC_EXPORT *csync_rename_adjust_path_source(CSYNC *ctx, const char *path);
+void OCSYNC_EXPORT csync_rename_destroy(CSYNC *ctx);
+void OCSYNC_EXPORT csync_rename_record(CSYNC *ctx, const char *from, const char *to);
 /*  Return the amount of renamed item recorded */
 bool OCSYNC_EXPORT csync_rename_count(CSYNC *ctx);
+
+#ifdef __cplusplus
+}
+#endif
--- a/csync/src/csync_statedb.c
+++ b/csync/src/csync_statedb.c
@@ -0,0 +1,622 @@
+/*
+ * libcsync -- a library to sync a directory with another
+ *
+ * Copyright (c) 2008-2013 by Andreas Schneider <asn@cryptomilk.org>
+ * Copyright (c) 2012-2013 by Klaas Freitag <freitag@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config_csync.h"
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <sqlite3.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <inttypes.h>
+
+#include "c_lib.h"
+#include "csync_private.h"
+#include "csync_statedb.h"
+#include "csync_util.h"
+#include "csync_misc.h"
+#include "csync_exclude.h"
+
+#include "c_string.h"
+#include "c_jhash.h"
+#include "csync_time.h"
+
+#define CSYNC_LOG_CATEGORY_NAME "csync.statedb"
+#include "csync_log.h"
+#include "csync_rename.h"
+
+#define BUF_SIZE 16
+
+#define sqlite_open(A, B) sqlite3_open_v2(A,B, SQLITE_OPEN_READONLY+SQLITE_OPEN_NOMUTEX, NULL)
+
+#define SQLTM_TIME 150
+#define SQLTM_COUNT 10
+
+#define SQLITE_BUSY_HANDLED(F) if(1) { \
+    int n = 0; \
+    do { rc = F ; \
+      if( (rc == SQLITE_BUSY) || (rc == SQLITE_LOCKED) ) { \
+         n++; \
+         csync_sleep(SQLTM_TIME); \
+      } \
+    }while( (n < SQLTM_COUNT) && ((rc == SQLITE_BUSY) || (rc == SQLITE_LOCKED))); \
+  }
+
+
+void csync_set_statedb_exists(CSYNC *ctx, int val) {
+  ctx->statedb.exists = val;
+}
+
+int csync_get_statedb_exists(CSYNC *ctx) {
+  return ctx->statedb.exists;
+}
+
+static int _csync_check_db_integrity(sqlite3 *db) {
+    c_strlist_t *result = NULL;
+    int rc = -1;
+
+    result = csync_statedb_query(db, "PRAGMA quick_check;");
+    if (result != NULL) {
+        /* There is  a result */
+        if (result->count > 0) {
+            if (c_streq(result->vector[0], "ok")) {
+                rc = 0;
+            }
+        }
+        c_strlist_destroy(result);
+    }
+
+    if( sqlite3_threadsafe() == 0 ) {
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "* WARNING: SQLite module is not threadsafe!");
+        rc = -1;
+    }
+
+    return rc;
+}
+
+static int _csync_statedb_is_empty(sqlite3 *db) {
+  c_strlist_t *result = NULL;
+  int rc = 0;
+
+  result = csync_statedb_query(db, "SELECT COUNT(phash) FROM metadata LIMIT 1 OFFSET 0;");
+  if (result == NULL) {
+    rc = 1;
+  }
+  c_strlist_destroy(result);
+
+  return rc;
+}
+
+#ifndef NDEBUG
+static void sqlite_profile( void *x, const char* sql, sqlite3_uint64 time)
+{
+    (void)x;
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
+              "_SQL_ %s: %llu", sql, time);
+
+}
+#endif
+
+int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb) {
+  int rc = -1;
+  c_strlist_t *result = NULL;
+  sqlite3 *db = NULL;
+
+  if( !ctx ) {
+      return -1;
+  }
+
+  if (ctx->statedb.db) {
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "ERR: DB already open");
+      ctx->status_code = CSYNC_STATUS_PARAM_ERROR;
+      return -1;
+  }
+
+  ctx->statedb.lastReturnValue = SQLITE_OK;
+
+  /* Openthe database */
+  if (sqlite_open(statedb, &db) != SQLITE_OK) {
+    const char *errmsg= sqlite3_errmsg(ctx->statedb.db);
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "ERR: Failed to sqlite3 open statedb - bail out: %s.",
+              errmsg ? errmsg : "<no sqlite3 errormsg>");
+
+    rc = -1;
+    ctx->status_code = CSYNC_STATUS_STATEDB_LOAD_ERROR;
+    goto out;
+  }
+
+  if (_csync_check_db_integrity(db) != 0) {
+      const char *errmsg= sqlite3_errmsg(db);
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "ERR: sqlite3 integrity check failed - bail out: %s.",
+                errmsg ? errmsg : "<no sqlite3 errormsg>");
+      rc = -1;
+      ctx->status_code = CSYNC_STATUS_STATEDB_CORRUPTED;
+      goto out;
+  }
+
+  if (_csync_statedb_is_empty(db)) {
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "statedb contents doesn't exist");
+    csync_set_statedb_exists(ctx, 0);
+  } else {
+    csync_set_statedb_exists(ctx, 1);
+  }
+
+  /* Print out the version */
+  //
+  result = csync_statedb_query(db, "SELECT sqlite_version();");
+  if (result && result->count >= 1) {
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "sqlite3 version \"%s\"", *result->vector);
+  }
+  c_strlist_destroy(result);
+
+  /* optimization for speeding up SQLite */
+  result = csync_statedb_query(db, "PRAGMA synchronous = NORMAL;");
+  c_strlist_destroy(result);
+  result = csync_statedb_query(db, "PRAGMA case_sensitive_like = ON;");
+  c_strlist_destroy(result);
+
+  /* set a busy handler with 5 seconds timeout */
+  sqlite3_busy_timeout(db, 5000);
+
+#ifndef NDEBUG
+  sqlite3_profile(db, sqlite_profile, 0 );
+#endif
+  *pdb = db;
+
+   CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "Success");
+
+  return 0;
+out:
+  sqlite3_close(db);
+  return rc;
+}
+
+int csync_statedb_close(CSYNC *ctx) {
+  int rc = 0;
+
+  if (!ctx) {
+      return -1;
+  }
+
+  /* deallocate query resources */
+  if( ctx->statedb.by_fileid_stmt ) {
+      sqlite3_finalize(ctx->statedb.by_fileid_stmt);
+      ctx->statedb.by_fileid_stmt = NULL;
+  }
+  if( ctx->statedb.by_hash_stmt ) {
+      sqlite3_finalize(ctx->statedb.by_hash_stmt);
+      ctx->statedb.by_hash_stmt = NULL;
+  }
+  if( ctx->statedb.by_inode_stmt) {
+      sqlite3_finalize(ctx->statedb.by_inode_stmt);
+      ctx->statedb.by_inode_stmt = NULL;
+  }
+
+  ctx->statedb.lastReturnValue = SQLITE_OK;
+
+  int sr = sqlite3_close(ctx->statedb.db);
+  CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "sqlite3_close=%d", sr);
+
+  ctx->statedb.db = 0;
+
+  return rc;
+}
+
+#define METADATA_COLUMNS "phash, pathlen, path, inode, uid, gid, mode, modtime, type, md5, fileid, remotePerm, filesize, ignoredChildrenRemote, contentChecksum, contentChecksumTypeId"
+
+// This funciton parses a line from the metadata table into the given csync_file_stat
+// structure which it is also allocating.
+// Note that this function calls laso sqlite3_step to actually get the info from db and
+// returns the sqlite return type.
+static int _csync_file_stat_from_metadata_table( csync_file_stat_t **st, sqlite3_stmt *stmt )
+{
+    int rc = SQLITE_ERROR;
+    int column_count;
+    int len;
+
+    if( ! stmt ) {
+       CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "Fatal: Statement is NULL.");
+       return SQLITE_ERROR;
+    }
+
+    column_count = sqlite3_column_count(stmt);
+
+    SQLITE_BUSY_HANDLED( sqlite3_step(stmt) );
+
+    if( rc == SQLITE_ROW ) {
+        if(column_count > 7) {
+            const char *name;
+
+            /* phash, pathlen, path, inode, uid, gid, mode, modtime */
+            len = sqlite3_column_int(stmt, 1);
+            *st = c_malloc(sizeof(csync_file_stat_t) + len + 1);
+            /* clear the whole structure */
+            ZERO_STRUCTP(*st);
+
+            /* The query suceeded so use the phash we pass to the function. */
+            (*st)->phash = sqlite3_column_int64(stmt, 0);
+
+            (*st)->pathlen = sqlite3_column_int(stmt, 1);
+            name = (const char*) sqlite3_column_text(stmt, 2);
+            memcpy((*st)->path, (len ? name : ""), len + 1);
+            (*st)->inode = sqlite3_column_int64(stmt,3);
+            (*st)->mode = sqlite3_column_int(stmt, 6);
+            (*st)->modtime = strtoul((char*)sqlite3_column_text(stmt, 7), NULL, 10);
+
+            if(*st && column_count > 8 ) {
+                (*st)->type = sqlite3_column_int(stmt, 8);
+            }
+
+            if(column_count > 9 && sqlite3_column_text(stmt, 9)) {
+                (*st)->etag = c_strdup( (char*) sqlite3_column_text(stmt, 9) );
+            }
+            if(column_count > 10 && sqlite3_column_text(stmt,10)) {
+                csync_vio_set_file_id((*st)->file_id, (char*) sqlite3_column_text(stmt, 10));
+            }
+            if(column_count > 11 && sqlite3_column_text(stmt,11)) {
+                strncpy((*st)->remotePerm,
+                        (char*) sqlite3_column_text(stmt, 11),
+                        REMOTE_PERM_BUF_SIZE);
+            }
+            if(column_count > 12 && sqlite3_column_int64(stmt,12)) {
+                (*st)->size = sqlite3_column_int64(stmt, 12);
+            }
+            if(column_count > 13) {
+                (*st)->has_ignored_files = sqlite3_column_int(stmt, 13);
+            }
+            if(column_count > 15 && sqlite3_column_int(stmt, 15)) {
+                (*st)->checksum = c_strdup( (char*) sqlite3_column_text(stmt, 14));
+                (*st)->checksumTypeId = sqlite3_column_int(stmt, 15);
+            }
+
+        }
+    } else {
+        if( rc != SQLITE_DONE ) {
+            CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "WARN: Query results in %d", rc);
+        }
+    }
+    return rc;
+}
+
+/* caller must free the memory */
+csync_file_stat_t *csync_statedb_get_stat_by_hash(CSYNC *ctx,
+                                                  uint64_t phash)
+{
+  csync_file_stat_t *st = NULL;
+  int rc;
+
+  if( !ctx || ctx->db_is_empty ) {
+      return NULL;
+  }
+
+  if( ctx->statedb.by_hash_stmt == NULL ) {
+      const char *hash_query = "SELECT " METADATA_COLUMNS " FROM metadata WHERE phash=?1";
+
+      SQLITE_BUSY_HANDLED(sqlite3_prepare_v2(ctx->statedb.db, hash_query, strlen(hash_query), &ctx->statedb.by_hash_stmt, NULL));
+      ctx->statedb.lastReturnValue = rc;
+      if( rc != SQLITE_OK ) {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for hash query.");
+          return NULL;
+      }
+  }
+
+  if( ctx->statedb.by_hash_stmt == NULL ) {
+    return NULL;
+  }
+
+  sqlite3_bind_int64(ctx->statedb.by_hash_stmt, 1, (long long signed int)phash);
+
+  rc = _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_hash_stmt);
+  ctx->statedb.lastReturnValue = rc;
+  if( !(rc == SQLITE_ROW || rc == SQLITE_DONE) )  {
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata: %d!", rc);
+  }
+  sqlite3_reset(ctx->statedb.by_hash_stmt);
+
+  return st;
+}
+
+csync_file_stat_t *csync_statedb_get_stat_by_file_id(CSYNC *ctx,
+                                                      const char *file_id ) {
+    csync_file_stat_t *st = NULL;
+    int rc = 0;
+
+    if (!file_id) {
+        return 0;
+    }
+    if (c_streq(file_id, "")) {
+        return 0;
+    }
+
+    if( !ctx || ctx->db_is_empty ) {
+        return NULL;
+    }
+
+    if( ctx->statedb.by_fileid_stmt == NULL ) {
+        const char *query = "SELECT " METADATA_COLUMNS " FROM metadata WHERE fileid=?1";
+
+        SQLITE_BUSY_HANDLED(sqlite3_prepare_v2(ctx->statedb.db, query, strlen(query), &ctx->statedb.by_fileid_stmt, NULL));
+        ctx->statedb.lastReturnValue = rc;
+        if( rc != SQLITE_OK ) {
+            CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for file id query.");
+            return NULL;
+        }
+    }
+
+    /* bind the query value */
+    sqlite3_bind_text(ctx->statedb.by_fileid_stmt, 1, file_id, -1, SQLITE_STATIC);
+
+    rc = _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_fileid_stmt);
+    ctx->statedb.lastReturnValue = rc;
+    if( !(rc == SQLITE_ROW || rc == SQLITE_DONE) ) {
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata: %d!", rc);
+    }
+    // clear the resources used by the statement.
+    sqlite3_reset(ctx->statedb.by_fileid_stmt);
+
+    return st;
+}
+
+/* caller must free the memory */
+csync_file_stat_t *csync_statedb_get_stat_by_inode(CSYNC *ctx,
+                                                  uint64_t inode)
+{
+  csync_file_stat_t *st = NULL;
+  int rc;
+
+  if (!inode) {
+      return NULL;
+  }
+
+  if( !ctx || ctx->db_is_empty ) {
+      return NULL;
+  }
+
+  if( ctx->statedb.by_inode_stmt == NULL ) {
+      const char *inode_query = "SELECT " METADATA_COLUMNS " FROM metadata WHERE inode=?1";
+
+      SQLITE_BUSY_HANDLED(sqlite3_prepare_v2(ctx->statedb.db, inode_query, strlen(inode_query), &ctx->statedb.by_inode_stmt, NULL));
+      ctx->statedb.lastReturnValue = rc;
+      if( rc != SQLITE_OK ) {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for inode query.");
+          return NULL;
+      }
+  }
+
+  if( ctx->statedb.by_inode_stmt == NULL ) {
+    return NULL;
+  }
+
+  sqlite3_bind_int64(ctx->statedb.by_inode_stmt, 1, (long long signed int)inode);
+
+  rc = _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_inode_stmt);
+  ctx->statedb.lastReturnValue = rc;
+  if( !(rc == SQLITE_ROW || rc == SQLITE_DONE) ) {
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata by inode: %d!", rc);
+  }
+  sqlite3_reset(ctx->statedb.by_inode_stmt);
+
+  return st;
+}
+
+int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
+    int rc;
+    sqlite3_stmt *stmt = NULL;
+    int64_t cnt = 0;
+
+    if( !path ) {
+        return -1;
+    }
+
+    if( !ctx || ctx->db_is_empty ) {
+        return -1;
+    }
+
+    /*  Select the entries for anything that starts with  (path+'/')
+     * In other words, anything that is between  path+'/' and path+'0',
+     * (because '0' follows '/' in ascii)
+     */
+    const char *below_path_query = "SELECT " METADATA_COLUMNS " FROM metadata WHERE path > (?||'/') AND path < (?||'0')";
+    SQLITE_BUSY_HANDLED(sqlite3_prepare_v2(ctx->statedb.db, below_path_query, -1, &stmt, NULL));
+    ctx->statedb.lastReturnValue = rc;
+    if( rc != SQLITE_OK ) {
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for below path query.");
+      return -1;
+    }
+
+    if (stmt == NULL) {
+      return -1;
+    }
+
+    sqlite3_bind_text(stmt, 1, path, -1, SQLITE_STATIC);
+    sqlite3_bind_text(stmt, 2, path, -1, SQLITE_STATIC);
+
+    cnt = 0;
+
+    ctx->statedb.lastReturnValue = rc;
+    do {
+        csync_file_stat_t *st = NULL;
+
+        rc = _csync_file_stat_from_metadata_table( &st, stmt);
+        if( st ) {
+            /* Check for exclusion from the tree.
+             * Note that this is only a safety net in case the ignore list changes
+             * without a full remote discovery being triggered. */
+            CSYNC_EXCLUDE_TYPE excluded = csync_excluded_traversal(ctx->excludes, st->path, st->type);
+            if (excluded != CSYNC_NOT_EXCLUDED) {
+                CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "%s excluded (%d)", st->path, excluded);
+
+                if (excluded == CSYNC_FILE_EXCLUDE_AND_REMOVE
+                        || excluded == CSYNC_FILE_SILENTLY_EXCLUDED) {
+                    csync_file_stat_free(st);
+                    continue;
+                }
+
+                st->instruction = CSYNC_INSTRUCTION_IGNORE;
+            }
+
+            /* store into result list. */
+            if (c_rbtree_insert(ctx->remote.tree, (void *) st) < 0) {
+                csync_file_stat_free(st);
+                ctx->status_code = CSYNC_STATUS_TREE_ERROR;
+                break;
+            }
+            cnt++;
+        }
+    } while( rc == SQLITE_ROW );
+
+    ctx->statedb.lastReturnValue = rc;
+    if( rc != SQLITE_DONE ) {
+        ctx->status_code = CSYNC_STATUS_TREE_ERROR;
+    } else {
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "%" PRId64 " entries read below path %s from db.", cnt, path);
+    }
+    sqlite3_finalize(stmt);
+
+    return 0;
+}
+
+/* query the statedb, caller must free the memory */
+c_strlist_t *csync_statedb_query(sqlite3 *db,
+                                 const char *statement) {
+  int err = SQLITE_OK;
+  int rc = SQLITE_OK;
+  size_t i = 0;
+  size_t busy_count = 0;
+  size_t retry_count = 0;
+  size_t column_count = 0;
+  sqlite3_stmt *stmt;
+  const char *tail = NULL;
+  const char *field = NULL;
+  c_strlist_t *result = NULL;
+  int row = 0;
+
+  do {
+    /* compile SQL program into a virtual machine, reattempteing if busy */
+    do {
+      if (busy_count) {
+        csync_sleep(100);
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "sqlite3_prepare: BUSY counter: %zu", busy_count);
+      }
+      err = sqlite3_prepare(db, statement, -1, &stmt, &tail);
+    } while (err == SQLITE_BUSY && busy_count ++ < 120);
+
+    if (err != SQLITE_OK) {
+      if (err == SQLITE_BUSY) {
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "Gave up waiting for lock to clear");
+      }
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN,
+                "sqlite3_compile error: %s - on query %s",
+                sqlite3_errmsg(db), statement);
+      break;
+    } else {
+      busy_count = 0;
+      column_count = sqlite3_column_count(stmt);
+
+      /* execute virtual machine by iterating over rows */
+      for(;;) {
+        err = sqlite3_step(stmt);
+
+        if (err == SQLITE_BUSY) {
+          if (busy_count++ > 120) {
+            CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "Busy counter has reached its maximum. Aborting this sql statement");
+            break;
+          }
+          csync_sleep(100);
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "sqlite3_step: BUSY counter: %zu", busy_count);
+          continue;
+        }
+
+        if (err == SQLITE_MISUSE) {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "sqlite3_step: MISUSE!!");
+        }
+
+        if (err == SQLITE_DONE) {
+          if (result == NULL) {
+            result = c_strlist_new(1);
+          }
+          break;
+        }
+
+        if (err == SQLITE_ERROR) {
+          break;
+        }
+
+       row++;
+        if( result ) {
+            result = c_strlist_expand(result, row*column_count);
+        } else {
+            result = c_strlist_new(column_count);
+        }
+
+        if (result == NULL) {
+          return NULL;
+        }
+
+        /* iterate over columns */
+        for (i = 0; i < column_count; i++) {
+          field = (const char *) sqlite3_column_text(stmt, i);
+          if (!field)
+              field = "";
+          // CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "sqlite3_column_text: %s", field);
+          if (c_strlist_add(result, field) < 0) {
+            c_strlist_destroy(result);
+            return NULL;
+          }
+        }
+      } /* end infinite for loop */
+
+      /* deallocate vm resources */
+      rc = sqlite3_finalize(stmt);
+
+      if (err != SQLITE_DONE && rc != SQLITE_SCHEMA) {
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "sqlite_step error: %s - on query: %s", sqlite3_errmsg(db), statement);
+        if (result != NULL) {
+          c_strlist_destroy(result);
+        }
+        return NULL;
+      }
+
+      if (rc == SQLITE_SCHEMA) {
+        retry_count ++;
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "SQLITE_SCHEMA error occurred on query: %s", statement);
+        if (retry_count < 10) {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Retrying now.");
+        } else {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "RETRY count has reached its maximum. Aborting statement: %s", statement);
+          if (result != NULL) {
+            c_strlist_destroy(result);
+          }
+          result = c_strlist_new(1);
+        }
+      }
+    }
+  } while (rc == SQLITE_SCHEMA && retry_count < 10);
+
+  return result;
+}
+
+/* vim: set ts=8 sw=2 et cindent: */
--- a/csync/src/csync_statedb.h
+++ b/csync/src/csync_statedb.h
@@ -0,0 +1,107 @@
+/*
+ * libcsync -- a library to sync a directory with another
+ *
+ * Copyright (c) 2008-2013 by Andreas Schneider <asn@cryptomilk.org>
+ * Copyright (c) 2012-2013 by Klaas Freitag <freitag@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file csync_private.h
+ *
+ * @brief Private interface of csync
+ *
+ * @defgroup csyncstatedbInternals csync statedb internals
+ * @ingroup csyncInternalAPI
+ *
+ * @{
+ */
+
+#ifndef _CSYNC_STATEDB_H
+#define _CSYNC_STATEDB_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "c_lib.h"
+#include "csync_private.h"
+
+void csync_set_statedb_exists(CSYNC *ctx, int val);
+
+int csync_get_statedb_exists(CSYNC *ctx);
+
+/**
+ * @brief Load the statedb.
+ *
+ * This function tries to load the statedb. If it doesn't exists it creates
+ * the sqlite3 database, but doesn't create the tables. This will be done when
+ * csync gets destroyed.
+ *
+ * @param ctx      The csync context.
+ * @param statedb  Path to the statedb file (sqlite3 db).
+ *
+ * @return 0 on success, less than 0 if an error occurred with errno set.
+ */
+OCSYNC_EXPORT int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb);
+
+OCSYNC_EXPORT int csync_statedb_close(CSYNC *ctx);
+
+OCSYNC_EXPORT csync_file_stat_t *csync_statedb_get_stat_by_hash(CSYNC *ctx, uint64_t phash);
+
+OCSYNC_EXPORT csync_file_stat_t *csync_statedb_get_stat_by_inode(CSYNC *ctx, uint64_t inode);
+
+OCSYNC_EXPORT csync_file_stat_t *csync_statedb_get_stat_by_file_id(CSYNC *ctx, const char *file_id);
+
+/**
+ * @brief Query all files metadata inside and below a path.
+ * @param ctx        The csync context.
+ * @param path       The path.
+ *
+ * This function queries all metadata of all files inside or below the
+ * given path. The result is a linear string list with a multiple of 9
+ * entries. For each result file there are 9 strings which are phash,
+ * path, inode, uid, gid, mode, modtime, type and md5 (unique id).
+ *
+ * Note that not only the files in the given path are part of the result
+ * but also the files in directories below the given path. Ie. if the
+ * parameter path is /home/kf/test, we have /home/kf/test/file.txt in
+ * the result but also /home/kf/test/homework/another_file.txt
+ *
+ * @return   A stringlist containing a multiple of 9 entries.
+ */
+int csync_statedb_get_below_path(CSYNC *ctx, const char *path);
+
+/**
+ * @brief A generic statedb query.
+ *
+ * @param ctx        The csync context.
+ * @param statement  The SQL statement to execute
+ * 
+ * @return   A stringlist of the entries of a column. An emtpy stringlist if
+ *           nothing has been found. NULL on error.
+ */
+c_strlist_t *csync_statedb_query(sqlite3 *db, const char *statement);
+
+#ifdef __cplusplus
+}
+#endif
+
+/**
+ * }@
+ */
+#endif /* _CSYNC_STATEDB_H */
+/* vim: set ft=c.doxygen ts=8 sw=2 et cindent: */
--- a/csync/src/csync_time.c
+++ b/csync/src/csync_time.c
@@ -29,12 +29,11 @@
 #include <time.h>

 #include "csync_time.h"
+#include "vio/csync_vio.h"

 #ifndef _WIN32
 #include <unistd.h>
 #include <sys/time.h>
-#else
-#include <windows.h>
 #endif

 #define CSYNC_LOG_CATEGORY_NAME "csync.time"
--- a/csync/src/csync_time.h
+++ b/csync/src/csync_time.h
@@ -21,17 +21,11 @@
 #ifndef _CSYNC_TIME_H
 #define _CSYNC_TIME_H

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <time.h>

+#include "csync_private.h"
+
 int csync_gettime(struct timespec *tp);
 void csync_sleep(unsigned int msecs);

-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _CSYNC_TIME_H */
--- a/csync/src/csync_update.c
+++ b/csync/src/csync_update.c
@@ -0,0 +1,852 @@
+/*
+ * libcsync -- a library to sync a directory with another
+ *
+ * Copyright (c) 2008-2013 by Andreas Schneider <asn@cryptomilk.org>
+ * Copyright (c) 2012-2013 by Klaas Freitag <freitag@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config_csync.h"
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <inttypes.h>
+#include <time.h>
+#include <math.h>
+
+#include "c_lib.h"
+#include "c_jhash.h"
+
+#include "csync_private.h"
+#include "csync_exclude.h"
+#include "csync_statedb.h"
+#include "csync_update.h"
+#include "csync_util.h"
+#include "csync_misc.h"
+
+#include "vio/csync_vio.h"
+
+#define CSYNC_LOG_CATEGORY_NAME "csync.updater"
+#include "csync_log.h"
+#include "csync_rename.h"
+
+/* calculate the hash of a given uri */
+static uint64_t _hash_of_file(CSYNC *ctx, const char *file) {
+  const char *path;
+  int len;
+  uint64_t h = 0;
+
+  if( ctx && file ) {
+    path = file;
+    if (ctx->current == LOCAL_REPLICA) {
+      if (strlen(path) <= strlen(ctx->local.uri)) {
+        return 0;
+      }
+      path += strlen(ctx->local.uri) + 1;
+    }
+    len = strlen(path);
+    h = c_jhash64((uint8_t *) path, len, 0);
+  }
+  return h;
+}
+
+#ifdef NO_RENAME_EXTENSION
+/* Return true if the two path have the same extension. false otherwise. */
+static bool _csync_sameextension(const char *p1, const char *p2) {
+    /* Find pointer to the extensions */
+    const char *e1 = strrchr(p1, '.');
+    const char *e2 = strrchr(p2, '.');
+
+    /* If the found extension contains a '/', it is because the . was in the folder name
+     *            => no extensions */
+    if (e1 && strchr(e1, '/')) e1 = NULL;
+    if (e2 && strchr(e2, '/')) e2 = NULL;
+
+    /* If none have extension, it is the same extension */
+    if (!e1 && !e2)
+        return true;
+
+    /* c_streq takes care of the rest */
+    return c_streq(e1, e2);
+}
+#endif
+
+static bool _last_db_return_error(CSYNC* ctx) {
+    return ctx->statedb.lastReturnValue != SQLITE_OK && ctx->statedb.lastReturnValue != SQLITE_DONE && ctx->statedb.lastReturnValue != SQLITE_ROW;
+}
+
+/*
+ * This static method is needed because the type members of the two structs use
+ * different enum values. A direct comparion is not neccessarily correct.
+ *
+ * tmp is csync_file_stat_t
+ * fs  is csync_vio_file_stat_t with this vio type:
+ *  enum csync_vio_file_type_e {
+ *              CSYNC_VIO_FILE_TYPE_UNKNOWN,
+ *              CSYNC_VIO_FILE_TYPE_REGULAR,
+ *              CSYNC_VIO_FILE_TYPE_DIRECTORY,
+ *              CSYNC_VIO_FILE_TYPE_FIFO,
+ *              CSYNC_VIO_FILE_TYPE_SOCKET,
+ *              CSYNC_VIO_FILE_TYPE_CHARACTER_DEVICE,
+ *              CSYNC_VIO_FILE_TYPE_BLOCK_DEVICE,
+ *              CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK
+ *            };
+ *
+ * csync_file_stat_t can be:
+ * CSYNC_FTW_TYPE_SKIP, CSYNC_FTW_TYPE_FILE
+ * CSYNC_FTW_TYPE_DIR, CSYNC_FTW_TYPE_SLINK
+ */
+static bool _csync_filetype_different( const csync_file_stat_t *tmp, const csync_vio_file_stat_t *fs)
+{
+    if( !(tmp && fs)) return false;
+
+    if( tmp->type == CSYNC_FTW_TYPE_SKIP ) return true;
+
+    if( tmp->type == CSYNC_FTW_TYPE_DIR && fs->type != CSYNC_VIO_FILE_TYPE_DIRECTORY )
+        return true;
+    if( tmp->type == CSYNC_FTW_TYPE_FILE && fs->type != CSYNC_VIO_FILE_TYPE_REGULAR )
+        return true;
+    if( tmp->type == CSYNC_FTW_TYPE_SLINK && fs->type != CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK )
+        return true;
+
+    return false; // both are NOT different.
+}
+
+/* Return true if two mtime are considered equal
+ * We consider mtime that are one hour difference to be equal if they are one hour appart
+ * because on some system (FAT) the date is changing when the daylight saving is changing */
+static bool _csync_mtime_equal(time_t a, time_t b)
+{
+    if (a == b)
+        return true;
+
+    /* 1h of difference +- 1 second because the accuracy of FAT is 2 seconds (#2438) */
+    if (fabs(3600 - fabs(difftime(a, b))) < 2)
+        return true;
+
+    return false;
+}
+
+/**
+ * The main function of the discovery/update pass.
+ *
+ * It's called (indirectly) by csync_update(), once for each entity in the
+ * local filesystem and once for each entity in the server data.
+ *
+ * It has two main jobs:
+ * - figure out whether anything happened compared to the sync journal
+ *   and set (primarily) the instruction flag accordingly
+ * - build the ctx->local.tree / ctx->remote.tree
+ *
+ * See doc/dev/sync-algorithm.md for an overview.
+ */
+static int _csync_detect_update(CSYNC *ctx, const char *file,
+    const csync_vio_file_stat_t *fs, const int type) {
+  uint64_t h = 0;
+  size_t len = 0;
+  size_t size = 0;
+  const char *path = NULL;
+  csync_file_stat_t *st = NULL;
+  csync_file_stat_t *tmp = NULL;
+  CSYNC_EXCLUDE_TYPE excluded;
+
+  if ((file == NULL) || (fs == NULL)) {
+    errno = EINVAL;
+    ctx->status_code = CSYNC_STATUS_PARAM_ERROR;
+    return -1;
+  }
+
+  path = file;
+  if (ctx->current == LOCAL_REPLICA) {
+      if (strlen(path) <= strlen(ctx->local.uri)) {
+        ctx->status_code = CSYNC_STATUS_PARAM_ERROR;
+        return -1;
+      }
+      path += strlen(ctx->local.uri) + 1;
+  }
+
+  len = strlen(path);
+
+  if (type == CSYNC_FTW_TYPE_SKIP) {
+      excluded =CSYNC_FILE_EXCLUDE_STAT_FAILED;
+  } else {
+    /* Check if file is excluded */
+    excluded = csync_excluded_traversal(ctx->excludes, path, type);
+  }
+
+  if( excluded == CSYNC_NOT_EXCLUDED ) {
+      /* Even if it is not excluded by a pattern, maybe it is to be ignored
+       * because it's a hidden file that should not be synced.
+       * This code should probably be in csync_exclude, but it does not have the fs parameter.
+       * Keep it here for now */
+      if (ctx->ignore_hidden_files && (fs->flags & CSYNC_VIO_FILE_FLAGS_HIDDEN)) {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file excluded because it is a hidden file: %s", path);
+          excluded = CSYNC_FILE_EXCLUDE_HIDDEN;
+      }
+  } else {
+      /* File is ignored because it's matched by a user- or system exclude pattern. */
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "%s excluded  (%d)", path, excluded);
+      if (excluded == CSYNC_FILE_EXCLUDE_AND_REMOVE) {
+          return 1;
+      }
+      if (excluded == CSYNC_FILE_SILENTLY_EXCLUDED) {
+          return 1;
+      }
+  }
+
+  if (ctx->current == REMOTE_REPLICA && ctx->callbacks.checkSelectiveSyncBlackListHook) {
+      if (ctx->callbacks.checkSelectiveSyncBlackListHook(ctx->callbacks.update_callback_userdata, path)) {
+          return 1;
+      }
+  }
+
+  h = _hash_of_file(ctx, file );
+  if( h == 0 ) {
+    return -1;
+  }
+  size = sizeof(csync_file_stat_t) + len + 1;
+
+  st = c_malloc(size);
+
+  /* Set instruction by default to none */
+  st->instruction = CSYNC_INSTRUCTION_NONE;
+  st->etag = NULL;
+  st->child_modified = 0;
+  st->has_ignored_files = 0;
+  if (type == CSYNC_FTW_TYPE_FILE ) {
+    if (fs->mtime == 0) {
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file: %s - mtime is zero!", path);
+    }
+  }
+
+  if (excluded > CSYNC_NOT_EXCLUDED || type == CSYNC_FTW_TYPE_SLINK) {
+      st->instruction = CSYNC_INSTRUCTION_IGNORE;
+      if (ctx->current_fs) {
+          ctx->current_fs->has_ignored_files = true;
+      }
+
+      goto out;
+  }
+
+  /* Update detection: Check if a database entry exists.
+   * If not, the file is either new or has been renamed. To see if it is
+   * renamed, the db gets queried by the inode of the file as that one
+   * does not change on rename.
+   */
+  if (csync_get_statedb_exists(ctx)) {
+    tmp = csync_statedb_get_stat_by_hash(ctx, h);
+
+    if(_last_db_return_error(ctx)) {
+        csync_file_stat_free(st);
+        csync_file_stat_free(tmp);
+        ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
+        return -1;
+    }
+
+    if(tmp && tmp->phash == h ) { /* there is an entry in the database */
+        /* we have an update! */
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Database entry found, compare: %" PRId64 " <-> %" PRId64
+                                            ", etag: %s <-> %s, inode: %" PRId64 " <-> %" PRId64
+                                            ", size: %" PRId64 " <-> %" PRId64 ", perms: %s <-> %s, ignore: %d",
+                  ((int64_t) fs->mtime), ((int64_t) tmp->modtime),
+                  fs->etag, tmp->etag, (uint64_t) fs->inode, (uint64_t) tmp->inode,
+                  (uint64_t) fs->size, (uint64_t) tmp->size, fs->remotePerm, tmp->remotePerm, tmp->has_ignored_files );
+        if (ctx->current == REMOTE_REPLICA && !c_streq(fs->etag, tmp->etag)) {
+            st->instruction = CSYNC_INSTRUCTION_EVAL;
+
+            // Preserve the EVAL flag later on if the type has changed.
+            if (_csync_filetype_different(tmp, fs)) {
+                st->child_modified = 1;
+            }
+
+            goto out;
+        }
+        if (ctx->current == LOCAL_REPLICA &&
+                (!_csync_mtime_equal(fs->mtime, tmp->modtime)
+                 // zero size in statedb can happen during migration
+                 || (tmp->size != 0 && fs->size != tmp->size))) {
+
+            // Checksum comparison at this stage is only enabled for .eml files,
+            // check #4754 #4755
+            bool isEmlFile = csync_fnmatch("*.eml", file, FNM_CASEFOLD) == 0;
+            if (isEmlFile && fs->size == tmp->size && tmp->checksumTypeId) {
+                if (ctx->callbacks.checksum_hook) {
+                    st->checksum = ctx->callbacks.checksum_hook(
+                                file, tmp->checksumTypeId,
+                                ctx->callbacks.checksum_userdata);
+                }
+                bool checksumIdentical = false;
+                if (st->checksum) {
+                    st->checksumTypeId = tmp->checksumTypeId;
+                    checksumIdentical = strncmp(st->checksum, tmp->checksum, 1000) == 0;
+                }
+                if (checksumIdentical) {
+                    CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "NOTE: Checksums are identical, file did not actually change: %s", path);
+                    st->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
+                    goto out;
+                }
+            }
+
+            // Preserve the EVAL flag later on if the type has changed.
+            if (_csync_filetype_different(tmp, fs)) {
+                st->child_modified = 1;
+            }
+
+            st->instruction = CSYNC_INSTRUCTION_EVAL;
+            goto out;
+        }
+        bool metadata_differ = (ctx->current == REMOTE_REPLICA && (!c_streq(fs->file_id, tmp->file_id)
+                                                            || !c_streq(fs->remotePerm, tmp->remotePerm)))
+                             || (ctx->current == LOCAL_REPLICA && fs->inode != tmp->inode);
+        if (type == CSYNC_FTW_TYPE_DIR && ctx->current == REMOTE_REPLICA
+                && !metadata_differ && ctx->read_remote_from_db) {
+            /* If both etag and file id are equal for a directory, read all contents from
+             * the database.
+             * The metadata comparison ensure that we fetch all the file id or permission when
+             * upgrading owncloud
+             */
+            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Reading from database: %s", path);
+            ctx->remote.read_from_db = true;
+        }
+        /* If it was remembered in the db that the remote dir has ignored files, store
+         * that so that the reconciler can make advantage of.
+         */
+        if( ctx->current == REMOTE_REPLICA ) {
+            st->has_ignored_files = tmp->has_ignored_files;
+        }
+        if (metadata_differ) {
+            /* file id or permissions has changed. Which means we need to update them in the DB. */
+            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Need to update metadata for: %s", path);
+            st->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
+        } else {
+            st->instruction = CSYNC_INSTRUCTION_NONE;
+        }
+    } else {
+        enum csync_vio_file_type_e tmp_vio_type = CSYNC_VIO_FILE_TYPE_UNKNOWN;
+
+        /* tmp might point to malloc mem, so free it here before reusing tmp  */
+        csync_file_stat_free(tmp);
+
+        /* check if it's a file and has been renamed */
+        if (ctx->current == LOCAL_REPLICA) {
+            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Checking for rename based on inode # %" PRId64 "", (uint64_t) fs->inode);
+
+            tmp = csync_statedb_get_stat_by_inode(ctx, fs->inode);
+
+            if(_last_db_return_error(ctx)) {
+                csync_file_stat_free(st);
+                ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
+                return -1;
+            }
+
+            /* translate the file type between the two stat types csync has. */
+            if( tmp && tmp->type == CSYNC_FTW_TYPE_FILE ) {
+                tmp_vio_type = CSYNC_VIO_FILE_TYPE_REGULAR;
+            } else if( tmp && tmp->type == CSYNC_FTW_TYPE_DIR) {
+                tmp_vio_type = CSYNC_VIO_FILE_TYPE_DIRECTORY;
+            } else if( tmp && tmp->type == CSYNC_FTW_TYPE_SLINK ) {
+                tmp_vio_type = CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK;
+            } else {
+                tmp_vio_type = CSYNC_VIO_FILE_TYPE_UNKNOWN;
+            }
+
+            // Default to NEW unless we're sure it's a rename.
+            st->instruction = CSYNC_INSTRUCTION_NEW;
+
+            bool isRename =
+                tmp && tmp->inode == fs->inode && tmp_vio_type == fs->type
+                    && (tmp->modtime == fs->mtime || fs->type == CSYNC_VIO_FILE_TYPE_DIRECTORY)
+#ifdef NO_RENAME_EXTENSION
+                    && _csync_sameextension(tmp->path, path)
+#endif
+                ;
+
+
+            // Verify the checksum where possible
+            if (isRename && tmp->checksumTypeId && ctx->callbacks.checksum_hook
+                    && fs->type == CSYNC_VIO_FILE_TYPE_REGULAR) {
+                st->checksum = ctx->callbacks.checksum_hook(
+                            file, tmp->checksumTypeId,
+                            ctx->callbacks.checksum_userdata);
+                if (st->checksum) {
+                    CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "checking checksum of potential rename %s %s <-> %s", path, st->checksum, tmp->checksum);
+                    st->checksumTypeId = tmp->checksumTypeId;
+                    isRename = strncmp(st->checksum, tmp->checksum, 1000) == 0;
+                }
+            }
+
+            if (isRename) {
+                CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "pot rename detected based on inode # %" PRId64 "", (uint64_t) fs->inode);
+                /* inode found so the file has been renamed */
+                st->instruction = CSYNC_INSTRUCTION_EVAL_RENAME;
+                if (fs->type == CSYNC_VIO_FILE_TYPE_DIRECTORY) {
+                    csync_rename_record(ctx, tmp->path, path);
+                }
+            }
+            goto out;
+
+        } else {
+            /* Remote Replica Rename check */
+            tmp = csync_statedb_get_stat_by_file_id(ctx, fs->file_id);
+
+            if(_last_db_return_error(ctx)) {
+                csync_file_stat_free(st);
+                ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
+                return -1;
+            }
+            if(tmp ) {                           /* tmp existing at all */
+                if ( _csync_filetype_different(tmp, fs)) {
+                    CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "WARN: file types different is not!");
+                    st->instruction = CSYNC_INSTRUCTION_NEW;
+                    goto out;
+                }
+                CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "remote rename detected based on fileid %s %s", tmp->path, file);
+                st->instruction = CSYNC_INSTRUCTION_EVAL_RENAME;
+                if (fs->type == CSYNC_VIO_FILE_TYPE_DIRECTORY) {
+                    csync_rename_record(ctx, tmp->path, path);
+                } else {
+                    if( !c_streq(tmp->etag, fs->etag) ) {
+                        /* CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "ETags are different!"); */
+                        /* File with different etag, don't do a rename, but download the file again */
+                        st->instruction = CSYNC_INSTRUCTION_NEW;
+                    }
+                }
+                goto out;
+
+            } else {
+                /* file not found in statedb */
+                st->instruction = CSYNC_INSTRUCTION_NEW;
+
+                if (fs->type == CSYNC_VIO_FILE_TYPE_DIRECTORY && ctx->current == REMOTE_REPLICA && ctx->callbacks.checkSelectiveSyncNewFolderHook) {
+                    if (ctx->callbacks.checkSelectiveSyncNewFolderHook(ctx->callbacks.update_callback_userdata, path, fs->remotePerm)) {
+                        csync_file_stat_free(st);
+                        return 1;
+                    }
+                }
+                goto out;
+            }
+        }
+    }
+  } else  {
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Unable to open statedb" );
+      csync_file_stat_free(st);
+      ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
+      return -1;
+  }
+
+out:
+
+  /* Set the ignored error string. */
+  if (st->instruction == CSYNC_INSTRUCTION_IGNORE) {
+      if( type == CSYNC_FTW_TYPE_SLINK ) {
+          st->error_status = CSYNC_STATUS_INDIVIDUAL_IS_SYMLINK; /* Symbolic links are ignored. */
+      } else {
+          if (excluded == CSYNC_FILE_EXCLUDE_LIST) {
+              st->error_status = CSYNC_STATUS_INDIVIDUAL_IGNORE_LIST; /* File listed on ignore list. */
+          } else if (excluded == CSYNC_FILE_EXCLUDE_INVALID_CHAR) {
+              st->error_status = CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS;  /* File contains invalid characters. */
+          } else if (excluded == CSYNC_FILE_EXCLUDE_TRAILING_SPACE) {
+              st->error_status = CSYNC_STATUS_INDIVIDUAL_TRAILING_SPACE; /* File ends with a trailing space. */
+          } else if (excluded == CSYNC_FILE_EXCLUDE_LONG_FILENAME) {
+              st->error_status = CSYNC_STATUS_INDIVIDUAL_EXCLUDE_LONG_FILENAME; /* File name is too long. */
+          } else if (excluded == CSYNC_FILE_EXCLUDE_HIDDEN ) {
+              st->error_status = CSYNC_STATUS_INDIVIDUAL_EXCLUDE_HIDDEN;
+          } else if (excluded == CSYNC_FILE_EXCLUDE_STAT_FAILED) {
+              st->error_status = CSYNC_STATUS_INDIVIDUAL_STAT_FAILED;
+          }
+      }
+  }
+  if (st->instruction != CSYNC_INSTRUCTION_NONE
+      && st->instruction != CSYNC_INSTRUCTION_IGNORE
+      && st->instruction != CSYNC_INSTRUCTION_UPDATE_METADATA
+      && type != CSYNC_FTW_TYPE_DIR) {
+    st->child_modified = 1;
+  }
+  ctx->current_fs = st;
+
+  csync_file_stat_free(tmp);
+  st->inode = fs->inode;
+  st->mode  = fs->mode;
+  st->size  = fs->size;
+  st->modtime = fs->mtime;
+  st->type  = type;
+  st->etag   = NULL;
+  if( fs->etag ) {
+      SAFE_FREE(st->etag);
+      st->etag  = c_strdup(fs->etag);
+  }
+  csync_vio_set_file_id(st->file_id, fs->file_id);
+  if (fs->fields & CSYNC_VIO_FILE_STAT_FIELDS_DIRECTDOWNLOADURL) {
+      SAFE_FREE(st->directDownloadUrl);
+      st->directDownloadUrl = c_strdup(fs->directDownloadUrl);
+  }
+  if (fs->fields & CSYNC_VIO_FILE_STAT_FIELDS_DIRECTDOWNLOADCOOKIES) {
+      SAFE_FREE(st->directDownloadCookies);
+      st->directDownloadCookies = c_strdup(fs->directDownloadCookies);
+  }
+  if (fs->fields & CSYNC_VIO_FILE_STAT_FIELDS_PERM) {
+      strncpy(st->remotePerm, fs->remotePerm, REMOTE_PERM_BUF_SIZE);
+  }
+
+  st->phash = h;
+  st->pathlen = len;
+  memcpy(st->path, (len ? path : ""), len + 1);
+
+  switch (ctx->current) {
+    case LOCAL_REPLICA:
+      if (c_rbtree_insert(ctx->local.tree, (void *) st) < 0) {
+        csync_file_stat_free(st);
+        ctx->status_code = CSYNC_STATUS_TREE_ERROR;
+        return -1;
+      }
+      break;
+    case REMOTE_REPLICA:
+      if (c_rbtree_insert(ctx->remote.tree, (void *) st) < 0) {
+        csync_file_stat_free(st);
+        ctx->status_code = CSYNC_STATUS_TREE_ERROR;
+        return -1;
+      }
+      break;
+    default:
+      break;
+  }
+  CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "file: %s, instruction: %s <<=", st->path,
+      csync_instruction_str(st->instruction));
+
+  return 0;
+}
+
+int csync_walker(CSYNC *ctx, const char *file, const csync_vio_file_stat_t *fs,
+    enum csync_ftw_flags_e flag) {
+  int rc = -1;
+  int type = CSYNC_FTW_TYPE_SKIP;
+  csync_file_stat_t *st = NULL;
+  uint64_t h;
+
+  if (ctx->abort) {
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Aborted!");
+    ctx->status_code = CSYNC_STATUS_ABORTED;
+    return -1;
+  }
+
+  switch (flag) {
+    case CSYNC_FTW_FLAG_FILE:
+      if (ctx->current == REMOTE_REPLICA) {
+          if (fs->fields & CSYNC_VIO_FILE_STAT_FIELDS_SIZE) {
+              CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file: %s [file_id=%s size=%" PRIu64 "]", file, fs->file_id, fs->size);
+          } else {
+              CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file: %s [file_id=%s size=UNKNOWN]", file, fs->file_id);
+          }
+      } else {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file: %s [inode=%" PRIu64 " size=%" PRIu64 "]", file, fs->inode, fs->size);
+      }
+      type = CSYNC_FTW_TYPE_FILE;
+      break;
+  case CSYNC_FTW_FLAG_DIR: /* enter directory */
+      if (ctx->current == REMOTE_REPLICA) {
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "directory: %s [file_id=%s]", file, fs->file_id);
+      } else {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "directory: %s [inode=%" PRIu64 "]", file, fs->inode);
+      }
+      type = CSYNC_FTW_TYPE_DIR;
+      break;
+  case CSYNC_FTW_FLAG_NSTAT: /* not statable file */
+    /* if file was here before and now is not longer stat-able, still
+     * add it to the db, otherwise not. */
+    h = _hash_of_file( ctx, file );
+    if( h == 0 ) {
+      return 0;
+    }
+    st = csync_statedb_get_stat_by_hash(ctx, h);
+    if( !st ) {
+      return 0;
+    }
+    csync_file_stat_free(st);
+    st = NULL;
+
+    type = CSYNC_FTW_TYPE_SKIP;
+    break;
+  case CSYNC_FTW_FLAG_SLINK:
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "symlink: %s - not supported", file);
+    type = CSYNC_FTW_TYPE_SLINK;
+    break;
+  case CSYNC_FTW_FLAG_DNR:
+  case CSYNC_FTW_FLAG_DP:
+  case CSYNC_FTW_FLAG_SLN:
+  default:
+    return 0;
+    break;
+  }
+
+  rc = _csync_detect_update(ctx, file, fs, type );
+
+  return rc;
+}
+
+static bool fill_tree_from_db(CSYNC *ctx, const char *uri)
+{
+    if( csync_statedb_get_below_path(ctx, uri) < 0 ) {
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "StateDB could not be read!");
+        return false;
+    }
+
+    return true;
+}
+
+/* set the current item to an ignored state.
+ * If the item is set to ignored, the update phase continues, ie. its not a hard error */
+static bool mark_current_item_ignored( CSYNC *ctx, csync_file_stat_t *previous_fs, CSYNC_STATUS status )
+{
+    if(!ctx) {
+        return false;
+    }
+
+    if (ctx->current_fs) {
+        ctx->current_fs->instruction = CSYNC_INSTRUCTION_IGNORE;
+        ctx->current_fs->error_status = status;
+        /* If a directory has ignored files, put the flag on the parent directory as well */
+        if( previous_fs ) {
+            previous_fs->has_ignored_files = true;
+        }
+        return true;
+    }
+    return false;
+}
+
+/* File tree walker */
+int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
+    unsigned int depth) {
+  char *filename = NULL;
+  char *d_name = NULL;
+  csync_vio_handle_t *dh = NULL;
+  csync_vio_file_stat_t *dirent = NULL;
+  csync_file_stat_t *previous_fs = NULL;
+  int read_from_db = 0;
+  int rc = 0;
+  int res = 0;
+
+  bool do_read_from_db = (ctx->current == REMOTE_REPLICA && ctx->remote.read_from_db);
+
+  read_from_db = ctx->remote.read_from_db;
+
+  // if the etag of this dir is still the same, its content is restored from the
+  // database.
+  if( do_read_from_db ) {
+      if( ! fill_tree_from_db(ctx, uri) ) {
+        errno = ENOENT;
+        ctx->status_code = CSYNC_STATUS_OPENDIR_ERROR;
+        goto error;
+      }
+      goto done;
+  }
+
+  if ((dh = csync_vio_opendir(ctx, uri)) == NULL) {
+      if (ctx->abort) {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Aborted!");
+          ctx->status_code = CSYNC_STATUS_ABORTED;
+          goto error;
+      }
+      int asp = 0;
+      /* permission denied */
+      ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_OPENDIR_ERROR);
+      if (errno == EACCES) {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Permission denied.");
+          if (mark_current_item_ignored(ctx, previous_fs, CSYNC_STATUS_PERMISSION_DENIED)) {
+              goto done;
+          }
+      } else if(errno == ENOENT) {
+          asp = asprintf( &ctx->error_string, "%s", uri);
+          if (asp < 0) {
+              CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "asprintf failed!");
+          }
+      }
+      // 403 Forbidden can be sent by the server if the file firewall is active.
+      // A file or directory should be ignored and sync must continue. See #3490
+      else if(errno == ERRNO_FORBIDDEN) {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Directory access Forbidden (File Firewall?)");
+          if( mark_current_item_ignored(ctx, previous_fs, CSYNC_STATUS_FORBIDDEN) ) {
+              goto done;
+          }
+          /* if current_fs is not defined here, better throw an error */
+      }
+      // The server usually replies with the custom "503 Storage not available"
+      // if some path is temporarily unavailable. But in some cases a standard 503
+      // is returned too. Thus we can't distinguish the two and will treat any
+      // 503 as request to ignore the folder. See #3113 #2884.
+      else if(errno == ERRNO_STORAGE_UNAVAILABLE || errno == ERRNO_SERVICE_UNAVAILABLE) {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Storage was not available!");
+          if( mark_current_item_ignored(ctx, previous_fs, CSYNC_STATUS_STORAGE_UNAVAILABLE ) ) {
+              goto done;
+          }
+          /* if current_fs is not defined here, better throw an error */
+      } else {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "opendir failed for %s - errno %d", uri, errno);
+      }
+      goto error;
+  }
+
+  while ((dirent = csync_vio_readdir(ctx, dh))) {
+    int flen;
+    int flag;
+
+    /* Conversion error */
+    if (dirent->name == NULL && dirent->original_name) {
+        ctx->status_code = CSYNC_STATUS_INVALID_CHARACTERS;
+        ctx->error_string = dirent->original_name; // take ownership
+        dirent->original_name = NULL;
+        goto error;
+    }
+
+    d_name = dirent->name;
+    if (d_name == NULL) {
+      ctx->status_code = CSYNC_STATUS_READDIR_ERROR;
+      goto error;
+    }
+
+    /* skip "." and ".." */
+    if ( (d_name[0] == '.' && d_name[1] == '\0')
+          || (d_name[0] == '.' && d_name[1] == '.' && d_name[2] == '\0')) {
+      csync_vio_file_stat_destroy(dirent);
+      dirent = NULL;
+      continue;
+    }
+
+    if (uri[0] == '\0') {
+      filename = c_strdup(d_name);
+      flen = strlen(d_name);
+    } else {
+      flen = asprintf(&filename, "%s/%s", uri, d_name);
+    }
+    if (flen < 0 || !filename) {
+      csync_vio_file_stat_destroy(dirent);
+      dirent = NULL;
+      ctx->status_code = CSYNC_STATUS_MEMORY_ERROR;
+      goto error;
+    }
+
+    /* 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);
+    } else {
+        res = 0;
+    }
+
+    /* if the filename starts with a . we consider it a hidden file
+     * For windows, the hidden state is also discovered within the vio
+     * local stat function.
+     */
+    if( d_name[0] == '.' ) {
+        if (strcmp(".sys.admin#recall#", d_name) != 0) { /* recall file shall not be ignored (#4420) */
+            dirent->flags |= CSYNC_VIO_FILE_FLAGS_HIDDEN;
+        }
+    }
+
+    if( res == 0) {
+      switch (dirent->type) {
+        case CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK:
+          flag = CSYNC_FTW_FLAG_SLINK;
+          break;
+        case CSYNC_VIO_FILE_TYPE_DIRECTORY:
+          flag = CSYNC_FTW_FLAG_DIR;
+          break;
+        case CSYNC_VIO_FILE_TYPE_BLOCK_DEVICE:
+        case CSYNC_VIO_FILE_TYPE_CHARACTER_DEVICE:
+        case CSYNC_VIO_FILE_TYPE_SOCKET:
+          flag = CSYNC_FTW_FLAG_SPEC;
+          break;
+        case CSYNC_VIO_FILE_TYPE_FIFO:
+          flag = CSYNC_FTW_FLAG_SPEC;
+          break;
+        default:
+          flag = CSYNC_FTW_FLAG_FILE;
+          break;
+      };
+    } else {
+      flag = CSYNC_FTW_FLAG_NSTAT;
+    }
+
+    previous_fs = ctx->current_fs;
+
+    /* Call walker function for each file */
+    rc = fn(ctx, filename, dirent, flag);
+    /* this function may update ctx->current and ctx->read_from_db */
+
+    if (rc < 0) {
+      if (CSYNC_STATUS_IS_OK(ctx->status_code)) {
+          ctx->status_code = CSYNC_STATUS_UPDATE_ERROR;
+      }
+
+      ctx->current_fs = previous_fs;
+      goto error;
+    }
+
+    if (flag == CSYNC_FTW_FLAG_DIR && depth && rc == 0
+        && (!ctx->current_fs || ctx->current_fs->instruction != CSYNC_INSTRUCTION_IGNORE)) {
+      rc = csync_ftw(ctx, filename, fn, depth - 1);
+      if (rc < 0) {
+        ctx->current_fs = previous_fs;
+        goto error;
+      }
+
+      if (ctx->current_fs && !ctx->current_fs->child_modified
+          && ctx->current_fs->instruction == CSYNC_INSTRUCTION_EVAL) {
+          if (ctx->current == REMOTE_REPLICA) {
+              ctx->current_fs->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
+          } else {
+              ctx->current_fs->instruction = CSYNC_INSTRUCTION_NONE;
+          }
+      }
+
+      if (ctx->current_fs && previous_fs && ctx->current_fs->has_ignored_files) {
+          /* If a directory has ignored files, put the flag on the parent directory as well */
+          previous_fs->has_ignored_files = ctx->current_fs->has_ignored_files;
+      }
+    }
+
+    if (ctx->current_fs && previous_fs && ctx->current_fs->child_modified) {
+        /* If a directory has modified files, put the flag on the parent directory as well */
+        previous_fs->child_modified = ctx->current_fs->child_modified;
+    }
+
+    ctx->current_fs = previous_fs;
+    ctx->remote.read_from_db = read_from_db;
+    SAFE_FREE(filename);
+    csync_vio_file_stat_destroy(dirent);
+    dirent = NULL;
+  }
+
+  csync_vio_closedir(ctx, dh);
+  CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, " <= Closing walk for %s with read_from_db %d", uri, read_from_db);
+
+done:
+  csync_vio_file_stat_destroy(dirent);
+  SAFE_FREE(filename);
+  return rc;
+error:
+  ctx->remote.read_from_db = read_from_db;
+  if (dh != NULL) {
+    csync_vio_closedir(ctx, dh);
+  }
+  SAFE_FREE(filename);
+  return -1;
+}
+
+/* vim: set ts=8 sw=2 et cindent: */
--- a/csync/src/csync_update.h
+++ b/csync/src/csync_update.h
@@ -37,7 +37,23 @@
 * @{
 */

-typedef int (*csync_walker_fn) (CSYNC *ctx, std::unique_ptr<csync_file_stat_t> fs);
+/**
+ * Types for files
+ */
+enum csync_ftw_flags_e {
+  CSYNC_FTW_FLAG_FILE,		/* Regular file.  */
+  CSYNC_FTW_FLAG_DIR,		/* Directory.  */
+  CSYNC_FTW_FLAG_DNR,		/* Unreadable directory.  */
+  CSYNC_FTW_FLAG_NSTAT,		/* Unstatable file.  */
+  CSYNC_FTW_FLAG_SLINK,		/* Symbolic link.  */
+  CSYNC_FTW_FLAG_SPEC,		/* Special file (fifo, ...).  */
+  /* These flags are only passed from the `nftw' function.  */
+  CSYNC_FTW_FLAG_DP,		/* Directory, all subdirs have been visited. */
+  CSYNC_FTW_FLAG_SLN		/* Symbolic link naming non-existing file.  */
+};
+
+typedef int (*csync_walker_fn) (CSYNC *ctx, const char *file,
+    const csync_vio_file_stat_t *fs, enum csync_ftw_flags_e flag);

 /**
 * @brief The walker function to use in the file tree walker.
@@ -52,7 +68,8 @@ typedef int (*csync_walker_fn) (CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
 *
 * @return 0 on success, < 0 on error.
 */
-int csync_walker(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> fs);
+int csync_walker(CSYNC *ctx, const char *file, const csync_vio_file_stat_t *fs,
+    enum csync_ftw_flags_e flag);

 /**
 * @brief The file tree walker.
--- a/src/csync/csync_util.cpp
+++ b/src/csync/csync_util.cpp
@@ -28,14 +28,14 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
-#include <time.h>

-#include "common/c_jhash.h"
+#include "c_jhash.h"
 #include "csync_util.h"
 #include "vio/csync_vio.h"

 #define CSYNC_LOG_CATEGORY_NAME "csync.util"
 #include "csync_log.h"
+#include "csync_statedb.h"

 typedef struct {
  const char *instr_str;
@@ -211,10 +211,3 @@ time_t oc_httpdate_parse( const char *date ) {
    result = timegm(&gmt);
    return result;
 }
-
-
-bool csync_is_collision_safe_hash(const QByteArray &checksum_header)
-{
-    return checksum_header.startsWith("SHA1:")
-        || checksum_header.startsWith("MD5:");
-}
--- a/csync/src/csync_util.h
+++ b/csync/src/csync_util.h
@@ -31,14 +31,4 @@ const char OCSYNC_EXPORT *csync_instruction_str(enum csync_instructions_e instr)
 void OCSYNC_EXPORT csync_memstat_check(void);

 bool OCSYNC_EXPORT csync_file_locked_or_open( const char *dir, const char *fname);
-
-/* Returns true if we're reasonably certain that hash equality
- * for the header means content equality.
- *
- * Cryptographic safety is not required - this is mainly
- * intended to rule out checksums like Adler32 that are not intended for
- * hashing and have high likelihood of collision with particular inputs.
- */
-bool OCSYNC_EXPORT csync_is_collision_safe_hash(const QByteArray &checksum_header);
-
 #endif /* _CSYNC_UTIL_H */
--- a/csync/src/csync_version.h.in
+++ b/csync/src/csync_version.h.in
@@ -21,9 +21,17 @@
 #ifndef _CSYNC_VERSION_H
 #define _CSYNC_VERSION_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define CSYNC_STRINGIFY(s) CSYNC_TOSTRING(s)
 #define CSYNC_TOSTRING(s) #s

 #define MIRALL_VERSION @MIRALL_VERSION@

+#ifdef __cplusplus
+}
+#endif
+
 #endif // _CSYNC_VERSION_H
--- a/csync/src/std/CMakeLists.txt
+++ b/csync/src/std/CMakeLists.txt
@@ -1,10 +1,14 @@
-project(cstdlib)
+project(cstdlib C)

 set(CSTDLIB_PUBLIC_INCLUDE_DIRS
  ${CMAKE_CURRENT_SOURCE_DIR}
  CACHE INTERNAL "cstdlib public include directories"
 )

+set(CSTDLIB_PRIVATE_INCLUDE_DIRS
+  ${ICONV_INCLUDE_DIR}
+)
+
 set(CSTDLIB_LIBRARY
  cstdlib
  CACHE INTERNAL "cstdlib library"
@@ -17,9 +21,9 @@ set(CSTDLIB_LINK_LIBRARIES
 set(cstdlib_SRCS
  c_alloc.c
  c_path.c
+  c_rbtree.c
  c_string.c
  c_time.c
-  c_utf8.cpp
 )

 if(NOT HAVE_ASPRINTF AND NOT HAVE___MINGW_ASPRINTF)
@@ -30,10 +34,14 @@ endif()

 include_directories(
  ${CSTDLIB_PUBLIC_INCLUDE_DIRS}
+  ${CSTDLIB_PRIVATE_INCLUDE_DIRS}
 )

 add_library(${CSTDLIB_LIBRARY} STATIC ${cstdlib_SRCS})
 if(NOT WIN32)
    add_definitions( -fPIC )
 endif()
-qt5_use_modules(${CSTDLIB_LIBRARY} Core)
+if(NOT HAVE_FNMATCH AND WIN32)
+  # needed for PathMatchSpec for our fnmatch replacement
+  target_link_libraries(${CSTDLIB_LIBRARY} ${SHLWAPI_LIBRARY})
+endif()
--- a/csync/src/std/asprintf.c
+++ b/csync/src/std/asprintf.c
--- a/csync/src/std/asprintf.h
+++ b/csync/src/std/asprintf.h
@@ -34,10 +34,6 @@
 #ifndef ASPRINTF_H
 #define ASPRINTF_H 1

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdarg.h>

 /**
@@ -60,9 +56,5 @@ vasprintf (char **, const char *, va_list);
 int
 asprintf (char **, const char *, ...);

-#ifdef __cplusplus
-}
-#endif
-
 #endif
 #endif
--- a/csync/src/std/c_alloc.c
+++ b/csync/src/std/c_alloc.c
--- a/csync/src/std/c_alloc.h
+++ b/csync/src/std/c_alloc.h
@@ -34,10 +34,6 @@
 #ifndef _C_ALLOC_H
 #define _C_ALLOC_H

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdlib.h>

 #include "c_macro.h"
@@ -117,9 +113,4 @@ char *c_strndup(const char *str, size_t size);
 /**
 * }@
 */
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _C_ALLOC_H */
--- a/csync/src/std/c_jhash.h
+++ b/csync/src/std/c_jhash.h
@@ -12,7 +12,7 @@
 */

 /**
- * @file common/c_jhash.h
+ * @file c_jhash.h
 *
 * @brief Interface of the cynapses jhash implementation
 *
--- a/csync/src/std/c_lib.h
+++ b/csync/src/std/c_lib.h
@@ -24,6 +24,7 @@
 #include "c_macro.h"
 #include "c_alloc.h"
 #include "c_path.h"
+#include "c_rbtree.h"
 #include "c_string.h"
 #include "c_time.h"
 #include "c_private.h"
--- a/csync/src/std/c_macro.h
+++ b/csync/src/std/c_macro.h
--- a/csync/src/std/c_path.c
+++ b/csync/src/std/c_path.c
@@ -33,7 +33,6 @@
 #include "c_alloc.h"
 #include "c_path.h"
 #include "c_string.h"
-#include "c_utf8.h"

 /*
 * dirname - parse directory component.
@@ -390,3 +389,63 @@ int c_parse_uri(const char *uri,

  return -1;
 }
+
+
+/*
+ * This function takes a path and converts it to a UNC representation of the
+ * string. That means that it prepends a \\?\ (unless already UNC) and converts
+ * all slashes to backslashes.
+ *
+ * Note the following:
+ *  - The string must be absolute.
+ *  - it needs to contain a drive character to be a valid UNC
+ *  - A conversion is only done if the path len is larger than 245. Otherwise
+ *    the windows API functions work with the normal "unixoid" representation too.
+ *
+ *  This function allocates memory that must be freed by the caller.
+ */
+ const char *c_path_to_UNC(const char *str)
+ {
+     int len = 0;
+     char *longStr = NULL;
+
+     len = strlen(str);
+     longStr = c_malloc(len+5);
+     *longStr = '\0';
+
+     // prepend \\?\ and convert '/' => '\' to support long names
+     if( str[0] == '/' || str[0] == '\\' ) {
+         // Don't prepend if already UNC
+         if( !(len > 1 && (str[1] == '/' || str[1] == '\\')) ) {
+            strcpy( longStr, "\\\\?");
+         }
+     } else {
+         strcpy( longStr, "\\\\?\\"); // prepend string by this four magic chars.
+     }
+     strncat( longStr, str, len );
+
+     /* replace all occurences of / with the windows native \ */
+     char *c = longStr;
+     for (; *c; ++c) {
+         if(*c == '/') {
+             *c = '\\';
+         }
+     }
+     return longStr;
+ }
+
+ mbchar_t* c_utf8_path_to_locale(const char *str)
+ {
+     if( str == NULL ) {
+         return NULL;
+     } else {
+ #ifdef _WIN32
+         const char *unc_str = c_path_to_UNC(str);
+         mbchar_t *dst = c_utf8_string_to_locale(unc_str);
+         SAFE_FREE(unc_str);
+         return dst;
+ #else
+         return c_utf8_string_to_locale(str);
+ #endif
+     }
+ }
--- a/csync/src/std/c_path.h
+++ b/csync/src/std/c_path.h
@@ -32,10 +32,6 @@
 #ifndef _C_PATH_H
 #define _C_PATH_H

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "c_macro.h"
 #include "c_private.h"

@@ -112,12 +108,35 @@ typedef struct
    char * extension;
 } C_PATHINFO;

+/**
+ * @brief c_path_to_UNC converts a unixoid path to UNC format.
+ *
+ * It converts the '/' to '\' and prepends \\?\ to the path.
+ *
+ * A proper windows path has to have a drive letter, otherwise it is not
+ * valid UNC.
+ *
+ * @param str The path to convert
+ *
+ * @return a pointer to the converted string. Caller has to free it.
+ */
+const char *c_path_to_UNC(const char *str);
+
+/**
+ * @brief c_utf8_path_to_locale converts a unixoid path to the locale aware format
+ *
+ * On windows, it converts to UNC and multibyte.
+ * On Mac, it converts to the correct utf8 using iconv.
+ * On Linux, it returns utf8
+ *
+ * @param str The path to convert
+ *
+ * @return a pointer to the converted string. Caller has to free it using the
+ *         function c_free_locale_string.
+ */
+mbchar_t* c_utf8_path_to_locale(const char *str);
+
 /**
 * }@
 */
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _C_PATH_H */
--- a/csync/src/std/c_private.h
+++ b/csync/src/std/c_private.h
@@ -159,6 +159,13 @@ typedef char           mbchar_t;
 #define _tgetcwd       getcwd
 #endif

+#ifdef WITH_ICONV
+/** @internal */
+int c_setup_iconv(const char* to);
+/** @internal */
+int c_close_iconv(void);
+#endif
+
 /* FIXME: Implement TLS for OS X */
 #if defined(__GNUC__) && !defined(__APPLE__)
 # define CSYNC_THREAD __thread
--- a/csync/src/std/c_rbtree.c
+++ b/csync/src/std/c_rbtree.c
@@ -0,0 +1,743 @@
+/*
+ * cynapses libc functions
+ *
+ * Copyright (c) 2003-2004 by Andrew Suffield <asuffield@debian.org>
+ * Copyright (c) 2008-2013 by Andreas Schneider <asn@cryptomilk.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/*
+ * This code was originally released under GPL but Andrew Suffield agreed to
+ * change it to LGPL.
+ */
+
+/*
+ * static function don't have NULL pointer checks, segfaults are intended.
+ */
+
+#include <assert.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#include "c_alloc.h"
+#include "c_rbtree.h"
+
+#define NIL &_sentinel /* all leafs are sentinels */
+static c_rbnode_t _sentinel = {NULL, NIL, NIL, NULL, NULL, BLACK};
+
+void c_rbtree_create(c_rbtree_t **rbtree, c_rbtree_compare_func *key_compare, c_rbtree_compare_func *data_compare) {
+  assert(rbtree);
+  assert(key_compare);
+  assert(data_compare);
+
+  c_rbtree_t *tree = NULL;
+
+  tree = c_malloc(sizeof(*tree));
+  tree->root = NIL;
+  tree->key_compare = key_compare;
+  tree->data_compare = data_compare;
+  tree->size = 0;
+
+  *rbtree = tree;
+}
+
+static c_rbnode_t *_rbtree_subtree_dup(const c_rbnode_t *node, c_rbtree_t *new_tree, c_rbnode_t *new_parent) {
+  c_rbnode_t *new_node = NULL;
+
+  new_node = (c_rbnode_t*) c_malloc(sizeof(c_rbnode_t));
+
+  new_node->tree = new_tree;
+  new_node->data = node->data;
+  new_node->color = node->color;
+  new_node->parent = new_parent;
+
+  if (node->left == NIL) {
+    new_node->left = NIL;
+  } else {
+    new_node->left = _rbtree_subtree_dup(node->left, new_tree, new_node);
+  }
+
+  if (node->right == NIL) {
+    new_node->right = NIL;
+  } else {
+    new_node->right = _rbtree_subtree_dup(node->right, new_tree, new_node);
+  }
+
+  return new_node;
+}
+
+c_rbtree_t *c_rbtree_dup(const c_rbtree_t *tree) {
+  c_rbtree_t *new_tree = NULL;
+
+  new_tree = (c_rbtree_t*) c_malloc(sizeof(c_rbtree_t));
+
+  new_tree->key_compare = tree->key_compare;
+  new_tree->data_compare = tree->data_compare;
+  new_tree->size = tree->size;
+  new_tree->root = _rbtree_subtree_dup(tree->root, new_tree, NULL);
+
+  return new_tree;
+}
+
+static int _rbtree_subtree_free(c_rbnode_t *node) {
+  assert(node);
+
+  if (node->left != NIL) {
+    if (_rbtree_subtree_free(node->left) < 0) {
+      /* TODO: set errno? ECANCELED? */
+      return -1;
+    }
+  }
+
+  if (node->right != NIL) {
+    if (_rbtree_subtree_free(node->right) < 0) {
+      /* TODO: set errno? ECANCELED? */
+      return -1;
+    }
+  }
+
+  SAFE_FREE(node);
+
+  return 0;
+}
+
+int c_rbtree_free(c_rbtree_t *tree) {
+  if (tree == NULL) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  if (tree->root != NIL) {
+    _rbtree_subtree_free(tree->root);
+  }
+
+  SAFE_FREE(tree);
+
+  return 0;
+}
+
+static int _rbtree_subtree_walk(c_rbnode_t *node, void *data, c_rbtree_visit_func *visitor) {
+  assert(node);
+  assert(data);
+  assert(visitor);
+
+  if (node == NIL) {
+    return 0;
+  }
+
+  if (_rbtree_subtree_walk(node->left, data, visitor) < 0) {
+    return -1;
+  }
+
+  if ((*visitor)(node->data, data) < 0) {
+    return -1;
+  }
+
+  if (_rbtree_subtree_walk(node->right, data, visitor) < 0) {
+    return -1;
+  }
+
+  return 0;
+}
+
+int c_rbtree_walk(c_rbtree_t *tree, void *data, c_rbtree_visit_func *visitor) {
+  if (tree == NULL || data == NULL || visitor == NULL) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  if (_rbtree_subtree_walk(tree->root, data, visitor) < 0) {
+    return -1;
+  }
+
+  return 0;
+}
+
+static c_rbnode_t *_rbtree_subtree_head(c_rbnode_t *node) {
+  assert(node);
+
+  if (node == NIL) {
+    return node;
+  }
+
+  while (node->left != NIL) {
+    node = node->left;
+  }
+
+  return node;
+}
+
+static c_rbnode_t *_rbtree_subtree_tail(c_rbnode_t *node) {
+  assert(node);
+
+  if (node == NIL) {
+    return node;
+  }
+
+  while (node->right != NIL) {
+    node = node->right;
+  }
+
+  return node;
+}
+
+c_rbnode_t *c_rbtree_head(c_rbtree_t *tree) {
+  c_rbnode_t *node = NULL;
+
+  if (tree == NULL) {
+    errno = EINVAL;
+    return NULL;
+  }
+
+  node = _rbtree_subtree_head(tree->root);
+
+  return node != NIL ? node : NULL;
+}
+
+c_rbnode_t *c_rbtree_tail(c_rbtree_t *tree) {
+  c_rbnode_t *node = NULL;
+
+  if (tree == NULL) {
+    errno = EINVAL;
+    return NULL;
+  }
+
+  node = _rbtree_subtree_tail(tree->root);
+
+  return node != NIL ? node : NULL;
+}
+
+c_rbnode_t *c_rbtree_node_next(c_rbnode_t *node) {
+  c_rbnode_t *parent = NULL;
+
+  if (node == NULL) {
+    errno = EINVAL;
+    return NULL;
+  }
+
+  if (node->right != NIL) {
+    c_rbnode_t *next = NULL;
+    next = _rbtree_subtree_head(node->right);
+
+    return next != NIL ? next : NULL;
+  }
+
+  parent = node->parent;
+  while (parent && node == parent->right) {
+    node = parent;
+    parent = node->parent;
+  }
+
+  return parent != NULL ? parent : NULL;
+}
+
+c_rbnode_t *c_rbtree_node_prev(c_rbnode_t *node) {
+  c_rbnode_t *parent = NULL;
+
+  if (node == NULL) {
+    return NULL;
+  }
+
+  if (node->left != NIL) {
+    c_rbnode_t *prev = NULL;
+    prev = _rbtree_subtree_tail(node->left);
+    return prev != NIL ? prev : NULL;
+  }
+
+  parent = node->parent;
+  while (parent && node == parent->left) {
+    node = parent;
+    parent = node->parent;
+  }
+
+  return parent != NULL ? parent : NULL;
+}
+
+c_rbnode_t *c_rbtree_find(c_rbtree_t *tree, const void *key) {
+  int cmp = 0;
+  c_rbnode_t *node = NULL;
+
+  if (tree == NULL) {
+    errno = EINVAL;
+    return NULL;
+  }
+  node = tree->root;
+
+  while (node != NIL) {
+    cmp = tree->key_compare(key, node->data);
+    if (cmp == 0) {
+      return node;
+    }
+
+    if (cmp < 0) {
+      node = node->left;
+    } else {
+        node = node->right;
+    }
+  }
+
+  return NULL;
+}
+
+static void _rbtree_subtree_left_rotate(c_rbnode_t *x) {
+  c_rbnode_t *y = NULL;
+
+  assert(x);
+
+  y = x->right;
+
+  /* establish x-right link */
+  x->right = y->left;
+
+  if (y->left != NIL) {
+    y->left->parent = x;
+  }
+
+  /* establish y->parent link */
+  if (y != NIL) {
+    y->parent = x->parent;
+  }
+
+  if (x->parent) {
+    if (x == x->parent->left) {
+      x->parent->left = y;
+    } else {
+      x->parent->right = y;
+    }
+  } else {
+    x->tree->root = y;
+  }
+
+  /* link x and y */
+  y->left = x;
+  if (x != NIL) {
+    x->parent = y;
+  }
+}
+
+/* rotat node x to the right */
+static void _rbtree_subtree_right_rotate(c_rbnode_t *x) {
+  c_rbnode_t *y = NULL;
+
+  assert(x);
+
+  y = x->left;
+
+  /* establish x->left link */
+  x->left = y->right;
+
+  if (y->right != NIL) {
+    y->right->parent = x;
+  }
+
+  /* establish y->parent link */
+  if (y != NIL) {
+    y->parent = x->parent;
+  }
+
+  if (x->parent) {
+    if (x == x->parent->right) {
+        x->parent->right = y;
+    } else {
+      x->parent->left = y;
+    }
+  } else {
+    x->tree->root = y;
+  }
+
+  /* link x and y */
+  y->right = x;
+  if (x != NIL) {
+    x->parent = y;
+  }
+}
+
+int c_rbtree_insert(c_rbtree_t *tree, void *data) {
+  int cmp = 0;
+  c_rbnode_t *current = NULL;
+  c_rbnode_t *parent = NULL;
+  c_rbnode_t *x = NULL;
+
+  if (tree == NULL) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  /* First we do a classic binary tree insert */
+  current = tree->root;
+  parent = NULL;
+
+  while (current != NIL) {
+    cmp = tree->data_compare(data, current->data);
+    parent = current;
+    if (cmp == 0) {
+      return 1;
+    } else if (cmp < 0) {
+      current = current->left;
+    } else {
+      current = current->right;
+    }
+  }
+
+  x = (c_rbnode_t *) c_malloc(sizeof(c_rbnode_t));
+
+  x->tree = tree;
+  x->data = data;
+  x->parent = parent;
+  x->left = NIL;
+  x->right = NIL;
+  x->color = RED;
+
+  if (parent) {
+    /* Note that cmp still contains the comparison of data with
+     * parent->data, from the last pass through the loop above
+     */
+    if (cmp < 0) {
+        parent->left = x;
+    } else {
+        parent->right = x;
+    }
+  } else {
+    tree->root = x;
+  }
+
+  /* Insert fixup - check red-black properties */
+  while (x != tree->root && x->parent->color == RED) {
+    /* we have a violation */
+    if (x->parent == x->parent->parent->left) {
+      c_rbnode_t *y = NULL;
+
+      y = x->parent->parent->right;
+      if (y->color == RED) {
+        x->parent->color = BLACK;
+        y->color = BLACK;
+        x->parent->parent->color = RED;
+        x = x->parent->parent;
+      } else {
+        /* uncle is back */
+        if (x == x->parent->right) {
+          /* make x a left child */
+          x = x->parent;
+          _rbtree_subtree_left_rotate(x);
+        }
+        x->parent->color = BLACK;
+        x->parent->parent->color = RED;
+        _rbtree_subtree_right_rotate(x->parent->parent);
+      }
+    } else {
+      c_rbnode_t *y = NULL;
+
+      y = x->parent->parent->left;
+      if (y->color == RED) {
+        x->parent->color = BLACK;
+        y->color = BLACK;
+        x->parent->parent->color = RED;
+        x = x->parent->parent;
+      } else {
+        /* uncle is back */
+        if (x == x->parent->left) {
+          x = x->parent;
+          _rbtree_subtree_right_rotate(x);
+        }
+        x->parent->color = BLACK;
+        x->parent->parent->color = RED;
+        _rbtree_subtree_left_rotate(x->parent->parent);
+      }
+    }
+  } /* end while */
+  tree->root->color = BLACK;
+
+  tree->size++;
+
+  return 0;
+}
+
+int c_rbtree_node_delete(c_rbnode_t *node) {
+  c_rbtree_t *tree;
+  c_rbnode_t *y;
+  c_rbnode_t *x;
+
+  if (node == NULL || node == NIL) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  tree = node->tree;
+
+  if (node->left == NIL || node->right == NIL) {
+    /* y has a NIL node as a child */
+    y = node;
+  } else {
+    /* find tree successor with a NIL node as a child */
+    y = node;
+    while(y->left != NIL) {
+      y = y->left;
+    }
+  }
+
+  /* x is y's only child */
+  if (y->left != NIL) {
+    x = y->left;
+  } else {
+    x = y->right;
+  }
+
+  /* remove y from the parent chain */
+  x->parent = y->parent;
+
+  if (y->parent) {
+    if (y == y->parent->left) {
+        y->parent->left = x;
+    } else {
+      y->parent->right = x;
+    }
+  } else {
+    y->tree->root = x;
+  }
+
+  /* If y is not the node we're deleting, splice it in place of that
+   * node
+   *
+   * The traditional code would call for us to simply copy y->data, but
+   * that would invalidate the wrong pointer - there might be external
+   * references to this node, and we must preserve its address.
+   */
+  if (y != node) {
+    /* Update y */
+    y->parent = node->parent;
+    y->left = node->left;
+    y->right = node->right;
+
+    /* Update the children and the parent */
+    if (y->left != NIL) {
+        y->left->parent = y;
+    }
+    if (y->right != NIL) {
+      y->right->parent = y;
+    }
+    if (y->parent != NULL) {
+      if (node == y->parent->left) {
+        y->parent->left = y;
+      } else {
+        y->parent->right = y;
+      }
+    } else {
+      y->tree->root = y;
+    }
+  }
+
+  if (y->color == BLACK) {
+    while (x != y->tree->root && x->color == BLACK) {
+      if (x == x->parent->left) {
+        c_rbnode_t *w = NULL;
+
+        w = x->parent->right;
+
+        if (w->color == RED) {
+          w->color = BLACK;
+          x->parent->color = RED;
+          _rbtree_subtree_left_rotate(x->parent);
+          w = x->parent->right;
+        }
+
+        if (w->left->color == BLACK && w->right->color == BLACK) {
+          w->color = RED;
+          x = x->parent;
+        } else {
+          if (w->right->color == BLACK) {
+            w->left->color = BLACK;
+            w->color = RED;
+            _rbtree_subtree_right_rotate(w);
+            w = x->parent->right;
+          }
+          w->color = x->parent->color;
+          x->parent->color = BLACK;
+          w->right->color = BLACK;
+          _rbtree_subtree_left_rotate(x->parent);
+          x = y->tree->root;
+        }
+      } else {
+        c_rbnode_t *w = NULL;
+
+        w = x->parent->left;
+        if (w->color == RED) {
+          w->color = BLACK;
+          x->parent->color = RED;
+          _rbtree_subtree_right_rotate(x->parent);
+          w = x->parent->left;
+        }
+
+        if (w->right->color == BLACK && w->left->color == BLACK) {
+          w->color = RED;
+          x = x->parent;
+        } else {
+          if (w->left->color == BLACK) {
+            w->right->color = BLACK;
+            w->color = RED;
+            _rbtree_subtree_left_rotate(w);
+            w = x->parent->left;
+          }
+          w->color = x->parent->color;
+          x->parent->color = BLACK;
+          w->left->color = BLACK;
+          _rbtree_subtree_right_rotate(x->parent);
+          x = y->tree->root;
+        }
+      }
+    }
+    x->color = BLACK;
+  } /* end if: y->color == BLACK */
+
+  /* node has now been spliced out of the tree */
+  SAFE_FREE(y);
+  tree->size--;
+
+  return 0;
+}
+
+static int _rbtree_subtree_check_black_height(c_rbnode_t *node) {
+  int left = 0;
+  int right = 0;
+
+  assert(node);
+
+  if (node == NIL) {
+    return 0;
+  }
+
+  left = _rbtree_subtree_check_black_height(node->left);
+  right = _rbtree_subtree_check_black_height(node->right);
+  if (left != right) {
+    return -1;
+  }
+
+  return left + (node->color == BLACK);
+}
+
+int c_rbtree_check_sanity(c_rbtree_t *tree) {
+  c_rbnode_t *node = NULL;
+  c_rbnode_t *prev = NULL;
+  c_rbnode_t *next = NULL;
+  c_rbnode_t *tail = NULL;
+  size_t size = 0;
+
+  if (tree == NULL) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  if (! tree->key_compare || ! tree->data_compare) {
+    errno = EINVAL;
+    return -2;
+  }
+
+  /* Iterate the tree */
+  tail = c_rbtree_tail(tree);
+  for (node = c_rbtree_head(tree); node; node = next) {
+    if (node->tree != tree) {
+      return -4;
+    }
+
+    /* We should never see a nil while iterating */
+    if (node == NIL) {
+      return -5;
+    }
+
+    /* node == tree-root iff node->parent == NIL */
+    if (node == tree->root) {
+      if (node->parent != NULL) {
+        return -6;
+      }
+    } else {
+      if (node->parent == NULL) {
+        return -7;
+      }
+    }
+
+    /* Invertability of the iterate functions */
+    if (prev != c_rbtree_node_prev(node)) {
+      return -8;
+    }
+
+    /* Check the iteration sequence */
+    if (prev) {
+      if (tree->data_compare(prev->data, node->data) > 0) {
+        return -9;
+      }
+
+      /* And the other way around, to make sure data_compare is stable */
+      if (tree->data_compare(node->data, prev->data) < 0) {
+        return -10;
+      }
+    }
+
+    /* The binary tree property */
+    if (node->left != NIL) {
+      if (tree->data_compare(node->left->data, node->data) > 0) {
+        return -11;
+      }
+
+      if (tree->data_compare(node->data, node->left->data) < 0) {
+        return -11;
+      }
+    }
+
+    if (node->right != NIL) {
+      if (tree->data_compare(node->data, node->right->data) > 0) {
+        return -12;
+      }
+
+      if (tree->data_compare(node->right->data, node->data) < 0) {
+        return -13;
+      }
+    }
+
+    /* Red-black tree property 3: red nodes have black children */
+    if (node->color == RED) {
+      if (node->left->color == RED) {
+        return -14;
+      }
+      if (node->right->color == RED) {
+        return -15;
+      }
+    }
+
+    /* next == NULL if node == tail */
+    next = c_rbtree_node_next(node);
+    if (next) {
+      if (node == tail) {
+        return -16;
+      }
+    } else {
+      if (node != tail) {
+        return -17;
+      }
+    }
+
+    prev = node;
+    size++;
+  } /* end for loop */
+
+  if (size != tree->size) {
+    return -18;
+  }
+
+  if (_rbtree_subtree_check_black_height(tree->root) < 0) {
+    return -19;
+  }
+
+  return 0;
+}
--- a/csync/src/std/c_rbtree.h
+++ b/csync/src/std/c_rbtree.h
@@ -0,0 +1,309 @@
+/*
+ * cynapses libc functions
+ *
+ * Copyright (c) 2003-2004 by Andrew Suffield <asuffield@debian.org>
+ * Copyright (c) 2008-2013 by Andreas Schneider <asn@cryptomilk.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file c_rbtree.h
+ *
+ * @brief Interface of the cynapses libc red-black tree implementation
+ *
+ * A red-black tree is a type of self-balancing binary search tree. It is
+ * complex, but has good worst-case running time for its operations and is
+ * efficient in practice: it can search, insert, and delete in O(log n)
+ * time, where n is the number of elements in the tree.
+ *
+ * In red-black trees, the leaf nodes are not relevant and do not contain
+ * data. Therefore we use a sentinal node to save memory. All references
+ * from internal nodes to leaf nodes instead point to the sentinel node.
+ *
+ * In a red-black tree each node has a color attribute, the value of which
+ * is either red or black. In addition to the ordinary requirements imposed
+ * on binary search trees, the following additional requirements of any
+ * valid red-black tree apply:
+ *
+ *    1. A node is either red or black.
+ *    2. The root is black.
+ *    3. All leaves are black, even when the parent is black
+ *       (The leaves are the null children.)
+ *    4. Both children of every red node are black.
+ *    5. Every simple path from a node to a descendant leaf contains the same
+ *       number of black nodes, either counting or not counting the null black
+ *       nodes. (Counting or not counting the null black nodes does not affect
+ *       the structure as long as the choice is used consistently.).
+ *
+ * These constraints enforce a critical property of red-black trees: that the
+ * longest path from the root to a leaf is no more than twice as long as the
+ * shortest path from the root to a leaf in that tree. The result is that the
+ * tree is roughly balanced. Since operations such as inserting, deleting, and
+ * finding values requires worst-case time proportional to the height of the
+ * tree, this theoretical upper bound on the height allows red-black trees to
+ * be efficient in the worst-case, unlike ordinary binary search trees.
+ *
+ * http://en.wikipedia.org/wiki/Red-black_tree
+ *
+ * @defgroup cynRBTreeInternals cynapses libc red-black tree functions
+ * @ingroup cynLibraryAPI
+ *
+ * @{
+ */
+#ifndef _C_RBTREE_H
+#define _C_RBTREE_H
+
+/* Forward declarations */
+struct c_rbtree_s; typedef struct c_rbtree_s c_rbtree_t;
+struct c_rbnode_s; typedef struct c_rbnode_s c_rbnode_t;
+
+/**
+ * Define the two colors for the red-black tree
+ */
+enum xrbcolor_e { BLACK = 0, RED }; typedef enum xrbcolor_e xrbcolor_t;
+
+/**
+ * @brief Callback function to compare a key with the data from a
+ *        red-black tree node.
+ *
+ * @param key   key as a generic pointer
+ * @param data  data as a generic pointer
+ *
+ * @return   It returns an integer less than, equal to, or greater than zero
+ *           depending on the key or data you use. The function is similar
+ *           to strcmp().
+ */
+typedef int c_rbtree_compare_func(const void *key, const void *data);
+
+/**
+ * @brief Visit function for the c_rbtree_walk() function.
+ *
+ * This function will be called by c_rbtree_walk() for every node. It is up to
+ * the developer what the function does. The fist parameter is a node object
+ * the second can be of any kind.
+ *
+ * @param obj    The node data that will be passed by c_rbtree_walk().
+ * @param data   Generic data pointer.
+ *
+ * @return 0 on success, < 0 on error. You should set errno.
+ *
+ */
+typedef int c_rbtree_visit_func(void *, void *);
+
+/**
+ * Structure that represents a red-black tree
+ */
+struct c_rbtree_s {
+  c_rbnode_t *root;
+  c_rbtree_compare_func *key_compare;
+  c_rbtree_compare_func *data_compare;
+  size_t size;
+};
+
+/**
+ * Structure that represents a node of a red-black tree
+ */
+struct c_rbnode_s {
+  c_rbtree_t *tree;
+  c_rbnode_t *left;
+  c_rbnode_t *right;
+  c_rbnode_t *parent;
+  void *data;
+  xrbcolor_t color;
+};
+
+/**
+ * @brief Create the red-black tree
+ *
+ * @param rbtree        The pointer to assign the allocated memory.
+ *
+ * @param key_compare   Callback function to compare a key with the data
+ *                      inside a reb-black tree node.
+ *
+ * @param data_compare  Callback function to compare a key as data with thee
+ *                      data inside a red-black tree node.
+ */
+void c_rbtree_create(c_rbtree_t **rbtree, c_rbtree_compare_func *key_compare, c_rbtree_compare_func *data_compare);
+
+/**
+ * @brief Duplicate a red-black tree.
+ *
+ * @param tree Tree to duplicate.
+ *
+ * @return   Pointer to a new allocated duplicated rbtree. NULL if an error
+ *           occurred.
+ */
+c_rbtree_t *c_rbtree_dup(const c_rbtree_t *tree);
+
+/**
+ * @brief Free the structure of a red-black tree.
+ *
+ * You should call c_rbtree_destroy() before you call this function.
+ *
+ * @param tree  The tree to free.
+ *
+ * @return   0 on success, less than 0 if an error occurred.
+ */
+int c_rbtree_free(c_rbtree_t *tree);
+
+/**
+ * @brief Destroy the content and the nodes of an red-black tree.
+ *
+ * This is far from the most efficient way to walk a tree, but it is
+ * the *safest* way to destroy a tree - the destructor can do almost
+ * anything (as long as it does not create an infinite loop) to the
+ * tree structure without risk.
+ *
+ * If for some strange reason you need a faster destructor (think
+ * twice - speed and memory deallocation don't mix well) then consider
+ * stashing an llist of dataects and destroying that instead, and just
+ * using c_rbtree_free() on your tree.
+ *
+ * @param T            The tree to destroy.
+ * @param DESTRUCTOR   The destructor to call on a node to destroy.
+ */
+#define c_rbtree_destroy(T, DESTRUCTOR)                 \
+  do {                                                  \
+    if (T) {                                            \
+      c_rbnode_t *_c_rbtree_temp;                       \
+      while ((_c_rbtree_temp = c_rbtree_head(T))) {     \
+        (DESTRUCTOR)(_c_rbtree_temp->data);             \
+        if (_c_rbtree_temp == c_rbtree_head(T)) {       \
+          c_rbtree_node_delete(_c_rbtree_temp);         \
+        }                                               \
+      }                                                 \
+    }                                                   \
+    SAFE_FREE(T);                                       \
+  } while (0);
+
+/**
+ * @brief Inserts a node into a red black tree.
+ *
+ * @param tree  The red black tree to insert the node.
+ * @param data  The data to insert into the tree.
+ *
+ * @return  0 on success, 1 if a duplicate has been found and < 0 if an error
+ *          occurred with errno set.
+ *          EINVAL if a null pointer has been passed as the tree.
+ *          ENOMEM if there is no memory left.
+ */
+int c_rbtree_insert(c_rbtree_t *tree, void *data);
+
+/**
+ * @brief Find a node in a red-black tree.
+ *
+ * c_rbtree_find() is searching for the given  key  in a red-black tree and
+ * returns the node if the key has been found.
+ *
+ * @param tree   The tree to search.
+ * @param key    The key to search for.
+ *
+ * @return   If the key was found the node will be returned. On error NULL
+ *           will be returned.
+ */
+c_rbnode_t *c_rbtree_find(c_rbtree_t *tree, const void *key);
+
+/**
+ * @brief Get the head of the red-black tree.
+ *
+ * @param tree   The tree to get the head for.
+ *
+ * @return   The head node. NULL if an error occurred.
+ */
+c_rbnode_t *c_rbtree_head(c_rbtree_t *tree);
+
+/**
+ * @brief Get the tail of the red-black tree.
+ *
+ * @param tree   The tree to get the tail for.
+ *
+ * @return   The tail node. NULL if an error occurred.
+ */
+c_rbnode_t *c_rbtree_tail(c_rbtree_t *tree);
+
+/**
+ * @brief Get the size of the red-black tree.
+ *
+ * @param T  The tree to get the size from.
+ *
+ * @return  The size of the red-black tree.
+ */
+#define c_rbtree_size(T) (T) == NULL ? 0 : ((T)->size)
+
+/**
+ * @brief Walk over a red-black tree.
+ * 
+ * Walk over a red-black tree calling a visitor function for each node found.
+ *
+ * @param tree     Tree to walk.
+ * @param data     Data which should be passed to the visitor function.
+ * @param visitor  Visitor function. This will be called for each node passed.
+ *
+ * @return   0 on sucess, less than 0 if an error occurred.
+ */
+int c_rbtree_walk(c_rbtree_t *tree, void *data, c_rbtree_visit_func *visitor);
+
+/**
+ * @brief Delete a node in a red-black tree.
+ *
+ * @param node  Node which should be deleted.
+ *
+ * @return  0 on success, -1 if an error occurred.
+ */
+int c_rbtree_node_delete(c_rbnode_t *node);
+
+/**
+ * @brief Get the next node.
+ *
+ * @param node  The node of which you want the next node.
+ *
+ * @return  The next node, NULL if an error occurred.
+ */
+c_rbnode_t *c_rbtree_node_next(c_rbnode_t *node);
+
+/**
+ * @brief Get the previous node.
+ *
+ * @param node  The node of which you want the previous node.
+ *
+ * @return  The previous node, NULL if an error occurred.
+ */
+c_rbnode_t *c_rbtree_node_prev(c_rbnode_t *node);
+
+/**
+ * @brief Get the data of a node.
+ *
+ * @param N  The node to get the data from.
+ *
+ * @return  The data, NULL if an error occurred.
+ */
+#define c_rbtree_node_data(N) ((N) ? ((N)->data) : NULL)
+
+/**
+ * @brief Perform a sanity check for a red-black tree.
+ *
+ * This is mostly for testing purposes.
+ *
+ * @param tree  The tree to check.
+ *
+ * @return 0 on success, less than 0 if an error occurred.
+ */
+int c_rbtree_check_sanity(c_rbtree_t *tree);
+
+/**
+ * }@
+ */
+#endif /* _C_RBTREE_H */
--- a/csync/src/std/c_string.c
+++ b/csync/src/std/c_string.c
@@ -40,6 +40,97 @@
 #include <windows.h>
 #endif

+#if defined(HAVE_ICONV) && defined(WITH_ICONV)
+# ifdef HAVE_ICONV_H
+#  include <iconv.h>
+# endif
+# ifdef HAVE_SYS_ICONV_H
+#  include <sys/iconv.h>
+# endif
+
+typedef struct {
+  iconv_t to;
+  iconv_t from;
+} iconv_conversions;
+
+CSYNC_THREAD iconv_conversions _iconvs = { NULL, NULL };
+
+int c_setup_iconv(const char* to) {
+  _iconvs.to = iconv_open(to, "UTF-8");
+  _iconvs.from = iconv_open("UTF-8", to);
+
+  if (_iconvs.to == (iconv_t)-1 || _iconvs.from == (iconv_t)-1)
+    return -1;
+
+  return 0;
+}
+
+int c_close_iconv() {
+    int ret_to = 0;
+    int ret_from = 0;
+    if( _iconvs.to != (iconv_t) NULL ) {
+        ret_to = iconv_close(_iconvs.to);
+    }
+    if( _iconvs.from != (iconv_t) NULL ) {
+        ret_from = iconv_close(_iconvs.from);
+    }
+
+  if (ret_to == -1 || ret_from == -1)
+    return -1;
+
+  _iconvs.to = (iconv_t) 0;
+  _iconvs.from = (iconv_t) 0;
+
+  return 0;
+}
+
+enum iconv_direction { iconv_from_native, iconv_to_native };
+
+static char *c_iconv(const char* str, enum iconv_direction dir)
+{
+#ifdef HAVE_ICONV_CONST
+    const char *in = str;
+#else
+    char *in = discard_const(str);
+#endif
+  size_t size;
+  size_t outsize;
+  char *out;
+  char *out_in;
+  size_t ret;
+
+  if (str == NULL) {
+    return NULL;
+  }
+
+  if(_iconvs.from == NULL && _iconvs.to == NULL) {
+#ifdef __APPLE__
+    c_setup_iconv("UTF-8-MAC");
+#else
+    return c_strdup(str);
+#endif
+  }
+
+  size = strlen(in);
+  outsize = size*2;
+  out = c_malloc(outsize);
+  out_in = out;
+
+  if (dir == iconv_to_native) {
+      ret = iconv(_iconvs.to, &in, &size, &out, &outsize);
+  } else {
+      ret = iconv(_iconvs.from, &in, &size, &out, &outsize);
+  }
+
+  if (ret == (size_t)-1) {
+      SAFE_FREE(out_in);
+      return NULL;
+  }
+
+  return out_in;
+}
+#endif /* defined(HAVE_ICONV) && defined(WITH_ICONV) */
+
 int c_strncasecmp(const char *a, const char *b, size_t n) {
 #ifdef _WIN32
    return _strnicmp(a, b, n);
@@ -167,3 +258,70 @@ void c_strlist_destroy(c_strlist_t *strlist) {
  SAFE_FREE(strlist->vector);
  SAFE_FREE(strlist);
 }
+
+/* Convert a wide multibyte String to UTF8 */
+char* c_utf8_from_locale(const mbchar_t *wstr)
+{
+  char *dst = NULL;
+#ifdef _WIN32
+  char *mdst = NULL;
+  int size_needed;
+  size_t len;
+#endif
+
+  if (wstr == NULL) {
+    return NULL;
+  }
+
+#ifdef _WIN32
+  len = wcslen(wstr);
+  /* Call once to get the required size. */
+  size_needed = WideCharToMultiByte(CP_UTF8, 0, wstr, len, NULL, 0, NULL, NULL);
+  if (size_needed > 0) {
+    mdst = c_malloc(size_needed + 1);
+
+    memset(mdst, 0, size_needed + 1);
+    WideCharToMultiByte(CP_UTF8, 0, wstr, len, mdst, size_needed, NULL, NULL);
+    dst = mdst;
+  }
+#else
+#ifdef WITH_ICONV
+  dst = c_iconv(wstr, iconv_from_native);
+#else
+  dst = (char*) wstr;
+#endif
+#endif
+  return dst;
+}
+
+/* Convert a an UTF8 string to multibyte */
+mbchar_t* c_utf8_string_to_locale(const char *str)
+{
+    mbchar_t *dst = NULL;
+#ifdef _WIN32
+    size_t len;
+    int size_needed;
+#endif
+
+    if (str == NULL ) {
+        return NULL;
+    }
+
+#ifdef _WIN32
+    len = strlen(str);
+    size_needed = MultiByteToWideChar(CP_UTF8, 0, str, len, NULL, 0);
+    if (size_needed > 0) {
+        int size_char = (size_needed + 1) * sizeof(mbchar_t);
+        dst = c_malloc(size_char);
+        memset((void*)dst, 0, size_char);
+        MultiByteToWideChar(CP_UTF8, 0, str, -1, dst, size_needed);
+    }
+#else
+#ifdef WITH_ICONV
+    dst = c_iconv(str, iconv_to_native);
+#else
+    dst = (_TCHAR*) str;
+#endif
+#endif
+    return dst;
+}
--- a/csync/src/std/c_string.h
+++ b/csync/src/std/c_string.h
@@ -32,10 +32,6 @@
 #ifndef _C_STR_H
 #define _C_STR_H

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "c_private.h"
 #include "c_macro.h"

@@ -148,12 +144,82 @@ void c_strlist_clear(c_strlist_t *strlist);
 void c_strlist_destroy(c_strlist_t *strlist);

 /**
- * }@
+ * @brief Convert a platform locale string to utf8.
+ *
+ * This function is part of the multi platform abstraction of basic file
+ * operations to handle various platform encoding correctly.
+ *
+ * Instead of using the standard file operations the multi platform aliases
+ * defined in c_private.h have to be used instead.
+ *
+ * To convert path names returned by these functions to the internally used
+ * utf8 format this function has to be used. The returned string has to
+ * be freed by c_free_locale_string(). On some platforms this method allocates
+ * memory and on others not but it has never to be cared about.
+ *
+ * @param  str     The multibyte encoded string to convert
+ *
+ * @return The malloced converted string or NULL on error.
+ *
+ * @see c_free_locale_string()
+ * @see c_utf8_to_locale()
+ *
 */
+ char*   c_utf8_from_locale(const mbchar_t *str);

-#ifdef __cplusplus
-}
+/**
+ * @brief Convert a utf8 encoded string to platform specific locale.
+ *
+ * This function is part of the multi platform abstraction of basic file
+ * operations to handle various platform encoding correctly.
+ *
+ * Instead of using the standard file operations the multi platform aliases
+ * defined in c_private.h have to be used instead.
+ *
+ * To convert strings as input for the cross platform functions from the
+ * internally used utf8 format, this function has to be used.
+ * The returned string has to be freed by c_free_locale_string(). On some
+ * platforms this method allocates memory and on others not but it has never
+ * sto be cared about.
+ *
+ * If the string to convert is a path, consider using c_utf8_path_to_locale().
+ *
+ * @param  str     The utf8 string to convert.
+ *
+ * @return The malloced converted multibyte string or NULL on error.
+ *
+ * @see c_free_locale_string()
+ * @see c_utf8_from_locale()
+ *
+ */
+mbchar_t* c_utf8_string_to_locale(const char *wstr);
+
+#if defined(_WIN32) || defined(WITH_ICONV)
+
+/**
+ * @brief Free buffer malloced by c_utf8_from_locale or c_utf8_to_locale().
+ *
+ * This function is part of the multi platform abstraction of basic file
+ * operations to handle various platform encoding correctly.
+ *
+ * Instead of using the standard file operations the multi platform aliases
+ * defined in c_private.h have to be used instead.
+ *
+ * This function frees the memory that was allocated by a previous call to
+ * c_utf8_to_locale() or c_utf8_from_locale().
+ *
+ * @param  buf     The buffer to free.
+ *
+ * @see c_utf8_from_locale(), c_utf8_to_locale()
+ *
+ */
+#define c_free_locale_string(x) SAFE_FREE(x)
+#else
+#define c_free_locale_string(x) (void)x
 #endif

+/**
+ * }@
+ */
 #endif /* _C_STR_H */

--- a/csync/src/std/c_time.c
+++ b/csync/src/std/c_time.c
@@ -24,7 +24,10 @@

 #include "c_path.h"
 #include "c_time.h"
-#include "c_utf8.h"
+
+#ifndef _WIN32
+#include <sys/time.h>
+#endif

 struct timespec c_tspecdiff(struct timespec time1, struct timespec time0) {
  struct timespec ret;
--- a/csync/src/std/c_time.h
+++ b/csync/src/std/c_time.h
@@ -21,15 +21,7 @@
 #ifndef _C_TIME_H
 #define _C_TIME_H

-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef _WIN32
 #include <time.h>
-#else
-#include <sys/time.h>
-#endif

 /**
 * @brief Calculate time difference
@@ -60,8 +52,4 @@ double c_secdiff(struct timespec clock1, struct timespec clock0);

 int c_utimes(const char *uri, const struct timeval *times);

-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _C_TIME_H */
--- a/src/csync/vio/csync_vio.cpp
+++ b/src/csync/vio/csync_vio.cpp
@@ -24,28 +24,36 @@

 #include <errno.h>
 #include <stdio.h>
-#include "common/asserts.h"
+#include <assert.h>

 #include "csync_private.h"
 #include "csync_util.h"
 #include "vio/csync_vio.h"
 #include "vio/csync_vio_local.h"
-#include "common/c_jhash.h"
+#include "csync_statedb.h"
+#include "std/c_jhash.h"
+
+#define CSYNC_LOG_CATEGORY_NAME "csync.vio.main"
+
+#include "csync_log.h"

 csync_vio_handle_t *csync_vio_opendir(CSYNC *ctx, const char *name) {
-  switch(ctx->current) {
+  switch(ctx->replica) {
    case REMOTE_REPLICA:
-      ASSERT(!ctx->remote.read_from_db);
+      if(ctx->remote.read_from_db) {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Read from db flag is true, should not!" );
+      }
      return ctx->callbacks.remote_opendir_hook(name, ctx->callbacks.vio_userdata);
      break;
    case LOCAL_REPLICA:
 	if( ctx->callbacks.update_callback ) {
-        ctx->callbacks.update_callback(ctx->current, name, ctx->callbacks.update_callback_userdata);
+        ctx->callbacks.update_callback(ctx->replica, name, ctx->callbacks.update_callback_userdata);
 	}
      return csync_vio_local_opendir(name);
      break;
    default:
-      ASSERT(false);
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_ALERT, "Invalid replica (%d)", (int)ctx->replica);
+      break;
  }
  return NULL;
 }
@@ -58,9 +66,11 @@ int csync_vio_closedir(CSYNC *ctx, csync_vio_handle_t *dhandle) {
    return -1;
  }

-  switch(ctx->current) {
+  switch(ctx->replica) {
  case REMOTE_REPLICA:
-      ASSERT(!ctx->remote.read_from_db);
+      if( ctx->remote.read_from_db ) {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Remote ReadFromDb is true, should not!");
+      }
      ctx->callbacks.remote_closedir_hook(dhandle, ctx->callbacks.vio_userdata);
      rc = 0;
      break;
@@ -68,28 +78,53 @@ int csync_vio_closedir(CSYNC *ctx, csync_vio_handle_t *dhandle) {
      rc = csync_vio_local_closedir(dhandle);
      break;
  default:
-      ASSERT(false);
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_ALERT, "Invalid replica (%d)", (int)ctx->replica);
      break;
  }
  return rc;
 }

-std::unique_ptr<csync_file_stat_t> csync_vio_readdir(CSYNC *ctx, csync_vio_handle_t *dhandle) {
-  switch(ctx->current) {
+csync_vio_file_stat_t *csync_vio_readdir(CSYNC *ctx, csync_vio_handle_t *dhandle) {
+  switch(ctx->replica) {
    case REMOTE_REPLICA:
-      ASSERT(!ctx->remote.read_from_db);
+      if( ctx->remote.read_from_db ) {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Remote readfromdb is true, should not!");
+      }
      return ctx->callbacks.remote_readdir_hook(dhandle, ctx->callbacks.vio_userdata);
      break;
    case LOCAL_REPLICA:
      return csync_vio_local_readdir(dhandle);
      break;
    default:
-      ASSERT(false);
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_ALERT, "Invalid replica (%d)", (int)ctx->replica);
+      break;
  }

  return NULL;
 }

+
+int csync_vio_stat(CSYNC *ctx, const char *uri, csync_vio_file_stat_t *buf) {
+  int rc = -1;
+
+  switch(ctx->replica) {
+    case REMOTE_REPLICA:
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "ERROR: Cannot call remote stat, not implemented");
+      assert(ctx->replica != REMOTE_REPLICA);
+      break;
+    case LOCAL_REPLICA:
+      rc = csync_vio_local_stat(uri, buf);
+      if (rc < 0) {
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "Local stat failed, errno %d", errno);
+      }
+      break;
+    default:
+      break;
+  }
+
+  return rc;
+}
+
 char *csync_vio_get_status_string(CSYNC *ctx) {
  if(ctx->error_string) {
    return ctx->error_string;
--- a/csync/src/vio/csync_vio.h
+++ b/csync/src/vio/csync_vio.h
@@ -34,7 +34,9 @@ typedef struct fhandle_s {

 csync_vio_handle_t *csync_vio_opendir(CSYNC *ctx, const char *name);
 int csync_vio_closedir(CSYNC *ctx, csync_vio_handle_t *dhandle);
-std::unique_ptr<csync_file_stat_t> csync_vio_readdir(CSYNC *ctx, csync_vio_handle_t *dhandle);
+csync_vio_file_stat_t *csync_vio_readdir(CSYNC *ctx, csync_vio_handle_t *dhandle);
+
+int csync_vio_stat(CSYNC *ctx, const char *uri, csync_vio_file_stat_t *buf);

 char *csync_vio_get_status_string(CSYNC *ctx);

--- a/csync/src/vio/csync_vio_file_stat.c
+++ b/csync/src/vio/csync_vio_file_stat.c
@@ -0,0 +1,81 @@
+/*
+ * libcsync -- a library to sync a directory with another
+ *
+ * Copyright (c) 2008-2013 by Andreas Schneider <asn@cryptomilk.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "c_lib.h"
+#include "csync.h"
+#include "csync_log.h"
+
+csync_vio_file_stat_t *csync_vio_file_stat_new(void) {
+  csync_vio_file_stat_t *file_stat = (csync_vio_file_stat_t *) c_malloc(sizeof(csync_vio_file_stat_t));
+  ZERO_STRUCTP(file_stat);
+  return file_stat;
+}
+
+csync_vio_file_stat_t* csync_vio_file_stat_copy(csync_vio_file_stat_t *file_stat) {
+    csync_vio_file_stat_t *file_stat_cpy = csync_vio_file_stat_new();
+    memcpy(file_stat_cpy, file_stat, sizeof(csync_vio_file_stat_t));
+    if (file_stat_cpy->fields & CSYNC_VIO_FILE_STAT_FIELDS_ETAG) {
+        file_stat_cpy->etag = c_strdup(file_stat_cpy->etag);
+    }
+    if (file_stat_cpy->directDownloadCookies) {
+        file_stat_cpy->directDownloadCookies = c_strdup(file_stat_cpy->directDownloadCookies);
+    }
+    if (file_stat_cpy->directDownloadUrl) {
+        file_stat_cpy->directDownloadUrl = c_strdup(file_stat_cpy->directDownloadUrl);
+    }
+    file_stat_cpy->name = c_strdup(file_stat_cpy->name);
+    return file_stat_cpy;
+}
+
+void csync_vio_file_stat_destroy(csync_vio_file_stat_t *file_stat) {
+  /* FIXME: free rest */
+  if (file_stat == NULL) {
+    return;
+  }
+
+  if (file_stat->fields & CSYNC_VIO_FILE_STAT_FIELDS_ETAG) {
+    SAFE_FREE(file_stat->etag);
+  }
+  SAFE_FREE(file_stat->directDownloadUrl);
+  SAFE_FREE(file_stat->directDownloadCookies);
+  SAFE_FREE(file_stat->name);
+  SAFE_FREE(file_stat->original_name);
+  SAFE_FREE(file_stat);
+}
+
+void csync_vio_file_stat_set_file_id( csync_vio_file_stat_t *dst, const char* src ) {
+
+    csync_vio_set_file_id( dst->file_id, src );
+    if( c_streq( dst->file_id, "" )) {
+        return;
+    }
+    dst->fields |= CSYNC_VIO_FILE_STAT_FIELDS_FILE_ID;
+}
+
+void csync_vio_set_file_id( char* dst, const char *src ) {
+    if( src && dst ) {
+        if( strlen(src) > FILE_ID_BUF_SIZE ) {
+            CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "Ignoring file_id because it is too long: %s", src);
+            strcpy(dst, "");
+        } else {
+            strcpy(dst, src);
+        }
+    }
+}
--- a/csync/src/vio/csync_vio_local.h
+++ b/csync/src/vio/csync_vio_local.h
@@ -23,8 +23,8 @@

 csync_vio_handle_t OCSYNC_EXPORT *csync_vio_local_opendir(const char *name);
 int OCSYNC_EXPORT csync_vio_local_closedir(csync_vio_handle_t *dhandle);
-std::unique_ptr<csync_file_stat_t> OCSYNC_EXPORT csync_vio_local_readdir(csync_vio_handle_t *dhandle);
+csync_vio_file_stat_t OCSYNC_EXPORT *csync_vio_local_readdir(csync_vio_handle_t *dhandle);

-int OCSYNC_EXPORT csync_vio_local_stat(const char *uri, csync_file_stat_t *buf);
+int OCSYNC_EXPORT csync_vio_local_stat(const char *uri, csync_vio_file_stat_t *buf);

 #endif /* _CSYNC_VIO_LOCAL_H */
--- a/src/csync/vio/csync_vio_local_unix.cpp
+++ b/src/csync/vio/csync_vio_local_unix.cpp
@@ -29,7 +29,6 @@
 #include "c_private.h"
 #include "c_lib.h"
 #include "c_string.h"
-#include "c_utf8.h"
 #include "csync_util.h"
 #include "csync_log.h"
 #include "csync_vio.h"
@@ -45,13 +44,11 @@ typedef struct dhandle_s {
  char *path;
 } dhandle_t;

-static int _csync_vio_local_stat_mb(const mbchar_t *wuri, csync_file_stat_t *buf);
-
 csync_vio_handle_t *csync_vio_local_opendir(const char *name) {
  dhandle_t *handle = NULL;
  mbchar_t *dirname = NULL;

-  handle = (dhandle_t*)c_malloc(sizeof(dhandle_t));
+  handle = c_malloc(sizeof(dhandle_t));

  dirname = c_utf8_path_to_locale(name);

@@ -86,25 +83,32 @@ int csync_vio_local_closedir(csync_vio_handle_t *dhandle) {
  return rc;
 }

-std::unique_ptr<csync_file_stat_t> csync_vio_local_readdir(csync_vio_handle_t *dhandle) {
+csync_vio_file_stat_t *csync_vio_local_readdir(csync_vio_handle_t *dhandle) {

  dhandle_t *handle = NULL;
+  csync_vio_file_stat_t *file_stat = NULL;

  handle = (dhandle_t *) dhandle;
+
+  errno = 0;
+  file_stat = csync_vio_file_stat_new();
+  if (file_stat == NULL) {
+    goto err;
+  }
+  file_stat->fields = CSYNC_VIO_FILE_STAT_FIELDS_NONE;
+
  struct _tdirent *dirent = NULL;
-  std::unique_ptr<csync_file_stat_t> file_stat;

-  do {
-      dirent = _treaddir(handle->dh);
-      if (dirent == NULL)
-          return {};
-  } while (qstrcmp(dirent->d_name, ".") == 0 || qstrcmp(dirent->d_name, "..") == 0);
-
-  file_stat.reset(new csync_file_stat_t);
-  file_stat->path = c_utf8_from_locale(dirent->d_name);
-  QByteArray fullPath = QByteArray() % const_cast<const char *>(handle->path) % '/' % QByteArray() % const_cast<const char *>(dirent->d_name);
-  if (file_stat->path.isNull()) {
-      file_stat->original_path = fullPath;
+  dirent = _treaddir(handle->dh);
+  if (dirent == NULL) {
+      goto err;
+  }
+  file_stat->name = c_utf8_from_locale(dirent->d_name);
+  if (file_stat->name == NULL) {
+      //file_stat->original_name = c_strdup(dirent->d_name);
+      if (asprintf(&file_stat->original_name, "%s/%s", handle->path, dirent->d_name) < 0) {
+          goto err;
+      }
      CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Invalid characters in file/directory name, please rename: \"%s\" (%s)",
                dirent->d_name, handle->path);
  }
@@ -119,69 +123,101 @@ std::unique_ptr<csync_file_stat_t> csync_vio_local_readdir(csync_vio_handle_t *d
      break;
    case DT_DIR:
    case DT_REG:
+      file_stat->fields |= CSYNC_VIO_FILE_STAT_FIELDS_TYPE;
      if (dirent->d_type == DT_DIR) {
-        file_stat->type = CSYNC_FTW_TYPE_DIR;
+        file_stat->type = CSYNC_VIO_FILE_TYPE_DIRECTORY;
      } else {
-        file_stat->type = CSYNC_FTW_TYPE_FILE;
+        file_stat->type = CSYNC_VIO_FILE_TYPE_REGULAR;
      }
      break;
+    case DT_UNKNOWN:
+      file_stat->fields |= CSYNC_VIO_FILE_STAT_FIELDS_TYPE;
+      file_stat->type = CSYNC_VIO_FILE_TYPE_UNKNOWN;
    default:
      break;
  }
 #endif

-  if (file_stat->path.isNull())
-      return file_stat;
-
-  if (_csync_vio_local_stat_mb(fullPath.constData(), file_stat.get()) < 0) {
-      // Will get excluded by _csync_detect_update.
-      file_stat->type = CSYNC_FTW_TYPE_SKIP;
-  }
  return file_stat;
+
+err:
+  csync_vio_file_stat_destroy(file_stat);
+
+  return NULL;
 }


-int csync_vio_local_stat(const char *uri, csync_file_stat_t *buf)
-{
-    mbchar_t *wuri = c_utf8_path_to_locale(uri);
-    *buf = csync_file_stat_t();
-    int rc = _csync_vio_local_stat_mb(wuri, buf);
+int csync_vio_local_stat(const char *uri, csync_vio_file_stat_t *buf) {
+  csync_stat_t sb;
+
+  mbchar_t *wuri = c_utf8_path_to_locale( uri );
+
+  if( _tstat(wuri, &sb) < 0) {
    c_free_locale_string(wuri);
-    return rc;
-}
+    return -1;
+  }

-static int _csync_vio_local_stat_mb(const mbchar_t *wuri, csync_file_stat_t *buf)
-{
-    csync_stat_t sb;
+  buf->fields = CSYNC_VIO_FILE_STAT_FIELDS_NONE;

-    if (_tstat(wuri, &sb) < 0) {
-        return -1;
-    }
-
-    switch (sb.st_mode & S_IFMT) {
+  switch(sb.st_mode & S_IFMT) {
+    case S_IFBLK:
+      buf->type = CSYNC_VIO_FILE_TYPE_BLOCK_DEVICE;
+      break;
+    case S_IFCHR:
+      buf->type = CSYNC_VIO_FILE_TYPE_CHARACTER_DEVICE;
+      break;
    case S_IFDIR:
-      buf->type = CSYNC_FTW_TYPE_DIR;
+      buf->type = CSYNC_VIO_FILE_TYPE_DIRECTORY;
+      break;
+    case S_IFIFO:
+      buf->type = CSYNC_VIO_FILE_TYPE_FIFO;
      break;
    case S_IFREG:
-      buf->type = CSYNC_FTW_TYPE_FILE;
+      buf->type = CSYNC_VIO_FILE_TYPE_REGULAR;
      break;
    case S_IFLNK:
+      buf->type = CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK;
+      break;
    case S_IFSOCK:
-      buf->type = CSYNC_FTW_TYPE_SLINK;
+      buf->type = CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK;
      break;
    default:
-      buf->type = CSYNC_FTW_TYPE_SKIP;
+      buf->type = CSYNC_VIO_FILE_TYPE_UNKNOWN;
      break;
  }
+  buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_TYPE;

+  buf->mode = sb.st_mode;
+  buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_MODE;
+
+  if (buf->type == CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK) {
+    /* FIXME: handle symlink */
+    buf->flags = CSYNC_VIO_FILE_FLAGS_SYMLINK;
+  } else {
+    buf->flags = CSYNC_VIO_FILE_FLAGS_NONE;
+  }
 #ifdef __APPLE__
  if (sb.st_flags & UF_HIDDEN) {
-      buf->is_hidden = true;
+      buf->flags |= CSYNC_VIO_FILE_FLAGS_HIDDEN;
  }
 #endif
+  buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_FLAGS;

  buf->inode = sb.st_ino;
-  buf->modtime = sb.st_mtime;
+  buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_INODE;
+
+  buf->atime = sb.st_atime;
+  buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_ATIME;
+
+  buf->mtime = sb.st_mtime;
+  buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_MTIME;
+
+  buf->ctime = sb.st_ctime;
+  buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_CTIME;
+
  buf->size = sb.st_size;
+  buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_SIZE;
+
+  c_free_locale_string(wuri);
  return 0;
 }
--- a/src/csync/vio/csync_vio_local_win.cpp
+++ b/src/csync/vio/csync_vio_local_win.cpp
@@ -29,7 +29,7 @@

 #include "c_private.h"
 #include "c_lib.h"
-#include "c_utf8.h"
+#include "c_string.h"
 #include "csync_util.h"
 #include "csync_log.h"
 #include "csync_vio.h"
@@ -45,16 +45,14 @@ typedef struct dhandle_s {
  WIN32_FIND_DATA ffd;
  HANDLE hFind;
  int firstFind;
-  mbchar_t *path; // Always ends with '\'
+  char *path;
 } dhandle_t;

-static int _csync_vio_local_stat_mb(const mbchar_t *uri, csync_file_stat_t *buf);
-
 csync_vio_handle_t *csync_vio_local_opendir(const char *name) {
  dhandle_t *handle = NULL;
  mbchar_t *dirname = NULL;

-  handle = (dhandle_t*)c_malloc(sizeof(dhandle_t));
+  handle = c_malloc(sizeof(dhandle_t));

  // the file wildcard has to be attached
  int len_name = strlen(name);
@@ -62,7 +60,7 @@ csync_vio_handle_t *csync_vio_local_opendir(const char *name) {
      char *h = NULL;

      // alloc an enough large buffer to take the name + '/*' + the closing zero.
-      h = (char*)c_malloc(len_name+3);
+      h = c_malloc(len_name+3);
      strncpy( h, name, 1+len_name);
      strncat(h, "/*", 2);

@@ -75,7 +73,6 @@ csync_vio_handle_t *csync_vio_local_opendir(const char *name) {
  }

  if (!dirname || handle->hFind == INVALID_HANDLE_VALUE) {
-      c_free_locale_string(dirname);
      int retcode = GetLastError();
      if( retcode == ERROR_FILE_NOT_FOUND ) {
          errno = ENOENT;
@@ -88,8 +85,8 @@ csync_vio_handle_t *csync_vio_local_opendir(const char *name) {

  handle->firstFind = 1; // Set a flag that there first fileinfo is available.

-  dirname[std::wcslen(dirname) - 1] = L'\0'; // remove the *
-  handle->path = dirname;
+  handle->path = c_strdup(name);
+  c_free_locale_string(dirname);

  return (csync_vio_handle_t *) handle;
 }
@@ -112,7 +109,7 @@ int csync_vio_local_closedir(csync_vio_handle_t *dhandle) {
      errno = EBADF;
  }

-  c_free_locale_string(handle->path);
+  SAFE_FREE(handle->path);
  SAFE_FREE(handle);

  return rc;
@@ -137,15 +134,21 @@ static time_t FileTimeToUnixTime(FILETIME *filetime, DWORD *remainder)
    }
 }

-std::unique_ptr<csync_file_stat_t> csync_vio_local_readdir(csync_vio_handle_t *dhandle) {
+csync_vio_file_stat_t *csync_vio_local_readdir(csync_vio_handle_t *dhandle) {

  dhandle_t *handle = NULL;
-  std::unique_ptr<csync_file_stat_t> file_stat;
+  csync_vio_file_stat_t *file_stat = NULL;
  DWORD rem;

  handle = (dhandle_t *) dhandle;

  errno = 0;
+  file_stat = csync_vio_file_stat_new();
+  if (file_stat == NULL) {
+      errno = ENOMEM;
+      goto err;
+  }
+  file_stat->fields = CSYNC_VIO_FILE_STAT_FIELDS_NONE;

  // the win32 functions get the first valid entry with the opendir
  // thus we must not jump to next entry if it was the first find.
@@ -158,69 +161,67 @@ std::unique_ptr<csync_file_stat_t> csync_vio_local_readdir(csync_vio_handle_t *d
          if (dwError != ERROR_NO_MORE_FILES) {
              errno = EACCES; // no more files is fine. Otherwise EACCESS
          }
-          return nullptr;
+          goto err;
      }
  }
-  auto path = c_utf8_from_locale(handle->ffd.cFileName);
-  if (path == "." || path == "..")
-      return csync_vio_local_readdir(dhandle);
+  file_stat->name = c_utf8_from_locale(handle->ffd.cFileName);

-  file_stat.reset(new csync_file_stat_t);
-  file_stat->path = path;
-
-  if (handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
-      // Detect symlinks, and treat junctions as symlinks too.
-      if (handle->ffd.dwReserved0 == IO_REPARSE_TAG_SYMLINK
-          || handle->ffd.dwReserved0 == IO_REPARSE_TAG_MOUNT_POINT) {
-          file_stat->type = CSYNC_FTW_TYPE_SLINK;
-      } else {
-          // The SIS and DEDUP reparse points should be treated as
-          // regular files. We don't know about the other ones yet,
-          // but will also treat them normally for now.
-          file_stat->type = CSYNC_FTW_TYPE_FILE;
-      }
+    file_stat->flags = CSYNC_VIO_FILE_FLAGS_NONE;
+    file_stat->fields |= CSYNC_VIO_FILE_STAT_FIELDS_TYPE;
+    if (handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+        // Detect symlinks, and treat junctions as symlinks too.
+        if (handle->ffd.dwReserved0 == IO_REPARSE_TAG_SYMLINK
+                || handle->ffd.dwReserved0 == IO_REPARSE_TAG_MOUNT_POINT) {
+            file_stat->flags |= CSYNC_VIO_FILE_FLAGS_SYMLINK;
+            file_stat->type = CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK;
+        } else {
+            // The SIS and DEDUP reparse points should be treated as
+            // regular files. We don't know about the other ones yet,
+            // but will also treat them normally for now.
+            file_stat->type = CSYNC_VIO_FILE_TYPE_REGULAR;
+        }
    } else if (handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_DEVICE
                || handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_OFFLINE
                || handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_TEMPORARY) {
-        file_stat->type = CSYNC_FTW_TYPE_SKIP;
+        file_stat->type = CSYNC_VIO_FILE_TYPE_UNKNOWN;
    } else if (handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-        file_stat->type = CSYNC_FTW_TYPE_DIR;
+        file_stat->type = CSYNC_VIO_FILE_TYPE_DIRECTORY;
    } else {
-        file_stat->type = CSYNC_FTW_TYPE_FILE;
+        file_stat->type = CSYNC_VIO_FILE_TYPE_REGULAR;
    }

    /* Check for the hidden flag */
    if( handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN ) {
-        file_stat->is_hidden = true;
+        file_stat->flags |= CSYNC_VIO_FILE_FLAGS_HIDDEN;
    }

+    file_stat->fields |= CSYNC_VIO_FILE_STAT_FIELDS_FLAGS;
+    file_stat->fields |= CSYNC_VIO_FILE_STAT_FIELDS_TYPE;
+
    file_stat->size = (handle->ffd.nFileSizeHigh * ((int64_t)(MAXDWORD)+1)) + handle->ffd.nFileSizeLow;
-    file_stat->modtime = FileTimeToUnixTime(&handle->ffd.ftLastWriteTime, &rem);
+    file_stat->fields |= CSYNC_VIO_FILE_STAT_FIELDS_SIZE;

-    std::wstring fullPath;
-    fullPath.reserve(std::wcslen(handle->path) + std::wcslen(handle->ffd.cFileName));
-    fullPath += handle->path; // path always ends with '\', by construction
-    fullPath += handle->ffd.cFileName;
+    file_stat->atime = FileTimeToUnixTime(&handle->ffd.ftLastAccessTime, &rem);
+    file_stat->fields |= CSYNC_VIO_FILE_STAT_FIELDS_ATIME;

-    if (_csync_vio_local_stat_mb(fullPath.data(), file_stat.get()) < 0) {
-        // Will get excluded by _csync_detect_update.
-        file_stat->type = CSYNC_FTW_TYPE_SKIP;
-    }
+    file_stat->mtime = FileTimeToUnixTime(&handle->ffd.ftLastWriteTime, &rem);
+      /* CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Local File MTime: %llu", (unsigned long long) buf->mtime ); */
+    file_stat->fields |= CSYNC_VIO_FILE_STAT_FIELDS_MTIME;
+
+    file_stat->ctime = FileTimeToUnixTime(&handle->ffd.ftCreationTime, &rem);
+    file_stat->fields |= CSYNC_VIO_FILE_STAT_FIELDS_CTIME;

    return file_stat;
+
+err:
+  SAFE_FREE(file_stat);
+
+  return NULL;
 }


-int csync_vio_local_stat(const char *uri, csync_file_stat_t *buf)
-{
-    mbchar_t *wuri = c_utf8_path_to_locale(uri);
-    int rc = _csync_vio_local_stat_mb(wuri, buf);
-    c_free_locale_string(wuri);
-    return rc;
-}

-static int _csync_vio_local_stat_mb(const mbchar_t *wuri, csync_file_stat_t *buf)
-{
+int csync_vio_local_stat(const char *uri, csync_vio_file_stat_t *buf) {
    /* Almost nothing to do since csync_vio_local_readdir already filled up most of the information
       But we still need to fetch the file ID.
       Possible optimisation: only fetch the file id when we need it (for new files)
@@ -229,20 +230,23 @@ static int _csync_vio_local_stat_mb(const mbchar_t *wuri, csync_file_stat_t *buf
    HANDLE h;
    BY_HANDLE_FILE_INFORMATION fileInfo;
    ULARGE_INTEGER FileIndex;
+    mbchar_t *wuri = c_utf8_path_to_locale( uri );

    h = CreateFileW( wuri, 0, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE,
                     NULL, OPEN_EXISTING,
                     FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT,
                     NULL );
    if( h == INVALID_HANDLE_VALUE ) {
-        CSYNC_LOG(CSYNC_LOG_PRIORITY_CRIT, "CreateFileW failed on %ls", wuri);
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_CRIT, "CreateFileW failed on %s", uri );
        errno = GetLastError();
+        c_free_locale_string(wuri);
        return -1;
    }

    if(!GetFileInformationByHandle( h, &fileInfo ) ) {
-        CSYNC_LOG(CSYNC_LOG_PRIORITY_CRIT, "GetFileInformationByHandle failed on %ls", wuri);
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_CRIT, "GetFileInformationByHandle failed on %s", uri );
        errno = GetLastError();
+        c_free_locale_string(wuri);
        CloseHandle(h);
        return -1;
    }
@@ -253,11 +257,19 @@ static int _csync_vio_local_stat_mb(const mbchar_t *wuri, csync_file_stat_t *buf
    FileIndex.QuadPart &= 0x0000FFFFFFFFFFFF;
    /* printf("Index: %I64i\n", FileIndex.QuadPart); */
    buf->inode = FileIndex.QuadPart;
-    buf->size = (fileInfo.nFileSizeHigh * ((int64_t)(MAXDWORD)+1)) + fileInfo.nFileSizeLow;

-    DWORD rem;
-    buf->modtime = FileTimeToUnixTime(&fileInfo.ftLastWriteTime, &rem);
+    if (!(buf->fields & CSYNC_VIO_FILE_STAT_FIELDS_SIZE)) {
+        buf->size = (fileInfo.nFileSizeHigh * ((int64_t)(MAXDWORD)+1)) + fileInfo.nFileSizeLow;
+        buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_SIZE;
+    }
+    if (!(buf->fields & CSYNC_VIO_FILE_STAT_FIELDS_MTIME)) {
+        DWORD rem;
+        buf->mtime = FileTimeToUnixTime(&fileInfo.ftLastWriteTime, &rem);
+        /* CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Local File MTime: %llu", (unsigned long long) buf->mtime ); */
+        buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_MTIME;
+    }

+    c_free_locale_string(wuri);
    CloseHandle(h);
    return 0;
 }
--- a/csync/tests/CMakeLists.txt
+++ b/csync/tests/CMakeLists.txt
@@ -0,0 +1,55 @@
+project(tests C)
+
+set(TORTURE_LIBRARY torture)
+
+include_directories(
+  ${CSYNC_PUBLIC_INCLUDE_DIRS}
+  ${CSTDLIB_PUBLIC_INCLUDE_DIRS}
+  ${CMAKE_BINARY_DIR}
+  ${CMOCKA_INCLUDE_DIR}
+)
+
+include_directories(${CHECK_INCLUDE_DIRS})
+# create test library
+add_library(${TORTURE_LIBRARY} STATIC torture.c cmdline.c)
+target_link_libraries(${TORTURE_LIBRARY} ${CMOCKA_LIBRARIES} ${CSYNC_LIBRARY} ${CSTDLIB_LIBRARY})
+
+set(TEST_TARGET_LIBRARIES ${TORTURE_LIBRARY})
+
+# create tests
+
+# std
+add_cmocka_test(check_std_c_alloc std_tests/check_std_c_alloc.c ${TEST_TARGET_LIBRARIES})
+add_cmocka_test(check_std_c_jhash std_tests/check_std_c_jhash.c ${TEST_TARGET_LIBRARIES})
+add_cmocka_test(check_std_c_path std_tests/check_std_c_path.c ${TEST_TARGET_LIBRARIES})
+add_cmocka_test(check_std_c_rbtree std_tests/check_std_c_rbtree.c ${TEST_TARGET_LIBRARIES})
+add_cmocka_test(check_std_c_str std_tests/check_std_c_str.c ${TEST_TARGET_LIBRARIES})
+add_cmocka_test(check_std_c_time std_tests/check_std_c_time.c ${TEST_TARGET_LIBRARIES})
+
+# csync tests
+# This will be rewritten soon anyway.
+#add_cmocka_test(check_logger log_tests/check_log.c ${TEST_TARGET_LIBRARIES})
+
+add_cmocka_test(check_csync_create csync_tests/check_csync_create.c ${TEST_TARGET_LIBRARIES})
+add_cmocka_test(check_csync_log csync_tests/check_csync_log.c ${TEST_TARGET_LIBRARIES})
+add_cmocka_test(check_csync_exclude csync_tests/check_csync_exclude.c ${TEST_TARGET_LIBRARIES})
+add_cmocka_test(check_csync_statedb_load csync_tests/check_csync_statedb_load.c ${TEST_TARGET_LIBRARIES})
+add_cmocka_test(check_csync_util csync_tests/check_csync_util.c ${TEST_TARGET_LIBRARIES})
+add_cmocka_test(check_csync_misc csync_tests/check_csync_misc.c ${TEST_TARGET_LIBRARIES})
+
+# csync tests which require init
+add_cmocka_test(check_csync_init csync_tests/check_csync_init.c ${TEST_TARGET_LIBRARIES})
+add_cmocka_test(check_csync_statedb_query csync_tests/check_csync_statedb_query.c ${TEST_TARGET_LIBRARIES})
+add_cmocka_test(check_csync_commit csync_tests/check_csync_commit.c ${TEST_TARGET_LIBRARIES})
+
+# vio
+add_cmocka_test(check_vio_file_stat vio_tests/check_vio_file_stat.c ${TEST_TARGET_LIBRARIES})
+add_cmocka_test(check_vio vio_tests/check_vio.c ${TEST_TARGET_LIBRARIES})
+add_cmocka_test(check_vio_ext vio_tests/check_vio_ext.c ${TEST_TARGET_LIBRARIES})
+
+# sync
+add_cmocka_test(check_csync_update csync_tests/check_csync_update.c ${TEST_TARGET_LIBRARIES})
+
+# encoding
+add_cmocka_test(check_encoding_functions encoding_tests/check_encoding.c ${TEST_TARGET_LIBRARIES})
+
--- a/csync/tests/cmdline.c
+++ b/csync/tests/cmdline.c
--- a/csync/tests/csync_tests/check_csync_commit.c
+++ b/csync/tests/csync_tests/check_csync_commit.c
@@ -0,0 +1,103 @@
+/*
+ * libcsync -- a library to sync a directory with another
+ *
+ * Copyright (c) 2008-2013 by Andreas Schneider <asn@cryptomilk.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include <string.h>
+
+#include "torture.h"
+
+#include "csync_private.h"
+
+static int setup(void **state) {
+    CSYNC *csync;
+    int rc;
+
+    rc = system("mkdir -p /tmp/check_csync1");
+    assert_int_equal(rc, 0);
+
+    csync_create(&csync, "/tmp/check_csync1");
+
+    *state = csync;
+    
+    return 0;
+}
+
+static int setup_module(void **state) {
+    CSYNC *csync;
+    int rc;
+
+    rc = system("mkdir -p /tmp/check_csync1");
+    assert_int_equal(rc, 0);
+
+    csync_create(&csync, "/tmp/check_csync1");
+
+    csync_init(csync, "foo");
+    *state = csync;
+    
+    return 0;
+}
+
+static int teardown(void **state) {
+    CSYNC *csync = *state;
+    int rc;
+
+    rc = csync_destroy(csync);
+
+    rc = system("rm -rf /tmp/check_csync");
+    assert_int_equal(rc, 0);
+
+    rc = system("rm -rf /tmp/check_csync1");
+    assert_int_equal(rc, 0);
+
+    *state = NULL;
+    
+    return 0;
+}
+
+static void check_csync_commit(void **state)
+{
+    CSYNC *csync = *state;
+    int rc;
+
+    rc = csync_commit(csync);
+    assert_int_equal(rc, 0);
+
+    assert_int_equal(csync->status & CSYNC_STATUS_INIT, 1);
+}
+
+static void check_csync_commit_dummy(void **state)
+{
+    CSYNC *csync = *state;
+    int rc;
+
+    rc = csync_commit(csync);
+    assert_int_equal(rc, 0);
+
+    assert_int_equal(csync->status & CSYNC_STATUS_INIT, 1);
+
+}
+
+int torture_run_tests(void)
+{
+    const struct CMUnitTest tests[] = {
+        cmocka_unit_test_setup_teardown(check_csync_commit, setup, teardown),
+        cmocka_unit_test_setup_teardown(check_csync_commit_dummy, setup_module, teardown),
+    };
+
+    return cmocka_run_group_tests(tests, NULL, NULL);
+}
--- a/csync/tests/csync_tests/check_csync_create.c
+++ b/csync/tests/csync_tests/check_csync_create.c
@@ -0,0 +1,60 @@
+/*
+ * libcsync -- a library to sync a directory with another
+ *
+ * Copyright (c) 2008-2013 by Andreas Schneider <asn@cryptomilk.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "torture.h"
+
+#include "csync_private.h"
+
+
+static void check_csync_destroy_null(void **state)
+{
+    int rc;
+
+    (void) state; /* unused */
+
+    rc = csync_destroy(NULL);
+    assert_int_equal(rc, -1);
+}
+
+static void check_csync_create(void **state)
+{
+    CSYNC *csync;
+    int rc;
+
+    (void) state; /* unused */
+
+    csync_create(&csync, "/tmp/csync1");
+
+    rc = csync_destroy(csync);
+    assert_int_equal(rc, 0);
+}
+
+int torture_run_tests(void)
+{
+    const struct CMUnitTest tests[] = {
+        cmocka_unit_test(check_csync_destroy_null),
+        cmocka_unit_test(check_csync_create),
+    };
+
+    return cmocka_run_group_tests(tests, NULL, NULL);
+}
+
--- a/test/csync/csync_tests/check_csync_exclude.cpp
+++ b/test/csync/csync_tests/check_csync_exclude.cpp
@@ -22,17 +22,17 @@
 #include <time.h>
 #include <sys/time.h>

-#define CSYNC_TEST 1
-#include "csync_exclude.cpp"
-
 #include "torture.h"

-#define EXCLUDE_LIST_FILE SOURCEDIR"/../../sync-exclude.lst"
+#define CSYNC_TEST 1
+#include "csync_exclude.c"
+
+#define EXCLUDE_LIST_FILE SOURCEDIR"/../sync-exclude.lst"

 static int setup(void **state) {
    CSYNC *csync;

-    csync = new CSYNC("/tmp/check_csync1", new OCC::SyncJournalDb(""));
+    csync_create(&csync, "/tmp/check_csync1");

    *state = csync;
    return 0;
@@ -42,7 +42,7 @@ static int setup_init(void **state) {
    CSYNC *csync;
    int rc;

-    csync = new CSYNC("/tmp/check_csync1", new OCC::SyncJournalDb(""));
+    csync_create(&csync, "/tmp/check_csync1");

    rc = csync_exclude_load(EXCLUDE_LIST_FILE, &(csync->excludes));
    assert_int_equal(rc, 0);
@@ -59,19 +59,16 @@ static int setup_init(void **state) {
    rc = _csync_exclude_add(&(csync->excludes), "latex/*/*.tex.tmp");
    assert_int_equal(rc, 0);

-    csync_exclude_traversal_prepare(csync);
-
    *state = csync;
    return 0;
 }

 static int teardown(void **state) {
-    CSYNC *csync = (CSYNC*)*state;
+    CSYNC *csync = *state;
    int rc;

-    auto statedb = csync->statedb;
-    delete csync;
-    delete statedb;
+    rc = csync_destroy(csync);
+    assert_int_equal(rc, 0);

    rc = system("rm -rf /tmp/check_csync1");
    assert_int_equal(rc, 0);
@@ -85,14 +82,14 @@ static int teardown(void **state) {

 static void check_csync_exclude_add(void **state)
 {
-  CSYNC *csync = (CSYNC*)*state;
+  CSYNC *csync = *state;
  _csync_exclude_add(&(csync->excludes), "/tmp/check_csync1/*");
  assert_string_equal(csync->excludes->vector[0], "/tmp/check_csync1/*");
 }

 static void check_csync_exclude_load(void **state)
 {
-    CSYNC *csync = (CSYNC*)*state;
+    CSYNC *csync = *state;
    int rc;

    rc = csync_exclude_load(EXCLUDE_LIST_FILE, &(csync->excludes) );
@@ -100,15 +97,11 @@ static void check_csync_exclude_load(void **state)

    assert_string_equal(csync->excludes->vector[0], "*~");
    assert_int_not_equal(csync->excludes->count, 0);
-
-    assert_true(csync->parsed_traversal_excludes.regexp_exclude.pattern().isEmpty());
-    csync_exclude_traversal_prepare(csync); /* parse into regular expression */
-    assert_false(csync->parsed_traversal_excludes.regexp_exclude.pattern().isEmpty());
 }

 static void check_csync_excluded(void **state)
 {
-    CSYNC *csync = (CSYNC*)*state;
+    CSYNC *csync = *state;
    int rc;

    rc = csync_excluded_no_ctx(csync->excludes, "", CSYNC_FTW_TYPE_FILE);
@@ -116,16 +109,13 @@ static void check_csync_excluded(void **state)
    rc = csync_excluded_no_ctx(csync->excludes, "/", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);

-    rc = csync_excluded_no_ctx(csync->excludes, "A", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
    rc = csync_excluded_no_ctx(csync->excludes, "krawel_krawel", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
    rc = csync_excluded_no_ctx(csync->excludes, ".kde/share/config/kwin.eventsrc", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded_no_ctx(csync->excludes, ".directory/cache-maximegalon/cache1.txt", CSYNC_FTW_TYPE_FILE);
+    rc = csync_excluded_no_ctx(csync->excludes, ".htaccess/cache-maximegalon/cache1.txt", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-    rc = csync_excluded_no_ctx(csync->excludes, "mozilla/.directory", CSYNC_FTW_TYPE_DIR);
+    rc = csync_excluded_no_ctx(csync->excludes, "mozilla/.htaccess", CSYNC_FTW_TYPE_DIR);
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);

    /*
@@ -167,16 +157,7 @@ static void check_csync_excluded(void **state)
    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
    rc = csync_excluded_no_ctx(csync->excludes, "subdir/._sync_5bdd60bdfcfa.db", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-
-    rc = csync_excluded_no_ctx(csync->excludes, ".sync_5bdd60bdfcfa.db", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_no_ctx(csync->excludes, ".sync_5bdd60bdfcfa.db.ctmp", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_no_ctx(csync->excludes, ".sync_5bdd60bdfcfa.db-shm", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_no_ctx(csync->excludes, "subdir/.sync_5bdd60bdfcfa.db", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-
+    

    /* pattern ]*.directory - ignore and remove */
    rc = csync_excluded_no_ctx(csync->excludes, "my.~directory", CSYNC_FTW_TYPE_FILE);
@@ -227,257 +208,61 @@ static void check_csync_excluded(void **state)
    rc = csync_excluded_no_ctx(csync->excludes, "file_invalid_char<", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_INVALID_CHAR);
 #endif
-
-    /* ? character */
-    _csync_exclude_add( &(csync->excludes), "bond00?" );
-    csync_exclude_traversal_prepare(csync);
-    rc = csync_excluded_no_ctx(csync->excludes, "bond00", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded_no_ctx(csync->excludes, "bond007", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-    rc = csync_excluded_no_ctx(csync->excludes, "bond0071", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-#ifndef _WIN32
-    /* brackets */
-    _csync_exclude_add( &(csync->excludes), "a [bc] d" );
-    csync_exclude_traversal_prepare(csync);
-    rc = csync_excluded_no_ctx(csync->excludes, "a d d", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded_no_ctx(csync->excludes, "a  d", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded_no_ctx(csync->excludes, "a b d", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-    rc = csync_excluded_no_ctx(csync->excludes, "a c d", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-#endif
-
-    /* escapes */
-    _csync_exclude_add( &(csync->excludes), "\\a \\* \\?" );
-    csync_exclude_traversal_prepare(csync);
-    rc = csync_excluded_no_ctx(csync->excludes, "\\a \\* \\?", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded_no_ctx(csync->excludes, "a b c", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded_no_ctx(csync->excludes, "a * ?", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
 }

 static void check_csync_excluded_traversal(void **state)
 {
-    CSYNC *csync = (CSYNC*)*state;
+    CSYNC *csync = *state;
    int rc;

-    rc = csync_excluded_traversal(csync, "", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded_traversal(csync, "/", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-    rc = csync_excluded_traversal(csync, "A", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-    rc = csync_excluded_traversal(csync,  "krawel_krawel", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded_traversal(csync,  ".kde/share/config/kwin.eventsrc", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded_traversal(csync,  "mozilla/.directory", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    /*
-     * Test for patterns in subdirs. '.beagle' is defined as a pattern and has
-     * to be found in top dir as well as in directories underneath.
-     */
-    rc = csync_excluded_traversal(csync,  ".apdisk", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-    rc = csync_excluded_traversal(csync,  "foo/.apdisk", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-    rc = csync_excluded_traversal(csync,  "foo/bar/.apdisk", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    rc = csync_excluded_traversal(csync, ".java", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-    /* csync-journal is ignored in general silently. */
-    rc = csync_excluded_traversal(csync, ".csync_journal.db", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_traversal(csync, ".csync_journal.db.ctmp", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_traversal(csync, "subdir/.csync_journal.db", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_traversal(csync, "/two/subdir/.csync_journal.db", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-
-    /* also the new form of the database name */
-    rc = csync_excluded_traversal(csync, "._sync_5bdd60bdfcfa.db", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_traversal(csync, "._sync_5bdd60bdfcfa.db.ctmp", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_traversal(csync, "._sync_5bdd60bdfcfa.db-shm", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_traversal(csync, "subdir/._sync_5bdd60bdfcfa.db", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-
-    rc = csync_excluded_traversal(csync,  ".sync_5bdd60bdfcfa.db", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_traversal(csync,  ".sync_5bdd60bdfcfa.db.ctmp", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_traversal(csync,  ".sync_5bdd60bdfcfa.db-shm", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_traversal(csync,  "subdir/.sync_5bdd60bdfcfa.db", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-
-
-    /* pattern ]*.directory - ignore and remove */
-    rc = csync_excluded_traversal(csync,  "my.~directory", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_AND_REMOVE);
-
-    rc = csync_excluded_traversal(csync,  "/a_folder/my.~directory", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_AND_REMOVE);
-
-    /* Not excluded because the pattern .netscape/cache requires directory. */
-    rc = csync_excluded_traversal(csync,  ".netscape/cache", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-    /* Not excluded  */
-    rc = csync_excluded_traversal(csync,  "unicode/中文.hé", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    /* excluded  */
-    rc = csync_excluded_traversal(csync,  "unicode/пятницы.txt", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-    rc = csync_excluded_traversal(csync,  "unicode/中文.💩", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    /* path wildcards */
-    rc = csync_excluded_traversal(csync,  "foobar/my_manuscript.out", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    rc = csync_excluded_traversal(csync,  "latex_tmp/my_manuscript.run.xml", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    rc = csync_excluded_traversal(csync,  "word_tmp/my_manuscript.run.xml", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-    rc = csync_excluded_traversal(csync,  "latex/my_manuscript.tex.tmp", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-    rc = csync_excluded_traversal(csync,  "latex/songbook/my_manuscript.tex.tmp", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-#ifdef _WIN32
-    rc = csync_excluded_traversal(csync,  "file_trailing_space ", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_TRAILING_SPACE);
-
-    rc = csync_excluded_traversal(csync,  "file_trailing_dot.", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_INVALID_CHAR);
-
-    rc = csync_excluded_traversal(csync,  "AUX", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_INVALID_CHAR);
-
-    rc = csync_excluded_traversal(csync,  "file_invalid_char<", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_INVALID_CHAR);
-#endif
-
-
-    /* From here the actual traversal tests */
-
    _csync_exclude_add( &(csync->excludes), "/exclude" );
-    csync_exclude_traversal_prepare(csync);

    /* Check toplevel dir, the pattern only works for toplevel dir. */
-    rc = csync_excluded_traversal(csync, "/exclude", CSYNC_FTW_TYPE_DIR);
+    rc = csync_excluded_traversal(csync->excludes, "/exclude", CSYNC_FTW_TYPE_DIR);
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);

-    rc = csync_excluded_traversal(csync, "/foo/exclude", CSYNC_FTW_TYPE_DIR);
+    rc = csync_excluded_traversal(csync->excludes, "/foo/exclude", CSYNC_FTW_TYPE_DIR);
    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);

    /* check for a file called exclude. Must still work */
-    rc = csync_excluded_traversal(csync, "/exclude", CSYNC_FTW_TYPE_FILE);
+    rc = csync_excluded_traversal(csync->excludes, "/exclude", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);

-    rc = csync_excluded_traversal(csync, "/foo/exclude", CSYNC_FTW_TYPE_FILE);
+    rc = csync_excluded_traversal(csync->excludes, "/foo/exclude", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);

    /* Add an exclude for directories only: excl/ */
    _csync_exclude_add( &(csync->excludes), "excl/" );
-    csync_exclude_traversal_prepare(csync);
-    rc = csync_excluded_traversal(csync, "/excl", CSYNC_FTW_TYPE_DIR);
+    rc = csync_excluded_traversal(csync->excludes, "/excl", CSYNC_FTW_TYPE_DIR);
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);

-    rc = csync_excluded_traversal(csync, "meep/excl", CSYNC_FTW_TYPE_DIR);
+    rc = csync_excluded_traversal(csync->excludes, "meep/excl", CSYNC_FTW_TYPE_DIR);
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);

-    rc = csync_excluded_traversal(csync, "meep/excl/file", CSYNC_FTW_TYPE_FILE);
+    rc = csync_excluded_traversal(csync->excludes, "meep/excl/file", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_NOT_EXCLUDED); // because leading dirs aren't checked!

-    rc = csync_excluded_traversal(csync, "/excl", CSYNC_FTW_TYPE_FILE);
+    rc = csync_excluded_traversal(csync->excludes, "/excl", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);

    _csync_exclude_add(&csync->excludes, "/excludepath/withsubdir");
-    csync_exclude_traversal_prepare(csync);

-    rc = csync_excluded_traversal(csync, "/excludepath/withsubdir", CSYNC_FTW_TYPE_DIR);
+    rc = csync_excluded_traversal(csync->excludes, "/excludepath/withsubdir", CSYNC_FTW_TYPE_DIR);
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);

-    rc = csync_excluded_traversal(csync, "/excludepath/withsubdir", CSYNC_FTW_TYPE_FILE);
+    rc = csync_excluded_traversal(csync->excludes, "/excludepath/withsubdir", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);

-    rc = csync_excluded_traversal(csync, "/excludepath/withsubdir2", CSYNC_FTW_TYPE_DIR);
+    rc = csync_excluded_traversal(csync->excludes, "/excludepath/withsubdir2", CSYNC_FTW_TYPE_DIR);
    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);

-    rc = csync_excluded_traversal(csync, "/excludepath/withsubdir/foo", CSYNC_FTW_TYPE_DIR);
+    rc = csync_excluded_traversal(csync->excludes, "/excludepath/withsubdir/foo", CSYNC_FTW_TYPE_DIR);
    assert_int_equal(rc, CSYNC_NOT_EXCLUDED); // because leading dirs aren't checked!
-
-    /* Check ending of pattern */
-    rc = csync_excluded_traversal(csync, "/exclude", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-    rc = csync_excluded_traversal(csync, "/excludeX", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded_traversal(csync, "exclude", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-    _csync_exclude_add( &(csync->excludes), "exclude" );
-    csync_exclude_traversal_prepare(csync);
-    rc = csync_excluded_traversal(csync, "exclude", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    /* ? character */
-    _csync_exclude_add( &(csync->excludes), "bond00?" );
-    csync_exclude_traversal_prepare(csync);
-    rc = csync_excluded_traversal(csync, "bond00", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded_traversal(csync, "bond007", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-    rc = csync_excluded_traversal(csync, "bond0071", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-#ifndef _WIN32
-    /* brackets */
-    _csync_exclude_add( &(csync->excludes), "a [bc] d" );
-    csync_exclude_traversal_prepare(csync);
-    rc = csync_excluded_traversal(csync, "a d d", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded_traversal(csync, "a  d", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded_traversal(csync, "a b d", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-    rc = csync_excluded_traversal(csync, "a c d", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-#endif
-
-    /* escapes */
-    _csync_exclude_add( &(csync->excludes), "\\a \\* \\?" );
-    csync_exclude_traversal_prepare(csync);
-    rc = csync_excluded_traversal(csync, "\\a \\* \\?", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded_traversal(csync, "a b c", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded_traversal(csync, "a * ?", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
 }

 static void check_csync_pathes(void **state)
 {
-    CSYNC *csync = (CSYNC*)*state;
+    CSYNC *csync = *state;
    int rc;

    _csync_exclude_add( &(csync->excludes), "/exclude" );
@@ -525,7 +310,7 @@ static void check_csync_pathes(void **state)
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
 }

-static void check_csync_is_windows_reserved_word(void **) {
+static void check_csync_is_windows_reserved_word() {
    assert_true(csync_is_windows_reserved_word("CON"));
    assert_true(csync_is_windows_reserved_word("con"));
    assert_true(csync_is_windows_reserved_word("CON."));
@@ -535,22 +320,6 @@ static void check_csync_is_windows_reserved_word(void **) {
    assert_false(csync_is_windows_reserved_word("conference"));
    assert_false(csync_is_windows_reserved_word("conf.erence"));
    assert_false(csync_is_windows_reserved_word("co"));
-
-    assert_true(csync_is_windows_reserved_word("COM2"));
-    assert_true(csync_is_windows_reserved_word("com2"));
-    assert_true(csync_is_windows_reserved_word("COM2."));
-    assert_true(csync_is_windows_reserved_word("com2."));
-    assert_true(csync_is_windows_reserved_word("COM2.ference"));
-    assert_false(csync_is_windows_reserved_word("COM2ference"));
-    assert_false(csync_is_windows_reserved_word("com2ference"));
-    assert_false(csync_is_windows_reserved_word("com2f.erence"));
-    assert_false(csync_is_windows_reserved_word("com"));
-
-    assert_true(csync_is_windows_reserved_word("CLOCK$"));
-    assert_true(csync_is_windows_reserved_word("$Recycle.Bin"));
-    assert_true(csync_is_windows_reserved_word("ClocK$"));
-    assert_true(csync_is_windows_reserved_word("$recycle.bin"));
-
    assert_true(csync_is_windows_reserved_word("A:"));
    assert_true(csync_is_windows_reserved_word("a:"));
    assert_true(csync_is_windows_reserved_word("z:"));
@@ -559,10 +328,9 @@ static void check_csync_is_windows_reserved_word(void **) {
    assert_true(csync_is_windows_reserved_word("m:"));
 }

-/* QT_ENABLE_REGEXP_JIT=0 to get slower results :-) */
 static void check_csync_excluded_performance(void **state)
 {
-    CSYNC *csync = (CSYNC*)*state;
+    CSYNC *csync = *state;

    const int N = 10000;
    int totalRc = 0;
@@ -592,8 +360,8 @@ static void check_csync_excluded_performance(void **state)
        gettimeofday(&before, 0);

        for (i = 0; i < N; ++i) {
-            totalRc += csync_excluded_traversal(csync, "/this/is/quite/a/long/path/with/many/components", CSYNC_FTW_TYPE_DIR);
-            totalRc += csync_excluded_traversal(csync, "/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21/22/23/24/25/26/27/29", CSYNC_FTW_TYPE_FILE);
+            totalRc += csync_excluded_traversal(csync->excludes, "/this/is/quite/a/long/path/with/many/components", CSYNC_FTW_TYPE_DIR);
+            totalRc += csync_excluded_traversal(csync->excludes, "/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21/22/23/24/25/26/27/29", CSYNC_FTW_TYPE_FILE);
        }
        assert_int_equal(totalRc, CSYNC_NOT_EXCLUDED); // mainly to avoid optimization

@@ -611,9 +379,9 @@ static void check_csync_exclude_expand_escapes(void **state)
    (void)state;

    const char *str = csync_exclude_expand_escapes(
-            "keep \\' \\\" \\? \\\\ \\a \\b \\f \\n \\r \\t \\v \\z \\#");
+            "keep \\' \\\" \\? \\\\ \\a \\b \\f \\n \\r \\t \\v \\z");
    assert_true(0 == strcmp(
-            str, "keep ' \" ? \\ \a \b \f \n \r \t \v \\z #"));
+            str, "keep ' \" ? \\ \a \b \f \n \r \t \v \\z"));
    SAFE_FREE(str);

    str = csync_exclude_expand_escapes("");
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Markus Goetz	74f4e12b92	VERSION.cmake: Fix year	2017-04-24 13:42:05 +02:00
Markus Goetz	573e9de39d	VERSION.cmake: 2.3.2 rc1	2017-04-24 13:37:45 +02:00
				`@@ -1 +0,0 @@`
				`c8d0f788e00bdae125a26d9159ce9efdd6325cd2 # Initial application of clang-format`