chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-04-09 19:15:43 +02:00
Code

Excludes: optimize csync_is_windows_reserved_word

Browse Source
This commit is contained in:
Christian Kamm 2017-09-28 10:54:58 +02:00 committed by Markus Goetz
parent 3a1a56c7ad
commit 99d406072f
2 changed files with 47 additions and 16 deletions
src/csync
csync_exclude.cpp
test/csync/csync_tests
check_csync_exclude.cpp

47
src/csync/csync_exclude.cpp
View File

@ -186,18 +186,18 @@ out:
// See http://support.microsoft.com/kb/74496 and
// https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx
// Additionally, we ignore '$Recycle.Bin', see https://github.com/owncloud/client/issues/2955
static const char* win_reserved_words[] = {"CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5",
"COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4",
"LPT5", "LPT6", "LPT7", "LPT8", "LPT9", "CLOCK$", "$Recycle.Bin" };
static const char *win_reserved_words_3[] = { "CON", "PRN", "AUX", "NUL" };
static const char *win_reserved_words_4[] = {
"COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
"LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"
};
static const char *win_reserved_words_n[] = { "CLOCK$", "$Recycle.Bin" };
bool csync_is_windows_reserved_word(const char* filename) {
bool csync_is_windows_reserved_word(const char *filename)
{
size_t len_filename = strlen(filename);
size_t win_reserve_words_len = sizeof(win_reserved_words) / sizeof(char*);
size_t j;
for (j = 0; j < win_reserve_words_len; j++) {
int len_reserved_word = strlen(win_reserved_words[j]);
int len_filename = strlen(filename);
// Drive letters
if (len_filename == 2 && filename[1] == ':') {
if (filename[0] >= 'a' && filename[0] <= 'z') {
return true;
@ -206,16 +206,31 @@ bool csync_is_windows_reserved_word(const char* filename) {
return true;
}
}
if (c_strncasecmp(filename, win_reserved_words[j], len_reserved_word) == 0) {
if (len_filename == len_reserved_word) {
return true;
if (len_filename == 3 || (len_filename > 3 && filename[3] == '.')) {
for (const char *word : win_reserved_words_3) {
if (c_strncasecmp(filename, word, 3) == 0) {
return true;
}
}
if ((len_filename > len_reserved_word) && (filename[len_reserved_word] == '.')) {
}
if (len_filename == 4 || (len_filename > 4 && filename[4] == '.')) {
for (const char *word : win_reserved_words_4) {
if (c_strncasecmp(filename, word, 4) == 0) {
return true;
}
}
}
for (const char *word : win_reserved_words_n) {
size_t len_word = strlen(word);
if (len_word == len_filename && c_strncasecmp(filename, word, len_word) == 0) {
return true;
}
}
}
return false;
return false;
}
static CSYNC_EXCLUDE_TYPE _csync_excluded_common(c_strlist_t *excludes, const char *path, int filetype, bool check_leading_dirs) {

16
test/csync/csync_tests/check_csync_exclude.cpp
View File

@ -488,6 +488,22 @@ static void check_csync_is_windows_reserved_word(void **) {
assert_false(csync_is_windows_reserved_word("conference"));
assert_false(csync_is_windows_reserved_word("conf.erence"));
assert_false(csync_is_windows_reserved_word("co"));
assert_true(csync_is_windows_reserved_word("COM2"));
assert_true(csync_is_windows_reserved_word("com2"));
assert_true(csync_is_windows_reserved_word("COM2."));
assert_true(csync_is_windows_reserved_word("com2."));
assert_true(csync_is_windows_reserved_word("COM2.ference"));
assert_false(csync_is_windows_reserved_word("COM2ference"));
assert_false(csync_is_windows_reserved_word("com2ference"));
assert_false(csync_is_windows_reserved_word("com2f.erence"));
assert_false(csync_is_windows_reserved_word("com"));
assert_true(csync_is_windows_reserved_word("CLOCK$"));
assert_true(csync_is_windows_reserved_word("$Recycle.Bin"));
assert_true(csync_is_windows_reserved_word("ClocK$"));
assert_true(csync_is_windows_reserved_word("$recycle.bin"));
assert_true(csync_is_windows_reserved_word("A:"));
assert_true(csync_is_windows_reserved_word("a:"));
assert_true(csync_is_windows_reserved_word("z:"));