TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

correct get_panda_root() logic one more time

Browse Source
This commit is contained in:
David Rose 2005-10-03 21:16:25 +00:00
parent 5081498c00
commit 0cd217e05b
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dtool/src/dtoolutil/filename.cxx
View File

@ -135,7 +135,11 @@ get_panda_root() {
panda_root = front_to_back_slash(envvar); panda_root = front_to_back_slash(envvar);
} }
if (!panda_root.empty() && panda_root[panda_root.length() - 1] != '\\') { // Ensure the string ends in a backslash. If PANDA_ROOT is empty
// or undefined, this function must return a single backslash--not
// an empty string--since this prefix is used to replace a leading
// slash in Filename::to_os_specific().
if (panda_root.empty() || panda_root[panda_root.length() - 1] != '\\') {
panda_root += '\\'; panda_root += '\\';
} }
@ -317,8 +321,24 @@ from_os_specific(const string &os_specific, Filename::Type type) {
string result = back_to_front_slash(os_specific); string result = back_to_front_slash(os_specific);
const string &panda_root = get_panda_root(); const string &panda_root = get_panda_root();
// If the initial prefix is the same as panda_root, remove it. // Does the filename begin with a drive letter?
if (!panda_root.empty() && panda_root.length() < result.length()) { if (result.size() >= 3 && isalpha(result[0]) &&
result[1] == ':' && result[2] == '/') {
result[1] = tolower(result[0]);
result[0] = '/';
// If there's *just* a slash following the drive letter, go ahead
// and trim it.
if (result.size() == 3) {
result = result.substr(0, 2);
}
} else if (result.substr(0, 2) == "//") {
// If the initial prefix is a double slash, convert it to /hosts/.
result = hosts_prefix + result.substr(2);
} else if (!panda_root.empty() && panda_root.length() < result.length()) {
// If the initial prefix is the same as panda_root, remove it.
bool matches = true; bool matches = true;
size_t p; size_t p;
for (p = 0; p < panda_root.length() && matches; ++p) { for (p = 0; p < panda_root.length() && matches; ++p) {
@ -343,23 +363,6 @@ from_os_specific(const string &os_specific, Filename::Type type) {
} }
} }
// All right, the initial prefix was not under panda_root. But
// maybe it begins with a drive letter.
if (result.size() >= 3 && isalpha(result[0]) &&
result[1] == ':' && result[2] == '/') {
result[1] = tolower(result[0]);
result[0] = '/';
// If there's *just* a slash following the drive letter, go ahead
// and trim it.
if (result.size() == 3) {
result = result.substr(0, 2);
}
} else if (result.substr(0, 2) == "//") {
// If the initial prefix is a double slash, convert it to /hosts/.
result = hosts_prefix + result.substr(2);
}
Filename filename(result); Filename filename(result);
filename.set_type(type); filename.set_type(type);