diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-08-18 12:52:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-08-18 12:52:54 +0100 |
| commit | 62e60473d474000af5ea63c68c0d402a2362731d (patch) | |
| tree | bd8c592eea3b88c55471bce76ac79ae687387d3c /src | |
| parent | 57b862d997857868d0c3c91a9776f854b62c6b56 (diff) | |
Don't allow backslashes into the ASSETMAP on Windows.
Diffstat (limited to 'src')
| -rw-r--r-- | src/asset.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/asset.cc b/src/asset.cc index 6a15f216..4cdbcc08 100644 --- a/src/asset.cc +++ b/src/asset.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,6 +28,7 @@ #include "dcp_assert.h" #include "compose.hpp" #include <libxml++/libxml++.h> +#include <boost/algorithm/string.hpp> using std::string; using boost::function; @@ -88,7 +89,14 @@ Asset::write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const throw MiscError (String::compose ("Asset %1 is not within the directory %2", _file, root)); } - chunk->add_child("Path")->add_child_text (path.get().string ()); + /* On Windows path.string() will contain back-slashes; replace these with + forward-slashes. XXX: perhaps there is a nicer way to do this with boost. + */ + + string path_string = path.get().string (); + boost::replace_all (path_string, "\\/", "/"); + + chunk->add_child("Path")->add_child_text (path_string); chunk->add_child("VolumeIndex")->add_child_text ("1"); chunk->add_child("Offset")->add_child_text ("0"); chunk->add_child("Length")->add_child_text (raw_convert<string> (boost::filesystem::file_size (_file))); @@ -129,4 +137,3 @@ Asset::set_file (boost::filesystem::path file) const _file = boost::filesystem::absolute (file); _hash.clear (); } - |