merged in the commit from the 2.2 branch

[wxWidgets.git] / src / common / fileconf.cpp

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index d26dd662c746f1d7357cdd560ed17d5fd6cfd239..0d5b0a4ae3132ede1a8a2547516dff0f1b1db0f6 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -49,14 +49,17 @@
 #if defined(__WXPM__)
   #define INCL_DOS
   #include <os2.h>
 #if defined(__WXPM__)
   #define INCL_DOS
   #include <os2.h>

-  #define LINKAGEMODE _Optlink
-#else
-  #define LINKAGEMODE

 #endif
 
 #include  <stdlib.h>
 #include  <ctype.h>
 
 #endif
 
 #include  <stdlib.h>
 #include  <ctype.h>
 

+// headers needed for umask()
+#ifdef __UNIX__
+    #include <sys/types.h>
+    #include <sys/stat.h>
+#endif // __UNIX__
+

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------


@@ -98,7 +101,9 @@ wxString wxFileConfig::GetGlobalDir()
 {
   wxString strDir;
 
 {
   wxString strDir;
 

-  #ifdef __UNIX__
+  #ifdef __VMS__ // Note if __VMS is defined __UNIX is also defined
+    strDir = wxT("sys$manager:");
+  #elif defined( __UNIX__ )

     strDir = wxT("/etc/");
   #elif defined(__WXPM__)
     ULONG                           aulSysInfo[QSV_MAX] = {0};
     strDir = wxT("/etc/");
   #elif defined(__WXPM__)
     ULONG                           aulSysInfo[QSV_MAX] = {0};


@@ -194,7 +199,19 @@ wxString wxFileConfig::GetGlobalDir()
   #elif defined(__WXSTUBS__)
     wxASSERT_MSG( FALSE, wxT("TODO") ) ;
   #elif defined(__WXMAC__)
   #elif defined(__WXSTUBS__)
     wxASSERT_MSG( FALSE, wxT("TODO") ) ;
   #elif defined(__WXMAC__)

-    wxASSERT_MSG( FALSE, wxT("TODO") ) ;
+  {
+               short           vRefNum  ;
+               long            dirID ;
+               
+               if ( FindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder, &vRefNum, &dirID) == noErr)
+               {
+                       FSSpec file ;
+                       if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
+                       {
+                               strDir = wxMacFSSpec2UnixFilename( &file ) + "/" ;
+                       }
+               }
+  }

   #else // Windows
     wxChar szWinDir[MAX_PATH];
     ::GetWindowsDirectory(szWinDir, MAX_PATH);
   #else // Windows
     wxChar szWinDir[MAX_PATH];
     ::GetWindowsDirectory(szWinDir, MAX_PATH);


@@ -210,13 +227,21 @@ wxString wxFileConfig::GetLocalDir()
 {
   wxString strDir;
 
 {
   wxString strDir;
 

+#ifndef __WXMAC__

   wxGetHomeDir(&strDir);
 
 #ifdef  __UNIX__
   wxGetHomeDir(&strDir);
 
 #ifdef  __UNIX__

-  if (strDir.Last() != wxT('/')) strDir << wxT('/');
+#ifdef __VMS
+   if (strDir.Last() != wxT(']'))
+#endif
+   if (strDir.Last() != wxT('/')) strDir << wxT('/');

 #else
   if (strDir.Last() != wxT('\\')) strDir << wxT('\\');
 #endif
 #else
   if (strDir.Last() != wxT('\\')) strDir << wxT('\\');
 #endif

+#else
+       // no local dir concept on mac
+       return GetGlobalDir() ;
+#endif

 
   return strDir;
 }
 
   return strDir;
 }


@@ -229,6 +254,8 @@ wxString wxFileConfig::GetGlobalFileName(const wxChar *szFile)
   if ( wxStrchr(szFile, wxT('.')) == NULL )
   #ifdef  __UNIX__
     str << wxT(".conf");
   if ( wxStrchr(szFile, wxT('.')) == NULL )
   #ifdef  __UNIX__
     str << wxT(".conf");

+  #elif defined( __WXMAC__ )
+     str << " Preferences";

   #else   // Windows
     str << wxT(".ini");
   #endif  // UNIX/Win
   #else   // Windows
     str << wxT(".ini");
   #endif  // UNIX/Win


@@ -238,9 +265,15 @@ wxString wxFileConfig::GetGlobalFileName(const wxChar *szFile)
 
 wxString wxFileConfig::GetLocalFileName(const wxChar *szFile)
 {
 
 wxString wxFileConfig::GetLocalFileName(const wxChar *szFile)
 {

-  wxString str = GetLocalDir();
-
-  #ifdef  __UNIX__
+#ifdef __VMS__ // On VMS I saw the problem that the home directory was appended
+   // twice for the configuration file. Does that also happen for other
+   // platforms?
+   wxString str = wxT( '.' ); 
+#else
+   wxString str = GetLocalDir();
+#endif
+   
+  #if defined( __UNIX__ ) && !defined( __VMS )

     str << wxT('.');
   #endif
 
     str << wxT('.');
   #endif
 


@@ -251,6 +284,10 @@ wxString wxFileConfig::GetLocalFileName(const wxChar *szFile)
       str << wxT(".ini");
   #endif
 
       str << wxT(".ini");
   #endif
 

+
+  #ifdef __WXMAC__
+     str << " Preferences";
+  #endif

   return str;
 }
 
   return str;
 }
 


@@ -341,6 +378,8 @@ wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName,
       }
   }
 
       }
   }
 

+  SetUmask(-1);
+

   Init();
 }
 
   Init();
 }
 


@@ -393,8 +432,15 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
       pEnd = pStart;
 
       while ( *++pEnd != wxT(']') ) {
       pEnd = pStart;
 
       while ( *++pEnd != wxT(']') ) {

-        if ( *pEnd == wxT('\n') || *pEnd == wxT('\0') )
+        if ( *pEnd == wxT('\\') ) {
+            // the next char is escaped, so skip it even if it is ']'
+            pEnd++;
+        }
+
+        if ( *pEnd == wxT('\n') || *pEnd == wxT('\0') ) {
+            // we reached the end of line, break out of the loop

             break;
             break;

+        }

       }
 
       if ( *pEnd != wxT(']') ) {
       }
 
       if ( *pEnd != wxT(']') ) {


@@ -430,8 +476,7 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
             break;
 
           default:
             break;
 
           default:

-            wxLogWarning(_("file '%s', line %d: '%s' "
-                           "ignored after group header."),
+            wxLogWarning(_("file '%s', line %d: '%s' ignored after group header."),

                          file.GetName(), n + 1, pEnd);
             bCont = FALSE;
         }
                          file.GetName(), n + 1, pEnd);
             bCont = FALSE;
         }


@@ -439,11 +484,15 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
     }
     else {                        // a key
       const wxChar *pEnd = pStart;
     }
     else {                        // a key
       const wxChar *pEnd = pStart;

-      while ( *pEnd != wxT('=') && !wxIsspace(*pEnd) ) {
+      while ( *pEnd && *pEnd != wxT('=') && !wxIsspace(*pEnd) ) {

         if ( *pEnd == wxT('\\') ) {
           // next character may be space or not - still take it because it's
         if ( *pEnd == wxT('\\') ) {
           // next character may be space or not - still take it because it's

-          // quoted
+          // quoted (unless there is nothing)

           pEnd++;
           pEnd++;

+          if ( !*pEnd ) {
+            // the error message will be given below anyhow
+            break;
+          }

         }
 
         pEnd++;
         }
 
         pEnd++;


@@ -452,7 +501,7 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
       wxString strKey(FilterInEntryName(wxString(pStart, pEnd)));
 
       // skip whitespace
       wxString strKey(FilterInEntryName(wxString(pStart, pEnd)));
 
       // skip whitespace

-      while ( isspace(*pEnd) )
+      while ( wxIsspace(*pEnd) )

         pEnd++;
 
       if ( *pEnd++ != wxT('=') ) {
         pEnd++;
 
       if ( *pEnd++ != wxT('=') ) {


@@ -472,8 +521,7 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
         else {
           if ( bLocal && pEntry->IsImmutable() ) {
             // immutable keys can't be changed by user
         else {
           if ( bLocal && pEntry->IsImmutable() ) {
             // immutable keys can't be changed by user

-            wxLogWarning(_("file '%s', line %d: value for "
-                           "immutable key '%s' ignored."),
+            wxLogWarning(_("file '%s', line %d: value for immutable key '%s' ignored."),

                          file.GetName(), n + 1, strKey.c_str());
             continue;
           }
                          file.GetName(), n + 1, strKey.c_str());
             continue;
           }


@@ -483,8 +531,7 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
           //  (c) key from global file now found in local one
           // which is exactly what we want.
           else if ( !bLocal || pEntry->IsLocal() ) {
           //  (c) key from global file now found in local one
           // which is exactly what we want.
           else if ( !bLocal || pEntry->IsLocal() ) {

-            wxLogWarning(_("file '%s', line %d: key '%s' was first "
-                           "found at line %d."),
+            wxLogWarning(_("file '%s', line %d: key '%s' was first found at line %d."),

                          file.GetName(), n + 1, strKey.c_str(), pEntry->Line());
 
             if ( bLocal )
                          file.GetName(), n + 1, strKey.c_str(), pEntry->Line());
 
             if ( bLocal )


@@ -562,7 +609,7 @@ bool wxFileConfig::GetFirstGroup(wxString& str, long& lIndex) const
 bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) const
 {
   if ( size_t(lIndex) < m_pCurrentGroup->Groups().Count() ) {
 bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) const
 {
   if ( size_t(lIndex) < m_pCurrentGroup->Groups().Count() ) {

-    str = m_pCurrentGroup->Groups()[lIndex++]->Name();
+    str = m_pCurrentGroup->Groups()[(size_t)lIndex++]->Name();

     return TRUE;
   }
   else
     return TRUE;
   }
   else


@@ -578,7 +625,7 @@ bool wxFileConfig::GetFirstEntry(wxString& str, long& lIndex) const
 bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const
 {
   if ( size_t(lIndex) < m_pCurrentGroup->Entries().Count() ) {
 bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const
 {
   if ( size_t(lIndex) < m_pCurrentGroup->Entries().Count() ) {

-    str = m_pCurrentGroup->Entries()[lIndex++]->Name();
+    str = m_pCurrentGroup->Entries()[(size_t)lIndex++]->Name();

     return TRUE;
   }
   else
     return TRUE;
   }
   else


@@ -650,10 +697,9 @@ bool wxFileConfig::Read(const wxString& key,
   if (pEntry == NULL) {
     return FALSE;
   }
   if (pEntry == NULL) {
     return FALSE;
   }

-  else {
-    *pStr = ExpandEnvVars(pEntry->Value());
-    return TRUE;
-  }
+
+  *pStr = ExpandEnvVars(pEntry->Value());
+  return TRUE;

 }
 
 bool wxFileConfig::Read(const wxString& key,
 }
 
 bool wxFileConfig::Read(const wxString& key,


@@ -662,28 +708,31 @@ bool wxFileConfig::Read(const wxString& key,
   wxConfigPathChanger path(this, key);
 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   wxConfigPathChanger path(this, key);
 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());

+  bool ok;

   if (pEntry == NULL) {
     if( IsRecordingDefaults() )
       ((wxFileConfig *)this)->Write(key,defVal);
     *pStr = ExpandEnvVars(defVal);
   if (pEntry == NULL) {
     if( IsRecordingDefaults() )
       ((wxFileConfig *)this)->Write(key,defVal);
     *pStr = ExpandEnvVars(defVal);

-    return FALSE;
+    ok = FALSE;

   }
   else {
     *pStr = ExpandEnvVars(pEntry->Value());
   }
   else {
     *pStr = ExpandEnvVars(pEntry->Value());

-    return TRUE;
+    ok = TRUE;

   }
   }

+
+  return ok;

 }
 
 bool wxFileConfig::Read(const wxString& key, long *pl) const
 {
   wxString str;
 }
 
 bool wxFileConfig::Read(const wxString& key, long *pl) const
 {
   wxString str;

-  if ( Read(key, & str) ) {
-    *pl = wxAtol(str);
-    return TRUE;
-  }
-  else {
+  if ( !Read(key, & str) )
+  {

     return FALSE;
   }
     return FALSE;
   }

+
+  *pl = wxAtol(str);
+  return TRUE;

 }
 
 bool wxFileConfig::Write(const wxString& key, const wxString& szValue)
 }
 
 bool wxFileConfig::Write(const wxString& key, const wxString& szValue)


@@ -731,9 +780,18 @@ bool wxFileConfig::Write(const wxString& key, long lValue)
 
 bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 {
 
 bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 {

-  if ( LineListIsEmpty() || !m_pRootGroup->IsDirty() )
+  if ( LineListIsEmpty() || !m_pRootGroup->IsDirty() || !m_strLocalFile )

     return TRUE;
 
     return TRUE;
 

+#ifdef __UNIX__
+  // set the umask if needed
+  mode_t umaskOld = 0;
+  if ( m_umask != -1 )
+  {
+      umaskOld = umask((mode_t)m_umask);
+  }
+#endif // __UNIX__
+

   wxTempFile file(m_strLocalFile);
 
   if ( !file.IsOpened() ) {
   wxTempFile file(m_strLocalFile);
 
   if ( !file.IsOpened() ) {


@@ -749,7 +807,33 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
     }
   }
 
     }
   }
 

-  return file.Commit();
+  bool ret = file.Commit();
+
+#ifdef __WXMAC__
+  if ( ret )
+  {
+       FSSpec spec ;
+       
+       wxUnixFilename2FSSpec( m_strLocalFile , &spec ) ;
+       FInfo finfo ;
+       if ( FSpGetFInfo( &spec , &finfo ) == noErr )
+       {
+               finfo.fdType = 'TEXT' ;
+               finfo.fdCreator = 'ttxt' ;
+               FSpSetFInfo( &spec , &finfo ) ;
+       }
+  }
+#endif // __WXMAC__
+
+#ifdef __UNIX__
+  // restore the old umask if we changed it
+  if ( m_umask != -1 )
+  {
+      (void)umask(umaskOld);
+  }
+#endif // __UNIX__
+
+  return ret;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -830,7 +914,7 @@ bool wxFileConfig::DeleteAll()
 {
   CleanUp();
 
 {
   CleanUp();
 

-  if ( remove(m_strLocalFile.fn_str()) == -1 )
+  if ( wxRemove(m_strLocalFile) == -1 )

     wxLogSysError(_("can't delete user configuration file '%s'"), m_strLocalFile.c_str());
 
   m_strLocalFile = m_strGlobalFile = wxT("");
     wxLogSysError(_("can't delete user configuration file '%s'"), m_strLocalFile.c_str());
 
   m_strLocalFile = m_strGlobalFile = wxT("");