Klaas Freitag
1585cab673
Compare to explicit NULL for clearer code.
2013-04-08 09:11:25 +02:00
Klaas Freitag
a1ebf8556a
Fix for Coverity CID #996827
2013-04-08 09:07:19 +02:00
Andreas Schneider
85b565fcbe
csync: Use macros for CSYNC_STATUS checking.
2013-04-06 18:48:16 +02:00
Andreas Schneider
7934cde2db
csync: Pass the errno to csync_errno_to_status().
...
This is needed to be sure we are thread-safe. See also the manpage of
strerror_r(3).
2013-04-06 18:48:16 +02:00
Andreas Schneider
b701bf3d9b
csync: Rename UNSPEC_ERROR to UNSUCCESSFUL.
2013-04-06 18:48:16 +02:00
Klaas Freitag
4e6d54194f
Check for file equalness after having created a conflict file.
...
If the files are equal and the conflict was created because the
timestamps were screwed the conflict is removed again. This only
works on the local repository so far.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-06 18:48:11 +02:00
Klaas Freitag
9f7de96a73
Added c_compare_file function plus a test function.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-06 18:11:18 +02:00
Klaas Freitag
b8cf6f7f5c
Make VIO_METHOD_HAS_FUNC macro more robust.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-06 18:11:18 +02:00
Klaas Freitag
4280adc60a
More optimized database handling for csync journal build up.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-06 18:11:15 +02:00
Jenkins for ownCloud
8bae06802b
[tx-robot] updated from transifex
2013-04-06 00:06:25 +02:00
Olivier Goffart
68fdf56db7
Add an API to be able to pass information to the vio module.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:22 +02:00
Klaas Freitag
bec2c4a2ea
Added get_status_string function.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:22 +02:00
Klaas Freitag
3de8a78e1c
Added error_string handling, improved error handling.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:22 +02:00
Klaas Freitag
2204c94770
Introduce csync status codes
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:22 +02:00
Klaas Freitag
7c138efd0e
Rename csync_errno_to_csync_error to csync_errno_to_csync_status.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag
f4ee205fe9
Minor code cleanups, warning avoidings and indentation.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag
aada909836
Use multibyte character in file system functions.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag
33d57eec3c
Remove parenthesis to make Win32 compile and happy.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag
f5c9458079
Define iconv conversions as thread safe varialbe instead of static.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag
72dddfd7f5
Introduce csync status codes for a more detailed error reporting.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag
10863cd32d
Add CSYNC_STATUS_CODE, a general csync status code.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag
f8f82a9af2
Added custom errnos for use with csync in addition to the system errnos.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag
5de0173804
Fix for Coverity CID #996824
2013-04-05 15:08:28 +02:00
Klaas Freitag
5d5ee328b0
Fix for Coverity CID #996825
2013-04-05 15:05:44 +02:00
Andreas Schneider
e1edda17db
getpass: Don't fail if stdin is not a tty.
...
We don't need to manipulate the tty state (such as turning off echo)
when prompting for passwords if we're not reading from a tty.
2013-04-05 14:12:05 +02:00
Jenkins for ownCloud
a20f572448
[tx-robot] updated from transifex
2013-04-05 00:24:21 +02:00
Daniel Molkentin
28aa1448c1
Remove superfluous frees.
2013-04-04 18:31:01 +02:00
Daniel Molkentin
f74aa1e9a6
terminate if more than one thread is being started.
2013-04-04 17:25:53 +02:00
Klaas Freitag
86525570aa
Fix default config storage path.
2013-04-04 15:19:45 +02:00
Klaas Freitag
ec51a6933a
Improve c_tmpname function to generate tmp name properly.
2013-04-04 12:59:39 +02:00
Klaas Freitag
093b166319
Rename pi to progress_info.
2013-04-04 12:58:29 +02:00
Klaas Freitag
815f652f08
Move tmpname generation to utility function c_tmpname for cleander code.
2013-04-04 12:57:44 +02:00
Jenkins for ownCloud
d11ce781d0
[tx-robot] updated from transifex
2013-04-04 00:07:40 +02:00
Klaas Freitag
08d439129c
Fix some documentation in the code
2013-04-03 16:39:04 +02:00
Klaas Freitag
0bea2ea8f9
Push len computing to the right place.
2013-04-03 16:38:35 +02:00
Klaas Freitag
c745bf4291
Use correct printf qualifiers.
2013-04-03 16:37:55 +02:00
Klaas Freitag
be5a50a000
Merge branch 'confdir' of https://github.com/smessmer/mirall into smessmer-confdir
2013-04-03 14:42:13 +02:00
dragotin
7309a894bc
Merge pull request #477 from rominf/master
...
Fix for bug with folders adding
2013-04-03 04:39:17 -07:00
Olivier Goffart
9939e325cf
Fix crash when setting a NULL error
2013-04-03 10:53:20 +02:00
Jenkins for ownCloud
310f29d3fd
[tx-robot] updated from transifex
2013-04-03 00:04:53 +02:00
Daniel Molkentin
07db03d6bc
1.2.3
2013-04-02 15:27:37 +02:00
Daniel Molkentin
d68c4b379f
Unbreak self-signed certificate handling
2013-04-02 15:22:27 +02:00
Klaas Freitag
34668e42b3
Merge branch 'dav_0.70.5' into dav - WIP
...
Conflicts:
CMakeLists.txt
CPackConfig.cmake
src/csync.h
src/csync_update.c
tests/ownCloud/t1.pl
2013-04-02 14:44:01 +02:00
Daniel Molkentin
396a12dfde
Amend ChangeLog
2013-04-02 10:14:02 +02:00
Klaas Freitag
867595e1ef
Fix release date.
2013-04-02 10:01:28 +02:00
Jenkins for ownCloud
c79f4f91a8
[tx-robot] updated from transifex
2013-04-02 00:05:14 +02:00
Olivier Goffart
296011436a
Store the error string in the database when blacklisting
2013-03-28 13:54:01 +01:00
Olivier Goffart
6659ee6d76
store the error string for files in the tree
2013-03-28 13:54:01 +01:00
Klaas Freitag
bec2f7c9b9
Removed verbose logging on Win32.
2013-03-28 11:14:16 +01:00
Klaas Freitag
4b98ee0644
Pushed version to 0.70.6
2013-03-28 09:57:49 +01:00