Added FileSystem::join("dir", "file") -> "dir/file"

diff --git a/src/util/file_system.cpp b/src/util/file_system.cpp
index a89b1b4..524d4a5 100644 (file)
--- a/src/util/file_system.cpp
+++ b/src/util/file_system.cpp
@@ -103,6 +103,22 @@ std::string normalize(const std::string& filename)
   return result.str();
 }
 
+std::string join(const std::string& lhs, const std::string& rhs)
+{
+  if (lhs.empty())
+  {
+    return rhs;
+  }
+  else if (lhs.back() == '/')
+  {
+    return lhs + rhs;
+  }
+  else
+  {
+    return lhs + "/" + rhs;
+  }
+}
+
 } // namespace FileSystem
 
 /* EOF */

diff --git a/src/util/file_system.hpp b/src/util/file_system.hpp
index 5cdda27..0e97835 100644 (file)
--- a/src/util/file_system.hpp
+++ b/src/util/file_system.hpp
@@ -40,6 +40,11 @@ std::string strip_extension(const std::string& filename);
  */
 std::string normalize(const std::string& filename);
 
+/**
+ * join two filenames join("foo", "bar") -> "foo/bar"
+ */
+std::string join(const std::string& lhs, const std::string& rhs);
+
 } // namespace FileSystem
 
 #endif