D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-08-13 18:00:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow / as a path separator on Windows.

Browse Source
This commit is contained in:
Christian Kamm
2008-07-29 17:35:33 +02:00
parent f2c5fa2c2f
commit 62e1d77cc1
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dmd/root.c
View File

@@ -323,12 +323,12 @@ char *FileName::combine(char *path, char *name)
namelen = strlen(name); namelen = strlen(name);
f = (char *)mem.malloc(pathlen + 1 + namelen + 1); f = (char *)mem.malloc(pathlen + 1 + namelen + 1);
memcpy(f, path, pathlen); memcpy(f, path, pathlen);
#if linux
if (path[pathlen - 1] != '/') if (path[pathlen - 1] != '/')
{ f[pathlen] = '/'; { f[pathlen] = '/';
pathlen++; pathlen++;
} }
#endif
#if _WIN32 #if _WIN32
if (path[pathlen - 1] != '\\' && path[pathlen - 1] != ':') if (path[pathlen - 1] != '\\' && path[pathlen - 1] != ':')
{ f[pathlen] = '\\'; { f[pathlen] = '\\';
@@ -486,14 +486,13 @@ int FileName::equals(Object *obj)
int FileName::absolute(const char *name) int FileName::absolute(const char *name)
{ {
return
#if _WIN32 #if _WIN32
return (*name == '\\') || (*name == '\\') ||
(*name == '/') || (*name == '/') ||
(*name && name[1] == ':'); (*name && name[1] == ':') ||
#endif
#if linux
return (*name == '/');
#endif #endif
(*name == '/');
} }
/******************************** /********************************
@@ -513,10 +512,10 @@ char *FileName::ext(const char *str)
switch (*e) switch (*e)
{ case '.': { case '.':
return e + 1; return e + 1;
#if linux
case '/': case '/':
break; break;
#endif
#if _WIN32 #if _WIN32
case '\\': case '\\':
case ':': case ':':
@@ -569,10 +568,10 @@ char *FileName::name(const char *str)
{ {
switch (*e) switch (*e)
{ {
#if linux
case '/': case '/':
return e + 1; return e + 1;
#endif
#if _WIN32 #if _WIN32
case '\\': case '\\':
case ':': case ':':
@@ -606,10 +605,10 @@ char *FileName::path(const char *str)
if (n > str) if (n > str)
{ {
#if linux
if (n[-1] == '/') if (n[-1] == '/')
n--; n--;
#endif
#if _WIN32 #if _WIN32
if (n[-1] == '\\') if (n[-1] == '\\')
n--; n--;
@@ -642,12 +641,12 @@ char *FileName::replaceName(char *path, char *name)
namelen = strlen(name); namelen = strlen(name);
f = (char *)mem.malloc(pathlen + 1 + namelen + 1); f = (char *)mem.malloc(pathlen + 1 + namelen + 1);
memcpy(f, path, pathlen); memcpy(f, path, pathlen);
#if linux
if (path[pathlen - 1] != '/') if (path[pathlen - 1] != '/')
{ f[pathlen] = '/'; { f[pathlen] = '/';
pathlen++; pathlen++;
} }
#endif
#if _WIN32 #if _WIN32
if (path[pathlen - 1] != '\\' && path[pathlen - 1] != ':') if (path[pathlen - 1] != '\\' && path[pathlen - 1] != ':')
{ f[pathlen] = '\\'; { f[pathlen] = '\\';