From 09cb29bbdac3d1d7c0f00f96d6699f4c0abc23ea Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Wed, 24 May 2006 19:27:05 +0000 Subject: [PATCH] Changed platform-specific getcwd calls to f_getcwd. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@451 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- xflaim/util/fshell.cpp | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/xflaim/util/fshell.cpp b/xflaim/util/fshell.cpp index 0c49acc..5363b39 100644 --- a/xflaim/util/fshell.cpp +++ b/xflaim/util/fshell.cpp @@ -25,13 +25,6 @@ #include "fshell.h" #include "domedit.h" -#ifdef FLM_UNIX - #include -#endif - -#ifdef FLM_WIN - #include -#endif // Imported global variables. @@ -1579,21 +1572,10 @@ RCODE FlmShell::execute( void) FTXWinSetCursorPos( m_pWindow, 0, uiRow); FTXWinClearToEOL( m_pWindow); -#if defined( FLM_NLM) - szDir [0] = 0; -#elif defined( FLM_WIN) - if (_getcwd( (char *)szDir, F_PATH_MAX_SIZE) == NULL) + if( RC_BAD( f_getcwd( szDir))) { szDir [0] = '\0'; } -#elif defined( FLM_UNIX) - if (getcwd( (char *)szDir, F_PATH_MAX_SIZE) == NULL) - { - szDir [0] = '\0'; - } -#else - #error "This platform is not supported" -#endif FTXWinPrintf( m_pWindow, "%s>", szDir); @@ -2318,9 +2300,6 @@ public: FTXWinPrintf( m_pWin, " %,I64u of %,I64u bytes copied\r", ui64BytesCopied, ui64BytesToCopy); f_yieldCPU(); - #ifdef FLM_WIN - f_sleep( 0); - #endif if( RC_OK( FTXWinTestKB( m_pWin))) { @@ -2646,9 +2625,6 @@ RCODE F_LocalBackupStatus::backupStatus( FTXWinPrintf( pWin, "%,I64u / %,I64u bytes backed up\r", ui64BytesDone, ui64BytesToDo); f_yieldCPU(); -#ifdef FLM_WIN - f_sleep( 0); -#endif if( pWin && RC_OK( FTXWinTestKB( pWin))) {