NTFileSystemAdapter: Assume FileNotFoundException or DirectoryNotFoundException will be thrown if file does not exists

SMBLibrary/NTFileStore/Adapter/NTFileSystemAdapter.Query.cs

@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2014-2018 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -30,12 +30,6 @@ namespace SMBLibrary
                 return status;
             }
 
-            if (entry == null)
-            {
-                result = null;
-                return NTStatus.STATUS_NO_SUCH_FILE;
-            }
-
             switch (informationClass)
             {
                 case FileInformationClass.FileBasicInformation:

SMBLibrary/NTFileStore/Adapter/NTFileSystemAdapter.QueryDirectory.cs

@@ -59,10 +59,16 @@ namespace SMBLibrary
             else
             {
                 path = FileSystem.GetDirectoryPath(path);
-                FileSystemEntry entry = m_fileSystem.GetEntry(path + fileName);
-                if (entry == null)
+                FileSystemEntry entry;
+                try
+                {
+                    entry = m_fileSystem.GetEntry(path + fileName);
+                }
+                catch (Exception ex)
                 {
-                    return NTStatus.STATUS_NO_SUCH_FILE;
+                    NTStatus status = ToNTStatus(ex);
+                    Log(Severity.Verbose, "QueryDirectory: Error querying '{0}'. {1}.", path, status);
+                    return status;
                 }
                 entries = new List<FileSystemEntry>();
                 entries.Add(entry);

SMBLibrary/NTFileStore/Adapter/NTFileSystemAdapter.Set.cs

@@ -1,4 +1,4 @@
-/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2014-2018 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -62,7 +62,7 @@ namespace SMBLibrary
                 // Note: it's possible that we just want to upcase / downcase a filename letter.
                 try
                 {
-                    if (renameInformation.ReplaceIfExists && (m_fileSystem.GetEntry(newFileName) != null))
+                    if (renameInformation.ReplaceIfExists && (IsFileExists(newFileName)))
                     {
                         m_fileSystem.Delete(newFileName);
                     }
@@ -137,5 +137,23 @@ namespace SMBLibrary
                 return NTStatus.STATUS_NOT_IMPLEMENTED;
             }
         }
+
+        private bool IsFileExists(string path)
+        {
+            try
+            {
+                m_fileSystem.GetEntry(path);
+            }
+            catch (FileNotFoundException)
+            {
+                return false;
+            }
+            catch (DirectoryNotFoundException)
+            {
+                return false;
+            }
+
+            return true;
+        }
     }
 }

SMBLibrary/NTFileStore/Adapter/NTFileSystemAdapter.cs

@@ -50,11 +50,17 @@ namespace SMBLibrary
                 return NTStatus.STATUS_NO_SUCH_FILE;
             }
 
-            FileSystemEntry entry;
+            FileSystemEntry entry = null;
             try
             {
                 entry = m_fileSystem.GetEntry(path);
             }
+            catch (FileNotFoundException)
+            {
+            }
+            catch (DirectoryNotFoundException)
+            {
+            }
             catch (Exception ex)
             {
                 NTStatus status = ToNTStatus(ex);