Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Need to return to working directory after checking if path exists #586

Merged
merged 2 commits into from
Oct 18, 2018
Merged

Need to return to working directory after checking if path exists #586

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03ff811
Need to return to working directory after checking if path exists
lasalvavida Aug 5, 2018
9c98290
Change spaces to tabs
lasalvavida Oct 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions COLLADABaseUtils/src/COLLADABUUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ namespace COLLADABU
start = text.find_first_not_of(separators, stop+1);
}
}

#ifdef COLLADABU_OS_WIN
//--------------------------------
bool Utils::createDirectoryIfNeeded( const WideString &pathString )
Expand All @@ -232,7 +232,7 @@ namespace COLLADABU

}
#endif

//--------------------------------
bool Utils::createDirectoryIfNeeded( const String &pathString )
{
Expand Down Expand Up @@ -298,12 +298,14 @@ namespace COLLADABU
for (std::list<WideString>::const_iterator iPath = paths.begin(); iPath != paths.end(); ++iPath)
{
// if path exists
if (_wchdir((*iPath).c_str()) == 0)
if (_wchdir((*iPath).c_str()) == 0) {
_wchdir(currentPath);
continue;
}

// path does not exist, try to create it
_wmkdir((*iPath).c_str());

if (_wchdir((*iPath).c_str()) != 0)
{
pathExists = false;
Expand All @@ -316,7 +318,7 @@ namespace COLLADABU
return pathExists;
}
#endif

//--------------------------------
bool Utils::createDirectoryRecursive( const String &pathString )
{
Expand Down Expand Up @@ -349,12 +351,14 @@ namespace COLLADABU
for (std::list<String>::const_iterator iPath = paths.begin(); iPath != paths.end(); ++iPath)
{
// if path exists
if (_chdir((*iPath).c_str()) == 0)
if (_chdir((*iPath).c_str()) == 0) {
_chdir(currentPath);
continue;
}

// path does not exist, try to create it
_mkdir((*iPath).c_str());

if (_chdir((*iPath).c_str()) != 0)
{
pathExists = false;
Expand All @@ -378,7 +382,7 @@ namespace COLLADABU

// path does not exist, try to create it
mkdir((*iPath).c_str(), 0755);

if (chdir((*iPath).c_str()) != 0)
{
pathExists = false;
Expand All @@ -391,7 +395,7 @@ namespace COLLADABU
#endif
return pathExists;
}

#ifdef COLLADABU_OS_WIN
//--------------------------------
bool Utils::directoryExists( const WideString &pathString )
Expand All @@ -412,7 +416,7 @@ namespace COLLADABU

}
#endif

//--------------------------------
bool Utils::directoryExists( const String &pathString )
{
Expand All @@ -437,7 +441,7 @@ namespace COLLADABU
struct stat st;
if(stat(pathString.c_str(),&st) == 0)
pathExists = true;

#endif

return pathExists;
Expand Down Expand Up @@ -471,8 +475,8 @@ namespace COLLADABU
size_t length = strlen(command);
if( length > 4096)
return false;


int status = system(command);
copystatus = (status == 0 ? true : false);
#endif
Expand Down