Changeset 1719 for branches/eraser6/6.0/Eraser.DefaultPlugins/FileSystems/Windows.cs

Timestamp:

01/29/10 00:40:49 (2 years ago)

Author:

lowjoel

Message:

Backported changes from trunk.

r1718: Author: lowjoel: When we have problems starting Eraser from the shell extension check the return code for ERROR_ELEVATION_REQUIRED; if we get that, then we should re-run the operation as an administrator.
r1717: Author: lowjoel: If the directory we are deleting does not exist, we should just return -- there's nothing to be deleted.
r1716: Author: lowjoel: Catch IOExceptions when we try to connect to other running instances and show a error message when one occurs.
r1715: Author: lowjoel: Set that files are not meant to be indexed when it is meant for deletion before we even set the file times.
r1714: Author: lowjoel: Fixed race condition potentially created by initialising the remote executor server thread immediately upon construction since Run is not yet called.
r1713: Author: lowjoel: Since we only force the creation of the SchedulerPanel?'s handle in the constructor, InvokeRequired? should be called on the panel itself, and not on subcontrols as they are still delay-constructed. Fixes crash when Eraser is started quietly and a task is created remotely.
r1712: Author: lowjoel: ThreadAbortExceptions? should not trigger BlackBox? report creation.

Location:

branches/eraser6/6.0

Files:

• . (modified) (1 prop)
• Eraser.DefaultPlugins/FileSystems/Windows.cs (modified) (2 diffs)

branches/eraser6/6.0/Eraser.DefaultPlugins/FileSystems/Windows.cs

@@ -40 +40 @@
             //Set the date of the file to be invalid to prevent forensic
             //detection
+            info.Attributes = FileAttributes.NotContentIndexed;
             info.CreationTime = info.LastWriteTime = info.LastAccessTime = MinTimestamp;
-            info.Attributes = FileAttributes.Normal;
-            info.Attributes = FileAttributes.NotContentIndexed;
 
             //Rename the file a few times to erase the entry from the file system
@@ -127 +126 @@
                 throw new InvalidOperationException(S._("The folder {0} cannot be deleted as it is " +
                     "not empty."));
+
+            //If the directory does not already exist, we should just return -- there's
+            //nothing to be done.
+            if (!info.Exists)
+                return;
 
             //TODO: check for reparse points