AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make install location autodetection work for executables compressed with (latest version of) UPX under Linux (patch 1565357)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-10-22 14:19:50 +00:00
parent 85fa9d60c4
commit 3abcfa9b7f
2 changed files with 52 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/unix/stdpaths.h
View File

@ -19,6 +19,10 @@
class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
{
public:
// tries to determine the installation prefix automatically (Linux only right
// now) and returns /usr/local if it failed
void DetectPrefix();
// set the program installation directory which is /usr/local by default
//
// under some systems (currently only Linux) the program directory can be
@ -29,8 +33,7 @@ public:
// get the program installation prefix
//
// if the prefix had been previously by SetInstallPrefix, returns that
// value, otherwise tries to determine it automatically (Linux only right
// now) and returns /usr/local if it failed
// value, otherwise calls DetectPrefix()
wxString GetInstallPrefix() const;

70
src/unix/stdpaths.cpp
View File

@ -106,34 +106,58 @@ wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang,
// wxStandardPaths implementation for Unix
// ============================================================================
void wxStandardPaths::DetectPrefix()
{
#ifdef __LINUX__
// under Linux, we can try to infer the prefix from the location of the
// executable
wxString exeStr;
char buf[4096];
int result = readlink("/proc/self/exe", buf, WXSIZEOF(buf) - sizeof(char));
if ( result != -1 )
{
buf[result] = '\0'; // readlink() doesn't NUL-terminate the buffer
// if the /proc/self/exe symlink has been dropped by the kernel for
// some reason, then readlink() could also return success but
// "(deleted)" as link destination...
if ( strcmp(buf, "(deleted)") != 0 )
exeStr = wxString(buf, wxConvLibc);
}
if ( exeStr.empty() )
{
// UPX-specific hack: when using UPX on linux, the kernel will drop the
// /proc/self/exe link; in this case we try to look for a special
// environment variable called " " which is created by UPX to save
// /proc/self/exe contents. See
// http://sf.net/tracker/?func=detail&atid=309863&aid=1565357&group_id=9863
// for more information about this issue.
wxGetEnv(wxT(" "), &exeStr);
}
if ( !exeStr.empty() )
{
// consider that we're in the last "bin" subdirectory of our prefix
size_t pos = exeStr.rfind(wxT("/bin/"));
if ( pos != wxString::npos )
m_prefix.assign(exeStr, 0, pos);
}
#endif // __LINUX__
if ( m_prefix.empty() )
{
m_prefix = wxT("/usr/local");
}
}
wxString wxStandardPaths::GetInstallPrefix() const
{
if ( m_prefix.empty() )
{
wxStandardPaths *pathPtr = wx_const_cast(wxStandardPaths *, this);
#ifdef __LINUX__
// under Linux, we can try to infer the prefix from the location of the
// executable
char buf[4096];
int result = readlink("/proc/self/exe", buf, WXSIZEOF(buf) - sizeof(char));
if ( result != -1 )
{
buf[result] = '\0'; // readlink() doesn't NUL-terminate the buffer
const wxString exeStr(buf, wxConvLibc);
// consider that we're in the last "bin" subdirectory of our prefix
size_t pos = exeStr.rfind(wxT("/bin/"));
if ( pos != wxString::npos )
pathPtr->m_prefix.assign(exeStr, 0, pos);
}
#endif // __LINUX__
if ( m_prefix.empty() )
{
pathPtr->m_prefix = wxT("/usr/local");
}
pathPtr->DetectPrefix();
}
return m_prefix;