handle LNK virtual files only when VFS mode is not off

mgallien · mgallien · commit 3a20ea871b9f · 2025-01-22T11:17:41.000+01:00
should ensure lnk widnows shortcut files are not mistakenly handled as
virtual files

Signed-off-by: Matthieu Gallien &lt;matthieu.gallien@nextcloud.com&gt;
diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
@@ -1662,14 +1662,14 @@ void ProcessDirectoryJob::processFileFinalize(
         }
     }
 
-    if (_discoveryData->_syncOptions._vfs &&
+    if (_discoveryData->_syncOptions._vfs && _discoveryData->_syncOptions._vfs->mode() != OCC::Vfs::Off &&
         (item->_type == CSyncEnums::ItemTypeFile || item->_type == CSyncEnums::ItemTypeDirectory) &&
         item->_instruction == CSyncEnums::CSYNC_INSTRUCTION_NONE &&
         !_discoveryData->_syncOptions._vfs->isPlaceHolderInSync(_discoveryData->_localDir + path._local)) {
         item->_instruction = CSyncEnums::CSYNC_INSTRUCTION_UPDATE_VFS_METADATA;
     }
 
-    if (_discoveryData->_syncOptions._vfs &&
+    if (_discoveryData->_syncOptions._vfs && _discoveryData->_syncOptions._vfs->mode() != OCC::Vfs::Off &&
         (item->_type == CSyncEnums::ItemTypeFile || item->_type == CSyncEnums::ItemTypeDirectory) &&
         item->_instruction == CSyncEnums::CSYNC_INSTRUCTION_NONE &&
         FileSystem::isLnkFile((_discoveryData->_localDir + path._local)) &&

Original file line number	Diff line number	Diff line change
`@@ -1662,14 +1662,14 @@ void ProcessDirectoryJob::processFileFinalize(`
`1662`	`1662`	`}`
`1663`	`1663`	`}`
`1664`	`1664`
`1665`		`- if (_discoveryData->_syncOptions._vfs &&`
	`1665`	`+ if (_discoveryData->_syncOptions._vfs && _discoveryData->_syncOptions._vfs->mode() != OCC::Vfs::Off &&`
`1666`	`1666`	`(item->_type == CSyncEnums::ItemTypeFile \|\| item->_type == CSyncEnums::ItemTypeDirectory) &&`
`1667`	`1667`	`item->_instruction == CSyncEnums::CSYNC_INSTRUCTION_NONE &&`
`1668`	`1668`	`!_discoveryData->_syncOptions._vfs->isPlaceHolderInSync(_discoveryData->_localDir + path._local)) {`
`1669`	`1669`	`item->_instruction = CSyncEnums::CSYNC_INSTRUCTION_UPDATE_VFS_METADATA;`
`1670`	`1670`	`}`
`1671`	`1671`
`1672`		`- if (_discoveryData->_syncOptions._vfs &&`
	`1672`	`+ if (_discoveryData->_syncOptions._vfs && _discoveryData->_syncOptions._vfs->mode() != OCC::Vfs::Off &&`
`1673`	`1673`	`(item->_type == CSyncEnums::ItemTypeFile \|\| item->_type == CSyncEnums::ItemTypeDirectory) &&`
`1674`	`1674`	`item->_instruction == CSyncEnums::CSYNC_INSTRUCTION_NONE &&`
`1675`	`1675`	`FileSystem::isLnkFile((_discoveryData->_localDir + path._local)) &&`