Merge branch 'main' into beta

Author: dacap

base/fs.cpp

@@ -1,5 +1,5 @@
 // LAF Base Library
-// Copyright (c) 2021-2024 Igara Studio S.A.
+// Copyright (c) 2021-2025 Igara Studio S.A.
 // Copyright (c) 2001-2018 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -35,6 +35,18 @@ const std::string::value_type* path_separators = "\\/";
 const std::string::value_type* path_separators = "/";
 #endif
 
+bool is_absolute_path(const std::string& path)
+{
+#if LAF_WINDOWS
+  return (path.size() > 2 && std::isalpha(path[0]) && path[1] == ':' &&
+          path[2] == path_separator) ||
+         // UNC network path
+         (path.size() > 1 && path[0] == path_separator && path[1] == path_separator);
+#else
+  return !path.empty() && path[0] == path_separator;
+#endif
+}
+
 void make_all_directories(const std::string& path)
 {
   std::vector<std::string> parts;
@@ -194,7 +206,15 @@ std::string get_relative_path(const std::string& filename, const std::string& ba
   auto itFrom = baseDirs.begin();
   auto itTo = toParts.begin();
 
-  while (itFrom != baseDirs.end() && itTo != toParts.end() && *itFrom == *itTo) {
+  while (itFrom != baseDirs.end() &&
+         itTo != toParts.end()
+#if LAF_LINUX
+         // The Linux file system is case sensitive
+         && *itFrom == *itTo
+#else
+         && base::string_to_lower(*itFrom) == base::string_to_lower(*itTo)
+#endif
+  ) {
     ++itFrom;
     ++itTo;
   }

base/fs.h

@@ -1,5 +1,5 @@
 // LAF Base Library
-// Copyright (c) 2020-2024 Igara Studio S.A.
+// Copyright (c) 2020-2025 Igara Studio S.A.
 // Copyright (c) 2001-2018 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -28,6 +28,7 @@ extern const std::string::value_type* path_separators;
 
 bool is_file(const std::string& path);
 bool is_directory(const std::string& path);
+bool is_absolute_path(const std::string& path);
 
 size_t file_size(const std::string& path);
 

base/fs_tests.cpp

@@ -259,6 +259,31 @@ TEST(FS, GetAbsolutePath)
 #endif
 }
 
+TEST(FS, IsAbsolutePath)
+{
+  EXPECT_FALSE(is_absolute_path(""));
+  EXPECT_FALSE(is_absolute_path("a"));
+  EXPECT_FALSE(is_absolute_path("./a"));
+  EXPECT_FALSE(is_absolute_path("../a"));
+  EXPECT_FALSE(is_absolute_path("."));
+  EXPECT_FALSE(is_absolute_path("./."));
+  EXPECT_FALSE(is_absolute_path("./a/.."));
+  EXPECT_FALSE(is_absolute_path(".\\//."));
+
+#if LAF_WINDOWS
+  EXPECT_TRUE(is_absolute_path("C:\\path\\..\\file"));
+  EXPECT_TRUE(is_absolute_path("\\\\network\\path"));
+  EXPECT_FALSE(is_absolute_path("C:user\\name\\"));
+  EXPECT_FALSE(is_absolute_path("C\\user\\name\\"));
+  EXPECT_FALSE(is_absolute_path("\\user\\path\\"));
+  EXPECT_FALSE(is_absolute_path(".:\\user\\name"));
+  EXPECT_FALSE(is_absolute_path("\\:\\user\\name"));
+#else
+  EXPECT_TRUE(is_absolute_path("/path/../file"));
+  EXPECT_FALSE(is_absolute_path("path/../file"));
+#endif
+}
+
 TEST(FS, GetCanonicalPath)
 {
   const auto cp = get_current_path();

base/fs_unix.h

@@ -1,5 +1,5 @@
 // LAF Base Library
-// Copyright (c) 2021-2024 Igara Studio S.A.
+// Copyright (c) 2021-2025 Igara Studio S.A.
 // Copyright (c) 2001-2018 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -213,7 +213,7 @@ std::string get_canonical_path(const std::string& path)
 std::string get_absolute_path(const std::string& path)
 {
   std::string full = path;
-  if (!full.empty() && full[0] != '/')
+  if (!full.empty() && !is_absolute_path(full))
     full = join_path(get_current_path(), full);
   full = normalize_path(full);
   if (!full.empty() && full.back() == path_separator)

base/fs_win32.h

@@ -161,7 +161,7 @@ std::string get_canonical_path(const std::string& path)
 std::string get_absolute_path(const std::string& path)
 {
   std::string full;
-  if (path.size() > 2 && path[1] != ':')
+  if (!full.empty() && !base::is_absolute_path(path))
     full = base::join_path(base::get_current_path(), path);
   else
     full = path;

base/platform.h

@@ -28,9 +28,10 @@ struct Platform {
   };
 
   enum class Arch {
-    x86,   // Windows 32-bit, Linux 32-bit
-    x64,   // Windows 64-bit, Mac Intel
-    arm64, // Mac Apple Silicon (M1, M1 Pro), Raspberry Pi?
+    x86,     // Windows 32-bit, Linux 32-bit
+    x64,     // Windows 64-bit, Mac Intel
+    arm64,   // Mac Apple Silicon (M1, M1 Pro), Raspberry Pi?
+    riscv64, // Linux RISC-V 64-bit
   };
 
   static constexpr OS os =
@@ -46,6 +47,8 @@ struct Platform {
   static constexpr Arch arch =
 #if defined(__arm64__) || defined(__aarch64__)
     Arch::arm64
+#elif defined(__riscv) && __riscv_xlen == 64
+    Arch::riscv64
 #elif defined(__x86_64__) || defined(_WIN64)
     Arch::x64
 #else
@@ -54,7 +57,8 @@ struct Platform {
     ;
 
   static_assert((arch == Arch::x86 && sizeof(void*) == 4) ||
-                  ((arch == Arch::x64 || arch == Arch::arm64) && sizeof(void*) == 8),
+                  ((arch == Arch::x64 || arch == Arch::arm64 || arch == Arch::riscv64) &&
+                   sizeof(void*) == 8),
                 "Invalid identification of CPU architecture");
 
   Version osVer;

examples/show_platform.cpp

@@ -30,9 +30,10 @@ int app_main(int argc, char* argv[])
 #endif
   }
   switch (p.arch) {
-    case base::Platform::Arch::x86:   std::printf(" (x86)"); break;
-    case base::Platform::Arch::x64:   std::printf(" (x64)"); break;
-    case base::Platform::Arch::arm64: std::printf(" (arm64)"); break;
+    case base::Platform::Arch::x86:     std::printf(" (x86)"); break;
+    case base::Platform::Arch::x64:     std::printf(" (x64)"); break;
+    case base::Platform::Arch::arm64:   std::printf(" (arm64)"); break;
+    case base::Platform::Arch::riscv64: std::printf(" (riscv64)"); break;
   }
   std::printf("\n");
   return 0;