sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix is_relative

Browse source
This commit is contained in:
Dane Springmeyer 2014-10-07 21:43:33 -07:00
parent ca0bc3ce5b
commit 84c70ba767
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/fs.cpp
View file

@ -28,6 +28,9 @@
// boost // boost
#include <boost/filesystem/convenience.hpp> #include <boost/filesystem/convenience.hpp>
#ifdef _WINDOWS
#include <boost/regex.hpp>
#endif
// stl // stl
#include <stdexcept> #include <stdexcept>
@ -110,13 +113,13 @@ namespace util {
bool is_relative(std::string const& filepath) bool is_relative(std::string const& filepath)
{ {
if (filepath.empty()) return true;
#ifdef _WINDOWS #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 #else
boost::filesystem::path child_path(filepath); return (filepath[0] != '/');
#endif #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) 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 // http://insanecoding.blogspot.com/2007/11/directory-safety-when-working-with.html
char * _base = realpath(base.c_str(),NULL); char * _base = realpath(base.c_str(),NULL);
if (_base != nullptr) { if (_base != nullptr) {
std::string absolute(_base); std::string absolute(_base);
free(_base); free(_base);
absolute += "/" + filepath; absolute += "/" + filepath;
//std::clog << "abs " << absolute << "\n";
return absolute; return absolute;
/* /*
char * res = realpath(absolute.c_str(),NULL); char * res = realpath(absolute.c_str(),NULL);

6
src/load_map.cpp
View file

@ -1572,10 +1572,10 @@ std::string map_parser::ensure_relative_to_xml(boost::optional<std::string> cons
if (!xml_base_path_.empty()) if (!xml_base_path_.empty())
{ {
std::string starting_path = *opt_path; 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 mapnik::util::make_absolute(starting_path,xml_base_path_);
//} }
} }
return *opt_path; return *opt_path;
} }