[Windows] addkernels: fix operations on path for Windows (#2657)

Author: apwojcik

addkernels/addkernels.cpp

@@ -25,6 +25,7 @@
  *******************************************************************************/
 #include "include_inliner.hpp"
 #include <algorithm>
+#include <filesystem>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
@@ -124,52 +125,41 @@ void PrintHelp()
     WrongUsage(ss.str());
 }
 
-void Process(const std::string& sourcePath,
+void Process(const std::filesystem::path& sourcePath,
              std::ostream& target,
              size_t bufferSize,
              size_t lineSize,
              bool recurse,
              bool as_extern,
              bool mark_includes)
 {
-    std::string fileName(sourcePath);
-    std::string extension, root;
-    std::stringstream inlinerTemp;
-    auto extPos   = fileName.rfind('.');
-    auto slashPos = fileName.rfind('/');
-
-    if(extPos != std::string::npos)
-    {
-        extension = fileName.substr(extPos + 1);
-        fileName  = fileName.substr(0, extPos);
-    }
-
-    if(slashPos != std::string::npos)
+    if(!std::filesystem::exists(sourcePath))
     {
-        root     = fileName.substr(0, slashPos + 1);
-        fileName = fileName.substr(slashPos + 1);
+        std::cerr << "File not found: " << sourcePath << std::endl;
+        // NOLINTNEXTLINE (concurrency-mt-unsafe)
+        std::exit(1);
     }
 
-    std::string variable(fileName);
-    std::ifstream sourceFile(sourcePath, std::ios::in | std::ios::binary);
+    std::filesystem::path root{sourcePath.has_parent_path() ? sourcePath.parent_path() : ""};
+    std::ifstream sourceFile{sourcePath, std::ios::in | std::ios::binary};
     std::istream* source = &sourceFile;
 
-    if(!sourceFile.good())
+    if(!sourceFile.is_open())
     {
-        std::cerr << "File not found: " << sourcePath << std::endl;
+        std::cerr << "Error opening file: " << sourcePath << std::endl;
         // NOLINTNEXTLINE (concurrency-mt-unsafe)
         std::exit(1);
     }
 
-    const auto is_asm    = extension == "s";
-    const auto is_cl     = extension == "cl";
-    const auto is_hip    = extension == "cpp";
-    const auto is_header = extension == "hpp";
+    const auto is_asm    = sourcePath.extension() == ".s";
+    const auto is_cl     = sourcePath.extension() == ".cl";
+    const auto is_hip    = sourcePath.extension() == ".cpp";
+    const auto is_header = sourcePath.extension() == ".hpp";
 
+    std::stringstream inlinerTemp;
     if(is_asm || is_cl || is_hip || is_header)
     {
         IncludeInliner inliner;
-
         try
         {
             if(is_asm)
@@ -190,15 +180,14 @@ void Process(const std::string& sourcePath,
         }
         catch(const InlineException& ex)
         {
-            std::cerr << ex.What() << std::endl;
-            std::cerr << ex.GetTrace() << std::endl;
+            std::cerr << ex.What() << '\n' << ex.GetTrace() << std::endl;
             // NOLINTNEXTLINE (concurrency-mt-unsafe)
             std::exit(1);
         }
-
         source = &inlinerTemp;
     }
 
+    auto variable{sourcePath.stem().string()};
     std::transform(variable.begin(), variable.end(), variable.begin(), ::toupper);
 
     if(mark_includes)

addkernels/include_inliner.cpp

@@ -24,48 +24,11 @@
  *
  *******************************************************************************/
 #include <algorithm>
-#include <exception>
 #include <fstream>
 #include <sstream>
 
-#ifdef _WIN32
-#include <windows.h>
-#endif
-#ifdef __linux__
-#include <linux/limits.h>
-#include <cstdlib>
-#endif // !WIN32
-
 #include "include_inliner.hpp"
 
-namespace {
-int GetMaxPath()
-{
-#ifdef _WIN32
-    return MAX_PATH;
-#else
-    return PATH_MAX;
-#endif
-}
-
-std::string GetAbsolutePath(const std::string& path)
-{
-    std::string result(GetMaxPath(), ' ');
-#ifdef _WIN32
-    const auto retval = GetFullPathName(path.c_str(), result.size(), &result[0], nullptr);
-
-    if(retval == 0)
-        return "";
-#else
-    auto* const retval = realpath(path.c_str(), &result[0]);
-
-    if(retval == nullptr)
-        return "";
-#endif
-    return result;
-}
-} // namespace
-
 std::string IncludeFileExceptionBase::What() const
 {
     std::ostringstream ss;
@@ -76,8 +39,8 @@ std::string IncludeFileExceptionBase::What() const
 
 void IncludeInliner::Process(std::istream& input,
                              std::ostream& output,
-                             const std::string& root,
-                             const std::string& file_name,
+                             const std::filesystem::path& root,
+                             const std::filesystem::path& file_name,
                              const std::string& directive,
                              bool allow_angle_brackets,
                              bool recurse)
@@ -87,8 +50,8 @@ void IncludeInliner::Process(std::istream& input,
 
 void IncludeInliner::ProcessCore(std::istream& input,
                                  std::ostream& output,
-                                 const std::string& root,
-                                 const std::string& file_name,
+                                 const std::filesystem::path& root,
+                                 const std::filesystem::path& file_name,
                                  int line_number,
                                  const std::string& directive,
                                  bool allow_angle_brackets,
@@ -151,10 +114,11 @@ void IncludeInliner::ProcessCore(std::istream& input,
 
             const std::string include_file_path =
                 line.substr(first_quote_pos + 1, second_quote_pos - first_quote_pos - 1);
-            const std::string abs_include_file_path(
-                GetAbsolutePath(root + "/" + include_file_path)); // NOLINT
 
-            if(abs_include_file_path.empty())
+            const auto abs_include_file_path{
+                std::filesystem::weakly_canonical(root / include_file_path)};
+
+            if(!std::filesystem::exists(abs_include_file_path))
             {
                 if(include_optional)
                     continue;
@@ -163,7 +127,7 @@ void IncludeInliner::ProcessCore(std::istream& input,
             }
             std::ifstream include_file(abs_include_file_path, std::ios::in);
 
-            if(!include_file.good())
+            if(!include_file.is_open())
             {
                 throw IncludeCantBeOpenedException(include_file_path,
                                                    GetIncludeStackTrace(current_line));

addkernels/include_inliner.hpp

@@ -24,11 +24,13 @@
  *
  *******************************************************************************/
 #ifndef SOURCE_INLINER_HPP
-
 #define SOURCE_INLINER_HPP
+
 #include "source_file_desc.hpp"
-#include <ostream>
+#include <exception>
+#include <filesystem>
 #include <memory>
+#include <ostream>
 #include <stack>
 
 class InlineException : public std::exception
@@ -118,8 +120,8 @@ class IncludeInliner
 
     void Process(std::istream& input,
                  std::ostream& output,
-                 const std::string& root,
-                 const std::string& file_name,
+                 const std::filesystem::path& root,
+                 const std::filesystem::path& file_name,
                  const std::string& directive,
                  bool allow_angle_brackets,
                  bool recurse);
@@ -131,8 +133,8 @@ class IncludeInliner
 
     void ProcessCore(std::istream& input,
                      std::ostream& output,
-                     const std::string& root,
-                     const std::string& file_name,
+                     const std::filesystem::path& root,
+                     const std::filesystem::path& file_name,
                      int line_number,
                      const std::string& directive,
                      bool allow_angle_brackets,

addkernels/source_file_desc.hpp

@@ -24,19 +24,22 @@
  *
  *******************************************************************************/
 #ifndef SOURCE_FILE_DESC_HPP
-
 #define SOURCE_FILE_DESC_HPP
-#include <string>
+
+#include <filesystem>
 #include <memory>
+#include <string>
 
 class SourceFileDesc
 {
 public:
-    std::string path;
+    std::filesystem::path path;
     int included_line;
     std::shared_ptr<SourceFileDesc> included_from;
 
-    SourceFileDesc(const std::string& path_, std::shared_ptr<SourceFileDesc> from, int line)
+    SourceFileDesc(const std::filesystem::path& path_,
+                   std::shared_ptr<SourceFileDesc> from,
+                   int line)
         : path(path_), included_line(line), included_from(from)
     {
     }