Olivier Goffart
ec8adf2bd7
Fix compilation of src/std after merge
2013-08-18 16:51:02 +02:00
Olivier Goffart
2afdc9d095
Adapt to new multybyte api after merge
...
(Search and replace)
2013-08-18 16:43:46 +02:00
Olivier Goffart
9f5388544a
Fix cmake after merge
...
iniparser dependency is gone.
2013-08-18 16:29:35 +02:00
Olivier Goffart
b5ed352aa3
Merge remote-tracking branch 'origin/master' into ocsync
...
Only confluct resolution, do not compile or works
Conflicts:
CMakeLists.txt
CPackConfig.cmake
ConfigureChecks.cmake
client/csync_client.c
cmake/Modules/DefineCompilerFlags.cmake
cmake/Modules/DefineInstallationPaths.cmake
cmake/Modules/FindIconv.cmake
cmake/Modules/FindIniparser.cmake
cmake/Modules/FindNeon.cmake
config.h.cmake
config/CMakeLists.txt
config/ocsync.conf
doc/CMakeLists.txt
modules/csync_owncloud.c
modules/csync_sftp2.c
src/CMakeLists.txt
src/csync.c
src/csync.h
src/csync_config.c
src/csync_exclude.c
src/csync_lock.c
src/csync_macros.h
src/csync_misc.c
src/csync_misc.h
src/csync_private.h
src/csync_propagate.c
src/csync_statedb.c
src/csync_statedb.h
src/csync_update.c
src/csync_util.c
src/csync_util.h
src/std/c_dir.c
src/std/c_file.c
src/std/c_private.h
src/std/c_string.c
src/std/c_string.h
src/std/c_time.c
src/vio/csync_vio.c
src/vio/csync_vio.h
src/vio/csync_vio_file_stat.h
src/vio/csync_vio_local.c
src/vio/csync_vio_method.h
tests/CMakeLists.txt
tests/csync_tests/check_csync_statedb_load.c
tests/csync_tests/check_csync_statedb_query.c
tests/csync_tests/check_csync_treewalk.c
tests/csync_tests/check_csync_update.c
tests/ownCloud/HTTP/DAV.pm
tests/ownCloud/ownCloud/Test.pm
tests/std_tests/check_std_c_str.c
tests/vio_tests/check_vio.c
2013-08-18 16:21:18 +02:00
Markus Goetz
ea6caed5a3
DB: More easy IO mode
...
We move the DB anyway at the end, no need to be so harsh
2013-08-18 16:10:30 +02:00
Olivier Goffart
868f8029a2
Close the database file in all cases.
...
If the database was empty, we forgot to close the file descriptor,
making it impssible to remove the database and replace it with the real
one
2013-08-16 12:23:26 +02:00
Olivier Goffart
14219a1ea5
Log error of sqlite3_close
2013-08-15 18:39:26 +02:00
Daniel Molkentin
1663c84db7
Return an error if rename fails on win32.
...
Amends 9ea39dbaa9
.
2013-08-15 18:06:27 +02:00
Klaas Freitag
9ea39dbaa9
win32: Retry renaming in case of access denied.
2013-08-15 17:40:30 +02:00
Klaas Freitag
d3ec897fee
Bump version to 0.82.0
2013-08-15 17:39:00 +02:00
Olivier Goffart
38a5ff42e0
show the errno in the debug when renaming the db fails
2013-08-15 13:51:57 +02:00
Klaas Freitag
274da3ad0b
std: Fix uninitialized rc that polutes return value.
2013-08-14 19:03:36 +02:00
Daniel Molkentin
f054ca3f72
Disable Werror by default, set CSYNC_STRICT=ON to disable
2013-08-08 16:19:44 +02:00
Klaas Freitag
74b7d441c8
Bump version to 0.81.0
2013-08-08 16:00:20 +02:00
Klaas Freitag
1df602be26
Updated changelog for 0.81.0
2013-08-08 15:51:30 +02:00
Daniel Molkentin
d75f807c01
Send OC-Total-Length
...
As per https://github.com/owncloud/core/issues/4343
2013-08-08 00:48:48 +02:00
Klaas Freitag
2d3272182b
Add correct cast to 64 bit type.
2013-08-07 16:58:46 +02:00
Daniel Molkentin
444946ae79
Fix update test
2013-08-07 16:58:29 +02:00
Daniel Molkentin
6a6bfd1c89
Use proper compiler switch
2013-08-07 16:58:09 +02:00
Klaas Freitag
26c0bbd0eb
open test db in test correctly.
2013-08-07 15:39:30 +02:00
Klaas Freitag
0191fa43e0
Fix tests after statedb_open had moved.
2013-08-07 12:43:32 +02:00
Klaas Freitag
76ee4cb3ba
Add symlinks to the file tree with instruction IGNORE
2013-08-07 12:14:29 +02:00
Klaas Freitag
7b22972630
Add excluded files to the tree with IGNORE instruction
2013-08-06 18:01:34 +02:00
Klaas Freitag
d88a5e1b11
Rename progress init function to reasonable name.
2013-08-06 15:42:02 +02:00
Klaas Freitag
d585742609
Log if the Etag in the journal is empty.
2013-08-06 12:12:53 +02:00
Klaas Freitag
d910a3af8b
Notify sync start and end always.
2013-08-06 12:12:52 +02:00
Olivier Goffart
6ad2920809
Load the statedb in csync_update rather than in csync_init.
...
This also allow to reduce duplicate code in csync_commit, and ease the
error reporting of csync_commit
csync_commit is supposed to be done after the previous sync, it is
better to open the statedb before the sync
2013-08-06 12:12:52 +02:00
Klaas Freitag
a42d942a35
Finalize progress before error handling.
2013-08-06 12:12:52 +02:00
Klaas Freitag
721443feea
deliver file size with the progress callback in propagate.
2013-08-06 12:12:52 +02:00
Klaas Freitag
ba73405613
Defines for progress start- and end delete.
2013-08-06 12:12:52 +02:00
Klaas Freitag
c89a55984b
Emit start- and end delete progress.
2013-08-06 12:12:52 +02:00
Daniel Molkentin
045a3f17ba
_USE_GNU -> _GNU_SOURCE
2013-08-05 21:11:14 +02:00
Krzesimir Nowak
3979d002bd
Add an owncloud-specific redirect callback.
2013-08-05 19:21:38 +02:00
Daniel Molkentin
575874bcbe
asprintf is GNU specific
...
Unless we have a replacement, use _USE_GNU
2013-08-02 15:20:03 +02:00
Daniel Molkentin
8c9799cede
Ignore false-positive compiler warnings
2013-08-02 15:19:41 +02:00
Daniel Molkentin
54b8f4d89b
transfer parameter is unused, mute
2013-08-02 11:35:03 +02:00
Andreas Schneider
4a87a1ee35
tests: Package testfiles as xz archive.
2013-08-01 17:08:19 +02:00
Andreas Schneider
de1df9a6d9
Update ChangeLog.
2013-08-01 17:04:09 +02:00
Klaas Freitag
c321c3dea0
MacOSX: Add a mac specific header to avoid a build warning.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-08-01 16:48:58 +02:00
Klaas Freitag
ed4877c27c
Use strerror_r outside of log functions to avoid warnings.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-08-01 16:48:44 +02:00
Klaas Freitag
702e987505
vio: Fix compile error if WITH_UNIT_TESTING is not defined.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-08-01 16:48:19 +02:00
Klaas Freitag
fafc9bc11a
tests: Moved all ownCloud testfiles into tarball.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-08-01 16:47:56 +02:00
Klaas Freitag
f103e4203d
Set csync version to 0.50.0
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-08-01 16:46:59 +02:00
Olivier Goffart
6766f41bf5
Add a hook in httpbf to do the logging
2013-08-01 13:13:05 +02:00
Olivier Goffart
3cc41db0bd
Fix warning with clang
...
/usr/include/features.h:330:4: error: _FORTIFY_SOURCE requires compiling
with optimization (-O) [-Werror,-W#warnings]
# warning _FORTIFY_SOURCE requires compiling with optimization (-O)
2013-08-01 13:13:05 +02:00
Andreas Schneider
354ef5e771
client: Fix strtol error check.
2013-08-01 10:37:02 +02:00
Klaas Freitag
38403f3343
Fix compile warning.
2013-08-01 09:59:48 +02:00
Klaas Freitag
59a133fe03
Fix logging for cross platform.
2013-08-01 09:41:17 +02:00
Klaas Freitag
0524613a57
Removed end up- and download notification, done in propagate.
2013-08-01 09:30:13 +02:00
Klaas Freitag
344ea661c9
Add more logging to chunking routines.
2013-07-31 16:26:28 +02:00