mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-30 07:00:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed bug 2322: Paths on Windows sometimes must include the trailing separator

Browse source
This commit is contained in:
Bartosz Milewski 2008-08-30 19:33:22 +00:00
parent 3ac4dbb828
commit 25d0ef1dd2
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
std/path.d
View file

@ -376,6 +376,9 @@ string dirname(string fullname)
break; break;
if (fullname[i - 1] == sep[0] || fullname[i - 1] == altsep[0]) if (fullname[i - 1] == sep[0] || fullname[i - 1] == altsep[0])
{ {
// Leave separator when it's the starting character (current root)
// or when it's preceded by ':' (absolute root)
if (i != 1 && fullname[i - 2] != ':')
i--; i--;
break; break;
} }
@ -404,6 +407,8 @@ unittest
version (Win32) version (Win32)
{ {
assert(dirname(r"\path\to\file") == r"\path\to"); assert(dirname(r"\path\to\file") == r"\path\to");
assert(dirname(r"\foo") == r"\");
assert(dirname(r"c:\foo") == r"c:\");
} }
} }
} }