1 files changed, 42 insertions, 79 deletions

diff --git a/Source/cmGetFilenameComponentCommand.cxx b/Source/cmGetFilenameComponentCommand.cxx
index 2026a45..1830b0c 100644
--- a/Source/cmGetFilenameComponentCommand.cxx
+++ b/Source/cmGetFilenameComponentCommand.cxx
@@ -14,139 +14,102 @@
 #include "cmSystemTools.h"
 
 // cmGetFilenameComponentCommand
-bool cmGetFilenameComponentCommand
-::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
+bool cmGetFilenameComponentCommand::InitialPass(
+  std::vector<std::string> const& args, cmExecutionStatus&)
 {
-  if(args.size() < 3)
-    {
+  if (args.size() < 3) {
     this->SetError("called with incorrect number of arguments");
     return false;
-    }
+  }
 
   // Check and see if the value has been stored in the cache
   // already, if so use that value
-  if(args.size() >= 4 && args[args.size() - 1] == "CACHE")
-    {
+  if (args.size() >= 4 && args[args.size() - 1] == "CACHE") {
     const char* cacheValue = this->Makefile->GetDefinition(args[0]);
-    if(cacheValue && !cmSystemTools::IsNOTFOUND(cacheValue))
-      {
+    if (cacheValue && !cmSystemTools::IsNOTFOUND(cacheValue)) {
       return true;
-      }
     }
+  }
 
   std::string result;
   std::string filename = args[1];
-  if(filename.find("[HKEY") != filename.npos)
-    {
+  if (filename.find("[HKEY") != filename.npos) {
     // Check the registry as the target application would view it.
     cmSystemTools::KeyWOW64 view = cmSystemTools::KeyWOW64_32;
     cmSystemTools::KeyWOW64 other_view = cmSystemTools::KeyWOW64_64;
-    if(this->Makefile->PlatformIs64Bit())
-      {
+    if (this->Makefile->PlatformIs64Bit()) {
       view = cmSystemTools::KeyWOW64_64;
       other_view = cmSystemTools::KeyWOW64_32;
-      }
+    }
     cmSystemTools::ExpandRegistryValues(filename, view);
-    if(filename.find("/registry") != filename.npos)
-      {
+    if (filename.find("/registry") != filename.npos) {
       std::string other = args[1];
       cmSystemTools::ExpandRegistryValues(other, other_view);
-      if(other.find("/registry") == other.npos)
-        {
+      if (other.find("/registry") == other.npos) {
         filename = other;
-        }
       }
     }
+  }
   std::string storeArgs;
   std::string programArgs;
-  if (args[2] == "DIRECTORY" || args[2] == "PATH")
-    {
+  if (args[2] == "DIRECTORY" || args[2] == "PATH") {
     result = cmSystemTools::GetFilenamePath(filename);
-    }
-  else if (args[2] == "NAME")
-    {
+  } else if (args[2] == "NAME") {
     result = cmSystemTools::GetFilenameName(filename);
-    }
-  else if (args[2] == "PROGRAM")
-    {
-    for(unsigned int i=2; i < args.size(); ++i)
-      {
-      if(args[i] == "PROGRAM_ARGS")
-        {
+  } else if (args[2] == "PROGRAM") {
+    for (unsigned int i = 2; i < args.size(); ++i) {
+      if (args[i] == "PROGRAM_ARGS") {
         i++;
-        if(i < args.size())
-          {
+        if (i < args.size()) {
           storeArgs = args[i];
-          }
         }
       }
-    cmSystemTools::SplitProgramFromArgs(filename,
-                                        result, programArgs);
     }
-  else if (args[2] == "EXT")
-    {
+    cmSystemTools::SplitProgramFromArgs(filename, result, programArgs);
+  } else if (args[2] == "EXT") {
     result = cmSystemTools::GetFilenameExtension(filename);
-    }
-  else if (args[2] == "NAME_WE")
-    {
+  } else if (args[2] == "NAME_WE") {
     result = cmSystemTools::GetFilenameWithoutExtension(filename);
-    }
-  else if (args[2] == "ABSOLUTE" ||
-           args[2] == "REALPATH")
-    {
+  } else if (args[2] == "ABSOLUTE" || args[2] == "REALPATH") {
     // If the path given is relative, evaluate it relative to the
     // current source directory unless the user passes a different
     // base directory.
     std::string baseDir = this->Makefile->GetCurrentSourceDirectory();
-    for(unsigned int i=3; i < args.size(); ++i)
-      {
-      if(args[i] == "BASE_DIR")
-        {
+    for (unsigned int i = 3; i < args.size(); ++i) {
+      if (args[i] == "BASE_DIR") {
         ++i;
-        if(i < args.size())
-          {
+        if (i < args.size()) {
           baseDir = args[i];
-          }
         }
       }
+    }
     // Collapse the path to its simplest form.
     result = cmSystemTools::CollapseFullPath(filename, baseDir);
-    if(args[2] == "REALPATH")
-      {
+    if (args[2] == "REALPATH") {
       // Resolve symlinks if possible
       result = cmSystemTools::GetRealPath(result);
-      }
     }
-  else
-    {
+  } else {
     std::string err = "unknown component " + args[2];
     this->SetError(err);
     return false;
-    }
+  }
 
-  if(args.size() >= 4 && args[args.size() - 1] == "CACHE")
-    {
-    if(!programArgs.empty() && !storeArgs.empty())
-      {
-      this->Makefile->AddCacheDefinition
-        (storeArgs, programArgs.c_str(),
-         "", args[2] == "PATH" ? cmState::FILEPATH
-         : cmState::STRING);
-      }
-    this->Makefile->AddCacheDefinition
-      (args[0], result.c_str(), "",
-       args[2] == "PATH" ? cmState::FILEPATH
-       : cmState::STRING);
+  if (args.size() >= 4 && args[args.size() - 1] == "CACHE") {
+    if (!programArgs.empty() && !storeArgs.empty()) {
+      this->Makefile->AddCacheDefinition(storeArgs, programArgs.c_str(), "",
+                                         args[2] == "PATH" ? cmState::FILEPATH
+                                                           : cmState::STRING);
     }
-  else
-    {
-    if(!programArgs.empty() && !storeArgs.empty())
-      {
+    this->Makefile->AddCacheDefinition(args[0], result.c_str(), "",
+                                       args[2] == "PATH" ? cmState::FILEPATH
+                                                         : cmState::STRING);
+  } else {
+    if (!programArgs.empty() && !storeArgs.empty()) {
       this->Makefile->AddDefinition(storeArgs, programArgs.c_str());
-      }
-    this->Makefile->AddDefinition(args[0], result.c_str());
     }
+    this->Makefile->AddDefinition(args[0], result.c_str());
+  }
 
   return true;
 }
-