From d37577d9e06bfc496df4499fe771e425c20462dc Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 8 Mar 2007 09:48:17 -0500 Subject: [PATCH] STYLE: Removing unused methods ConvertToShellPath and EscapeForUnixShell. --- Source/cmSystemTools.cxx | 58 ---------------------------------------- Source/cmSystemTools.h | 4 --- 2 files changed, 62 deletions(-) diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 942f59333..7af78fb79 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1341,64 +1341,6 @@ std::string cmSystemTools::ConvertToOutputPath(const char* path) #endif } -std::string cmSystemTools::EscapeForUnixShell(std::string& result) -{ - // For UNIX Shell paths we need to escape () in the path - if(result.find_first_of("()") != result.npos) - { - std::string newResult = ""; - char lastch = 1; - bool inDollarVariable = false; - for(const char* ch = result.c_str(); *ch != '\0'; ++ch) - { - // if it is already escaped then don't try to escape it again - if((*ch == ' ' || *ch == '(' || *ch == ')') && lastch != '\\') - { - if(*ch == '(' && lastch == '$') - { - inDollarVariable = true; - } - // if we are in a $(..... and we get a ) then do not escape - // the ) and but set inDollarVariable to false - else if(*ch == ')' && inDollarVariable) - { - inDollarVariable = false; - } - else - { - newResult += '\\'; - } - } - newResult += *ch; - lastch = *ch; - } - return newResult; - } - return result; -} - -std::string cmSystemTools::ConvertToShellPath(const char* path) -{ - bool useUnix = false; // assume windows -#if defined(_WIN32) && !defined(__CYGWIN__) - // if windows and force paths but not cygwin useUnix is on - if(s_ForceUnixPaths) - { - useUnix = true; - } -#else - // if not win32 and maybe cygwin then unix is true - useUnix = true; -#endif - // if unix we need to call EscapeForUnixShell as well - if(useUnix) - { - std::string result = cmSystemTools::ConvertToUnixOutputPath(path); - return cmSystemTools::EscapeForUnixShell(result); - } - return cmSystemTools::ConvertToWindowsOutputPath(path); -} - std::string cmSystemTools::ConvertToRunCommandPath(const char* path) { #if defined(_WIN32) && !defined(__CYGWIN__) diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index f42ac17a1..ecb595d09 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -293,12 +293,8 @@ public: // be used when RunCommand is called from cmake, because the // running cmake needs paths to be in its format static std::string ConvertToRunCommandPath(const char* path); - // convert to a shell path - static std::string ConvertToShellPath(const char* path); //! Check if the first string ends with the second one. static bool StringEndsWith(const char* str1, const char* str2); - // escape for unix shells - static std::string EscapeForUnixShell(std::string& result); static bool CreateSymlink(const char* origName, const char* newName); /** compute the relative path from local to remote. local must