make install location autodetection work for executables compressed with (latest...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/unix/stdpaths.h b/include/wx/unix/stdpaths.h
index 2c5575196503a70f8af6f71ec8e2ca2f5fd06f49..dee1224b061832ae74dad10abd3d012082ce6836 100644 (file)
--- a/include/wx/unix/stdpaths.h
+++ b/include/wx/unix/stdpaths.h
@@ -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;
 
 

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index cc425db3b43026bda55420a33f372d92164b6e80..cce3dc9eb1fcf29edd37d8ceac507e7128110b05 100644 (file)
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -106,34 +106,58 @@ wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang,
 // wxStandardPaths implementation for Unix
 // ============================================================================
 
-wxString wxStandardPaths::GetInstallPrefix() const
+void wxStandardPaths::DetectPrefix()
 {
-    if ( m_prefix.empty() )
+#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 )
     {
-        wxStandardPaths *pathPtr = wx_const_cast(wxStandardPaths *, this);
+        buf[result] = '\0'; // readlink() doesn't NUL-terminate the buffer
 
-#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);
-        }
+        // 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() )
-        {
-            pathPtr->m_prefix = wxT("/usr/local");
-        }
+    if ( m_prefix.empty() )
+    {
+        m_prefix = wxT("/usr/local");
+    }
+}
+
+wxString wxStandardPaths::GetInstallPrefix() const
+{
+    if ( m_prefix.empty() )
+    {
+        wxStandardPaths *pathPtr = wx_const_cast(wxStandardPaths *, this);
+        pathPtr->DetectPrefix();
     }
 
     return m_prefix;