mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-16 19:04:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
1640 commits 482 branches 258 tags 451 MiB
Commit graph

916 commits

Author SHA1 Message Date
Andreas Schneider
f124810059 lock: Make sure we have pid value in the correct range. 
Found by Coverity.
 2012-10-19 19:38:05 +02:00
Andreas Schneider
3f02bf7990 csync: Rework _csync_treewalk_visitor(). 
This fixes some possible null pointer defererences.

Found by Coverity.
 2012-10-19 19:24:07 +02:00
Andreas Schneider
81a0dc8cb0 rbtree: Fix finding the node with a NIL child. 
Found by Coverity.
 2012-10-19 19:14:54 +02:00
Andreas Schneider
06cb39e1e1 propagate: Fix a possible null pointer deference. 
Found by Coverity.
 2012-10-19 19:07:15 +02:00
Benjamin Legrand
cb8a501241 Fix a typeo and rename REPLCIA to REPLICA. 
BUG #8

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-10-19 15:59:51 +02:00
Klaas Freitag
aad8e5320a Some more memory cleanups after valgrinding. 2012-10-18 13:26:44 +02:00
Klaas Freitag
cc28d22c96 Removed overwhelming logging. 2012-10-18 13:26:44 +02:00
Klaas Freitag
9d126bc45a Set version to next tag 0.60.1 2012-10-16 15:48:13 +02:00
Klaas Freitag
5c780e99be Remove sqlite specific code here and use csync_statedb_get_below. 
This also fixes an escaping problem with path names with
apostrophes, reported in bug genie #oc-1997.
 2012-10-16 13:14:45 +02:00
Klaas Freitag
4682afc2bc Added function csync_statedb_get_below_path. 2012-10-16 13:14:04 +02:00
Klaas Freitag
687efaaaf6 Some more memory free - after valgrind analyze. 2012-10-16 11:52:50 +02:00
Klaas Freitag
7c20897036 Also reset read_from_db flag in context in error case. 2012-10-16 11:52:11 +02:00
Klaas Freitag
e89c6dc256 Free md5 memory when destroying. 2012-10-16 09:47:07 +02:00
Andreas Schneider
2ddccf6c16 propagate: Fix build on systems without atime support. 
This fixes bug #6.
 2012-10-15 21:27:17 +02:00
Klaas Freitag
48eec357d7 Push version to 0.60.0 - final release for owncloud client 1.1.0 2012-10-10 12:10:07 +02:00
Klaas Freitag
a9e544fd7d renamed config files and dirs to ocsync. 2012-10-05 14:38:33 +02:00
Klaas Freitag
b039b5642f Copy csync.conf from ~/.csync/ if existing. 2012-10-04 13:56:30 +02:00
Klaas Freitag
fbb88abe85 Clear memory and fix zero return type for _get_stat_by_hash 2012-10-04 13:03:42 +02:00
Klaas Freitag
2ec0b63f98 Migrate existing database from $HOME/.csync if non exists at config dir. 2012-10-04 13:02:38 +02:00
Klaas Freitag
207c8d9786 Set version to 0.50.11 - for ownCloud 1.1.0 beta3 2012-10-04 12:59:38 +02:00
Klaas Freitag
404073fe7f Rename csync to ocsync to not collide with upstream csync. 2012-10-01 12:39:05 +02:00
Daniel Molkentin
6c33462842 Remove redundant code block 2012-09-27 10:05:06 +02:00
Daniel Molkentin
4bae545c90 vio plugin loading: cut of filename regardless of length. 2012-09-27 10:05:01 +02:00
Klaas Freitag
2af0d6f1a4 Be careful with memory, some fixes for that. 2012-09-26 15:32:38 +02:00
Klaas Freitag
004f5ccce6 Fix state change for deleted or not longer existing directories. 2012-09-26 12:46:59 +02:00
Klaas Freitag
7b16fcf2a4 Avoid useless warnings. 2012-09-26 12:45:24 +02:00
Klaas Freitag
b976ac914d Also check the files basename against the exclude pattern. 2012-09-25 15:41:55 +03:00
Klaas Freitag
34249e9f64 Use destination path in case of file rename. 2012-09-24 15:57:32 +03:00
Klaas Freitag
2354b9c52f Fix detection of local file renames. 2012-09-24 15:56:42 +03:00
Klaas Freitag
77e79ea767 For rename, retrieve the new id and set in local tree. 2012-09-24 15:55:18 +03:00
Klaas Freitag
128926cac7 Check path for len exactly 1 when comparing on '.'. 2012-09-24 15:54:17 +03:00
Klaas Freitag
7a70a6fa69 Update version to 0.50.10 2012-09-20 17:57:58 +03:00
Klaas Freitag
44a6cf9bfc Remove wrong free. 2012-09-20 17:54:23 +03:00
Klaas Freitag
fc6cd714c7 win32: Fix random file name generation, init random generator once. 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-09-04 12:19:12 +02:00
Klaas Freitag
50f698673c Update version number to 0.50.9 2012-08-30 18:45:36 +03:00
Klaas Freitag
08f7fbbd71 Fix printf argument for win32 platform. 2012-08-30 17:01:52 +03:00
Klaas Freitag
caa1945daa Added another check on file length. 2012-08-30 15:45:45 +03:00
Klaas Freitag
6fbc510aeb Free memory of id_list lists. 2012-08-30 13:05:24 +03:00
Klaas Freitag
ffc5e6f0cc Memory cleanups for id syncing, removed unused code. 2012-08-30 13:04:48 +03:00
Klaas Freitag
7600eb4a09 Memory cleanups for id syncing. 2012-08-30 13:04:14 +03:00
Klaas Freitag
d756c45c50 Free memory used by the id in csync_file_stat. 2012-08-30 13:01:21 +03:00
Klaas Freitag
99691059bf Removed all usage of openSSL. 2012-08-29 15:37:31 +03:00
Klaas Freitag
ae94ce7430 Check if the file id method exists in the vio plugin. 2012-08-29 13:34:21 +03:00
Klaas Freitag
3950b18dc7 Fix memory leaks in new id sync code. 2012-08-28 17:53:26 +03:00
Klaas Freitag
4750380565 Fix flag setting detection of the fields. 2012-08-28 17:52:28 +03:00
Klaas Freitag
c491e8bb68 Check for valid result count after query. 2012-08-28 14:09:54 +03:00
Klaas Freitag
78c43e542c Handle zero result list correctly. 2012-08-28 14:09:29 +03:00
Klaas Freitag
3b369c8b03 More robust query result access if columns are missing. 2012-08-26 20:07:36 +02:00
Klaas Freitag
ef64756334 Merge branch 'md5' of ssh://milliways.cryptomilk.org/users/freitag/csync into fastsync 
Conflicts:
	modules/csync_owncloud.c
	src/csync_private.h
	src/csync_propagate.c
	src/csync_reconcile.c
	src/csync_statedb.c
 2012-08-23 18:04:32 +03:00
Klaas Freitag
2420eeffd1 Read remote file tree from db if id has not changed. 2012-08-23 17:55:39 +03:00
Klaas Freitag
5b5fe29eb5 Make sqlite_query function able to deal with multiple row queries. 2012-08-23 17:54:36 +03:00
Klaas Freitag
cf8f31914a Added a file type column to the database. 2012-08-23 17:53:53 +03:00
Klaas Freitag
1dc50eea5d Decide if the file tree is read from db or stat'ed 2012-08-23 17:50:30 +03:00
Klaas Freitag
1e41c469f0 Add the dbtree function module. 2012-08-23 17:49:47 +03:00
Klaas Freitag
e349df9f4c Added flag to indicate to read the remote filetree from db. 2012-08-23 17:49:18 +03:00
Klaas Freitag
8876658810 Added functions to read the file tree from database. 2012-08-23 17:48:24 +03:00
Klaas Freitag
e9cf546818 Free the memory for the MD5 string. 2012-08-23 17:44:07 +03:00
Klaas Freitag
97a7e46595 Set to INSTRUCTION_UPDATED only for NONE instructions. 2012-08-23 17:44:07 +03:00
Klaas Freitag
7f7c2b977c Avoid a null pointer dereference. 2012-08-23 17:44:07 +03:00
Klaas Freitag
337c56da66 Fix: If no database entry exists, the status is set to NEW. 2012-08-23 17:44:07 +03:00
Klaas Freitag
a0353249f1 Remove a database column comment that just blows the log file. 2012-08-23 17:44:07 +03:00
Klaas Freitag
868a07c322 Update the md5 also if the instruction is not UPDATE. 2012-08-23 17:44:07 +03:00
Klaas Freitag
f4c9ced446 Handle ID change propagation to the top directory. 2012-08-23 17:43:51 +03:00
Klaas Freitag
1c6da9c0bb Update the md5 sum of files in merge. 2012-08-23 17:43:51 +03:00
Klaas Freitag
e3638ced2c Add csync_get_file_id function for modules. 2012-08-23 17:43:51 +03:00
Klaas Freitag
62b49e8bcc Query ids from database for local files, remove bogus code. 2012-08-23 17:43:51 +03:00
Klaas Freitag
9bd9949d68 Fixed merge conflict, only one md5 needed. 2012-08-23 17:43:21 +03:00
Klaas Freitag
ede710843b Added csync_vio_file_id function and removed unused previous code. 2012-08-23 17:42:51 +03:00
Klaas Freitag
20f4ee16cc removed unneeded initialisations. 2012-08-23 17:42:33 +03:00
Klaas Freitag
3fb3f78446 Add a visible log entry at program start, easier to read log output. 2012-08-23 17:41:53 +03:00
Klaas Freitag
d8967a2bd1 try to propagate EVAL status up by detecting changes in underlying 
directories. That does not work as the reconciler runs through the
directoires in the wrong order, ie. the outermost first.
 2012-08-23 17:41:53 +03:00
Klaas Freitag
c2e2f8de00 more md5 calculations 2012-08-23 17:41:53 +03:00
Klaas Freitag
f2d603108a more logging, ids added. 2012-08-23 17:41:53 +03:00
Klaas Freitag
ae1b8a5682 Query new id for local repository because of utimes changes. 2012-08-23 17:41:53 +03:00
Klaas Freitag
0618eb956d Merge conflicts solved. 2012-08-23 17:40:36 +03:00
Klaas Freitag
ae5394ad75 UniqID based syncing, first WIP state. 2012-08-23 17:38:44 +03:00
Klaas Freitag
d2ba37a419 Resolved merge conflict. 2012-08-23 17:38:25 +03:00
Klaas Freitag
8e401e662f MD5 Support WIP 2012-08-23 17:34:19 +03:00
Klaas Freitag
943e960bc0 Fixed merge conflict. 2012-08-23 17:34:02 +03:00
Klaas Freitag
2a40106e70 Fixed merge conflict. 2012-08-23 17:33:41 +03:00
Klaas Freitag
faf1970e3a Avoid a null pointer dereference. 2012-08-20 19:11:46 +03:00
Klaas Freitag
ec63ab4e16 Fix: If no database entry exists, the status is set to NEW. 2012-08-20 19:11:18 +03:00
Klaas Freitag
4a6b0e7241 Remove a database column comment that just blows the log file. 2012-08-20 19:10:29 +03:00
Klaas Freitag
bc1e59a048 Update the md5 also if the instruction is not UPDATE. 2012-08-20 19:10:03 +03:00
Klaas Freitag
d9267f7928 Handle ID change propagation to the top directory. 2012-08-17 16:48:56 +03:00
Klaas Freitag
972412e436 Update the md5 sum of files in merge. 2012-08-17 16:48:15 +03:00
Klaas Freitag
38cf0f2704 Add csync_get_file_id function for modules. 2012-08-17 16:46:50 +03:00
Klaas Freitag
0443764308 Query ids from database for local files, remove bogus code. 2012-08-17 16:46:07 +03:00
Klaas Freitag
7dcb9ffdeb Added id lists to context type and removed change counter. 2012-08-17 16:45:12 +03:00
Klaas Freitag
fcba1cefce Added csync_vio_file_id function and removed unused previous code. 2012-08-17 16:44:38 +03:00
Klaas Freitag
bac0002eeb Add a visible log entry at program start, easier to read log output. 2012-08-17 16:42:23 +03:00
Klaas Freitag
0147063090 try to propagate EVAL status up by detecting changes in underlying 
directories. That does not work as the reconciler runs through the
directoires in the wrong order, ie. the outermost first.
 2012-08-15 16:32:10 +03:00
Klaas Freitag
19f52313a8 more md5 calculations 2012-08-15 12:46:36 +03:00
Klaas Freitag
142ef140f0 more logging, ids added. 2012-08-14 16:32:23 +03:00
Klaas Freitag
eb019905e4 Query new id for local repository because of utimes changes. 2012-08-14 16:31:52 +03:00
Klaas Freitag
b37096354f Fix url to calculate hash 2012-08-14 16:31:01 +03:00
Klaas Freitag
cf24513879 Merge branch 'dav' of ssh://milliways.cryptomilk.org/users/freitag/csync into md5 
Conflicts:
	modules/csync_owncloud.c
	src/csync_private.h
	src/csync_reconcile.c
	src/vio/csync_vio.c
 2012-08-13 15:24:15 +03:00
Klaas Freitag
2bc171e520 Set version to 0.50.8 2012-08-09 17:07:44 +03:00
Klaas Freitag
76b09b3c14 Fix rename: Exclude directories and set mtimes accordingly. 2012-08-09 16:59:08 +03:00
Klaas Freitag
452babe593 Improved error report on proxy- and connection problems. 2012-08-09 15:12:22 +03:00
Klaas Freitag
cbb09aeb0a Sync based on uniqIDs WIP 2012-08-06 09:22:21 +02:00
Klaas Freitag
3ae996c688 Fixed rename support for Win32. Need to use unit64 instead of ino_t. 2012-08-03 18:48:44 +03:00
Klaas Freitag
253605758e Use remote rename if local rename is detected. 2012-08-02 16:58:54 +03:00
Klaas Freitag
5b38e2cb5a Improved logging in error case (minor fix). 2012-07-31 17:58:49 +03:00
Klaas Freitag
abef7eb3d2 UniqID based syncing, first WIP state. 2012-07-31 11:40:46 +03:00
Thomas Mueller
d4e808d45a use custom FindOpenSSL only for cross compilation in any other cases it is used from the local system 2012-07-30 13:27:59 +03:00
Thomas Mueller
9134955899 use custom FindOpenSSL only for cross compilation in any other cases it is used from the local system 2012-07-26 14:57:15 +03:00
Klaas Freitag
1352f6bc39 MD5 Support WIP 2012-07-24 09:36:06 +02:00
Klaas Freitag
85993d2650 Don't override error code set by timedif in vio init 2012-07-19 21:21:33 +02:00
Klaas Freitag
1104619a52 No atime on apple platform. 2012-07-19 21:11:35 +02:00
Klaas Freitag
b57f33353d fixed copy and paste errors in error output. 2012-07-19 21:06:18 +02:00
Klaas Freitag
cad3da10db Merge branch 'timedelta' into dav 2012-07-19 15:53:12 +02:00
Klaas Freitag
2b4261f15a Added functions to generate MD5-Sums based on openssl with tests. 2012-07-18 17:00:46 +02:00
Klaas Freitag
1866956984 use lstat instead of stat to stat files. Avoids problems with links. 2012-07-11 16:48:38 +02:00
Klaas Freitag
e90b4a13b3 Added logging of the time values. 2012-07-11 16:05:40 +02:00
Klaas Freitag
59202fffe4 fixed spaces and logging if timesync is needed for the module. 2012-07-11 16:03:31 +02:00
Klaas Freitag
0ed8c57cad make proper logging of the module capabilities. 2012-07-09 16:46:14 +02:00
Klaas Freitag
bcb31b6998 Merge branch 'dav' of ssh://milliways.cryptomilk.org/users/freitag/csync into dav 
Conflicts:
	src/csync.c
	src/csync_propagate.c
	src/std/c_private.h
	src/vio/csync_vio.c
 2012-07-09 16:39:11 +02:00
Klaas Freitag
7fb929a82d use lstat instead of stat for local files, fix oCB #713. 2012-07-09 16:15:27 +02:00
Klaas Freitag
43685f69a3 do the capabilities after the module was initialized. 2012-07-09 14:45:05 +02:00
Klaas Freitag
b9329f2991 undef malloc only if not doing UNIT_TESTING. 2012-07-09 14:09:34 +02:00
Klaas Freitag
c0f1f36f59 Fix condition on when atomar push is allowed, never for local files. 2012-07-09 13:26:20 +02:00
Dominik Schmidt
77d71eb080 Load plugins on MacOSX. 2012-07-09 13:26:20 +02:00
Klaas Freitag
065529642e Ability to push to remote without using a tempfile to copy to. 
Modules such as ownCloud make sure anyway that the upload to a
remote resource happens atomar. This patch allows to switch off
the default behaviour of first copying to a temp file in the
same directory. Use csync_set_remote_push_atomar function to
switch off.
 2012-07-09 13:26:20 +02:00
Klaas Freitag
037532d73b win32: Fix random file name generation, init random generator once. 2012-07-09 13:26:20 +02:00
Klaas Freitag
09b82ea7cd do not log on stderr on MacOSX because that spams system log 2012-07-09 13:26:00 +02:00
Klaas Freitag
f802b54f6f set version to 0.50.7 2012-07-09 13:26:00 +02:00
Klaas Freitag
62acdc3b8c win32: use wide char variant of CopyFile for file copy. 2012-07-09 13:26:00 +02:00
Klaas Freitag
d7deaf3448 win32: Use wide character variant of GetSpecialFolderPath to get home. 2012-07-09 13:26:00 +02:00
Klaas Freitag
9f900266f4 Added a newline in case the logging callback is zero. 2012-07-09 13:25:59 +02:00
Klaas Freitag
f2439d83f0 Fix wide character support for the mkdir definition. 2012-07-09 13:25:59 +02:00
Klaas Freitag
5734a31b60 Add ability to log to a callback for the csync library. 2012-07-09 13:25:59 +02:00
Klaas Freitag
03476b3a11 Set the correct define to the new released version 0.50.6. 2012-07-09 13:25:59 +02:00
Klaas Freitag
a47ddb59ae Win32: Chdir to app path before searching module relative. 2012-07-09 13:25:59 +02:00
Klaas Freitag
1d55691e75 Do not log on Apple by default as that goes to ASL 2012-07-09 13:25:59 +02:00
Klaas Freitag
b261ecb705 Do proper handling of Win32 special characters. 
Introduced a tchar based handling of wide character encoding that
is happening on Windows platforms.
 2012-07-09 13:25:59 +02:00
Klaas Freitag
1fe093b6b6 Fixed local treewalk function filter comment. 2012-07-09 13:25:59 +02:00
Klaas Freitag
992f0d6b87 ownCloud: set correct module load error code. 2012-07-09 13:25:59 +02:00
Klaas Freitag
1939ea93f5 Moved error_code to context for thread savety. 2012-07-09 13:25:46 +02:00
Klaas Freitag
c1c36a15c4 Pushed version to 0.50.5 and lib version 0.1.5 for next oC release. 2012-07-09 13:25:46 +02:00
Klaas Freitag
ecb409bc06 Added errnos to the timediff function to allow specific error reports. 2012-07-09 13:25:46 +02:00
Dominik Schmidt
d5de27f289 Apple: Fix loading plugins inside bundles. 2012-07-09 13:25:33 +02:00
Dominik Schmidt
a216790c28 do plugins on apple 2012-07-09 13:25:11 +02:00
Dominik Schmidt
8d5af96f46 Compile cstdlib with -fPIC 2012-07-09 13:25:11 +02:00
Dominik Schmidt
fcb3aa6208 Define O_NOATIME to 0 if it's not there 2012-07-09 13:24:15 +02:00
Klaas Freitag
8be6ebb1de Push csync release to next internal beta 0.50.4. 2012-07-09 13:23:49 +02:00
Klaas Freitag
221de3c866 Added a csync_errno function to provide more info for clients. 2012-07-09 13:23:49 +02:00
Klaas Freitag
dc2148aa15 Removed a stat call that is just for a file size check. 2012-07-09 13:23:48 +02:00
Klaas Freitag
e28c530d13 Version to 0.50.3 for a next beta 2012-07-09 13:23:48 +02:00
Klaas Freitag
de209ecdb9 ownCloud: Don't require time sync between server and client. 2012-07-04 16:32:17 +02:00
Klaas Freitag
6eb4e707d9 Add module capability about if a post copy size check is required. 2012-07-04 15:03:15 +02:00
Klaas Freitag
8ba2f483bf Add a vio capabilites function to let a module define its capabilities. 2012-07-04 13:56:24 +02:00
Klaas Freitag
98bc5098c9 Merge branch 'dav' of ssh://milliways.cryptomilk.org/users/freitag/csync into dav 
Conflicts:
	src/csync_propagate.c
 2012-07-01 15:27:41 +02:00
Klaas Freitag
f31c74743c Fix condition on when atomar push is allowed, never for local files. 2012-06-26 18:30:50 +02:00
Klaas Freitag
8034da83cc Ability to push to remote without using a tempfile to copy to. 
Modules such as ownCloud make sure anyway that the upload to a
remote resource happens atomar. This patch allows to switch off
the default behaviour of first copying to a temp file in the
same directory. Use csync_set_remote_push_atomar function to
switch off.
 2012-06-26 18:30:50 +02:00
Klaas Freitag
92ec13d886 win32: Fix random file name generation, init random generator once. 2012-06-26 18:30:50 +02:00
Klaas Freitag
e129d02024 do not log on stderr on MacOSX because that spams system log 2012-06-26 18:28:38 +02:00
Klaas Freitag
d3d3454aaa Set csync version to 0.50.7. 2012-06-26 18:28:18 +02:00
Klaas Freitag
cd7aec1636 Do not log "module not found" messages if there is a second try. 2012-06-26 18:28:18 +02:00
Klaas Freitag
6fc93f64a4 win32: use wide char variant of CopyFile for file copy. 2012-06-26 18:28:18 +02:00
Klaas Freitag
4253194fa0 win32: Use wide character variant of GetSpecialFolderPath to get home. 2012-06-26 18:28:18 +02:00
Klaas Freitag
1fe6db6b2b Fix wide character support for the mkdir definition. 2012-06-26 18:28:18 +02:00
Klaas Freitag
5e040d47d6 Add ability to log to a callback for the csync library. 2012-06-26 18:28:07 +02:00
Klaas Freitag
84bf91b711 Win32: Chdir to app path before searching module relative. 2012-06-26 18:28:07 +02:00
Klaas Freitag
7ec663a0c6 Do not log on Apple by default as that goes to ASL 2012-06-26 18:28:07 +02:00
Klaas Freitag
36cf074337 Set version to 0.50.6 for next oC version. 2012-06-26 18:27:47 +02:00
Klaas Freitag
a0fe623ab6 Do proper handling of Win32 special characters. 
Introduced a tchar based handling of wide character encoding that
is happening on Windows platforms.
 2012-06-26 18:27:47 +02:00
Klaas Freitag
2fb8672d3e Fixed local treewalk function filter comment. 2012-06-26 18:27:26 +02:00
Dominik Schmidt
02b617b536 Load plugins on MacOSX. 2012-06-26 18:24:39 +02:00
Dominik Schmidt
4c6a1356a1 Compile cstdlib with -fPIC. 2012-06-26 18:24:39 +02:00
Klaas Freitag
798dbb408f Pushed version to 0.50.5 and lib version 0.1.5 for next oC release. 2012-06-26 18:24:39 +02:00
Dominik Schmidt
56e6b900db Define O_NOATIME to 0 if it's not there 2012-06-26 18:24:39 +02:00
Klaas Freitag
531c09f5b3 Push csync release to next internal beta 0.50.4. 2012-06-26 18:24:39 +02:00
Klaas Freitag
b0f6602681 Added a csync_errno function to provide more info for clients. 2012-06-26 18:24:08 +02:00
Klaas Freitag
55c3b0862c Zero'ed a stat call that is just for a file size check. 2012-06-26 18:20:16 +02:00
Klaas Freitag
9286647262 Version to 0.50.3 for a next beta 2012-06-26 18:20:16 +02:00
Klaas Freitag
357b5cd5f3 Ability to push to remote without using a tempfile to copy to. 
Modules such as ownCloud make sure anyway that the upload to a
remote resource happens atomar. This patch allows to switch off
the default behaviour of first copying to a temp file in the
same directory. Use csync_set_remote_push_atomar function to
switch off.
 2012-06-22 15:32:04 +02:00
Klaas Freitag
9836ec864a win32: Fix random file name generation, init random generator once. 2012-06-20 10:40:40 +02:00
Klaas Freitag
26aff2d744 Bumped version to 0.50.7 2012-06-18 17:25:32 +02:00
Andreas Schneider
28e4963647 time: Make the timediff a hidden file. 2012-06-18 16:20:28 +02:00
Klaas Freitag
370e2e451f do not log on stderr on MacOSX because that spams system log 2012-06-18 13:02:06 +02:00
Klaas Freitag
c1953d61c7 Do not log "module not found" messages if there is a second try. 2012-06-18 10:43:07 +02:00
Klaas Freitag
9b64825c69 win32: use wide char variant of CopyFile for file copy. 2012-06-13 17:32:13 +02:00
Klaas Freitag
26191448e7 win32: Use wide character variant of GetSpecialFolderPath to get home. 2012-06-13 17:30:50 +02:00
Klaas Freitag
d1ae05166d Added a newline in case the logging callback is zero. 2012-06-08 12:52:48 +02:00
Klaas Freitag
13847b9249 Fix wide character support for the mkdir definition. 2012-06-08 12:52:06 +02:00
Klaas Freitag
39534fb5de Add ability to log to a callback for the csync library. 2012-06-05 17:11:33 +02:00
Klaas Freitag
17450f1f4b Set the correct define to the new released version 0.50.6. 2012-05-21 09:43:42 +02:00
Klaas Freitag
7f9003bc83 Win32: Chdir to app path before searching module relative. 2012-05-18 12:56:03 +02:00
Klaas Freitag
a9ac5bf752 Do not log on Apple by default as that goes to ASL 2012-05-16 12:42:00 +02:00
Klaas Freitag
33d1825551 Merge branch 'dav' of http://git.csync.org/users/freitag/csync into dav 
Conflicts:
	src/csync.c
 2012-05-15 16:17:51 +02:00
Klaas Freitag
a198f36bf5 ownCloud: set correct module load error code. 2012-05-15 16:15:27 +02:00
Klaas Freitag
9ec8d70822 Do proper handling of Win32 special characters. 
Introduced a tchar based handling of wide character encoding that
is happening on Windows platforms.
 2012-05-09 16:55:56 +02:00
Klaas Freitag
81a6b49c07 Fixed local treewalk function filter comment. 2012-05-07 15:47:57 +02:00
Klaas Freitag
d9ae749dcf Merge branch 'dav' of ssh://milliways.cryptomilk.org/users/freitag/csync into dav 
Conflicts:
	modules/csync_owncloud.c
	src/csync.h
 2012-05-04 14:25:01 +02:00
Klaas Freitag
522a6e27a2 Set module load error code after csync_vio_init failed. 2012-05-04 12:07:20 +02:00
Klaas Freitag
2b5d31b29e Moved error_code to context for thread savety. 2012-05-04 12:07:20 +02:00
Klaas Freitag
73bcdb73a7 Added errnos to the timediff function to allow specific error reports. 2012-05-04 12:05:45 +02:00
Dominik Schmidt
c4667c893b Fix loading plugins inside MacOSX bundles. 2012-05-04 12:05:22 +02:00
Dominik Schmidt
4c98f6bcd8 Load plugins on apple. 2012-05-04 12:04:36 +02:00
Dominik Schmidt
a8c10780f2 Compile cstdlib with -fPIC. 2012-05-04 12:04:30 +02:00
Dominik Schmidt
5ac2f676d7 Define O_NOATIME to 0 if it's not there. 2012-05-04 12:03:53 +02:00
Klaas Freitag
e4fae59bcf Added a csync_errno function to provide more info for clients. 2012-05-04 12:00:46 +02:00
Klaas Freitag
0d71347508 Removed a stat call that is just for a file size check. 2012-05-04 12:00:46 +02:00
Klaas Freitag
cc5d2866b1 Set module load error code after csync_vio_init failed. 2012-04-19 16:12:05 +02:00
Klaas Freitag
6f51876b45 Moved error_code to context for thread savety. 2012-04-17 12:31:27 +02:00
Dominik Schmidt
13f05db934 cmake: Make Log4C optional. 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-04-17 11:21:03 +02:00
Klaas Freitag
44a078b991 Win32: Add win32 rename function that overwrites existing targets. 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-04-17 10:49:51 +02:00
Klaas Freitag
0bedd5d9a3 Win32: Disabled Query per inode, always returning NULL. 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-04-17 10:49:29 +02:00
Klaas Freitag
ec921a1e51 Win32: Added some specific headers to c_private.h to fix build. 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-04-17 10:47:56 +02:00
Andreas Schneider
fdc1a71050 csync: Use uint32_t for uid and gid. 2012-04-17 10:46:58 +02:00
Klaas Freitag
d2ae109cc3 Win32: substitute uid_t and gui_t and removed a not needed include. 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-04-17 10:46:04 +02:00
Klaas Freitag
2ac172f4fe update: Add new exported file tree traverse functions. 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-04-17 10:45:04 +02:00
Klaas Freitag
f0d2943e5f Do not bail out if the config can't be read, use default values. 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-04-17 10:42:36 +02:00
Klaas Freitag
5e7d5c983a win32: Copy the default conf file from the application dir. 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-04-17 10:42:01 +02:00
Klaas Freitag
f292c01eac Read $HOME variable first before checking the password file entry. 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-04-17 10:40:35 +02:00
Klaas Freitag
871dde4911 Added ability to limit the csync run to the local tree only. 
That gives apps the chance to use the efficient treewalk of csync
to get information on the tree.

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-04-17 10:40:21 +02:00
Klaas Freitag
53263a2685 owncloud: set _fmode variable to set file ops to binary mode. 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-04-17 10:40:21 +02:00
Klaas Freitag
db614ecf34 Pushed version to 0.50.5 and lib version 0.1.5 for next oC release. 2012-04-17 10:36:52 +02:00
Klaas Freitag
e32d02c984 Added errnos to the timediff function to allow specific error reports. 2012-04-16 09:33:40 +02:00
Dominik Schmidt
f355bef266 Fix loading plugins inside bundles 2012-04-15 14:36:11 +02:00
Dominik Schmidt
8312e4430c do plugins on apple 2012-04-15 14:13:07 +02:00
Dominik Schmidt
d768ad7f0f Compile cstdlib with -fPIC 2012-04-14 14:54:14 +02:00
Dominik Schmidt
7b2d1da3b7 Define O_NOATIME to 0 if it's not there 2012-04-14 03:13:28 +02:00
Klaas Freitag
6620d68c5e Push csync release to next internal beta 0.50.4. 2012-04-14 03:13:28 +02:00
Klaas Freitag
285baa6fb7 Added a csync_errno function to provide more info for clients. 2012-04-14 03:13:27 +02:00
Klaas Freitag
10c11cc5e8 Removed a stat call that is just for a file size check. 2012-04-14 03:13:27 +02:00
Klaas Freitag
a64ce22997 Win32: Add win32 rename function that overwrites existing targets. 2012-04-14 03:13:27 +02:00
Klaas Freitag
270a4262b4 Win32: Disabled Query per inode, always returning NULL. 2012-04-14 03:13:27 +02:00
Klaas Freitag
b815e169f1 ownCloud: Disabled useless debugging output. 2012-04-14 03:13:27 +02:00
Klaas Freitag
3979492914 Version to 0.50.3 for a next beta 2012-04-14 03:13:27 +02:00
Klaas Freitag
a4865cfdf4 Win32: Added some specific headers to c_private.h to fix build. 2012-04-14 03:13:27 +02:00
Klaas Freitag
4730d80738 Win32: substitute uid_t and gui_t and removed a not needed include. 2012-04-14 03:13:27 +02:00
Klaas Freitag
254045780a Add new exported file tree traverse functions. 2012-04-14 03:13:27 +02:00
Klaas Freitag
4a0713370e Do not bail out if the config can't be read, use default values. 2012-04-14 03:13:27 +02:00
Klaas Freitag
1634a8bdf4 Win32: copy the default conf file from the application dir. 2012-04-14 03:13:27 +02:00
Klaas Freitag
48579fe73f Disable config file copy for Win32 platform. 2012-04-14 03:13:27 +02:00
Klaas Freitag
becb03ad97 Read $HOME variable first before checking the password file entry. 2012-04-14 03:13:27 +02:00
Klaas Freitag
1a329539ec Added ability to limit the csync run to the local tree only. 
That gives apps the chance to use the efficient treewalk of csync
to get information on the tree.
 2012-04-14 03:13:26 +02:00
Klaas Freitag
b6ad8635d6 owncloud: set _fmode variable to set file ops to binary mode. 2012-04-14 03:13:26 +02:00
Klaas Freitag
f7c8e9f26c std: Renamed struct_stat to csync_stat_t and use c_private.h again. 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-04-14 03:13:26 +02:00
Dominik Schmidt
9d73d7705d Make LOG4C optional 2012-04-14 00:05:52 +02:00
Klaas Freitag
3ae453cc36 std: Renamed struct_stat to csync_stat_t and use c_private.h again. 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-03-21 13:48:41 +01:00
Klaas Freitag
dbc9576876 Fix use of strerror_r on non GNU platforms. 2012-03-19 12:40:43 +01:00
Klaas Freitag
6300e78816 Fix use of strerror_r on non GNU platforms. 2012-03-19 12:40:43 +01:00
Klaas Freitag
8b9c10246e Fix use of strerror_r on non GNU platforms. 2012-03-19 12:40:43 +01:00
Klaas Freitag
f0a84bb5da Fix use of strerror_r on non GNU platforms. 2012-03-19 12:40:43 +01:00
Klaas Freitag
a0e0caa5b8 Fix use of strerror_r on non GNU platforms. 2012-03-19 12:40:43 +01:00
Klaas Freitag
ffd2e0e767 Fixed file copy for Win32 platform by using API function FileCopy. 2012-03-19 12:40:30 +01:00
Andreas Schneider
e409d0fae9 time: Use correct abs() function for long long. 2012-03-07 16:17:43 +01:00
Andreas Schneider
f0cf678c0e Fix config checks. 2012-03-02 17:04:02 +01:00
Dominik Schmidt
3ed887f152 windows: don't use malloc directly in csync_get_[user_home_dir||local_username] 2012-03-02 17:04:02 +01:00
Dominik Schmidt
4c22c84bd1 windows: fix loading plugins 2012-03-02 17:04:02 +01:00
Dominik Schmidt
00c47f62c4 windows: install libcsync.dll to bin/ 2012-03-02 17:04:02 +01:00
Dominik Schmidt
94006d0171 windows: don't refer to SYSCONFDIR 2012-03-02 17:04:02 +01:00
Dominik Schmidt
593cd4514a windows: disable locks 2012-03-02 17:04:02 +01:00
Dominik Schmidt
6e4ce19a85 Add csync_fnmatch 2012-03-02 17:04:02 +01:00
Dominik Schmidt
d1ea29f4aa Don't check for links on non-unix platforms 2012-03-02 17:04:02 +01:00
Dominik Schmidt
6272a2b485 Use stat if lstat is not available 2012-03-02 17:04:02 +01:00
Dominik Schmidt
da286857e0 windows: add utimes implementation 2012-03-02 17:04:02 +01:00
Dominik Schmidt
674aa7cd64 windows: add strerror_r implementation 2012-03-02 17:04:02 +01:00
Dominik Schmidt
31389975e7 Add missing break statement 2012-03-02 17:04:02 +01:00
Dominik Schmidt
ee6c631f28 windows: add missing status codes, types and return-values 2012-03-02 17:04:02 +01:00
Dominik Schmidt
29f45a4ee5 windows: minor adjustments 2012-03-02 17:04:02 +01:00
Andreas Schneider
1d9b4f0640 std: Make it possible to use the macros alone. 2012-03-02 17:02:59 +01:00
Andreas Schneider
9d6001d39d std: Add missing include. 2012-03-02 17:02:59 +01:00
Andreas Schneider
29839d42a8 misc: Add missing header file guard and update copyright. 2012-03-02 13:47:45 +01:00
Andreas Schneider
9c86b3adcd csync: Use csync_get_user_home_dir(). 2012-03-02 13:40:10 +01:00
Andreas Schneider
3952c4be62 misc: Add csync_get_user_home_dir() and csync_get_local_username(). 2012-03-02 13:40:05 +01:00
Andreas Schneider
cd2c75e602 Increase version numbers for beta release. 2012-02-22 18:27:09 +01:00
Klaas Freitag
784fc60ec1 Fix off-by-one error in url rewrite for SSL. 2012-02-22 18:23:18 +01:00
Andreas Schneider
f753a3db0a util: Rename temp file of the unix extension test. 2012-02-22 16:18:07 +01:00
Andreas Schneider
9a12d219d3 vio: Add support for SSL scheme names. 
If the scheme is https try to load the module without the s at the end
if there is no module.
 2012-02-13 14:33:23 +01:00
Andreas Schneider
63565b0f26 time: Fix clock_gettime(). 2012-02-04 14:24:22 +01:00
Andreas Schneider
19abbc04ff csync: Use csync_gettime(). 2012-02-04 13:24:53 +01:00
Andreas Schneider
1d609e5985 time: Add csync_gettime() function. 2012-02-04 13:09:07 +01:00
Andreas Schneider
331783baef propagate: Remove dead and wrong assignments. 2012-02-04 12:54:15 +01:00
Andreas Schneider
8e89bfec2b propagate: Fix dead assignment. 2012-02-04 12:47:39 +01:00
Andreas Schneider
82c2017a04 path: Fix dead assignment. 2012-02-04 12:44:15 +01:00
Andreas Schneider
eb2b3438ba lock: Fix unlink in error path. 2012-02-04 12:41:55 +01:00
Andreas Schneider
9f802a83f3 propagate: Fix some blank lines. 2012-02-04 12:37:33 +01:00
Andreas Schneider
b99fd213b6 vio: Fix build errors. 2012-02-04 12:34:46 +01:00
Andreas Schneider
de2cb55f0e propagate: Remove unused variables. 2012-02-04 12:28:51 +01:00
Andreas Schneider
6dca82a4a1 reconcile: Fix return value. 2012-02-04 12:26:27 +01:00
Andreas Schneider
4e5b29257e include: Fix packed attribute for file structure. 2012-02-04 12:23:54 +01:00
Andreas Schneider
1c52b90fa4 Pack the csync_file_stat structure. 2012-02-04 12:15:48 +01:00
Christian Jann
ffd7d5b247 better idea to align the INSTRUCTIONs printf(%-20s,...) 2011-04-12 19:42:08 +02:00
Christian Jann
9c40ecafc4 csync.reconciler: show the correct type: "file" or "dir" 2011-04-12 17:59:25 +02:00
Christian Jann
deb620b5be align everything correctly (easier to read) 
prefix "CSYNC_": no extra information -> removed
we could even remove "INSTRUCTION_" or change it to "INST_"
 2011-04-12 17:09:39 +02:00
Christian Jann
a8071bfd14 csync.propagator/csync.reconciler first print instruction type, 
than print the path and align everything correctly (easier to read)
 2011-04-12 17:06:18 +02:00
Christian Jann
f65612ff2e hide instruction NONE messages when log level is set to debug, 
only show these messages on log level trace
 2011-04-12 13:20:50 +02:00
Christian Jann
aad3e146fc set instruction after conflict backup for the statedb merger to NONE 2011-04-12 10:09:41 +02:00
Christian Jann
92dc16a59e Increase version numbers. 2011-04-06 17:08:52 +02:00
Christian Jann
9864baa0c8 fixed small error: 
csync/first/a~
was renamed to:
csync/first/~a_conflict-20110326-190457~
but it should be:
csync/first/a_conflict-20110326-190457~
 2011-04-06 17:08:01 +02:00
Christian Jann
d842119065 improved logging 2011-04-06 17:07:20 +02:00
Christian Jann
e4d8e793f6 added new conflict resolution to libcsync 
- use the latest version of the two files under its original filename
  in both destinations (same as currently implemented)
- additionally, create a copy of the older file under a different name
  using the same file extension with appended marker (e.g. "conflict")
  and timestamp in both destinations
  (e.g. textfile.odt -> textfile_conflict-20100222-105000.odt)
- At the Moment 'textfile_conflict-20100222-105000.odt' is only created
  on the side where the conflict has occurred and gets synced to the other side
  on the second sync.
 2011-04-06 16:57:24 +02:00
Christian Jann
09980fcf5a fix hundreds of these warnings: 
csync.c:272:75: warning: ISO C99 requires rest arguments to be used
 2011-04-06 16:56:05 +02:00
Andreas Schneider
3a9bfdb489 Increase version numbers. 2010-02-15 11:56:35 +01:00
Andreas Schneider
6c2c86aa50 Fixed build warning. 2009-09-12 12:27:03 +02:00
Andreas Schneider
16c76166bd Improve detection of system libraries. 2009-09-01 12:25:10 +02:00
Andreas Schneider
312c40d16f Improve c_list_find functions. 2009-06-05 11:22:06 +02:00
Andreas Schneider
f98265b30e Some code cleanups. 2009-06-05 10:51:22 +02:00
Andreas Schneider
460aa67dca Document the propagation functions. 2009-05-25 12:58:34 +02:00
Andreas Schneider
778640f1e1 Fix the documentation of the reconciliation. 2009-05-25 12:58:00 +02:00
Andreas Schneider
62b33fbf2d Fix textwidth. 2009-05-25 11:59:30 +02:00
Andreas Schneider
7c88ed8454 Document Reconcilation. 2009-05-25 11:58:51 +02:00
Andreas Schneider
022731b241 Add a group for update detection functions. 2009-05-25 11:58:31 +02:00
Andreas Schneider
7ab802a3b2 Document update detection functions. 2009-05-25 11:42:46 +02:00
Andreas Schneider
3c05e000f8 Reformat some code in update detection functions. 2009-05-25 11:33:18 +02:00
Andreas Schneider
f57576f08a Cleanup c_list_insert_sorted(). 2009-05-23 11:57:15 +02:00
Andreas Schneider
5dda8fdfa5 Some code reformating. 2009-05-22 20:23:54 +02:00
Andreas Schneider
1d7ce7d5fe Improve the documentation of csync_excluded(). 2009-05-22 20:21:20 +02:00
Andreas Schneider
dd3c9cd99e Document csync_config_load(). 2009-05-22 20:19:06 +02:00
Andreas Schneider
6e893ab31c Document the return value of c_list_remove(). 2009-05-21 11:53:07 +02:00
Andreas Schneider
f79b291646 Add a c_rmdirs() function. 2009-05-14 17:22:42 +02:00
Andreas Schneider
fdea54edc5 Fix the vim modlines. 2009-05-13 10:12:07 +02:00
Andreas Schneider
df5a8d6662 Add a macro to get the size of an array. 2009-05-06 19:35:21 +02:00
Andreas Schneider
73548e8a16 Merge branch 'master' of git://git.csync.org/projects/csync/csync 2009-04-29 10:08:34 +02:00
Andreas Schneider
e7a495dc50 Fix a segfault in c_uppercase and c_lowercase. 2009-04-29 09:55:32 +02:00
Andreas Schneider
9de1f977b5 Cleanup some code of the doubly-linked list. 2009-04-25 10:57:46 +02:00
Andreas Schneider
867a8cb246 Reformat some code. 2009-04-22 13:41:46 +02:00
Andreas Schneider
e7a09af755 Add a function to uppercase and to lowercase a string. 2009-04-21 09:05:40 +02:00
Andreas Schneider
7d0393338c Fix possible precedence problems. 2009-03-27 00:00:49 +01:00
Andreas Schneider
5d84518f00 Fix comment typos ;) 2009-03-26 18:23:43 +01:00
Andreas Schneider
e948cf6880 Document all public functions. 2009-03-26 11:24:34 +01:00
Andreas Schneider
3c618a3d7d Add possibility to pass userdata to the auth function. 2009-03-26 11:09:46 +01:00
Andreas Schneider
c826f021d6 Improve the version function. 2009-03-26 10:40:16 +01:00
Andreas Schneider
20048b238d Cosmetic change for a define. 2009-03-26 10:27:04 +01:00
Andreas Schneider
25f83f1764 Cleanup dirname and basename code. 2009-03-18 20:19:37 +01:00
Andreas Schneider
0634e0fdea Don't require a C++ compiler. 2009-03-18 10:55:14 +01:00
Andreas Schneider
467c082368 Set version to 0.42.0. 2009-02-10 12:50:26 +01:00
Andreas Schneider
a18202744d Change versions to 0.42.0 rc3 and add changelog entries. 2009-01-23 14:44:54 +01:00
Andreas Schneider
dd23c4ecbf Add some comments. 2009-01-23 14:10:08 +01:00
Andreas Schneider
e69976bc88 Fix a bug where the wrong function for deletion was executed. 
Thanks to David Wooldridge for all the testing.
 2009-01-23 14:07:34 +01:00
Andreas Schneider
2331568f08 Fix a segfault if we use a local path. 2009-01-22 15:21:06 +01:00
Andreas Schneider
ecca37d2a1 Normalize the path to <host>/<path> for the statedb filename. 
This should fix problem if a user uses pam_csync and csync with different
urls (#27).
 2009-01-22 14:44:06 +01:00
Andreas Schneider
228a19abf4 Add min and max macros. 2009-01-22 14:43:37 +01:00
Andreas Schneider
c5104e8da3 Rename variable to unix_extensions. 2009-01-19 11:32:58 +01:00
Andreas Schneider
2ffe986dc1 Don't exclude paths. 2009-01-15 23:14:46 +01:00
Andreas Schneider
e0807cba1b Add a check if we are operating remote on a unix filesystem. 
This extends the exclude function. Maybe we should do this for the local
too.
 2009-01-13 15:50:44 +01:00
Andreas Schneider
f6a956e248 Set the version numbers for 0.42.0 rc2/gmc. 2009-01-07 13:10:28 +01:00
Andreas Schneider
a9150e9e2a Initialize some variables. 2008-12-23 13:54:57 +01:00
Andreas Schneider
6d20c8b4fc Install the modules to a version directory. 
The directory version number is the soversion of the library.
 2008-12-16 15:03:57 +01:00
Andreas Schneider
9152e25f8f Fix the format for the inode number in the mprintf. 2008-12-14 18:27:24 +01:00
Andreas Schneider
1047431e4c Fix a typo. 2008-12-13 23:29:16 +01:00
Andreas Schneider
600b8657de Prepare for 0.42.0 rc1. 2008-12-05 14:51:01 +01:00
Andreas Schneider
3b51103a60 Implement own function to create a random filename. 
This removes an uneeded syscall to lstat by mktemp at this point.
 2008-11-13 15:11:02 +01:00
Andreas Schneider
0681db0efe Reduce system calls of getuid and geteuid. 2008-11-13 14:08:26 +01:00
Andreas Schneider
1e70c74037 Set the replica to destination only once. 2008-11-13 14:06:22 +01:00
Andreas Schneider
d177c57cfe Check return value of mkdir in the mkdirs functions. 2008-11-13 10:53:24 +01:00