inc

Author: firewave

lib/path.cpp

@@ -32,13 +32,20 @@
 #include <unistd.h>
 #else
 #include <direct.h>
+#include <stdexcept>
 #endif
 #if defined(__CYGWIN__)
 #include <strings.h>
 #endif
 
 #include <simplecpp.h>
 
+#if defined(_WIN32) && !defined(__MINGW32__)
+static const char SEP_NATIVE = '\\';
+#else
+static const char SEP_NATIVE = '/';
+#endif
+
 /** Is the filesystem case insensitive? */
 static bool caseInsensitiveFilesystem()
 {
@@ -54,20 +61,16 @@ std::string Path::toNativeSeparators(std::string path)
 {
 #if defined(_WIN32)
     const char separ = '/';
-    const char native = '\\';
 #else
     const char separ = '\\';
-    const char native = '/';
 #endif
-    std::replace(path.begin(), path.end(), separ, native);
+    std::replace(path.begin(), path.end(), separ, SEP_NATIVE);
     return path;
 }
 
 std::string Path::fromNativeSeparators(std::string path)
 {
-    const char nonnative = '\\';
-    const char newsepar = '/';
-    std::replace(path.begin(), path.end(), nonnative, newsepar);
+    std::replace(path.begin(), path.end(), '\\', '/');
     return path;
 }
 
@@ -211,9 +214,13 @@ std::string Path::getAbsoluteFilePath(const std::string& filePath)
     if (_fullpath(absolute, filePath.c_str(), _MAX_PATH))
         absolute_path = absolute;
 #elif defined(__linux__) || defined(__sun) || defined(__hpux) || defined(__GNUC__) || defined(__CPPCHECK__)
+    // realpath() only works with files that actually exist
     char * absolute = realpath(filePath.c_str(), nullptr);
-    if (absolute)
-        absolute_path = absolute;
+    if (!absolute) {
+        const int err = errno;
+        throw std::runtime_error("realpath() failed with " + std::to_string(err));
+    }
+    absolute_path = absolute;
     free(absolute);
 #else
 #error Platform absolute path function needed
@@ -223,13 +230,7 @@ std::string Path::getAbsoluteFilePath(const std::string& filePath)
 
 std::string Path::stripDirectoryPart(const std::string &file)
 {
-#if defined(_WIN32) && !defined(__MINGW32__)
-    const char native = '\\';
-#else
-    const char native = '/';
-#endif
-
-    const std::string::size_type p = file.rfind(native);
+    const std::string::size_type p = file.rfind(SEP_NATIVE);
     if (p != std::string::npos) {
         return file.substr(p + 1);
     }
@@ -243,6 +244,8 @@ bool Path::fileExists(const std::string &file)
 }
 
 std::string Path::join(std::string path1, std::string path2) {
+    path1 = fromNativeSeparators(std::move(path1));
+    path2 = fromNativeSeparators(std::move(path2));
     if (path1.empty() || path2.empty())
         return path1 + path2;
     if (path2.front() == '/')

test/helpers.cpp

@@ -44,9 +44,10 @@ ScopedFile::ScopedFile(std::string name, const std::string &content, std::string
             throw std::runtime_error("ScopedFile(" + mFullPath + ") - could not create directory");
 #endif
     }
-    std::cout << mName << " - " << mPath << " - " << mFullPath << " - " << Path::getAbsoluteFilePath(mFullPath) << std::endl;
 
-    std::ofstream of(Path::getAbsoluteFilePath(mFullPath));
+    std::cout << Path::getCurrentPath() << std::endl;
+
+    std::ofstream of(mFullPath);
     if (!of.is_open())
         throw std::runtime_error("ScopedFile(" + mFullPath + ") - could not open file");
     of << content;

test/testpath.cpp

@@ -38,6 +38,7 @@ class TestPath : public TestFixture {
         TEST_CASE(is_cpp);
         TEST_CASE(get_path_from_filename);
         TEST_CASE(join);
+        TEST_CASE(getAbsoluteFilePath);
     }
 
     void removeQuotationMarks() const {
@@ -148,7 +149,23 @@ class TestPath : public TestFixture {
         ASSERT_EQUALS("a", Path::join("", "a"));
         ASSERT_EQUALS("a/b", Path::join("a", "b"));
         ASSERT_EQUALS("a/b", Path::join("a/", "b"));
+        ASSERT_EQUALS("a/b", Path::join("a\\", "b"));
         ASSERT_EQUALS("/b", Path::join("a", "/b"));
+        ASSERT_EQUALS("/b", Path::join("a", "\\b"));
+    }
+
+    // TODO: this is quite messy - should Path::getAbsoluteFilePath() return normalized separators?
+    void getAbsoluteFilePath() const {
+        // Path::getAbsoluteFilePath() only works with existing paths on Linux
+#ifdef _WIN32
+        const std::string cwd = Path::getCurrentPath();
+        ASSERT_EQUALS(Path::join(cwd, "a.h"), Path::fromNativeSeparators(Path::getAbsoluteFilePath("a.h")));
+        ASSERT_EQUALS(Path::join(cwd, "inc/a.h"), Path::fromNativeSeparators(Path::getAbsoluteFilePath("inc/a.h")));
+        const std::string cwd_down = Path::getPathFromFilename(cwd);
+        ASSERT_EQUALS(Path::join(cwd_down, "a.h"), Path::fromNativeSeparators(Path::getAbsoluteFilePath("../a.h")));
+        ASSERT_EQUALS(Path::join(cwd_down, "inc/a.h"), Path::fromNativeSeparators(Path::getAbsoluteFilePath("../inc/a.h")));
+        ASSERT_EQUALS(Path::join(cwd_down, "inc/a.h"), Path::fromNativeSeparators(Path::getAbsoluteFilePath("../inc/../inc/a.h")));
+#endif
     }
 };