Warning fix.

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

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index f68392f0f41d29e5278de0edcff8aeebf0151ace..cc425db3b43026bda55420a33f372d92164b6e80 100644 (file)
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        unix/stdpaths.cpp
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        unix/stdpaths.cpp

-// Purpose:     wxStandardPaths implementation for Unix systems
+// Purpose:     wxStandardPaths implementation for Unix & OpenVMS systems

 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19


@@ -34,49 +34,105 @@
 
 #include "wx/stdpaths.h"
 
 
 #include "wx/stdpaths.h"
 

-#ifdef __LINUX__
+#if defined( __LINUX__ ) || defined( __VMS )

     #include <unistd.h>
 #endif
 
 // ============================================================================
     #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() )
+    {
+        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() )
     {
 wxString wxStandardPaths::GetInstallPrefix() const
 {
     if ( m_prefix.empty() )
     {

-        wxStandardPaths *self = wx_const_cast(wxStandardPaths *, this);
+        wxStandardPaths *pathPtr = wx_const_cast(wxStandardPaths *, this);

 
 #ifdef __LINUX__
 
 #ifdef __LINUX__

-        // under Linux, we can get location of the executable
+        // under Linux, we can try to infer the prefix from the location of the
+        // executable

         char buf[4096];
         char buf[4096];

-        if ( readlink("/proc/self/exe", buf, WXSIZEOF(buf)) != -1 )
+        int result = readlink("/proc/self/exe", buf, WXSIZEOF(buf) - sizeof(char));
+        if ( result != -1 )

         {
         {

-            wxString exe(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
 
             // consider that we're in the last "bin" subdirectory of our prefix

-            wxString basename(wxString(wxTheApp->argv[0]).AfterLast(_T('/')));
-            size_t pos = exe.find(_T("/bin/") + basename);
+            size_t pos = exeStr.rfind(wxT("/bin/"));

             if ( pos != wxString::npos )
             if ( pos != wxString::npos )

-            {
-                self->m_prefix.assign(exe, 0, pos);
-            }
+                pathPtr->m_prefix.assign(exeStr, 0, pos);

         }
         }

+#endif // __LINUX__

 
         if ( m_prefix.empty() )
 
         if ( m_prefix.empty() )

-#endif // __LINUX__

         {
         {

-            self->m_prefix = _T("/usr/local");
+            pathPtr->m_prefix = wxT("/usr/local");

         }
     }
 
         }
     }
 


@@ -89,32 +145,39 @@ wxString wxStandardPaths::GetInstallPrefix() const
 
 wxString wxStandardPaths::GetConfigDir() const
 {
 
 wxString wxStandardPaths::GetConfigDir() const
 {

-    return _T("/etc");
-}
-
-wxString wxStandardPaths::GetUserConfigDir() const
-{
-    return wxFileName::GetHomeDir();
+   return _T("/etc");

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

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

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

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

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

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

 }
 
 wxString wxStandardPaths::GetPluginsDir() const
 {
 }
 
 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
 #endif // wxUSE_STDPATHS