premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

back-port path fixup in file_storage add_file

This commit is contained in:
arvidn 2017-12-23 00:50:30 +01:00 committed by Arvid Norberg
parent 47709244d3
commit b5d4bc5e62
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/file_storage.cpp
View File

@ -181,10 +181,14 @@ namespace libtorrent
&& std::memcmp(branch_path, m_name.c_str(), m_name.size()) == 0 && std::memcmp(branch_path, m_name.c_str(), m_name.size()) == 0
&& branch_path[m_name.size()] == TORRENT_SEPARATOR) && branch_path[m_name.size()] == TORRENT_SEPARATOR)
{ {
int const offset = m_name.size() int const offset = m_name.size();
+ (m_name.size() == branch_len?0:1);
branch_path += offset; branch_path += offset;
branch_len -= offset; branch_len -= offset;
while (branch_len > 0 && branch_path[0] == TORRENT_SEPARATOR)
{
--branch_len;
++branch_path;
}
e.no_root_dir = false; e.no_root_dir = false;
} }
else else
@ -199,7 +203,7 @@ namespace libtorrent
int file_storage::get_or_add_path(char const* branch_path, int branch_len) int file_storage::get_or_add_path(char const* branch_path, int branch_len)
{ {
// trim trailing slashes // trim trailing slashes
if (branch_len > 0 && branch_path[branch_len-1] == TORRENT_SEPARATOR) while (branch_len > 0 && branch_path[branch_len-1] == TORRENT_SEPARATOR)
--branch_len; --branch_len;
// do we already have this path in the path list? // do we already have this path in the path list?