Changeset 1862

Timestamp:

3/1/2010 5:50:12 AM (3 years ago)

Author:

lowjoel

Message:

Forward-port from Eraser 6.0: Generate names which are valid, not any of those reserved file names (e.g. con, prn, nul)

Location:

trunk/eraser6

Files:

• . (modified) (1 prop)
• Eraser.Manager/FileSystem.cs (modified) (3 diffs)
• Eraser.msbuild (modified) (1 prop)
• Eraser/BlackBoxMainForm.it.resx (modified) (1 prop)
• Eraser/BlackBoxUploadForm.it.resx (modified) (1 prop)

trunk/eraser6/Eraser.Manager/FileSystem.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Text;
+using System.IO;
 using Eraser.Util;
-using System.IO;
 
 namespace Eraser.Manager
@@ -43 +43 @@
         public static string GenerateRandomFileName(DirectoryInfo info, int length)
         {
-            //Get a random file name
+            //Get the PRNG we are going to use
             Prng prng = ManagerLibrary.Instance.PrngRegistrar[ManagerLibrary.Settings.ActivePrng];
+
+            //Initialsie the base name, if any.
             string resultPrefix = info == null ? string.Empty : info.FullName +
                 Path.DirectorySeparatorChar;
+
+            //Variables to store the intermediates.
             byte[] resultAry = new byte[length];
             string result = string.Empty;
+            List<string> prohibitedFileNames = new List<string>(new string[] {
+                "CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4",
+                "COM5", "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3",
+                "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"
+            });
 
             do
@@ -63 +72 @@
                 result = Encoding.UTF8.GetString(resultAry);
             }
-            while (info != null && (Directory.Exists(resultPrefix + result) ||
-                File.Exists(resultPrefix + result)));
+            while (info != null &&
+                prohibitedFileNames.IndexOf(Path.GetFileNameWithoutExtension(result)) != -1 ||
+                (Directory.Exists(resultPrefix + result) || File.Exists(resultPrefix + result)));
             return resultPrefix + result;
         }