From bd71ddf0aa22e80338ecc9c4e8649bd5c53130a1 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Tue, 11 Dec 2012 14:23:53 +0100 Subject: [PATCH 1/3] Iconv: Also search in /usr on OS X --- cmake/Modules/FindIconv.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/Modules/FindIconv.cmake b/cmake/Modules/FindIconv.cmake index 9ce2fa7fc..33a25d9d2 100644 --- a/cmake/Modules/FindIconv.cmake +++ b/cmake/Modules/FindIconv.cmake @@ -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 ) From fded216fb63f843628e9dd14f36787739f7af5a9 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Tue, 11 Dec 2012 17:21:56 +0100 Subject: [PATCH 2/3] Propagate: Fix file name pattern Starting with dot on Windows is a bad idea --- src/csync_propagate.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/csync_propagate.c b/src/csync_propagate.c index 89804095e..37c6e0e9f 100644 --- a/src/csync_propagate.c +++ b/src/csync_propagate.c @@ -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; } From 316fd7b0361e925c6cd5f633521e6e6c81a2513b Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Tue, 11 Dec 2012 16:07:44 +0100 Subject: [PATCH 3/3] Exclude: Tell which file we load --- src/csync_exclude.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/csync_exclude.c b/src/csync_exclude.c index 02c4fc028..166f5f2e4 100644 --- a/src/csync_exclude.c +++ b/src/csync_exclude.c @@ -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