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

minor problems with windows filenames

Browse Source
This commit is contained in:
David Rose 2001-11-14 22:06:20 +00:00
parent 8553a3ce3d
commit 1ba961f71d
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,17 +123,18 @@ convert_pathname(const string &unix_style_pathname) {
} else if (unix_style_pathname.length() > 3 && } else if (unix_style_pathname.length() > 3 &&
isalpha(unix_style_pathname[1]) && isalpha(unix_style_pathname[1]) &&
unix_style_pathname[2] == '/') { unix_style_pathname[2] == '/') {
// This is a pathname that begins with a single letter. That must // This pathname begins with a slash and a single letter. That
// be the drive letter. // must be the drive letter.
windows_pathname = windows_pathname =
string(1, toupper(unix_style_pathname[1])) + ":" + string(1, toupper(unix_style_pathname[1])) + ":" +
front_to_back_slash(unix_style_pathname.substr(2)); front_to_back_slash(unix_style_pathname.substr(2));
} else { } else {
// It does not begin with a single letter, so prefix "PANDA_ROOT". // It starts with a slash, but the first part is not a single
// letter, so prefix $PANDA_ROOT.
windows_pathname = windows_pathname =
get_panda_root() + front_to_back_slash(unix_style_pathname); get_panda_root() + front_to_back_slash(unix_style_pathname.substr(1));
} }
return windows_pathname; return windows_pathname;
@ -609,7 +610,7 @@ make_canonical() {
if (is_directory()) { if (is_directory()) {
// If the filename itself represents a directory and not a // If the filename itself represents a directory and not a
// filename, cd to the named directory, not the one above it. // filename, cd to the named directory, not the one above it.
string dirname = get_fullpath(); string dirname = to_os_specific();
if (chdir(dirname.c_str()) < 0) { if (chdir(dirname.c_str()) < 0) {
return false; return false;
@ -619,14 +620,15 @@ make_canonical() {
} else { } else {
// Otherwise, if the filename represents a regular file (or // Otherwise, if the filename represents a regular file (or
// doesn't even exist), cd to the directory above. // doesn't even exist), cd to the directory above.
string dirname = get_dirname(); Filename dir(get_dirname());
if (dirname.empty()) { if (dir.empty()) {
// No dirname means the file is in this directory. // No dirname means the file is in this directory.
set_dirname(cwd); set_dirname(cwd);
return true; return true;
} }
string dirname = dir.to_os_specific();
if (chdir(dirname.c_str()) < 0) { if (chdir(dirname.c_str()) < 0) {
return false; return false;
} }
@ -1301,20 +1303,23 @@ make_dir() const {
// because the directory was already there. // because the directory was already there.
size_t slash = dirname.find('/'); size_t slash = dirname.find('/');
while (slash != string::npos) { while (slash != string::npos) {
string component = dirname.substr(0, slash); Filename component(dirname.substr(0, slash));
string os_specific = component.to_os_specific();
#ifndef WIN32_VC #ifndef WIN32_VC
mkdir(component.c_str(), 0777); mkdir(os_specific.c_str(), 0777);
#else #else
mkdir(component.c_str()); mkdir(os_specific.c_str());
#endif #endif
slash = dirname.find('/', slash + 1); slash = dirname.find('/', slash + 1);
} }
// Now make the last one, and check the return value. // Now make the last one, and check the return value.
Filename component(dirname);
string os_specific = component.to_os_specific();
#ifndef WIN32_VC #ifndef WIN32_VC
int result = mkdir(dirname.c_str(), 0777); int result = mkdir(os_specific.c_str(), 0777);
#else #else
int result = mkdir(dirname.c_str()); int result = mkdir(os_specific.c_str());
#endif #endif
return (result == 0); return (result == 0);