Changeset 2222 for trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/FolderErasureTarget.cs

Timestamp:

7/10/2010 8:36:36 AM (23 months ago)

Author:

lowjoel

Message:

Define proper behaviour when a directory reparse point (symbolic link/junction) is encountered. We should not touch the target of the reparse point, instead, just securely remove the reparse point. This also fixes a crash when a reparse point to the current directory is encountered (i.e. a folder referring to its immediate parent)

File:

• trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/FolderErasureTarget.cs (modified) (3 diffs)

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

@@ -176 +176 @@
                 0.0f, S._("Removing folders...")));
 
-            //Remove all subfolders which are empty.
-            FileSystem fsManager = ManagerLibrary.Instance.FileSystemRegistrar[
-                VolumeInfo.FromMountPoint(Path)];
+            //Erase all subdirectories which are not reparse points.
             DirectoryInfo directory = new DirectoryInfo(Path);
+            if ((directory.Attributes & FileAttributes.ReparsePoint) == 0)
                 foreach (DirectoryInfo subDir in directory.GetDirectories())
                     EraseFolder(subDir, step);
 
+            //Does the user want this directory to be erased if there are no more
+            //entries within it?
             if (DeleteIfEmpty)
             {
@@ -198 +199 @@
                     directory.GetFiles("*", SearchOption.AllDirectories).Length == 0)
                 {
+                    FileSystem fsManager = ManagerLibrary.Instance.FileSystemRegistrar[
+                        VolumeInfo.FromMountPoint(Path)];
                     fsManager.DeleteFolder(directory);
                 }
@@ -205 +208 @@
         private void EraseFolder(DirectoryInfo info, ProgressManager progress)
         {
+            //Skip all symbolic links and junctions as we want to retain the
+            //contents of those directories.
+            if ((info.Attributes & FileAttributes.ReparsePoint) != 0)
+                return;
+
+            //Iterate over each directory and erase the subdirectories.
             foreach (DirectoryInfo subDir in info.GetDirectories())
                 EraseFolder(subDir, progress);
+
+            //Public progress updates.
             OnProgressChanged(this, new ProgressChangedEventArgs(progress,
                 new TaskProgressChangedEventArgs(info.FullName, 0, 0)));
 
+            //Ensure that the current directory is empty before deleting.
             FileSystemInfo[] files = info.GetFileSystemInfos();
             if (files.Length == 0)