blind OS/2 compilation fix in wxSetWorkingDirectory()

[wxWidgets.git] / src / unix / stdpaths.cpp

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index fbecba3600730cee85065f3db5af5ff078579fc8..af3551bf068b51546d3f765c7d64491d0e6693a1 100644 (file)
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -26,64 +26,151 @@
 
 #if wxUSE_STDPATHS
 
 
 #if wxUSE_STDPATHS
 

+#include "wx/stdpaths.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/app.h"
+    #include "wx/utils.h"

 #endif //WX_PRECOMP
 
 #include "wx/filename.h"
 
 #endif //WX_PRECOMP
 
 #include "wx/filename.h"
 

-#include "wx/stdpaths.h"
-

 #if defined( __LINUX__ ) || defined( __VMS )
     #include <unistd.h>
 #endif
 
 // ============================================================================
 #if defined( __LINUX__ ) || defined( __VMS )
     #include <unistd.h>
 #endif
 
 // ============================================================================

-// wxStandardPaths implementation
+// common VMS/Unix part of wxStandardPaths implementation

 // ============================================================================
 
 // ============================================================================
 

-// ----------------------------------------------------------------------------
-// prefix management
-// ----------------------------------------------------------------------------
-

 void wxStandardPaths::SetInstallPrefix(const wxString& prefix)
 {
     m_prefix = prefix;
 }
 
 void wxStandardPaths::SetInstallPrefix(const wxString& prefix)
 {
     m_prefix = prefix;
 }
 

+wxString wxStandardPaths::GetUserConfigDir() const
+{
+    return wxFileName::GetHomeDir();
+}
+
+// ============================================================================
+// wxStandardPaths implementation for VMS
+// ============================================================================
+
+#ifdef __VMS
+

 wxString wxStandardPaths::GetInstallPrefix() const
 {
     if ( m_prefix.empty() )
     {
 wxString wxStandardPaths::GetInstallPrefix() const
 {
     if ( m_prefix.empty() )
     {

-        wxStandardPaths *pathPtr = wx_const_cast(wxStandardPaths *, this);
+        wx_const_cast(wxStandardPaths *, this)->m_prefix = wxT("/sys$system");
+    }
+
+    return m_prefix;
+}
+
+wxString wxStandardPaths::GetConfigDir() const
+{
+   return _T("/sys$manager");
+}
+
+wxString wxStandardPaths::GetDataDir() const
+{
+   return AppendAppName(GetInstallPrefix() + _T("/sys$share"));
+}
+
+wxString wxStandardPaths::GetLocalDataDir() const
+{
+   return AppendAppName(_T("/sys$manager"));
+}
+
+wxString wxStandardPaths::GetUserDataDir() const
+{
+   return wxFileName::GetHomeDir();
+}
+
+wxString wxStandardPaths::GetPluginsDir() const
+{
+    return wxString(); // TODO: this is wrong, it should return something
+}
+
+wxString
+wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang,
+                                          ResourceCat category) const
+{
+    return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
+}
+
+wxString wxStandardPaths::GetExecutablePath() const
+{
+    return wxStandardPathsBase::GetExecutablePath();
+}
+
+#else // !__VMS

 
 

+// ============================================================================
+// wxStandardPaths implementation for Unix
+// ============================================================================
+
+wxString wxStandardPaths::GetExecutablePath() const
+{

 #ifdef __LINUX__
 #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
-
-            wxString exeStr(buf, wxConvLibc);
-
-            // consider that we're in the last "bin" subdirectory of our prefix
-            wxString basename(wxString(wxTheApp->argv[0]).AfterLast(_T('/')));
-            size_t pos = exeStr.find(wxT("/bin/") + basename);
-            if ( pos != wxString::npos )
-                pathPtr->m_prefix.assign(exeStr, 0, pos);
-        }
+    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() )
+        return exeStr;

 #endif // __LINUX__
 
 #endif // __LINUX__
 

-        if ( m_prefix.empty() )
-        {
-#ifdef __VMS
-            pathPtr->m_prefix = wxT("/sys$system");
-#else
-            pathPtr->m_prefix = wxT("/usr/local");
-#endif
-        }
+    return wxStandardPathsBase::GetExecutablePath();
+}
+
+void wxStandardPaths::DetectPrefix()
+{
+    // we can try to infer the prefix from the location of the executable
+    wxString exeStr = GetExecutablePath();
+    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);
+    }
+
+    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;
     }
 
     return m_prefix;


@@ -95,48 +182,39 @@ wxString wxStandardPaths::GetInstallPrefix() const
 
 wxString wxStandardPaths::GetConfigDir() const
 {
 
 wxString wxStandardPaths::GetConfigDir() const
 {

-#ifdef __VMS
-   return _T("/sys$manager");
-#else

    return _T("/etc");
    return _T("/etc");

-#endif
-}
-
-wxString wxStandardPaths::GetUserConfigDir() const
-{
-    return wxFileName::GetHomeDir();

 }
 
 wxString wxStandardPaths::GetDataDir() const
 {
 }
 
 wxString wxStandardPaths::GetDataDir() const
 {

-#ifdef __VMS
-   return AppendAppName(GetInstallPrefix() + _T("/sys$share"));
-#else

    return AppendAppName(GetInstallPrefix() + _T("/share"));
    return AppendAppName(GetInstallPrefix() + _T("/share"));

-#endif

 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {
 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {

-#ifdef __VMS
-   return AppendAppName(_T("/sys$manager"));
-#else

    return AppendAppName(_T("/etc"));
    return AppendAppName(_T("/etc"));

-#endif

 }
 
 wxString wxStandardPaths::GetUserDataDir() const
 {
 }
 
 wxString wxStandardPaths::GetUserDataDir() const
 {

-#ifdef __VMS
-   return wxFileName::GetHomeDir();
-#else

    return AppendAppName(wxFileName::GetHomeDir() + _T("/."));
    return AppendAppName(wxFileName::GetHomeDir() + _T("/."));

-#endif

 }
 
 wxString wxStandardPaths::GetPluginsDir() const
 {
 }
 
 wxString wxStandardPaths::GetPluginsDir() const
 {

-    return wxString();
+    return AppendAppName(GetInstallPrefix() + _T("/lib"));
+}
+
+wxString
+wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang,
+                                          ResourceCat category) const
+{
+    if ( category != ResourceCat_Messages )
+        return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
+
+    return GetInstallPrefix() + _T("/share/locale/") + lang + _T("/LC_MESSAGES");

 }
 
 }
 

+#endif // __VMS/!__VMS
+

 #endif // wxUSE_STDPATHS
 #endif // wxUSE_STDPATHS