diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-09 15:06:22 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-09 15:06:22 +0000 |
commit | 31d1d0a829a8d59939f55dccd50911cf1f7e49b4 (patch) | |
tree | 7ff256303c85a4e69cfee1e09d6b3137dfbbced2 /ruby.c | |
parent | 700a2b2350ce22ffd060be811f0258875425b592 (diff) | |
download | ruby-31d1d0a829a8d59939f55dccd50911cf1f7e49b4.tar.gz |
* configure.in (load_relative): new option to enable load path
relative to libruby_so.
* ruby.c (ruby_init_loadpath_safe): added the case using dladdr().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22860 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r-- | ruby.c | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -26,6 +26,9 @@ #ifdef __hpux #include <sys/pstat.h> #endif +#if defined(LOAD_RELATIVE) && defined(HAVE_DLADDR) +#include <dlfcn.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -352,10 +355,16 @@ ruby_init_loadpath_safe(int safe_level) char *p; int rest; + libpath[0] = '\0'; #if defined _WIN32 || defined __CYGWIN__ GetModuleFileName(libruby, libpath, sizeof libpath); #elif defined(__EMX__) _execname(libpath, sizeof(libpath) - 1); +#elif defined(HAVE_DLADDR) + Dl_info dli; + if (dladdr(ruby_init_loadpath_safe, &dli)) { + strlcpy(libpath, dli.dli_fname, sizeof(libpath)); + } #endif libpath[sizeof(libpath) - 1] = '\0'; |