Changeset 2249

Timestamp:

10/23/2010 1:35:00 AM (3 years ago)

Author:

lowjoel

Message:

Backported r2150 r2155 and r2161 from trunk: do not throw an out-of-disk space error when erasing unused space. This is triggered by us renaming files even when there is insufficient disk space (apparently NTFS needs space even when renaming filenames to one of the same length.)

Location:

branches/eraser6/6.0

Files:

• . (modified) (1 prop)
• Eraser.DefaultPlugins/FileSystems/Ntfs.cs (modified) (1 diff)
• Eraser.DefaultPlugins/FileSystems/Windows.cs (modified) (4 diffs)
• Eraser.Manager/FileSystem.cs (modified) (1 diff)
• Eraser.Util/StreamInfo.cs (modified) (2 diffs)

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

@@ -202 +202 @@
             get
             {
-                return new DateTime(1601, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
+                return new DateTime(1601, 1, 1, 0, 0, 0, 1, DateTimeKind.Utc);
             }
         }

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

@@ -36 +36 @@
     public abstract class WindowsFileSystem : FileSystem
     {
+        public override void ResetFileTimes(FileSystemInfo info)
+        {
+            //Reset the file access times: after every rename the file times may change.
+            info.SetTimes(MinTimestamp, MinTimestamp, MinTimestamp, MinTimestamp);
+        }
+
         public override void DeleteFile(FileInfo info)
         {
@@ -51 +57 @@
                 try
                 {
-                    info.CreationTime = info.LastWriteTime = info.LastAccessTime = MinTimestamp;
+                    ResetFileTimes(info);
                     info.MoveTo(newPath);
                     ++i;
@@ -73 +79 @@
                             //Let the process locking the file release the lock
                             Thread.Sleep(100);
+                            break;
+
+                        case Win32ErrorCode.DiskFull:
+                            //If the disk is full, we can't do anything except manually deleting
+                            //the file, break out of this loop.
+                            i = FileNameEraseTries;
                             break;
 
@@ -361 +373 @@
                 }
             }
+            finally
+            {
+                //Reset the file times
+                streamInfo.SetTimes(MinTimestamp, created, lastWrite, lastAccess);
+            }
         }
 

branches/eraser6/6.0/Eraser.Manager/FileSystem.cs

@@ -190 +190 @@
 
         /// <summary>
+        /// Resets the created, modified, accessed and last update times for the given
+        /// <paramref name="info"/>.
+        /// </summary>
+        /// <param name="info">The file to reset times.</param>
+        public abstract void ResetFileTimes(FileSystemInfo info);
+
+        /// <summary>
         /// Securely deletes the file reference from the directory structures
         /// as well as resetting the Date Created, Date Accessed and Date Modified

branches/eraser6/6.0/Eraser.Util/StreamInfo.cs

@@ -387 +387 @@
             }
 
+            return OpenHandle(mode, iAccess, share, options);
+        }
+
+        internal SafeFileHandle OpenHandle(FileMode mode, uint access, FileShare share,
+            FileOptions options)
+        {
             //Sharing mode
             if ((share & FileShare.Inheritable) != 0)
@@ -408 +414 @@
         }
 
+        public void SetTimes(DateTime updateTime, DateTime createdTime, DateTime lastModifiedTime,
+            DateTime lastAccessedTime)
+        {
+            using (SafeFileHandle streamHandle = OpenHandle(FileMode.Open,
+                    NativeMethods.FILE_WRITE_ATTRIBUTES, FileShare.ReadWrite,
+                    FileOptions.None))
+            {
+                ExtensionMethods.IO.SetTimes(streamHandle, updateTime, createdTime,
+                    lastModifiedTime, lastAccessedTime);
+            }
+        }
+
         /// <summary>
         /// Returns the path as a string.