X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92384716797eae7e739ea5b4cb2ca7995d53bc86..7bd236e6da74203ba429941d3f9643291494b420:/src/unix/stdpaths.cpp

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index 5850820158..cc425db3b4 100644
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -39,18 +39,73 @@
 #endif
 
 // ============================================================================
-// wxStandardPaths implementation
+// common VMS/Unix part of wxStandardPaths implementation
 // ============================================================================
 
-// ----------------------------------------------------------------------------
-// prefix management
-// ----------------------------------------------------------------------------
-
 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() )
+    {
+        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 wxChar *lang,
+                                          ResourceCat category) const
+{
+    return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
+}
+
+#else // !__VMS
+
+// ============================================================================
+// wxStandardPaths implementation for Unix
+// ============================================================================
+
 wxString wxStandardPaths::GetInstallPrefix() const
 {
     if ( m_prefix.empty() )
@@ -58,32 +113,26 @@ wxString wxStandardPaths::GetInstallPrefix() const
         wxStandardPaths *pathPtr = wx_const_cast(wxStandardPaths *, this);
 
 #ifdef __LINUX__
-        // under Linux, we can get location of the executable
-        wxChar buf[4096];
-        int result;
-
-        // FIXME: is readlink() Unicode-aware or not???
-        result = readlink( (const char*)wxT("/proc/self/exe"), buf, WXSIZEOF(buf) - sizeof(wxChar) );
-        if (result != -1)
+        // 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] = wxChar(0);
-            wxString exeStr( buf, wxConvLibc );
+            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
-            wxString basename( wxString( wxTheApp->argv[0]).AfterLast( wxChar('/')) );
-            size_t pos = exeStr.find( wxT("/bin/") + basename );
-            if (pos != wxString::npos)
-                pathPtr->m_prefix.assign( exeStr, 0, pos );
+            size_t pos = exeStr.rfind(wxT("/bin/"));
+            if ( pos != wxString::npos )
+                pathPtr->m_prefix.assign(exeStr, 0, pos);
         }
 #endif // __LINUX__
 
-        if (m_prefix.empty())
+        if ( m_prefix.empty() )
         {
-#ifdef __VMS
-	   pathPtr->m_prefix = wxT("/sys$system");
-#else
-	   pathPtr->m_prefix = wxT("/usr/local");
-#endif
+            pathPtr->m_prefix = wxT("/usr/local");
         }
     }
 
@@ -96,48 +145,39 @@ wxString wxStandardPaths::GetInstallPrefix() const
 
 wxString wxStandardPaths::GetConfigDir() const
 {
-#ifdef __VMS
-   return _T("/sys$manager");
-#else
    return _T("/etc");
-#endif
-}
-
-wxString wxStandardPaths::GetUserConfigDir() const
-{
-    return wxFileName::GetHomeDir();
 }
 
 wxString wxStandardPaths::GetDataDir() const
 {
-#ifdef __VMS
-   return AppendAppName(GetInstallPrefix() + _T("/sys$share"));
-#else
    return AppendAppName(GetInstallPrefix() + _T("/share"));
-#endif
 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {
-#ifdef __VMS
-   return AppendAppName(_T("/sys$manager"));
-#else
    return AppendAppName(_T("/etc"));
-#endif
 }
 
 wxString wxStandardPaths::GetUserDataDir() const
 {
-#ifdef __VMS
-   return wxFileName::GetHomeDir();
-#else
    return AppendAppName(wxFileName::GetHomeDir() + _T("/."));
-#endif
 }
 
 wxString wxStandardPaths::GetPluginsDir() const
 {
-    return wxString();
+    return AppendAppName(GetInstallPrefix() + _T("/lib"));
 }
 
+wxString
+wxStandardPaths::GetLocalizedResourcesDir(const wxChar *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