Changeset 2093 for trunk/eraser

Timestamp:

05/10/10 12:06:58 (3 years ago)

Author:

lowjoel

Message:

When checking whether a path is a directory, always ensure that the path exists before running GetAttributes?.

Location:

trunk/eraser

Files:

• Eraser.Manager/FileSystem.cs (modified) (1 diff)
• Eraser/Program.cs (modified) (1 diff)
• Eraser/SchedulerPanel.cs (modified) (1 diff)

trunk/eraser/Eraser.Manager/FileSystem.cs

@@ -141 +141 @@
                             "replaced with random data."));
 
+                    //Get an item from the list of files, and then check that the item exists.
                     int index = prng.Next(entries.Count - 1);
-                    if ((File.GetAttributes(entries[index]) & FileAttributes.Directory) != 0)
+                    shadowFile = entries[index];
+                    if (File.Exists(shadowFile))
                     {
-                        DirectoryInfo dir = new DirectoryInfo(entries[index]);
-                        FileInfo[] files = dir.GetFiles("*", SearchOption.AllDirectories);
-                        foreach (FileInfo f in files)
-                            entries.Add(f.FullName);
+                        if ((File.GetAttributes(shadowFile) & FileAttributes.Directory) != 0)
+                        {
+                            DirectoryInfo dir = new DirectoryInfo(shadowFile);
+                            FileInfo[] files = dir.GetFiles("*", SearchOption.AllDirectories);
+                            entries.Capacity += files.Length;
+                            foreach (FileInfo f in files)
+                                entries.Add(f.FullName);
+                        }
+                        else
+                            shadowFile = entries[index];
                     }
                     else
-                        shadowFile = entries[index];
+                        shadowFile = null;
 
                     entries.RemoveAt(index);
                 }
-                while (shadowFile == null || shadowFile.Length == 0 || !File.Exists(shadowFile));
+                while (string.IsNullOrEmpty(shadowFile));
                 shadowFileInfo = new FileInfo(shadowFile);
             }

trunk/eraser/Eraser/Program.cs

@@ -489 +489 @@
                     foreach (string path in args.PositionalArguments)
                     {
+                        //If the path doesn't exist, skip the file
+                        if (!File.Exists(path))
+                            continue;
+
                         FileSystemObjectErasureTarget target = null;
                         if ((File.GetAttributes(path) & FileAttributes.Directory) != 0)

trunk/eraser/Eraser/SchedulerPanel.cs

@@ -534 +534 @@
                 if (files != null)
                     foreach (string file in files)
-                    {   
+                    {
+                        //If the path doesn't exist, skip the file
+                        if (!File.Exists(file))
+                            continue;
+
                         FileSystemObjectErasureTarget target;
                         if ((File.GetAttributes(file) & FileAttributes.Directory) != 0)