Changeset 2555

Timestamp:

3/20/2012 1:37:37 AM (14 months ago)

Author:

lowjoel

Message:

Forward-port from Eraser 6.0: Supplements r2551: Support direct volume reparse points, similar to what would occur before the code change.

Location:

trunk/eraser

Files:

• . (modified) (1 prop)
• Eraser.Util/ExtensionMethods/PathUtil.cs (modified) (1 diff)
• Eraser.Util/Strings.en.resx (modified) (1 diff)
• Eraser.Util/Strings.it.resx (modified) (1 diff)
• Eraser.Util/Strings.nl.resx (modified) (1 diff)
• Eraser.Util/Strings.pl.resx (modified) (1 diff)
• Eraser.Util/Strings.resx (modified) (1 diff)
• Eraser.Util/VolumeInfo.cs (modified) (2 diffs)

trunk/eraser/Eraser.Util/ExtensionMethods/PathUtil.cs

@@ -214 +214 @@
 
                     //Is it a directory? If it is, we need to add a trailing \
-                    if (Directory.Exists(path))
+                    if (Directory.Exists(path) && !result.EndsWith("\\"))
                         result += '\\';
                     return result;

trunk/eraser/Eraser.Util/Strings.en.resx

@@ -145 +145 @@
     <value>Session ended</value>
   </data>
+  <data name="The path provided includes a reparse point which references another volume." xml:space="preserve">
+    <value>The path provided includes a reparse point which references another volume.</value>
+  </data>
 </root>

trunk/eraser/Eraser.Util/Strings.it.resx

@@ -145 +145 @@
     <value>(Untranslated)</value>
   </data>
+  <data name="The path provided includes a reparse point which references another volume." xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
 </root>

trunk/eraser/Eraser.Util/Strings.nl.resx

@@ -145 +145 @@
     <value>(Untranslated)</value>
   </data>
+  <data name="The path provided includes a reparse point which references another volume." xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
 </root>

trunk/eraser/Eraser.Util/Strings.pl.resx

@@ -145 +145 @@
     <value>(Untranslated)</value>
   </data>
+  <data name="The path provided includes a reparse point which references another volume." xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
 </root>

trunk/eraser/Eraser.Util/Strings.resx

@@ -145 +145 @@
     <value>Session ended</value>
   </data>
+  <data name="The path provided includes a reparse point which references another volume." xml:space="preserve">
+    <value>The path provided includes a reparse point which references another volume.</value>
+  </data>
 </root>

trunk/eraser/Eraser.Util/VolumeInfo.cs

@@ -30 +30 @@
 using Microsoft.Win32.SafeHandles;
 using System.Collections.ObjectModel;
+using System.Globalization;
 
 namespace Eraser.Util
@@ -311 +312 @@
                         currentDir = ExtensionMethods.PathUtil.ResolveReparsePoint(currentDir);
 
+                        //If we get a volume identifier, we need to see if it is the only thing
+                        //in the path. If it is, we found our volume GUID and we won't have to
+                        //call GetVolumeNameForVolumeMountPoint.
+                        if (currentDir.StartsWith("\\??\\Volume{"))
+                        {
+                            if (currentDir.Length == 49 && currentDir.EndsWith("}\\"))
+                                return new VolumeInfo(string.Format(CultureInfo.InvariantCulture,
+                                    "\\\\?\\Volume{{{0}}}\\", currentDir.Substring(11, 36)));
+                            else
+                                throw new ArgumentException(S._("The path provided includes a " +
+                                    "reparse point which references another volume."));
+                        }
+
                         //Strip the NT namespace bit
-                        if (currentDir.StartsWith("\\??\\Volume"))
-                            throw new ArgumentException(S._("The path provided includes a reparse" +
-                                "point which references another volume."));
                         else
                             currentDir = currentDir.Substring(4);