mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-11 18:26:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
2025 commits 481 branches 256 tags 439 MiB
Commit graph

73 commits

Author SHA1 Message Date
Olivier Goffart
56d5359f5b Fix compilation after merge 
Still untetested
 2013-08-18 18:55:32 +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
Daniel Molkentin
8c9799cede Ignore false-positive compiler warnings 2013-08-02 15:19:41 +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
Andreas Schneider
354ef5e771 client: Fix strtol error check. 2013-08-01 10:37:02 +02:00
Daniel Molkentin
8d99364d63 Eliminate all warnings 
- use proper casts
- use aproproate types
- offer to build with -Werror
- make printf attribute hinting gnu format style
- remove unused helper methods
- begin to use inttyes.h macros where suitable
- move var declarations to the beginning of the method
- properly use _FILE_OFFSET_BITS
- silence variables unused depending on the define
 2013-07-31 13:12:10 +02:00
Klaas Freitag
fed0eefde3 client: Add better implementation of atoi for numeric arguments. 
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
 2013-07-30 09:31:14 +02:00
Andreas Schneider
d80da2a088 LICENSE: Change license of libcsync from GPL to LGPL. 
All contributors have agreed to change the license of libcsync to LGPL.
 2013-07-29 14:04:37 +02:00
Klaas Freitag
6aa7a62ee0 client: Check if optarg is different from NULL before dereferencing. 
CID 968159
 2013-07-25 17:46:55 +02:00
Klaas Freitag
8e1c8a3ea8 client: Fix a build warning of used userdata parameter. 
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
 2013-07-23 17:31:11 +02:00
Klaas Freitag
05a62bb41f csync: Add userdata parameter to the overall progress callback. 
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
 2013-07-23 07:45:17 +02:00
Klaas Freitag
70495d3ede client: Don't call strdup on NULL. 
CID: #968159

Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
 2013-07-22 15:54:02 +02:00
Klaas Freitag
b0fbabc1bf Show progress in csync client with commandline switch -v 2013-05-06 17:27:20 +02:00
Klaas Freitag
ab17e2aa8b Revert "Don't include csync_version.h from csync.h" 
This reverts commit 5cda5d523c.
 2013-04-26 10:45:14 +02:00
Klaas Freitag
5cda5d523c Don't include csync_version.h from csync.h 2013-04-26 10:37:45 +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
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
Klaas Freitag
2010c4ad21 Fix a typo. 2013-03-26 15:07:41 +01:00
Klaas Freitag
f211ee8bf1 Add a command line option to set a http proxy (owncloud only) 2013-03-05 15:33:14 +01:00
Andreas Schneider
11b539088e client: Fix connection to a remote with password in it. 
The password needs to be cleaned after we processed the uri.

Thanks to Patrick Buergi.
 2013-02-19 08:35:20 +01:00
Andreas Schneider
fc2b860022 client: Fix setting the debug level. 
Thanks to Patrick Buergi.
 2013-02-19 08:34:44 +01:00
Daniel Molkentin
9c0c693081 Add iconv support to convert charsets to different platforms. 2013-02-06 15:11:40 +01:00
Klaas Freitag
e40a810187 Make client compile with picky compiler. 
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
 2013-02-06 14:39:21 +01:00
Andreas Schneider
9a539526f1 log: Use a thread local variable for the log level. 2012-12-17 09:40:17 +01:00
Daniel Molkentin
49d2fd685b iconv support 
This allows for files on mac to automatically be converted to UNC
 2012-12-07 13:03:01 +01:00
Olivier Goffart
95edd6a9de Merge remote-tracking branch 'origin/master' into dav 
Conflicts:
	config/ocsync_log.conf
	src/csync.c
	src/csync.h
	src/csync_config.c
	src/csync_log.h
	src/csync_private.h
	src/csync_statedb.c
	tests/csync_tests/check_csync_config.c
 2012-12-03 17:32:08 +01:00
Klaas Freitag
803b3fb542 Fix compile with mingw32 for win32, removed int decl in for loop. 2012-10-31 21:08:08 +01:00
Andreas Schneider
b43f6690d5 client: Add setting the debug level. 2012-10-30 11:27:21 +01:00
Klaas Freitag
2bb52ef6f9 Merge branch 'master' into dav - get cmocka tests and database move. 
Conflicts:
	CMakeLists.txt
	cmake/Modules/FindCMocka.cmake
	src/csync.c
	src/csync_exclude.c
	src/csync_reconcile.c
	src/csync_statedb.c
	src/csync_update.c
	src/csync_util.c
	src/vio/csync_vio.c
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_exclude.c
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_update.c
	tests/std_tests/check_std_c_path.c
 2012-10-27 19:27:14 +02:00
Eric Seigne
a371546038 Fix bug #4: Hide password from command line. 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-10-15 20:57:16 +02:00
Klaas Freitag
404073fe7f Rename csync to ocsync to not collide with upstream csync. 2012-10-01 12:39:05 +02:00
Klaas Freitag
b57f33353d fixed copy and paste errors in error output. 2012-07-19 21:06:18 +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
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
ea89ac46ac Use getopt functions instead of GNU libc specific argp functions. 
For command line option parsing, better use the getopt functions
instead of the GNU libc specific argp functions if we want to be
portable. argp usage does not compile on MacOS, thus it was now
removed from csync.
 2012-03-15 15:15:35 +01:00
Dominik Schmidt
4df3aee5c2 Replace csync_auth with ssh_gets implementation from libssh 2012-03-02 17:04:02 +01:00
Dominik Schmidt
f08d145c39 Link against libargp on non-linux platforms 2012-03-02 17:04:02 +01:00
Dominik Schmidt
674aa7cd64 windows: add strerror_r implementation 2012-03-02 17:04:02 +01:00
Andreas Schneider
2b05dc33b7 client: Disable conflict copies by default. 2012-02-22 17:52:19 +01:00
Christian Jann
c848d8ffd7 added conflict-copy option to csync client 2011-04-06 17:08:30 +02:00
Andreas Schneider
fdea54edc5 Fix the vim modlines. 2009-05-13 10:12:07 +02: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
0634e0fdea Don't require a C++ compiler. 2009-03-18 10:55:14 +01:00
Andreas Schneider
38807d09c5 Change client option to be more descriptive (#25). 2009-01-20 16:57:27 +01:00
Andreas Schneider
27800adce5 Fix some visual flaws in the auth callback of the client. 2008-08-12 11:18:24 +02:00
Andreas Schneider
95f4db7c4f Create a more generic authentication callback. 2008-08-11 13:21:15 +02:00
Andreas Schneider
ae304565af Added password only flag or auth callback. 2008-08-08 17:28:33 +02:00
Andreas Schneider
08eab05c29 Use the GNU version of strerror_r. 2008-07-19 12:03:48 +02:00
Andreas Schneider
8451d29d12 Replace strerror with thread safe version. 2008-07-18 11:35:02 +02:00