Changeset 2561 for trunk/eraser

Timestamp:

3/21/2012 1:46:30 AM (15 months ago)

Author:

lowjoel

Message:

Part 2 fix for ​https://eraser.heidi.ie/forum/viewtopic.php?f=2&t=8684&p=25969#p25966 since erasing the actual reparse point would cause Eraser to crash if the reparse point references an invalid target.

File:

• trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/FolderErasureTarget.cs (modified) (1 diff)

trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/FolderErasureTarget.cs

@@ -197 +197 @@
                 //If the folder is a mount point, then don't delete it. If it isn't,
                 //search for files under the folder to see if it is empty.
-                if (!isVolumeRoot && directory.Exists &&
-                    directory.GetFiles("*", SearchOption.AllDirectories).Length == 0)
+                if (!isVolumeRoot && directory.Exists)
                 {
                     IFileSystem fsManager = Host.Instance.FileSystems[
                         VolumeInfo.FromMountPoint(Path)];
-                    fsManager.DeleteFolder(directory, true);
+                    if ((directory.Attributes & FileAttributes.ReparsePoint) == 0)
+                    {
+                        if (directory.GetFiles("*", SearchOption.AllDirectories).Length == 0)
+                            fsManager.DeleteFolder(directory, true);
+                    }
+                    else
+                    {
+                        fsManager.DeleteFolder(directory, false);
+                    }
                 }
             }