# HG changeset patch # User Christian Kamm # Date 1217347201 -7200 # Node ID 3dd9ae9ea708e421f7402590415d88e519d0ffcf # Parent 120cb5ea9eea7c64ff8206d2ef2c34d22e79c5f3 Another fix to DMD's path code. diff -r 120cb5ea9eea -r 3dd9ae9ea708 dmd/root.c --- a/dmd/root.c Tue Jul 29 17:45:28 2008 +0200 +++ b/dmd/root.c Tue Jul 29 18:00:01 2008 +0200 @@ -641,17 +641,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; }