actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use fchdir.

Browse Source
This commit is contained in:
Glenn Maynard
2003-09-16 02:45:49 +00:00
parent 32aedad7ab
commit 1efefa8493
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageUtil_FileDB.cpp
+8 -2
View File
@@ -14,6 +14,7 @@
#if !defined(WIN32) #if !defined(WIN32)
#include <dirent.h> #include <dirent.h>
#include <fcntl.h>
#endif #endif
@@ -72,13 +73,16 @@ void FileSet::LoadFromDir(const CString &dir)
} while( FindNextFile( hFind, &fd ) ); } while( FindNextFile( hFind, &fd ) );
FindClose(hFind); FindClose(hFind);
#else #else
CString OldDir = GetCwd(); int OldDir = open(".", O_RDONLY);
if( OldDir == -1 )
RageException::Throw( "Couldn't open(.): %s", strerror(errno) );
if( chdir(dir.c_str()) == -1 ) if( chdir(dir.c_str()) == -1 )
{ {
/* Only log once per dir. */ /* Only log once per dir. */
if( LOG ) if( LOG )
LOG->MapLog("chdir " + dir, "Couldn't chdir(%s): %s", dir.c_str(), strerror(errno) ); LOG->MapLog("chdir " + dir, "Couldn't chdir(%s): %s", dir.c_str(), strerror(errno) );
close( OldDir );
return; return;
} }
DIR *d = opendir("."); DIR *d = opendir(".");
@@ -111,7 +115,9 @@ void FileSet::LoadFromDir(const CString &dir)
} }
closedir(d); closedir(d);
chdir( OldDir ); if( fchdir( OldDir ) == -1 )
RageException::Throw( "Couldn't fchdir(): %s", strerror(errno) );
close( OldDir );
#endif #endif
} }