jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fox windows code for get_symlink_path() (the previous implementation caused infinite recursion on windows)

Browse Source
This commit is contained in:
Arvid Norberg
2009-07-20 02:07:32 +00:00
parent 3f11c9c57f
commit 0a18d91583
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/create_torrent.cpp
View File

@@ -143,40 +143,37 @@ namespace libtorrent
#endif #endif
} }
boost::filesystem::path get_symlink_path(char const* path) #ifndef TORRENT_WINDOWS
boost::filesystem::path get_symlink_path_impl(char const* path)
{ {
#ifdef TORRENT_WINDOWS
return "";
#else
char buf[MAX_SYMLINK_PATH]; char buf[MAX_SYMLINK_PATH];
int char_read = readlink(path,buf,MAX_SYMLINK_PATH); int char_read = readlink(path,buf,MAX_SYMLINK_PATH);
if (char_read < 0) return ""; if (char_read < 0) return "";
if (char_read < MAX_SYMLINK_PATH) buf[char_read] = 0; if (char_read < MAX_SYMLINK_PATH) buf[char_read] = 0;
else buf[0] = 0; else buf[0] = 0;
return buf; return buf;
#endif
} }
#endif
boost::filesystem::path TORRENT_EXPORT get_symlink_path(boost::filesystem::path const& p) boost::filesystem::path TORRENT_EXPORT get_symlink_path(boost::filesystem::path const& p)
{ {
#if defined TORRENT_WINDOWS && TORRENT_USE_WPATH #if defined TORRENT_WINDOWS && TORRENT_USE_WPATH
std::wstring path = convert_to_wstring(p.external_file_string()); return "";
return get_symlink_path(path.c_str());
#else #else
std::string path = convert_to_native(p.external_file_string()); std::string path = convert_to_native(p.external_file_string());
return get_symlink_path(p.string().c_str()); return get_symlink_path_impl(p.string().c_str());
#endif #endif
} }
boost::filesystem::path TORRENT_EXPORT get_symlink_path(boost::filesystem::wpath const& p) boost::filesystem::path TORRENT_EXPORT get_symlink_path(boost::filesystem::wpath const& p)
{ {
#ifdef TORRENT_WINDOWS #ifdef TORRENT_WINDOWS
return get_symlink_path(p.string().c_str()); return "";
#else #else
std::string utf8; std::string utf8;
wchar_utf8(p.string(), utf8); wchar_utf8(p.string(), utf8);
utf8 = convert_to_native(utf8); utf8 = convert_to_native(utf8);
return get_symlink_path(utf8.c_str()); return get_symlink_path_impl(utf8.c_str());
#endif #endif
} }