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