D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-12 02:43:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Path combining on Windows didn't work with / properly.

Browse Source
This commit is contained in:
Christian Kamm
2008-08-03 12:27:11 +02:00
parent 0613b47df9
commit d87a3cd4ee
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dmd/root.c
View File

@@ -324,17 +324,16 @@ char *FileName::combine(char *path, char *name)
f = (char *)mem.malloc(pathlen + 1 + namelen + 1);
memcpy(f, path, pathlen);
if (path[pathlen - 1] != '/')
if (
path[pathlen - 1] != '/'
#if _WIN32
&& path[pathlen - 1] != '\\' && path[pathlen - 1] != ':'
#endif
)
{ f[pathlen] = '/';
pathlen++;
}
#if _WIN32
if (path[pathlen - 1] != '\\' && path[pathlen - 1] != ':')
{ f[pathlen] = '\\';
pathlen++;
}
#endif
memcpy(f + pathlen, name, namelen + 1);
return f;
}