admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GetDriveQualifiedPath for single root filesystems

Browse Source 
Reverted to original code and fixed correctly.
This commit is contained in:
Andrew Schwartzmeyer
2016-06-15 12:16:54 -07:00
parent 3464f9aee3
commit 3262a4b3ec
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/namespaces/LocationGlobber.cs
+28 -23
View File
@@ -3343,13 +3343,10 @@ namespace System.Management.Automation
}
string result = path;
bool treatAsRelative = true;
// platform notes:
// this needs to be implemented differently depending if the drive uses colon to separate paths
if (drive.VolumeSeparatedByColon)
{
bool treatAsRelative = true;
// Ensure the drive name is the same as the portion of the path before
// :. If not add the drive name and colon as if it was a relative path
@@ -3370,29 +3367,37 @@ namespace System.Management.Automation
}
}
}
if (treatAsRelative)
{
string formatString = "{0}:" + StringLiterals.DefaultPathSeparator + "{1}";
if (path.StartsWith(StringLiterals.DefaultPathSeparator.ToString(), StringComparison.Ordinal))
{
formatString = "{0}:{1}";
}
result =
String.Format(
System.Globalization.CultureInfo.InvariantCulture,
formatString,
drive.Name,
path);
}
}
else
{
if (path.StartsWith(drive.Name))
result = path;
if (IsAbsolutePath(path))
{
treatAsRelative = false;
}
}
if (treatAsRelative)
{
string formatString;
if (drive.VolumeSeparatedByColon)
{
formatString = "{0}:" + StringLiterals.DefaultPathSeparator + "{1}";
if (path.StartsWith(StringLiterals.DefaultPathSeparatorString, StringComparison.Ordinal))
{
formatString = "{0}:{1}";
}
}
else
result = drive.Name + path;
{
formatString = "{0}{1}";
}
result =
String.Format(
System.Globalization.CultureInfo.InvariantCulture,
formatString,
drive.Name,
path);
}
tracer.WriteLine("result = {0}", result);