X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/297ebe6b9749bba3ad8e7adb004f1ed390895c9c..1be2473f5909d77ec93070d390429d92f3e47298:/src/unix/dlunix.cpp diff --git a/src/unix/dlunix.cpp b/src/unix/dlunix.cpp index 8a9de2c421..97d20f98ee 100644 --- a/src/unix/dlunix.cpp +++ b/src/unix/dlunix.cpp @@ -28,6 +28,31 @@ #include "wx/dynlib.h" #include "wx/ffile.h" +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" +#endif + +// only Mac OS X 10.3+ has dlfcn.h, and it is simpler to always provide our own +// wrappers using the native functions instead of doing checks for OS version +#ifndef __DARWIN__ + #include +#endif + +// if some flags are not supported, just ignore them +#ifndef RTLD_LAZY + #define RTLD_LAZY 0 +#endif + +#ifndef RTLD_NOW + #define RTLD_NOW 0 +#endif + +#ifndef RTLD_GLOBAL + #define RTLD_GLOBAL 0 +#endif + + #if defined(HAVE_DLOPEN) || defined(__DARWIN__) #define USE_POSIX_DL_FUNCS #elif !defined(HAVE_SHL_LOAD) @@ -73,29 +98,6 @@ static char dl_last_error[1024]; -static -void TranslateError(const char *path, int number) -{ - unsigned int index; - static char *OFIErrorStrings[] = - { - "%s(%d): Object Image Load Failure\n", - "%s(%d): Object Image Load Success\n", - "%s(%d): Not an recognisable object file\n", - "%s(%d): No valid architecture\n", - "%s(%d): Object image has an invalid format\n", - "%s(%d): Invalid access (permissions?)\n", - "%s(%d): Unknown error code from NSCreateObjectFileImageFromFile\n", - }; -#define NUM_OFI_ERRORS (sizeof(OFIErrorStrings) / sizeof(OFIErrorStrings[0])) - - index = number; - if (index > NUM_OFI_ERRORS - 1) { - index = NUM_OFI_ERRORS - 1; - } - sprintf(dl_last_error, OFIErrorStrings[index], path, number); -} - const char *dlerror() { return dl_last_error; @@ -106,10 +108,29 @@ void *dlopen(const char *path, int WXUNUSED(mode) /* mode is ignored */) NSObjectFileImage ofile; NSModule handle = NULL; - int dyld_result = NSCreateObjectFileImageFromFile(path, &ofile); + unsigned dyld_result = NSCreateObjectFileImageFromFile(path, &ofile); if ( dyld_result != NSObjectFileImageSuccess ) { handle = NULL; + + static const char *errorStrings[] = + { + "%d: Object Image Load Failure", + "%d: Object Image Load Success", + "%d: Not an recognisable object file", + "%d: No valid architecture", + "%d: Object image has an invalid format", + "%d: Invalid access (permissions?)", + "%d: Unknown error code from NSCreateObjectFileImageFromFile" + }; + + const int index = dyld_result < WXSIZEOF(errorStrings) + ? dyld_result + : WXSIZEOF(errorStrings) - 1; + + // this call to sprintf() is safe as strings above are fixed at + // compile-time and are shorter than WXSIZEOF(dl_last_error) + sprintf(dl_last_error, errorStrings[index], dyld_result); } else { @@ -120,17 +141,27 @@ void *dlopen(const char *path, int WXUNUSED(mode) /* mode is ignored */) NSLINKMODULE_OPTION_BINDNOW | NSLINKMODULE_OPTION_RETURN_ON_ERROR ); + + if ( !handle ) + { + NSLinkEditErrors err; + int code; + const char *filename; + const char *errmsg; + + NSLinkEditError(&err, &code, &filename, &errmsg); + strncpy(dl_last_error, errmsg, WXSIZEOF(dl_last_error)-1); + dl_last_error[WXSIZEOF(dl_last_error)-1] = '\0'; + } } - if ( !handle ) - TranslateError(path, dyld_result); return handle; } int dlclose(void *handle) { - NSUnLinkModule( handle, NSUNLINKMODULE_OPTION_NONE); + NSUnLinkModule((NSModule)handle, NSUNLINKMODULE_OPTION_NONE); return 0; } @@ -144,7 +175,7 @@ void *dlsym(void *handle, const char *symbol) p[0] = '_'; strcpy(p + 1, symbol); - NSSymbol nsSymbol = NSLookupSymbolInModule( handle, p ); + NSSymbol nsSymbol = NSLookupSymbolInModule((NSModule)handle, p ); return nsSymbol ? NSAddressOfSymbol(nsSymbol) : NULL; } @@ -166,30 +197,17 @@ wxDllType wxDynamicLibrary::GetProgramHandle() /* static */ wxDllType wxDynamicLibrary::RawLoad(const wxString& libname, int flags) { - wxASSERT_MSG( (flags & wxDL_NOW) == 0, + wxASSERT_MSG( !(flags & wxDL_NOW) || !(flags & wxDL_LAZY), _T("wxDL_LAZY and wxDL_NOW are mutually exclusive.") ); #ifdef USE_POSIX_DL_FUNCS - int rtldFlags = 0; + // we need to use either RTLD_NOW or RTLD_LAZY because if we call dlopen() + // with flags == 0 recent versions of glibc just fail the call, so use + // RTLD_NOW even if wxDL_NOW was not specified + int rtldFlags = flags & wxDL_LAZY ? RTLD_LAZY : RTLD_NOW; -#ifdef RTLD_LAZY - if ( flags & wxDL_LAZY ) - { - rtldFlags |= RTLD_LAZY; - } -#endif -#ifdef RTLD_NOW - if ( flags & wxDL_NOW ) - { - rtldFlags |= RTLD_NOW; - } -#endif -#ifdef RTLD_GLOBAL if ( flags & wxDL_GLOBAL ) - { rtldFlags |= RTLD_GLOBAL; - } -#endif return dlopen(libname.fn_str(), rtldFlags); #else // !USE_POSIX_DL_FUNCS @@ -221,7 +239,7 @@ void wxDynamicLibrary::Unload(wxDllType handle) shl_unload(handle); #endif // USE_POSIX_DL_FUNCS/!USE_POSIX_DL_FUNCS -#ifdef USE_POSIX_DL_FUNCS +#if defined(USE_POSIX_DL_FUNCS) && defined(wxHAVE_DYNLIB_ERROR) if ( rc != 0 ) Error(); #endif @@ -253,14 +271,12 @@ void *wxDynamicLibrary::RawGetSymbol(wxDllType handle, const wxString& name) /* static */ void wxDynamicLibrary::Error() { -#if wxUSE_UNICODE - wxWCharBuffer buffer = wxConvLocal.cMB2WC( dlerror() ); - const wxChar *err = buffer; -#else - const wxChar *err = dlerror(); -#endif + wxString err(dlerror()); - wxLogError(wxT("%s"), err ? err : _("Unknown dynamic library error")); + if ( err.empty() ) + err = _("Unknown dynamic library error"); + + wxLogError(wxT("%s"), err); } #endif // wxHAVE_DYNLIB_ERROR @@ -276,13 +292,13 @@ class wxDynamicLibraryDetailsCreator public: // create a new wxDynamicLibraryDetails from the given data static wxDynamicLibraryDetails * - New(unsigned long start, unsigned long end, const wxString& path) + New(void *start, void *end, const wxString& path) { wxDynamicLibraryDetails *details = new wxDynamicLibraryDetails; details->m_path = path; details->m_name = path.AfterLast(_T('/')); - details->m_address = wx_reinterpret_cast(void *, start); - details->m_length = end - start; + details->m_address = start; + details->m_length = (char *)end - (char *)start; // try to extract the library version from its name const size_t posExt = path.rfind(_T(".so")); @@ -316,21 +332,22 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded() #ifdef __LINUX__ // examine /proc/self/maps to find out what is loaded in our address space - wxFFile file("/proc/self/maps"); + wxFFile file(_T("/proc/self/maps")); if ( file.IsOpened() ) { // details of the module currently being parsed wxString pathCur; - unsigned long startCur, - endCur; + void *startCur = NULL, + *endCur = NULL; char path[1024]; char buf[1024]; while ( fgets(buf, WXSIZEOF(buf), file.fp()) ) { - // format is: start-end perm something? maj:min inode path - unsigned long start, end; - switch ( sscanf(buf, "%08lx-%08lx %*4s %*08x %*02d:%*02d %*d %1024s\n", + // format is: "start-end perm offset maj:min inode path", see proc(5) + void *start, + *end; + switch ( sscanf(buf, "%p-%p %*4s %*p %*02x:%*02x %*d %1024s\n", &start, &end, path) ) { case 2: @@ -350,6 +367,9 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded() continue; } + wxASSERT_MSG( start >= endCur, + _T("overlapping regions in /proc/self/maps?") ); + wxString pathNew = wxString::FromAscii(path); if ( pathCur.empty() ) { @@ -358,10 +378,9 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded() startCur = start; endCur = end; } - else if ( pathCur == pathNew ) + else if ( pathCur == pathNew && endCur == end ) { - // continuation of the same module - wxASSERT_MSG( start == endCur, _T("hole in /proc/self/maps?") ); + // continuation of the same module in the address space endCur = end; } else // end of the current module