#include "wx/file.h"
#include "wx/log.h"
#include "wx/textfile.h"
+#include "wx/memtext.h"
#include "wx/config.h"
#include "wx/fileconf.h"
+#if wxUSE_STREAMS
+ #include "wx/stream.h"
+#endif // wxUSE_STREAMS
+
#include "wx/utils.h" // for wxGetHomeDir
// _WINDOWS_ is defined when windows.h is included,
#if defined(__WXPM__)
#define INCL_DOS
#include <os2.h>
- #define LINKAGEMODE _Optlink
-#else
- #define LINKAGEMODE
#endif
#include <stdlib.h>
#include <ctype.h>
+// headers needed for umask()
+#ifdef __UNIX__
+ #include <sys/types.h>
+ #include <sys/stat.h>
+#endif // __UNIX__
+
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
+
#ifndef MAX_PATH
#define MAX_PATH 512
#endif
// ----------------------------------------------------------------------------
// compare functions for sorting the arrays
-static int LINKAGEMODE CompareEntries(ConfigEntry *p1, ConfigEntry *p2);
-static int LINKAGEMODE CompareGroups(ConfigGroup *p1, ConfigGroup *p2);
+static int LINKAGEMODE CompareEntries(wxFileConfigEntry *p1, wxFileConfigEntry *p2);
+static int LINKAGEMODE CompareGroups(wxFileConfigGroup *p1, wxFileConfigGroup *p2);
// filter strings
static wxString FilterInValue(const wxString& str);
// get the name to use in wxFileConfig ctor
static wxString GetAppName(const wxString& appname);
+// ============================================================================
+// private classes
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// "template" array types
+// ----------------------------------------------------------------------------
+
+WX_DEFINE_SORTED_EXPORTED_ARRAY(wxFileConfigEntry *, ArrayEntries);
+WX_DEFINE_SORTED_EXPORTED_ARRAY(wxFileConfigGroup *, ArrayGroups);
+
+// ----------------------------------------------------------------------------
+// wxFileConfigLineList
+// ----------------------------------------------------------------------------
+
+// we store all lines of the local config file as a linked list in memory
+class wxFileConfigLineList
+{
+public:
+ void SetNext(wxFileConfigLineList *pNext) { m_pNext = pNext; }
+ void SetPrev(wxFileConfigLineList *pPrev) { m_pPrev = pPrev; }
+
+ // ctor
+ wxFileConfigLineList(const wxString& str,
+ wxFileConfigLineList *pNext = NULL) : m_strLine(str)
+ { SetNext(pNext); SetPrev(NULL); }
+
+ // next/prev nodes in the linked list
+ wxFileConfigLineList *Next() const { return m_pNext; }
+ wxFileConfigLineList *Prev() const { return m_pPrev; }
+
+ // get/change lines text
+ void SetText(const wxString& str) { m_strLine = str; }
+ const wxString& Text() const { return m_strLine; }
+
+private:
+ wxString m_strLine; // line contents
+ wxFileConfigLineList *m_pNext, // next node
+ *m_pPrev; // previous one
+};
+
+// ----------------------------------------------------------------------------
+// wxFileConfigEntry: a name/value pair
+// ----------------------------------------------------------------------------
+
+class wxFileConfigEntry
+{
+private:
+ wxFileConfigGroup *m_pParent; // group that contains us
+
+ wxString m_strName, // entry name
+ m_strValue; // value
+ bool m_bDirty:1, // changed since last read?
+ m_bImmutable:1, // can be overriden locally?
+ m_bHasValue:1; // set after first call to SetValue()
+
+ int m_nLine; // used if m_pLine == NULL only
+
+ // pointer to our line in the linked list or NULL if it was found in global
+ // file (which we don't modify)
+ wxFileConfigLineList *m_pLine;
+
+public:
+ wxFileConfigEntry(wxFileConfigGroup *pParent,
+ const wxString& strName, int nLine);
+
+ // simple accessors
+ const wxString& Name() const { return m_strName; }
+ const wxString& Value() const { return m_strValue; }
+ wxFileConfigGroup *Group() const { return m_pParent; }
+ bool IsDirty() const { return m_bDirty; }
+ bool IsImmutable() const { return m_bImmutable; }
+ bool IsLocal() const { return m_pLine != 0; }
+ int Line() const { return m_nLine; }
+ wxFileConfigLineList *
+ GetLine() const { return m_pLine; }
+
+ // modify entry attributes
+ void SetValue(const wxString& strValue, bool bUser = TRUE);
+ void SetDirty();
+ void SetLine(wxFileConfigLineList *pLine);
+};
+
+// ----------------------------------------------------------------------------
+// wxFileConfigGroup: container of entries and other groups
+// ----------------------------------------------------------------------------
+
+class wxFileConfigGroup
+{
+private:
+ wxFileConfig *m_pConfig; // config object we belong to
+ wxFileConfigGroup *m_pParent; // parent group (NULL for root group)
+ ArrayEntries m_aEntries; // entries in this group
+ ArrayGroups m_aSubgroups; // subgroups
+ wxString m_strName; // group's name
+ bool m_bDirty; // if FALSE => all subgroups are not dirty
+ wxFileConfigLineList *m_pLine; // pointer to our line in the linked list
+ wxFileConfigEntry *m_pLastEntry; // last entry/subgroup of this group in the
+ wxFileConfigGroup *m_pLastGroup; // local file (we insert new ones after it)
+
+ // DeleteSubgroupByName helper
+ bool DeleteSubgroup(wxFileConfigGroup *pGroup);
+
+public:
+ // ctor
+ wxFileConfigGroup(wxFileConfigGroup *pParent, const wxString& strName, wxFileConfig *);
+
+ // dtor deletes all entries and subgroups also
+ ~wxFileConfigGroup();
+
+ // simple accessors
+ const wxString& Name() const { return m_strName; }
+ wxFileConfigGroup *Parent() const { return m_pParent; }
+ wxFileConfig *Config() const { return m_pConfig; }
+ bool IsDirty() const { return m_bDirty; }
+
+ const ArrayEntries& Entries() const { return m_aEntries; }
+ const ArrayGroups& Groups() const { return m_aSubgroups; }
+ bool IsEmpty() const { return Entries().IsEmpty() && Groups().IsEmpty(); }
+
+ // find entry/subgroup (NULL if not found)
+ wxFileConfigGroup *FindSubgroup(const wxChar *szName) const;
+ wxFileConfigEntry *FindEntry (const wxChar *szName) const;
+
+ // delete entry/subgroup, return FALSE if doesn't exist
+ bool DeleteSubgroupByName(const wxChar *szName);
+ bool DeleteEntry(const wxChar *szName);
+
+ // create new entry/subgroup returning pointer to newly created element
+ wxFileConfigGroup *AddSubgroup(const wxString& strName);
+ wxFileConfigEntry *AddEntry (const wxString& strName, int nLine = wxNOT_FOUND);
+
+ // will also recursively set parent's dirty flag
+ void SetDirty();
+ void SetLine(wxFileConfigLineList *pLine);
+
+ // rename: no checks are done to ensure that the name is unique!
+ void Rename(const wxString& newName);
+
+ //
+ wxString GetFullName() const;
+
+ // get the last line belonging to an entry/subgroup of this group
+ wxFileConfigLineList *GetGroupLine(); // line which contains [group]
+ wxFileConfigLineList *GetLastEntryLine(); // after which our subgroups start
+ wxFileConfigLineList *GetLastGroupLine(); // after which the next group starts
+
+ // called by entries/subgroups when they're created/deleted
+ void SetLastEntry(wxFileConfigEntry *pEntry) { m_pLastEntry = pEntry; }
+ void SetLastGroup(wxFileConfigGroup *pGroup) { m_pLastGroup = pGroup; }
+};
+
// ============================================================================
// implementation
// ============================================================================
{
wxString strDir;
- #ifdef __UNIX__
- strDir = T("/etc/");
+ #ifdef __VMS__ // Note if __VMS is defined __UNIX is also defined
+ strDir = wxT("sys$manager:");
+ #elif defined(__WXMAC__)
+ strDir = wxMacFindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
+ #elif defined( __UNIX__ )
+ strDir = wxT("/etc/");
#elif defined(__WXPM__)
ULONG aulSysInfo[QSV_MAX] = {0};
UINT drive;
if (rc == 0)
{
drive = aulSysInfo[QSV_BOOT_DRIVE - 1];
- switch(drive)
- {
- case 1:
- strDir = "A:\\OS2\\";
- break;
- case 2:
- strDir = "B:\\OS2\\";
- break;
- case 3:
- strDir = "C:\\OS2\\";
- break;
- case 4:
- strDir = "D:\\OS2\\";
- break;
- case 5:
- strDir = "E:\\OS2\\";
- break;
- case 6:
- strDir = "F:\\OS2\\";
- break;
- case 7:
- strDir = "G:\\OS2\\";
- break;
- case 8:
- strDir = "H:\\OS2\\";
- break;
- case 9:
- strDir = "I:\\OS2\\";
- break;
- case 10:
- strDir = "J:\\OS2\\";
- break;
- case 11:
- strDir = "K:\\OS2\\";
- break;
- case 12:
- strDir = "L:\\OS2\\";
- break;
- case 13:
- strDir = "M:\\OS2\\";
- break;
- case 14:
- strDir = "N:\\OS2\\";
- break;
- case 15:
- strDir = "O:\\OS2\\";
- break;
- case 16:
- strDir = "P:\\OS2\\";
- break;
- case 17:
- strDir = "Q:\\OS2\\";
- break;
- case 18:
- strDir = "R:\\OS2\\";
- break;
- case 19:
- strDir = "S:\\OS2\\";
- break;
- case 20:
- strDir = "T:\\OS2\\";
- break;
- case 21:
- strDir = "U:\\OS2\\";
- break;
- case 22:
- strDir = "V:\\OS2\\";
- break;
- case 23:
- strDir = "W:\\OS2\\";
- break;
- case 24:
- strDir = "X:\\OS2\\";
- break;
- case 25:
- strDir = "Y:\\OS2\\";
- break;
- case 26:
- strDir = "Z:\\OS2\\";
- break;
- }
+ strDir.Printf(wxT("%c:\\OS2\\"), 'A'+drive-1);
}
#elif defined(__WXSTUBS__)
- wxASSERT_MSG( FALSE, T("TODO") ) ;
- #elif defined(__WXMAC__)
- wxASSERT_MSG( FALSE, T("TODO") ) ;
+ wxASSERT_MSG( FALSE, wxT("TODO") ) ;
+ #elif defined(__DOS__)
+ // There's no such thing as global cfg dir in MS-DOS, let's return
+ // current directory (FIXME_MGL?)
+ return wxT(".\\");
#else // Windows
wxChar szWinDir[MAX_PATH];
::GetWindowsDirectory(szWinDir, MAX_PATH);
strDir = szWinDir;
- strDir << T('\\');
+ strDir << wxT('\\');
#endif // Unix/Windows
return strDir;
{
wxString strDir;
+#if defined(__WXMAC__) || defined(__DOS__)
+ // no local dir concept on Mac OS 9 or MS-DOS
+ return GetGlobalDir() ;
+#else
wxGetHomeDir(&strDir);
-#ifdef __UNIX__
- if (strDir.Last() != T('/')) strDir << T('/');
-#else
- if (strDir.Last() != T('\\')) strDir << T('\\');
+# ifdef __UNIX__
+# ifdef __VMS
+ if (strDir.Last() != wxT(']'))
+# endif
+ if (strDir.Last() != wxT('/')) strDir << wxT('/');
+# else
+ if (strDir.Last() != wxT('\\')) strDir << wxT('\\');
+# endif
#endif
return strDir;
wxString str = GetGlobalDir();
str << szFile;
- if ( wxStrchr(szFile, T('.')) == NULL )
- #ifdef __UNIX__
- str << T(".conf");
+ if ( wxStrchr(szFile, wxT('.')) == NULL )
+ #if defined( __WXMAC__ )
+ str << " Preferences";
+ #elif defined( __UNIX__ )
+ str << wxT(".conf");
#else // Windows
- str << T(".ini");
+ str << wxT(".ini");
#endif // UNIX/Win
return str;
wxString wxFileConfig::GetLocalFileName(const wxChar *szFile)
{
- wxString str = GetLocalDir();
-
- #ifdef __UNIX__
- str << T('.');
+#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 ) && !defined( __WXMAC__ )
+ str << wxT('.');
#endif
str << szFile;
- #ifdef __WXMSW__
- if ( wxStrchr(szFile, T('.')) == NULL )
- str << T(".ini");
+ #if defined(__WINDOWS__) || defined(__DOS__)
+ if ( wxStrchr(szFile, wxT('.')) == NULL )
+ str << wxT(".ini");
#endif
+ #ifdef __WXMAC__
+ str << " Preferences";
+ #endif
return str;
}
void wxFileConfig::Init()
{
m_pCurrentGroup =
- m_pRootGroup = new ConfigGroup(NULL, "", this);
+ m_pRootGroup = new wxFileConfigGroup(NULL, "", this);
m_linesHead =
m_linesTail = NULL;
// if the path is not absolute, prepend the standard directory to it
// UNLESS wxCONFIG_USE_RELATIVE_PATH style is set
- if ( !(style & wxCONFIG_USE_RELATIVE_PATH) ){
- if ( !m_strLocalFile.IsEmpty() && !wxIsAbsolutePath(m_strLocalFile) )
- {
- wxString strLocal = m_strLocalFile;
- m_strLocalFile = GetLocalDir();
- m_strLocalFile << strLocal;
- }
-
- if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) )
- {
- wxString strGlobal = m_strGlobalFile;
- m_strGlobalFile = GetGlobalDir();
- m_strGlobalFile << strGlobal;
- }
+ if ( !(style & wxCONFIG_USE_RELATIVE_PATH) )
+ {
+ if ( !m_strLocalFile.IsEmpty() && !wxIsAbsolutePath(m_strLocalFile) )
+ {
+ wxString strLocal = m_strLocalFile;
+ m_strLocalFile = GetLocalDir();
+ m_strLocalFile << strLocal;
+ }
+
+ if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) )
+ {
+ wxString strGlobal = m_strGlobalFile;
+ m_strGlobalFile = GetGlobalDir();
+ m_strGlobalFile << strGlobal;
+ }
}
+ SetUmask(-1);
+
Init();
}
+#if wxUSE_STREAMS
+
+wxFileConfig::wxFileConfig(wxInputStream &inStream)
+{
+ // always local_file when this constructor is called (?)
+ SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE);
+
+ m_pCurrentGroup =
+ m_pRootGroup = new wxFileConfigGroup(NULL, "", this);
+
+ m_linesHead =
+ m_linesTail = NULL;
+
+ // translate everything to the current (platform-dependent) line
+ // termination character
+ wxString strTrans;
+ {
+ wxString strTmp;
+
+ char buf[1024];
+ while ( !inStream.Read(buf, WXSIZEOF(buf)).Eof() )
+ strTmp.append(wxConvertMB2WX(buf), inStream.LastRead());
+
+ strTmp.append(wxConvertMB2WX(buf), inStream.LastRead());
+
+ strTrans = wxTextBuffer::Translate(strTmp);
+ }
+
+ wxMemoryText memText;
+
+ // Now we can add the text to the memory text. To do this we extract line
+ // by line from the translated string, until we've reached the end.
+ //
+ // VZ: all this is horribly inefficient, we should do the translation on
+ // the fly in one pass saving both memory and time (TODO)
+
+ const wxChar *pEOL = wxTextBuffer::GetEOL(wxTextBuffer::typeDefault);
+ const size_t EOLLen = wxStrlen(pEOL);
+
+ int posLineStart = strTrans.Find(pEOL);
+ while ( posLineStart != -1 )
+ {
+ wxString line(strTrans.Left(posLineStart));
+
+ memText.AddLine(line);
+
+ strTrans = strTrans.Mid(posLineStart + EOLLen);
+
+ posLineStart = strTrans.Find(pEOL);
+ }
+
+ // also add whatever we have left in the translated string.
+ memText.AddLine(strTrans);
+
+ // Finally we can parse it all.
+ Parse(memText, TRUE /* local */);
+
+ SetRootPath();
+}
+
+#endif // wxUSE_STREAMS
+
void wxFileConfig::CleanUp()
{
delete m_pRootGroup;
- LineList *pCur = m_linesHead;
+ wxFileConfigLineList *pCur = m_linesHead;
while ( pCur != NULL ) {
- LineList *pNext = pCur->Next();
+ wxFileConfigLineList *pNext = pCur->Next();
delete pCur;
pCur = pNext;
}
// parse a config file
// ----------------------------------------------------------------------------
-void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
+void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
{
const wxChar *pStart;
const wxChar *pEnd;
wxString strLine;
- size_t nLineCount = file.GetLineCount();
+ size_t nLineCount = buffer.GetLineCount();
for ( size_t n = 0; n < nLineCount; n++ ) {
- strLine = file[n];
+ strLine = buffer[n];
// add the line to linked list
if ( bLocal )
;
// skip blank/comment lines
- if ( *pStart == T('\0')|| *pStart == T(';') || *pStart == T('#') )
+ if ( *pStart == wxT('\0')|| *pStart == wxT(';') || *pStart == wxT('#') )
continue;
- if ( *pStart == T('[') ) { // a new group
+ if ( *pStart == wxT('[') ) { // a new group
pEnd = pStart;
- while ( *++pEnd != T(']') ) {
- if ( *pEnd == T('\n') || *pEnd == T('\0') )
+ while ( *++pEnd != wxT(']') ) {
+ 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;
+ }
}
- if ( *pEnd != T(']') ) {
+ if ( *pEnd != wxT(']') ) {
wxLogError(_("file '%s': unexpected character %c at line %d."),
- file.GetName(), *pEnd, n + 1);
+ buffer.GetName(), *pEnd, n + 1);
continue; // skip this line
}
// check that there is nothing except comments left on this line
bool bCont = TRUE;
- while ( *++pEnd != T('\0') && bCont ) {
+ while ( *++pEnd != wxT('\0') && bCont ) {
switch ( *pEnd ) {
- case T('#'):
- case T(';'):
+ case wxT('#'):
+ case wxT(';'):
bCont = FALSE;
break;
- case T(' '):
- case T('\t'):
+ case wxT(' '):
+ case wxT('\t'):
// ignore whitespace ('\n' impossible here)
break;
default:
- wxLogWarning(_("file '%s', line %d: '%s' "
- "ignored after group header."),
- file.GetName(), n + 1, pEnd);
+ wxLogWarning(_("file '%s', line %d: '%s' ignored after group header."),
+ buffer.GetName(), n + 1, pEnd);
bCont = FALSE;
}
}
}
else { // a key
const wxChar *pEnd = pStart;
- while ( *pEnd != T('=') && !wxIsspace(*pEnd) ) {
- if ( *pEnd == T('\\') ) {
+ while ( *pEnd && *pEnd != wxT('=') && !wxIsspace(*pEnd) ) {
+ if ( *pEnd == wxT('\\') ) {
// next character may be space or not - still take it because it's
- // quoted
+ // quoted (unless there is nothing)
pEnd++;
+ if ( !*pEnd ) {
+ // the error message will be given below anyhow
+ break;
+ }
}
pEnd++;
wxString strKey(FilterInEntryName(wxString(pStart, pEnd)));
// skip whitespace
- while ( isspace(*pEnd) )
+ while ( wxIsspace(*pEnd) )
pEnd++;
- if ( *pEnd++ != T('=') ) {
+ if ( *pEnd++ != wxT('=') ) {
wxLogError(_("file '%s', line %d: '=' expected."),
- file.GetName(), n + 1);
+ buffer.GetName(), n + 1);
}
else {
- ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(strKey);
+ wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(strKey);
if ( pEntry == NULL ) {
// new entry
else {
if ( bLocal && pEntry->IsImmutable() ) {
// immutable keys can't be changed by user
- wxLogWarning(_("file '%s', line %d: value for "
- "immutable key '%s' ignored."),
- file.GetName(), n + 1, strKey.c_str());
+ wxLogWarning(_("file '%s', line %d: value for immutable key '%s' ignored."),
+ buffer.GetName(), n + 1, strKey.c_str());
continue;
}
// the condition below catches the cases (a) and (b) but not (c):
// (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."),
- file.GetName(), n + 1, strKey.c_str(), pEntry->Line());
+ wxLogWarning(_("file '%s', line %d: key '%s' was first found at line %d."),
+ buffer.GetName(), n + 1, strKey.c_str(), pEntry->Line());
if ( bLocal )
pEntry->SetLine(m_linesTail);
size_t n;
m_pCurrentGroup = m_pRootGroup;
for ( n = 0; n < aParts.Count(); n++ ) {
- ConfigGroup *pNextGroup = m_pCurrentGroup->FindSubgroup(aParts[n]);
+ wxFileConfigGroup *pNextGroup = m_pCurrentGroup->FindSubgroup(aParts[n]);
if ( pNextGroup == NULL )
pNextGroup = m_pCurrentGroup->AddSubgroup(aParts[n]);
m_pCurrentGroup = pNextGroup;
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
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
{
size_t n = m_pCurrentGroup->Entries().Count();
if ( bRecursive ) {
- ConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
+ wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
size_t nSubgroups = m_pCurrentGroup->Groups().Count();
for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
{
size_t n = m_pCurrentGroup->Groups().Count();
if ( bRecursive ) {
- ConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
+ wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
size_t nSubgroups = m_pCurrentGroup->Groups().Count();
for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
{
wxConfigPathChanger path(this, strName);
- ConfigGroup *pGroup = m_pCurrentGroup->FindSubgroup(path.Name());
+ wxFileConfigGroup *pGroup = m_pCurrentGroup->FindSubgroup(path.Name());
return pGroup != NULL;
}
{
wxConfigPathChanger path(this, strName);
- ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
+ wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
return pEntry != NULL;
}
{
wxConfigPathChanger path(this, key);
- ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
+ wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
if (pEntry == NULL) {
return FALSE;
}
- else {
- *pStr = ExpandEnvVars(pEntry->Value());
- return TRUE;
- }
+
+ *pStr = ExpandEnvVars(pEntry->Value());
+ return TRUE;
}
bool wxFileConfig::Read(const wxString& key,
{
wxConfigPathChanger path(this, key);
- ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
+ wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
+ bool ok;
if (pEntry == NULL) {
if( IsRecordingDefaults() )
((wxFileConfig *)this)->Write(key,defVal);
*pStr = ExpandEnvVars(defVal);
- return FALSE;
+ ok = FALSE;
}
else {
*pStr = ExpandEnvVars(pEntry->Value());
- return TRUE;
+ ok = TRUE;
}
+
+ return ok;
}
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;
}
+
+ *pl = wxAtol(str);
+ return TRUE;
}
bool wxFileConfig::Write(const wxString& key, const wxString& szValue)
wxString strName = path.Name();
if ( strName.IsEmpty() ) {
// setting the value of a group is an error
- wxASSERT_MSG( wxIsEmpty(szValue), T("can't set value of a group!") );
+ wxASSERT_MSG( wxIsEmpty(szValue), wxT("can't set value of a group!") );
// ... except if it's empty in which case it's a way to force it's creation
m_pCurrentGroup->SetDirty();
return FALSE;
}
- ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(strName);
+ wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(strName);
if ( pEntry == NULL )
pEntry = m_pCurrentGroup->AddEntry(strName);
{
// ltoa() is not ANSI :-(
wxString buf;
- buf.Printf(T("%ld"), lValue);
+ buf.Printf(wxT("%ld"), lValue);
return Write(key, buf);
}
bool wxFileConfig::Flush(bool /* bCurrentOnly */)
{
- if ( LineListIsEmpty() || !m_pRootGroup->IsDirty() )
+ if ( LineListIsEmpty() || !m_pRootGroup->IsDirty() || !m_strLocalFile )
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() ) {
}
// write all strings to file
- for ( LineList *p = m_linesHead; p != NULL; p = p->Next() ) {
+ for ( wxFileConfigLineList *p = m_linesHead; p != NULL; p = p->Next() ) {
if ( !file.Write(p->Text() + wxTextFile::GetEOL()) ) {
wxLogError(_("can't write user configuration file."));
return FALSE;
}
}
- return file.Commit();
+ bool ret = file.Commit();
+
+#if defined(__WXMAC__)
+ if ( ret )
+ {
+ FSSpec spec ;
+
+ wxMacFilename2FSSpec( 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;
}
// ----------------------------------------------------------------------------
const wxString& newName)
{
// check that the entry exists
- ConfigEntry *oldEntry = m_pCurrentGroup->FindEntry(oldName);
+ wxFileConfigEntry *oldEntry = m_pCurrentGroup->FindEntry(oldName);
if ( !oldEntry )
return FALSE;
if ( !m_pCurrentGroup->DeleteEntry(oldName) )
return FALSE;
- ConfigEntry *newEntry = m_pCurrentGroup->AddEntry(newName);
+ wxFileConfigEntry *newEntry = m_pCurrentGroup->AddEntry(newName);
newEntry->SetValue(value);
return TRUE;
const wxString& newName)
{
// check that the group exists
- ConfigGroup *group = m_pCurrentGroup->FindSubgroup(oldName);
+ wxFileConfigGroup *group = m_pCurrentGroup->FindSubgroup(oldName);
if ( !group )
return FALSE;
if ( bGroupIfEmptyAlso && m_pCurrentGroup->IsEmpty() ) {
if ( m_pCurrentGroup != m_pRootGroup ) {
- ConfigGroup *pGroup = m_pCurrentGroup;
- SetPath(T("..")); // changes m_pCurrentGroup!
+ wxFileConfigGroup *pGroup = m_pCurrentGroup;
+ SetPath(wxT("..")); // changes m_pCurrentGroup!
m_pCurrentGroup->DeleteSubgroupByName(pGroup->Name());
}
//else: never delete the root group
{
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 = T("");
+ m_strLocalFile = m_strGlobalFile = wxT("");
Init();
return TRUE;
// ----------------------------------------------------------------------------
// append a new line to the end of the list
-LineList *wxFileConfig::LineListAppend(const wxString& str)
+wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str)
{
- LineList *pLine = new LineList(str);
+ wxFileConfigLineList *pLine = new wxFileConfigLineList(str);
if ( m_linesTail == NULL ) {
// list is empty
}
// insert a new line after the given one or in the very beginning if !pLine
-LineList *wxFileConfig::LineListInsert(const wxString& str,
- LineList *pLine)
+wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str,
+ wxFileConfigLineList *pLine)
{
if ( pLine == m_linesTail )
return LineListAppend(str);
- LineList *pNewLine = new LineList(str);
+ wxFileConfigLineList *pNewLine = new wxFileConfigLineList(str);
if ( pLine == NULL ) {
// prepend to the list
pNewLine->SetNext(m_linesHead);
}
else {
// insert before pLine
- LineList *pNext = pLine->Next();
+ wxFileConfigLineList *pNext = pLine->Next();
pNewLine->SetNext(pNext);
pNewLine->SetPrev(pLine);
pNext->SetPrev(pNewLine);
return pNewLine;
}
-void wxFileConfig::LineListRemove(LineList *pLine)
+void wxFileConfig::LineListRemove(wxFileConfigLineList *pLine)
{
- LineList *pPrev = pLine->Prev(),
+ wxFileConfigLineList *pPrev = pLine->Prev(),
*pNext = pLine->Next();
// first entry?
}
// ============================================================================
-// wxFileConfig::ConfigGroup
+// wxFileConfig::wxFileConfigGroup
// ============================================================================
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// ctor
-ConfigGroup::ConfigGroup(ConfigGroup *pParent,
+wxFileConfigGroup::wxFileConfigGroup(wxFileConfigGroup *pParent,
const wxString& strName,
wxFileConfig *pConfig)
: m_aEntries(CompareEntries),
}
// dtor deletes all children
-ConfigGroup::~ConfigGroup()
+wxFileConfigGroup::~wxFileConfigGroup()
{
// entries
size_t n, nCount = m_aEntries.Count();
// line
// ----------------------------------------------------------------------------
-void ConfigGroup::SetLine(LineList *pLine)
+void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine)
{
wxASSERT( m_pLine == NULL ); // shouldn't be called twice
// Return the line which contains "[our name]". If we're still not in the list,
// add our line to it immediately after the last line of our parent group if we
// have it or in the very beginning if we're the root group.
-LineList *ConfigGroup::GetGroupLine()
+wxFileConfigLineList *wxFileConfigGroup::GetGroupLine()
{
if ( m_pLine == NULL ) {
- ConfigGroup *pParent = Parent();
+ wxFileConfigGroup *pParent = Parent();
// this group wasn't present in local config file, add it now
if ( pParent != NULL ) {
wxString strFullName;
- strFullName << T("[")
+ strFullName << wxT("[")
// +1: no '/'
<< FilterOutEntryName(GetFullName().c_str() + 1)
- << T("]");
+ << wxT("]");
m_pLine = m_pConfig->LineListInsert(strFullName,
pParent->GetLastGroupLine());
pParent->SetLastGroup(this); // we're surely after all the others
// Return the last line belonging to the subgroups of this group (after which
// we can add a new subgroup), if we don't have any subgroups or entries our
// last line is the group line (m_pLine) itself.
-LineList *ConfigGroup::GetLastGroupLine()
+wxFileConfigLineList *wxFileConfigGroup::GetLastGroupLine()
{
// if we have any subgroups, our last line is the last line of the last
// subgroup
if ( m_pLastGroup != NULL ) {
- LineList *pLine = m_pLastGroup->GetLastGroupLine();
+ wxFileConfigLineList *pLine = m_pLastGroup->GetLastGroupLine();
wxASSERT( pLine != NULL ); // last group must have !NULL associated line
return pLine;
// return the last line belonging to the entries of this group (after which
// we can add a new entry), if we don't have any entries we will add the new
// one immediately after the group line itself.
-LineList *ConfigGroup::GetLastEntryLine()
+wxFileConfigLineList *wxFileConfigGroup::GetLastEntryLine()
{
if ( m_pLastEntry != NULL ) {
- LineList *pLine = m_pLastEntry->GetLine();
+ wxFileConfigLineList *pLine = m_pLastEntry->GetLine();
wxASSERT( pLine != NULL ); // last entry must have !NULL associated line
return pLine;
// group name
// ----------------------------------------------------------------------------
-void ConfigGroup::Rename(const wxString& newName)
+void wxFileConfigGroup::Rename(const wxString& newName)
{
m_strName = newName;
- LineList *line = GetGroupLine();
+ wxFileConfigLineList *line = GetGroupLine();
wxString strFullName;
- strFullName << T("[") << (GetFullName().c_str() + 1) << T("]"); // +1: no '/'
+ strFullName << wxT("[") << (GetFullName().c_str() + 1) << wxT("]"); // +1: no '/'
line->SetText(strFullName);
SetDirty();
}
-wxString ConfigGroup::GetFullName() const
+wxString wxFileConfigGroup::GetFullName() const
{
if ( Parent() )
return Parent()->GetFullName() + wxCONFIG_PATH_SEPARATOR + Name();
else
- return T("");
+ return wxT("");
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// use binary search because the array is sorted
-ConfigEntry *
-ConfigGroup::FindEntry(const wxChar *szName) const
+wxFileConfigEntry *
+wxFileConfigGroup::FindEntry(const wxChar *szName) const
{
size_t i,
lo = 0,
hi = m_aEntries.Count();
int res;
- ConfigEntry *pEntry;
+ wxFileConfigEntry *pEntry;
while ( lo < hi ) {
i = (lo + hi)/2;
return NULL;
}
-ConfigGroup *
-ConfigGroup::FindSubgroup(const wxChar *szName) const
+wxFileConfigGroup *
+wxFileConfigGroup::FindSubgroup(const wxChar *szName) const
{
size_t i,
lo = 0,
hi = m_aSubgroups.Count();
int res;
- ConfigGroup *pGroup;
+ wxFileConfigGroup *pGroup;
while ( lo < hi ) {
i = (lo + hi)/2;
// ----------------------------------------------------------------------------
// create a new entry and add it to the current group
-ConfigEntry *
-ConfigGroup::AddEntry(const wxString& strName, int nLine)
+wxFileConfigEntry *
+wxFileConfigGroup::AddEntry(const wxString& strName, int nLine)
{
wxASSERT( FindEntry(strName) == NULL );
- ConfigEntry *pEntry = new ConfigEntry(this, strName, nLine);
+ wxFileConfigEntry *pEntry = new wxFileConfigEntry(this, strName, nLine);
m_aEntries.Add(pEntry);
return pEntry;
}
// create a new group and add it to the current group
-ConfigGroup *
-ConfigGroup::AddSubgroup(const wxString& strName)
+wxFileConfigGroup *
+wxFileConfigGroup::AddSubgroup(const wxString& strName)
{
wxASSERT( FindSubgroup(strName) == NULL );
- ConfigGroup *pGroup = new ConfigGroup(this, strName, m_pConfig);
+ wxFileConfigGroup *pGroup = new wxFileConfigGroup(this, strName, m_pConfig);
m_aSubgroups.Add(pGroup);
return pGroup;
delete several of them.
*/
-bool ConfigGroup::DeleteSubgroupByName(const wxChar *szName)
+bool wxFileConfigGroup::DeleteSubgroupByName(const wxChar *szName)
{
return DeleteSubgroup(FindSubgroup(szName));
}
// doesn't delete the subgroup itself, but does remove references to it from
// all other data structures (and normally the returned pointer should be
// deleted a.s.a.p. because there is nothing much to be done with it anyhow)
-bool ConfigGroup::DeleteSubgroup(ConfigGroup *pGroup)
+bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
{
wxCHECK( pGroup != NULL, FALSE ); // deleting non existing group?
// delete all entries
size_t nCount = pGroup->m_aEntries.Count();
for ( size_t nEntry = 0; nEntry < nCount; nEntry++ ) {
- LineList *pLine = pGroup->m_aEntries[nEntry]->GetLine();
+ wxFileConfigLineList *pLine = pGroup->m_aEntries[nEntry]->GetLine();
if ( pLine != NULL )
m_pConfig->LineListRemove(pLine);
}
pGroup->DeleteSubgroup(pGroup->m_aSubgroups[0]);
}
- LineList *pLine = pGroup->m_pLine;
+ wxFileConfigLineList *pLine = pGroup->m_pLine;
if ( pLine != NULL ) {
// notice that we may do this test inside the previous "if" because the
// last entry's line is surely !NULL
wxASSERT( m_pLine != NULL ); // we have a subgroup with !NULL pLine...
// go back until we find a subgroup or reach the group's line
- ConfigGroup *pNewLast = NULL;
+ wxFileConfigGroup *pNewLast = NULL;
size_t n, nSubgroups = m_aSubgroups.Count();
- LineList *pl;
+ wxFileConfigLineList *pl;
for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() ) {
// is it our subgroup?
for ( n = 0; (pNewLast == NULL) && (n < nSubgroups); n++ ) {
return TRUE;
}
-bool ConfigGroup::DeleteEntry(const wxChar *szName)
+bool wxFileConfigGroup::DeleteEntry(const wxChar *szName)
{
- ConfigEntry *pEntry = FindEntry(szName);
+ wxFileConfigEntry *pEntry = FindEntry(szName);
wxCHECK( pEntry != NULL, FALSE ); // deleting non existing item?
- LineList *pLine = pEntry->GetLine();
+ wxFileConfigLineList *pLine = pEntry->GetLine();
if ( pLine != NULL ) {
// notice that we may do this test inside the previous "if" because the
// last entry's line is surely !NULL
wxASSERT( m_pLine != NULL ); // if we have an entry with !NULL pLine...
// go back until we find another entry or reach the group's line
- ConfigEntry *pNewLast = NULL;
+ wxFileConfigEntry *pNewLast = NULL;
size_t n, nEntries = m_aEntries.Count();
- LineList *pl;
+ wxFileConfigLineList *pl;
for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() ) {
// is it our subgroup?
for ( n = 0; (pNewLast == NULL) && (n < nEntries); n++ ) {
// ----------------------------------------------------------------------------
//
// ----------------------------------------------------------------------------
-void ConfigGroup::SetDirty()
+void wxFileConfigGroup::SetDirty()
{
m_bDirty = TRUE;
if ( Parent() != NULL ) // propagate upwards
}
// ============================================================================
-// wxFileConfig::ConfigEntry
+// wxFileConfig::wxFileConfigEntry
// ============================================================================
// ----------------------------------------------------------------------------
// ctor
// ----------------------------------------------------------------------------
-ConfigEntry::ConfigEntry(ConfigGroup *pParent,
+wxFileConfigEntry::wxFileConfigEntry(wxFileConfigGroup *pParent,
const wxString& strName,
int nLine)
: m_strName(strName)
m_nLine = nLine;
m_pLine = NULL;
- m_bDirty = FALSE;
+ m_bDirty =
+ m_bHasValue = FALSE;
m_bImmutable = strName[0] == wxCONFIG_IMMUTABLE_PREFIX;
if ( m_bImmutable )
// set value
// ----------------------------------------------------------------------------
-void ConfigEntry::SetLine(LineList *pLine)
+void wxFileConfigEntry::SetLine(wxFileConfigLineList *pLine)
{
if ( m_pLine != NULL ) {
wxLogWarning(_("entry '%s' appears more than once in group '%s'"),
// second parameter is FALSE if we read the value from file and prevents the
// entry from being marked as 'dirty'
-void ConfigEntry::SetValue(const wxString& strValue, bool bUser)
+void wxFileConfigEntry::SetValue(const wxString& strValue, bool bUser)
{
if ( bUser && IsImmutable() ) {
wxLogWarning(_("attempt to change immutable key '%s' ignored."),
return;
}
- // do nothing if it's the same value
- if ( strValue == m_strValue )
+ // do nothing if it's the same value: but don't test for it if m_bHasValue
+ // hadn't been set yet or we'd never write empty values to the file
+ if ( m_bHasValue && strValue == m_strValue )
return;
+ m_bHasValue = TRUE;
m_strValue = strValue;
if ( bUser ) {
wxString strVal = FilterOutValue(strValue);
wxString strLine;
- strLine << FilterOutEntryName(m_strName) << T('=') << strVal;
+ strLine << FilterOutEntryName(m_strName) << wxT('=') << strVal;
if ( m_pLine != NULL ) {
// entry was read from the local config file, just modify the line
}
}
-void ConfigEntry::SetDirty()
+void wxFileConfigEntry::SetDirty()
{
m_bDirty = TRUE;
Group()->SetDirty();
// compare functions for array sorting
// ----------------------------------------------------------------------------
-int CompareEntries(ConfigEntry *p1,
- ConfigEntry *p2)
+int CompareEntries(wxFileConfigEntry *p1, wxFileConfigEntry *p2)
{
#if wxCONFIG_CASE_SENSITIVE
return wxStrcmp(p1->Name(), p2->Name());
#endif
}
-int CompareGroups(ConfigGroup *p1,
- ConfigGroup *p2)
+int CompareGroups(wxFileConfigGroup *p1, wxFileConfigGroup *p2)
{
#if wxCONFIG_CASE_SENSITIVE
return wxStrcmp(p1->Name(), p2->Name());
bool bQuoted = !str.IsEmpty() && str[0] == '"';
for ( size_t n = bQuoted ? 1 : 0; n < str.Len(); n++ ) {
- if ( str[n] == T('\\') ) {
+ if ( str[n] == wxT('\\') ) {
switch ( str[++n] ) {
- case T('n'):
- strResult += T('\n');
+ case wxT('n'):
+ strResult += wxT('\n');
break;
- case T('r'):
- strResult += T('\r');
+ case wxT('r'):
+ strResult += wxT('\r');
break;
- case T('t'):
- strResult += T('\t');
+ case wxT('t'):
+ strResult += wxT('\t');
break;
- case T('\\'):
- strResult += T('\\');
+ case wxT('\\'):
+ strResult += wxT('\\');
break;
- case T('"'):
- strResult += T('"');
+ case wxT('"'):
+ strResult += wxT('"');
break;
}
}
else {
- if ( str[n] != T('"') || !bQuoted )
+ if ( str[n] != wxT('"') || !bQuoted )
strResult += str[n];
else if ( n != str.Len() - 1 ) {
wxLogWarning(_("unexpected \" at position %d in '%s'."),
strResult.Alloc(str.Len());
// quoting is necessary to preserve spaces in the beginning of the string
- bool bQuote = wxIsspace(str[0]) || str[0] == T('"');
+ bool bQuote = wxIsspace(str[0]) || str[0] == wxT('"');
if ( bQuote )
- strResult += T('"');
+ strResult += wxT('"');
wxChar c;
for ( size_t n = 0; n < str.Len(); n++ ) {
switch ( str[n] ) {
- case T('\n'):
- c = T('n');
+ case wxT('\n'):
+ c = wxT('n');
break;
- case T('\r'):
- c = T('r');
+ case wxT('\r'):
+ c = wxT('r');
break;
- case T('\t'):
- c = T('t');
+ case wxT('\t'):
+ c = wxT('t');
break;
- case T('\\'):
- c = T('\\');
+ case wxT('\\'):
+ c = wxT('\\');
break;
- case T('"'):
+ case wxT('"'):
if ( bQuote ) {
- c = T('"');
+ c = wxT('"');
break;
}
//else: fall through
}
// we get here only for special characters
- strResult << T('\\') << c;
+ strResult << wxT('\\') << c;
}
if ( bQuote )
- strResult += T('"');
+ strResult += wxT('"');
return strResult;
}
strResult.Alloc(str.Len());
for ( const wxChar *pc = str.c_str(); *pc != '\0'; pc++ ) {
- if ( *pc == T('\\') )
+ if ( *pc == wxT('\\') )
pc++;
strResult += *pc;
wxString strResult;
strResult.Alloc(str.Len());
- for ( const wxChar *pc = str.c_str(); *pc != T('\0'); pc++ ) {
+ for ( const wxChar *pc = str.c_str(); *pc != wxT('\0'); pc++ ) {
wxChar c = *pc;
// we explicitly allow some of "safe" chars and 8bit ASCII characters
// which will probably never have special meaning
// NB: note that wxCONFIG_IMMUTABLE_PREFIX and wxCONFIG_PATH_SEPARATOR
// should *not* be quoted
- if ( !wxIsalnum(c) && !wxStrchr(T("@_/-!.*%"), c) && ((c & 0x80) == 0) )
- strResult += T('\\');
+ if ( !wxIsalnum(c) && !wxStrchr(wxT("@_/-!.*%"), c) && ((c & 0x80) == 0) )
+ strResult += wxT('\\');
strResult += c;
}
projects / wxWidgets.git / blobdiff