Mercurial > projects > ldc
changeset 462:f7ba5f705d59
Path combining on Windows didn't work with / properly.
author | Christian Kamm <kamm incasoftware de> |
---|---|
date | Sun, 03 Aug 2008 12:27:11 +0200 |
parents | 2b28fd92bab8 |
children | ea991021a56a |
files | dmd/root.c |
diffstat | 1 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/dmd/root.c Sun Aug 03 12:26:43 2008 +0200 +++ b/dmd/root.c Sun Aug 03 12:27:11 2008 +0200 @@ -324,17 +324,16 @@ 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; }