diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-18 07:22:26 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-18 07:22:26 +0000 |
| commit | 24d6ec0750afd0c393bab09aabe174da824a8c56 (patch) | |
| tree | c856ef924b12b5f1a88809208c38438cc874e6a1 /tools/mhmake/src/curdir.cpp | |
| parent | 5a30da03ddafd49caf68942f7ddf021bd898ef6d (diff) | |
| download | vcxsrv-24d6ec0750afd0c393bab09aabe174da824a8c56.tar.gz vcxsrv-24d6ec0750afd0c393bab09aabe174da824a8c56.tar.bz2 vcxsrv-24d6ec0750afd0c393bab09aabe174da824a8c56.zip | |
svn merge --reintegrate ^/branches/mhmake.parallel .
Diffstat (limited to 'tools/mhmake/src/curdir.cpp')
| -rw-r--r-- | tools/mhmake/src/curdir.cpp | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/tools/mhmake/src/curdir.cpp b/tools/mhmake/src/curdir.cpp index 64389c993..094093a9b 100644 --- a/tools/mhmake/src/curdir.cpp +++ b/tools/mhmake/src/curdir.cpp @@ -38,23 +38,6 @@ curdir::initcurdir::initcurdir() {
char CurDir[MAX_PATH];
getcwd(CurDir,MAX_PATH);
- *this=GetFileInfo(CurDir,refptr<fileinfo>());
+ string strCurDir=CurDir;
+ *this=GetAbsFileInfo(NormalizePathName(strCurDir));
}
-
-///////////////////////////////////////////////////////////////////////////////
-void curdir::ChangeCurDir(const refptr<fileinfo>&NewDir)
-{
- if (NewDir!=m_pCurrentDir)
- {
- #ifdef _DEBUG
- if (g_PrintAdditionalInfo)
- cout << "Changing to dir "<<NewDir->GetFullFileName()<<endl;
- #endif
- if (-1==chdir(NewDir->GetFullFileName().c_str()))
- {
- throw string("Error changing to directory ") + NewDir->GetQuotedFullFileName();
- }
- m_pCurrentDir=NewDir;
- }
-}
-
|