Olivier Goffart
|
02704cdf74
|
Merge remote-tracking branch 'origin/1.6' into il
Conflicts:
VERSION.cmake
csync/src/csync_statedb.c
src/mirall/syncengine.cpp
src/mirall/syncfileitem.h
|
2014-06-23 12:48:34 +02:00 |
|
Klaas Freitag
|
041066a252
|
Exclude: Add a missing free in case of empty lines.
This fixes Coverity CLT 12893
|
2014-06-20 15:15:35 +02:00 |
|
Olivier Goffart
|
b29a757b18
|
Revert "csync file util: Remove compare file function, not needed anymore."
This break the test.
And the function is aleady gone in master anyway
This reverts commit 407b3bebfe .
|
2014-06-20 14:29:43 +02:00 |
|
Klaas Freitag
|
db3d2eed5f
|
csync core: Remove logically dead code: Can never be reached.
This fixes Coverity CID 12881
|
2014-06-20 13:08:03 +02:00 |
|
Olivier Goffart
|
b34afa1afc
|
reconcile: use the proper enum type
thankfully the value hapenned to be the same, but the type
is of CSYNC_FTW_.. and not CSYNC_VIO_FILE_TYPE
Detected by coverity (CID 12887)
|
2014-06-20 11:51:07 +02:00 |
|
Olivier Goffart
|
b7c9fa6d5f
|
csync_owncloud: silent CID 12883
|
2014-06-20 11:51:07 +02:00 |
|
Klaas Freitag
|
407b3bebfe
|
csync file util: Remove compare file function, not needed anymore.
This also fixes Coverity CID 12890 and CID 12898
|
2014-06-20 11:39:28 +02:00 |
|
Olivier Goffart
|
f04c80dd0e
|
httpbf: silent coverity issue 12905
|
2014-06-20 11:33:29 +02:00 |
|
Klaas Freitag
|
b144a5bbf9
|
csync_exclude: Add a missing free of path components.
This fixes Coverity CID 12895
|
2014-06-20 11:14:50 +02:00 |
|
Olivier Goffart
|
5225fe07e0
|
csync_owncloud_recursive_propfind: "fix" possible memory leak
This was only leaking memory if ne_path_parent returns 0, which
should never happen
This fixes coverity issue 12897
|
2014-06-20 11:12:45 +02:00 |
|
Klaas Freitag
|
85cdbd1f1d
|
stateDB: Close the file descriptor even if stat failed.
This fixes Coverity CID 12897
|
2014-06-20 11:05:40 +02:00 |
|
Klaas Freitag
|
e4f8a136f1
|
StateDB: Free locale string also if attribs are invalid.
This fixes Coverity CID 12898
|
2014-06-20 11:05:40 +02:00 |
|
Daniel Molkentin
|
c263c38cdf
|
statedb.c: fix potential memory leak on win32
This fixes coverity issue 12898
|
2014-06-20 10:58:03 +02:00 |
|
Daniel Molkentin
|
df8553e878
|
httpbf.c: Fix resource leak
This fixes Coverity CID 12902
|
2014-06-20 10:58:03 +02:00 |
|
Daniel Molkentin
|
bec66c85d4
|
Fix potential memory leak
This fixes Coverity CID 12893
|
2014-06-20 10:58:03 +02:00 |
|
Daniel Molkentin
|
f9710cc1d5
|
c_time: Fix resource leak in error case
This fixes Coverity CID 12903
|
2014-06-20 10:58:03 +02:00 |
|
Klaas Freitag
|
d0c992c991
|
Updater: Free tmp variable that might point to temp malloced memory
This fixes Coverity CID 12900
|
2014-06-20 10:41:01 +02:00 |
|
Klaas Freitag
|
9ee86cf06b
|
Fix resource leak in win32 code path, added free of locale filename.
This fixes Coverity CID 12901
|
2014-06-20 10:25:00 +02:00 |
|
Olivier Goffart
|
38254125c9
|
csync: fix the size in strncpy for the remote perms
We must only do strncpy with size one smaller than
the size of the buffer in order to leave at least
one '\0' at the end
|
2014-06-18 15:56:13 +02:00 |
|
Olivier Goffart
|
e5b3363ecf
|
csync_statedb: remove noisy output
|
2014-06-18 15:40:26 +02:00 |
|
Olivier Goffart
|
0a953b91f9
|
csync_vio_local: fix memory leak on windows
|
2014-06-17 16:40:38 +02:00 |
|
Olivier Goffart
|
ade92d8ac1
|
csync test: fix warning
|
2014-06-17 14:16:42 +02:00 |
|
Markus Goetz
|
a5967e4ecd
|
CSync: Fix win32 compile
|
2014-06-16 16:53:10 +02:00 |
|
Olivier Goffart
|
2f361278d2
|
Merge remote-tracking branch 'origin/1.6' into 'il'
|
2014-06-16 16:41:48 +02:00 |
|
Markus Goetz
|
319cf76417
|
CSync: Move compiler ifdef outwards
|
2014-06-16 16:26:00 +02:00 |
|
Markus Goetz
|
be7b08b50a
|
CMake: Fix token auth compile
|
2014-06-16 15:34:46 +02:00 |
|
Markus Goetz
|
61999a67cd
|
CSync: Give ctx to proxy callback
This fixes a crash.
|
2014-06-13 15:36:00 +02:00 |
|
Klaas Freitag
|
e1db834ec9
|
Add missing cmakedefine for HAVE_ASPRINTF and minor cleanup.
Fixes windows build.
|
2014-06-13 13:30:59 +02:00 |
|
Olivier Goffart
|
d5bd3190d4
|
csync unit tests: fix cimpilation
|
2014-06-07 12:08:58 +02:00 |
|
Markus Goetz
|
8dbfcd782b
|
CSync: Fetch permissions from server for whole tree on server update
|
2014-06-06 17:10:07 +02:00 |
|
Markus Goetz
|
70ff928381
|
CSync & statedb: Parse 'perm' from server
ownCloud 6 sends this.
|
2014-06-06 15:24:17 +02:00 |
|
Markus Goetz
|
b48ab79a92
|
CSync & statedb: Remove uid/gid
Columns are still in the DB as we don't want to break any compatibility.
|
2014-06-06 13:41:16 +02:00 |
|
Markus Goetz
|
9a7fbd4f71
|
csync_owncloud: Parse properties in one function
|
2014-06-06 13:41:16 +02:00 |
|
Olivier Goffart
|
6dd248e527
|
csync: fix warnings
warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
|
2014-06-05 15:48:53 +02:00 |
|
Olivier Goffart
|
7d00c3646a
|
csync: remove unused variable
|
2014-06-05 15:45:15 +02:00 |
|
Olivier Goffart
|
e355e12385
|
Fix crash in tests
|
2014-06-05 15:43:27 +02:00 |
|
Markus Goetz
|
34b31c0146
|
CSync: Fix test compile
The previously applied pull request apparantly broke the compile
because it re-ordered entries in the CMakeLists
|
2014-06-05 14:22:10 +02:00 |
|
Daniel Molkentin
|
7fcf6f9f79
|
Merge branch '1.6'
|
2014-06-05 12:01:50 +02:00 |
|
Olivier Goffart
|
bd48ab23c3
|
Merge pull request #1835 from zizzfizzix/cmake_fixes
A little CMake cleanup
|
2014-06-05 11:48:40 +02:00 |
|
Markus Goetz
|
4e28ba73bb
|
Windows: Fix build harder.
|
2014-06-05 10:13:20 +02:00 |
|
Markus Goetz
|
d4d630b2e9
|
Windows: Fix build
|
2014-06-04 12:47:17 +02:00 |
|
Markus Goetz
|
2f81167164
|
CSync: Remove more unused things
|
2014-06-04 11:19:09 +02:00 |
|
Markus Goetz
|
6897c5d41f
|
CSync: Always have statedb enabled
|
2014-06-04 11:06:41 +02:00 |
|
Markus Goetz
|
233450d850
|
CSync: Remove config dir setting
|
2014-06-04 10:56:56 +02:00 |
|
Markus Goetz
|
7428a8fa63
|
CSync: Remove unused std functions
|
2014-06-04 10:33:19 +02:00 |
|
Markus Goetz
|
18359d7871
|
StateDB: Remove _csync_win32_hide_file and use other implementation
|
2014-06-04 09:46:31 +02:00 |
|
Kuba Serafinowski
|
62ea6f316f
|
don't look for CMocka if we're not building unit tests
|
2014-06-04 00:10:16 +03:00 |
|
Olivier Goffart
|
6605a89990
|
csync_statedb: Fix wrong % code in debug output
%ld is for long, but int64_t is larger than long on windows
|
2014-06-03 18:28:31 +02:00 |
|
Olivier Goffart
|
4cb9b3a85b
|
Test: fix compilation
|
2014-06-03 17:54:43 +02:00 |
|
Olivier Goffart
|
806ab8ea46
|
csync: remove the local mode
It is no longer used for a long time
|
2014-06-03 17:52:07 +02:00 |
|