mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 05:25:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'ogoffart/dav' into dav

Browse source
This commit is contained in:
Klaas Freitag 2012-12-12 13:37:10 +01:00
commit 5772021a53
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/Modules/FindIconv.cmake
View file

@ -17,12 +17,14 @@ ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
IF(APPLE)
FIND_PATH(ICONV_INCLUDE_DIR iconv.h
PATHS
/usr/include/
/opt/local/include/
NO_CMAKE_SYSTEM_PATH
)
FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c
PATHS
/usr/lib/
/opt/local/lib/
NO_CMAKE_SYSTEM_PATH
)

2
src/csync_exclude.c
View file

@ -64,6 +64,8 @@ int csync_exclude_load(CSYNC *ctx, const char *fname) {
char *entry = NULL;
const _TCHAR *wfname;
CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Loading exclude file: %s", fname);
#ifdef _WIN32
_fmode = _O_BINARY;
#endif

4
src/csync_propagate.c
View file

@ -189,7 +189,11 @@ static int _csync_push_file(CSYNC *ctx, csync_file_stat_t *st) {
if (_push_to_tmp_first(ctx)) {
/* create the temporary file name */
#ifdef _WIN32
if (asprintf(&turi, "%s.~XXXXXX", duri) < 0) {
#else
if (asprintf(&turi, ".%s.~XXXXXX", duri) < 0) {
#endif
rc = -1;
goto out;
}