From 84c70ba767dbdf331cc2282bb61b4b0048c7bd7d Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Tue, 7 Oct 2014 21:43:33 -0700
Subject: [PATCH] fix is_relative

---
 src/fs.cpp       | 20 +++++++-------------
 src/load_map.cpp |  6 +++---
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/fs.cpp b/src/fs.cpp
index 8d515576e..a4c48d608 100644
--- a/src/fs.cpp
+++ b/src/fs.cpp
@@ -28,6 +28,9 @@
 
 // boost
 #include <boost/filesystem/convenience.hpp>
+#ifdef _WINDOWS
+#include <boost/regex.hpp>
+#endif
 
 // stl
 #include <stdexcept>
@@ -110,13 +113,13 @@ namespace util {
 
     bool is_relative(std::string const& filepath)
     {
-
+        if (filepath.empty()) return true;
 #ifdef _WINDOWS
-        boost::filesystem::path child_path(mapnik::utf8_to_utf16(filepath));
+        static const boost::regex expression("^[a-zA-Z]:");
+        return (filepath[0] != '\\') && (filepath[0] != '/') && boost::regex_search(filepath,expression);
 #else
-        boost::filesystem::path child_path(filepath);
+        return (filepath[0] != '/');
 #endif
-        return (! child_path.has_root_directory() && ! child_path.has_root_name());
     }
 
 
@@ -141,21 +144,12 @@ namespace util {
 
     std::string make_absolute(std::string const& filepath, std::string const& base)
     {
-/*
-#if (BOOST_FILESYSTEM_VERSION == 3)
-        // TODO - normalize is now deprecated, use make_preferred?
-        return boost::filesystem::absolute(boost::filesystem::path(base)/filepath).string();
-#else // v2
-        return boost::filesystem::complete(boost::filesystem::path(base)/filepath).normalize().string();
-#endif
-*/
         // http://insanecoding.blogspot.com/2007/11/directory-safety-when-working-with.html
         char * _base = realpath(base.c_str(),NULL);
         if (_base != nullptr) {
             std::string absolute(_base);
             free(_base);
             absolute += "/" + filepath;
-            //std::clog << "abs " << absolute << "\n";
             return absolute;
             /*
             char * res = realpath(absolute.c_str(),NULL);
diff --git a/src/load_map.cpp b/src/load_map.cpp
index 810a049ad..38a58acd9 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -1572,10 +1572,10 @@ std::string map_parser::ensure_relative_to_xml(boost::optional<std::string> cons
     if (!xml_base_path_.empty())
     {
         std::string starting_path = *opt_path;
-        //if (mapnik::util::is_relative(starting_path))
-        //{
+        if (mapnik::util::is_relative(starting_path))
+        {
             return mapnik::util::make_absolute(starting_path,xml_base_path_);
-        //}
+        }
     }
     return *opt_path;
 }