Merge pull request #5934 from nextcloud/backport/4977/stable-3.9

[stable-3.9] windows reserved word silently excluded - csync exclude.cpp
nextcloud · Jul 28, 2023 · 5bc90e0 · 5bc90e0
2 parents 4293661 + af420f3
commit 5bc90e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/csync/csync_exclude.cpp b/src/csync/csync_exclude.cpp
@@ -174,7 +174,7 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(const QString &path, bool exclu
     }
 
     if (csync_is_windows_reserved_word(bname)) {
-        return CSYNC_FILE_EXCLUDE_INVALID_CHAR;
+        return CSYNC_FILE_SILENTLY_EXCLUDED;
     }
 
     // Filter out characters not allowed in a filename on windows

diff --git a/test/testexcludedfiles.cpp b/test/testexcludedfiles.cpp
@@ -196,7 +196,7 @@ private slots:
         QCOMPARE(check_file_full("file_trailing_space "), CSYNC_NOT_EXCLUDED);
         QCOMPARE(check_file_full(" file_leading_and_trailing_space "), CSYNC_NOT_EXCLUDED);
         QCOMPARE(check_file_full("file_trailing_dot."), CSYNC_FILE_EXCLUDE_INVALID_CHAR);
-        QCOMPARE(check_file_full("AUX"), CSYNC_FILE_EXCLUDE_INVALID_CHAR);
+        QCOMPARE(check_file_full("AUX"), CSYNC_FILE_SILENTLY_EXCLUDED);
         QCOMPARE(check_file_full("file_invalid_char<"), CSYNC_FILE_EXCLUDE_INVALID_CHAR);
         QCOMPARE(check_file_full("file_invalid_char\n"), CSYNC_FILE_EXCLUDE_INVALID_CHAR);
     #endif
@@ -352,7 +352,7 @@ private slots:
         QCOMPARE(check_file_traversal("file_trailing_space "), CSYNC_NOT_EXCLUDED);
         QCOMPARE(check_file_traversal(" file_leading_and_trailing_space "), CSYNC_NOT_EXCLUDED);
         QCOMPARE(check_file_traversal("file_trailing_dot."), CSYNC_FILE_EXCLUDE_INVALID_CHAR);
-        QCOMPARE(check_file_traversal("AUX"), CSYNC_FILE_EXCLUDE_INVALID_CHAR);
+        QCOMPARE(check_file_traversal("AUX"), CSYNC_FILE_SILENTLY_EXCLUDED);
         QCOMPARE(check_file_traversal("file_invalid_char<"), CSYNC_FILE_EXCLUDE_INVALID_CHAR);
     #endif