Another fix to DMD's path code.

This commit is contained in:
Christian Kamm
2008-07-29 18:00:01 +02:00
parent fe76eeee4e
commit f439de46ab

View File

@@ -641,17 +641,16 @@ char *FileName::replaceName(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;
}