Changeset 559

Timestamp:

11/14/2008 6:57:38 AM (3 years ago)

Author:

lowjoel

Message:

Fixed #18

Location:

branches/eraser6/Manager

Files:

• DirectExecutor.cs (modified) (2 diffs)
• Task.cs (modified) (2 diffs)

branches/eraser6/Manager/DirectExecutor.cs

@@ -619 +619 @@
                 try
                 {
+                    //Skip this directory if it is a reparse point
+                    if ((info.Attributes & FileAttributes.ReparsePoint) != 0)
+                    {
+                        task.Log.Add(new LogEntry(string.Format(S._("Files in {0} did not have " +
+                            "their cluster tips erased because it is a hard link or a symbolic " +
+                            "link."), info.FullName), LogLevel.INFORMATION);
+                        return;
+                    }
+
                     foreach (FileInfo file in info.GetFiles())
-                        if (Eraser.Util.File.IsProtectedSystemFile(file.FullName))
-                            task.Log.Add(new LogEntry(string.Format("{0} did not have its cluster tips " +
-                                "erased, because it is a system file", file.FullName), LogLevel.INFORMATION));
+                        if (Util.File.IsProtectedSystemFile(file.FullName))
+                            task.Log.Add(new LogEntry(string.Format("{0} did not have its " +
+                                "cluster tips erased, because it is a system file", file.FullName),
+                                LogLevel.INFORMATION));
+                        else if ((file.Attributes & FileAttributes.ReparsePoint) != 0)
+                            task.Log.Add(new LogEntry(string.Format(S._("{0} did not have its " +
+                                "cluster tips erased because it is a hard link or a symbolic link."),
+                                file.FullName), LogLevel.INFORMATION);
                         else
                         {
@@ -807 +821 @@
                 if ((info.Attributes & FileAttributes.Compressed) != 0 ||
                     (info.Attributes & FileAttributes.Encrypted) != 0 ||
-                    (info.Attributes & FileAttributes.SparseFile) != 0 ||
-                    (info.Attributes & FileAttributes.ReparsePoint) != 0)
+                    (info.Attributes & FileAttributes.SparseFile) != 0
                 {
                     //Log the error

branches/eraser6/Manager/Task.cs

@@ -368 +368 @@
                     Regex excludePattern = new Regex(regex, RegexOptions.IgnoreCase);
                     foreach (FileInfo file in files)
-                        if (excludePattern.Matches(file.FullName).Count == 0)
+                        if ((file.Attributes & FileAttributes.ReparsePoint) == 0 &&
+                            excludePattern.Matches(file.FullName).Count == 0)
                         {
                             totalSize += file.Length;
@@ -378 +379 @@
                     foreach (FileInfo file in files)
                     {
+                        if ((file.Attributes & FileAttributes.ReparsePoint) != 0)
+                            continue;
+
                         totalSize += file.Length;
                         GetPathADSes(ref result, ref totalSize, file.FullName);