Discovery: Windows: Don't check if a server file name can be encoded

ogoffart · ogoffart · commit 04fa824a7b16 · 2018-10-17T15:30:32.000+02:00
Because on windows, all filename can be encoded: The file system uses UTF-16, regardless of the locale Issue: #6810
diff --git a/src/csync/csync_update.cpp b/src/csync/csync_update.cpp
@@ -38,6 +38,7 @@
 #include "csync_update.h"
 #include "csync_util.h"
 #include "csync_misc.h"
+#include "common/utility.h"
 
 #include "vio/csync_vio.h"
 
@@ -147,7 +148,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
   }
 
   auto localCodec = QTextCodec::codecForLocale();
-  if (ctx->current == REMOTE_REPLICA && localCodec->mibEnum() != 106) {
+  if (!OCC::Utility::isWindows() && ctx->current == REMOTE_REPLICA && localCodec->mibEnum() != 106) {
       /* If the locale codec is not UTF-8, we must check that the filename from the server can
        * be encoded in the local file system.
        *

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`	`#include "csync_update.h"`
`39`	`39`	`#include "csync_util.h"`
`40`	`40`	`#include "csync_misc.h"`
	`41`	`+#include "common/utility.h"`
`41`	`42`
`42`	`43`	`#include "vio/csync_vio.h"`
`43`	`44`
`@@ -147,7 +148,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f`
`147`	`148`	`}`
`148`	`149`
`149`	`150`	`auto localCodec = QTextCodec::codecForLocale();`
`150`		`- if (ctx->current == REMOTE_REPLICA && localCodec->mibEnum() != 106) {`
	`151`	`+ if (!OCC::Utility::isWindows() && ctx->current == REMOTE_REPLICA && localCodec->mibEnum() != 106) {`
`151`	`152`	`/* If the locale codec is not UTF-8, we must check that the filename from the server can`
`152`	`153`	`* be encoded in the local file system.`
`153`	`154`	`*`