townforge/dll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve issue with getting location of a self loaded object

Browse Source
This commit is contained in:
Antony Polukhin 2015-11-01 22:48:06 +03:00
parent b36d49b11f
commit faf4483fb0
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/boost/dll/detail/posix/path_from_handle.hpp
View File

@ -9,6 +9,7 @@
#include <boost/config.hpp>
#include <boost/dll/detail/system_error.hpp>
#include <boost/dll/detail/posix/program_location_impl.hpp>
#include <boost/filesystem/path.hpp>
#include <boost/predef/os.h>
@ -93,26 +94,30 @@ namespace boost { namespace dll { namespace detail {
// Fortunately investigating the sources of open source projects brought the understanding, that
// `handle` is just a `struct link_map*` that contains full library name.
const struct link_map* link_map = 0;
#if BOOST_OS_BSD_FREE
// FreeBSD has it's own logic http://code.metager.de/source/xref/freebsd/libexec/rtld-elf/rtld.c
// Fortunately it has the dlinfo call.
const struct link_map * link_map;
if (dlinfo(handle, RTLD_DI_LINKMAP, &link_map) >= 0) {
return boost::filesystem::path(link_map->l_name);
if (dlinfo(handle, RTLD_DI_LINKMAP, &link_map) < 0) {
link_map = 0;
}
#else
if (handle) {
return boost::filesystem::path(
static_cast<const struct link_map*>(handle)->l_name
);
}
link_map = static_cast<const struct link_map*>(handle);
#endif
ec = boost::system::error_code(
boost::system::errc::bad_file_descriptor,
boost::system::generic_category()
);
if (!link_map) {
ec = boost::system::error_code(
boost::system::errc::bad_file_descriptor,
boost::system::generic_category()
);
return boost::filesystem::path();
return boost::filesystem::path();
}
if (!link_map->l_name || *link_map->l_name == '\0') {
return program_location_impl(ec);
}
return boost::filesystem::path(link_map->l_name);
}
}}} // namespace boost::dll::detail

8
test/shared_library_load_test.cpp
View File

@ -346,11 +346,12 @@ int main(int argc, char* argv[])
shared_library sl(program_location());
BOOST_TEST(sl.is_loaded());
BOOST_TEST(sl);
BOOST_TEST(sl.location() == program_location());
boost::system::error_code ec;
shared_library sl2(program_location());
BOOST_TEST(sl2.is_loaded());
BOOST_TEST(sl2.location() == program_location());
BOOST_TEST(sl2);
BOOST_TEST(!ec);
@ -377,10 +378,9 @@ int main(int argc, char* argv[])
// assigning self
sl.load(program_location());
// TODO: known issue sl2.load(sl.location());
/* sl2 = sl;
sl2 = sl;
BOOST_TEST(sl == sl2);
BOOST_TEST(sl.location() == sl2.location()); */
BOOST_TEST(sl.location() == sl2.location());
}
{