X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6df09f32fd0bbc2324a6a96683109e6c6cc47db5..77c8efc8c37da6d6a5e2e8022d21d1cd7d76371d:/src/common/fileconf.cpp diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp index e3b61cf806..4b63270320 100644 --- a/src/common/fileconf.cpp +++ b/src/common/fileconf.cpp @@ -46,7 +46,7 @@ #include "wx/stdpaths.h" -#if defined(__WXMSW__) +#if defined(__WINDOWS__) #include "wx/msw/private.h" #endif //windows.h #if defined(__WXPM__) @@ -57,11 +57,6 @@ #include #include -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- -#define CONST_CAST ((wxFileConfig *)this)-> - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -70,7 +65,7 @@ #define MAX_PATH 512 #endif -#define FILECONF_TRACE_MASK _T("fileconf") +#define FILECONF_TRACE_MASK wxT("fileconf") // ---------------------------------------------------------------------------- // global functions declarations @@ -151,7 +146,7 @@ private: wxString m_strName, // entry name m_strValue; // value - bool m_bImmutable:1, // can be overriden locally? + bool m_bImmutable:1, // can be overridden locally? m_bHasValue:1; // set after first call to SetValue() int m_nLine; // used if m_pLine == NULL only @@ -474,32 +469,35 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, const wxMBConv& conv) cbuf = wxCharBuffer::CreateNonOwned((char *)buf.GetData(), buf.GetDataLen()); #endif // wxUSE_UNICODE/!wxUSE_UNICODE - - // now break it into lines - wxMemoryText memText; - for ( const wxChar *s = cbuf; ; ++s ) + // parse the input contents if there is anything to parse + if ( cbuf ) { - const wxChar *e = s; - while ( *e != '\0' && *e != '\n' && *e != '\r' ) - ++e; + // now break it into lines + wxMemoryText memText; + for ( const wxChar *s = cbuf; ; ++s ) + { + const wxChar *e = s; + while ( *e != '\0' && *e != '\n' && *e != '\r' ) + ++e; - // notice that we throw away the original EOL kind here, maybe we - // should preserve it? - if ( e != s ) - memText.AddLine(wxString(s, e)); + // notice that we throw away the original EOL kind here, maybe we + // should preserve it? + if ( e != s ) + memText.AddLine(wxString(s, e)); - if ( *e == '\0' ) - break; + if ( *e == '\0' ) + break; - // skip the second EOL byte if it's a DOS one - if ( *e == '\r' && e[1] == '\n' ) - ++e; + // skip the second EOL byte if it's a DOS one + if ( *e == '\r' && e[1] == '\n' ) + ++e; - s = e; - } + s = e; + } - // Finally we can parse it all. - Parse(memText, true /* local */); + // Finally we can parse it all. + Parse(memText, true /* local */); + } SetRootPath(); ResetDirty(); @@ -663,7 +661,7 @@ void wxFileConfig::Parse(const wxTextBuffer& buffer, bool bLocal) // which is exactly what we want. else if ( !bLocal || pEntry->IsLocal() ) { wxLogWarning(_("file '%s', line %d: key '%s' was first found at line %d."), - buffer.GetName(), n + 1, strKey.c_str(), pEntry->Line()); + buffer.GetName(), (int)n + 1, strKey.c_str(), pEntry->Line()); } } @@ -746,6 +744,11 @@ void wxFileConfig::SetPath(const wxString& strPath) DoSetPath(strPath, true /* create missing path components */); } +const wxString& wxFileConfig::GetPath() const +{ + return m_strPath; +} + // ---------------------------------------------------------------------------- // enumeration // ---------------------------------------------------------------------------- @@ -786,12 +789,14 @@ size_t wxFileConfig::GetNumberOfEntries(bool bRecursive) const { size_t n = m_pCurrentGroup->Entries().GetCount(); if ( bRecursive ) { + wxFileConfig * const self = const_cast(this); + wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup; size_t nSubgroups = m_pCurrentGroup->Groups().GetCount(); for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) { - CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup]; + self->m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup]; n += GetNumberOfEntries(true); - CONST_CAST m_pCurrentGroup = pOldCurrentGroup; + self->m_pCurrentGroup = pOldCurrentGroup; } } @@ -802,12 +807,14 @@ size_t wxFileConfig::GetNumberOfGroups(bool bRecursive) const { size_t n = m_pCurrentGroup->Groups().GetCount(); if ( bRecursive ) { + wxFileConfig * const self = const_cast(this); + wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup; size_t nSubgroups = m_pCurrentGroup->Groups().GetCount(); for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) { - CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup]; + self->m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup]; n += GetNumberOfGroups(true); - CONST_CAST m_pCurrentGroup = pOldCurrentGroup; + self->m_pCurrentGroup = pOldCurrentGroup; } } @@ -910,7 +917,7 @@ bool wxFileConfig::DoReadLong(const wxString& key, long *pl) const bool wxFileConfig::DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const { - wxCHECK_MSG( buf, false, _T("NULL buffer") ); + wxCHECK_MSG( buf, false, wxT("NULL buffer") ); wxString str; if ( !Read(key, &str) ) @@ -928,7 +935,7 @@ bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue) wxString strName = path.Name(); wxLogTrace( FILECONF_TRACE_MASK, - _T(" Writing String '%s' = '%s' to Group '%s'"), + wxT(" Writing String '%s' = '%s' to Group '%s'"), strName.c_str(), szValue.c_str(), GetPath().c_str() ); @@ -942,7 +949,7 @@ bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue) // ... except if it's empty in which case it's a way to force it's creation wxLogTrace( FILECONF_TRACE_MASK, - _T(" Creating group %s"), + wxT(" Creating group %s"), m_pCurrentGroup->Name().c_str() ); SetDirty(); @@ -966,13 +973,13 @@ bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue) if ( pEntry == 0 ) { wxLogTrace( FILECONF_TRACE_MASK, - _T(" Adding Entry %s"), + wxT(" Adding Entry %s"), strName.c_str() ); pEntry = m_pCurrentGroup->AddEntry(strName); } wxLogTrace( FILECONF_TRACE_MASK, - _T(" Setting value %s"), + wxT(" Setting value %s"), szValue.c_str() ); pEntry->SetValue(szValue); @@ -984,7 +991,7 @@ bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue) bool wxFileConfig::DoWriteLong(const wxString& key, long lValue) { - return Write(key, wxString::Format(_T("%ld"), lValue)); + return Write(key, wxString::Format(wxT("%ld"), lValue)); } #if wxUSE_BASE64 @@ -1076,7 +1083,7 @@ bool wxFileConfig::RenameEntry(const wxString& oldName, const wxString& newName) { wxASSERT_MSG( oldName.find(wxCONFIG_PATH_SEPARATOR) == wxString::npos, - _T("RenameEntry(): paths are not supported") ); + wxT("RenameEntry(): paths are not supported") ); // check that the entry exists wxFileConfigEntry *oldEntry = m_pCurrentGroup->FindEntry(oldName); @@ -1187,14 +1194,14 @@ bool wxFileConfig::DeleteAll() wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str) { wxLogTrace( FILECONF_TRACE_MASK, - _T(" ** Adding Line '%s'"), + wxT(" ** Adding Line '%s'"), str.c_str() ); wxLogTrace( FILECONF_TRACE_MASK, - _T(" head: %s"), + wxT(" head: %s"), ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str() : wxEmptyString) ); wxLogTrace( FILECONF_TRACE_MASK, - _T(" tail: %s"), + wxT(" tail: %s"), ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str() : wxEmptyString) ); @@ -1215,11 +1222,11 @@ wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str) m_linesTail = pLine; wxLogTrace( FILECONF_TRACE_MASK, - _T(" head: %s"), + wxT(" head: %s"), ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str() : wxEmptyString) ); wxLogTrace( FILECONF_TRACE_MASK, - _T(" tail: %s"), + wxT(" tail: %s"), ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str() : wxEmptyString) ); @@ -1231,16 +1238,16 @@ wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str, wxFileConfigLineList *pLine) { wxLogTrace( FILECONF_TRACE_MASK, - _T(" ** Inserting Line '%s' after '%s'"), + wxT(" ** Inserting Line '%s' after '%s'"), str.c_str(), ((pLine) ? (const wxChar*)pLine->Text().c_str() : wxEmptyString) ); wxLogTrace( FILECONF_TRACE_MASK, - _T(" head: %s"), + wxT(" head: %s"), ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str() : wxEmptyString) ); wxLogTrace( FILECONF_TRACE_MASK, - _T(" tail: %s"), + wxT(" tail: %s"), ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str() : wxEmptyString) ); @@ -1266,11 +1273,11 @@ wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str, } wxLogTrace( FILECONF_TRACE_MASK, - _T(" head: %s"), + wxT(" head: %s"), ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str() : wxEmptyString) ); wxLogTrace( FILECONF_TRACE_MASK, - _T(" tail: %s"), + wxT(" tail: %s"), ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str() : wxEmptyString) ); @@ -1280,14 +1287,14 @@ wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str, void wxFileConfig::LineListRemove(wxFileConfigLineList *pLine) { wxLogTrace( FILECONF_TRACE_MASK, - _T(" ** Removing Line '%s'"), + wxT(" ** Removing Line '%s'"), pLine->Text().c_str() ); wxLogTrace( FILECONF_TRACE_MASK, - _T(" head: %s"), + wxT(" head: %s"), ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str() : wxEmptyString) ); wxLogTrace( FILECONF_TRACE_MASK, - _T(" tail: %s"), + wxT(" tail: %s"), ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str() : wxEmptyString) ); @@ -1309,11 +1316,11 @@ void wxFileConfig::LineListRemove(wxFileConfigLineList *pLine) pNext->SetPrev(pPrev); wxLogTrace( FILECONF_TRACE_MASK, - _T(" head: %s"), + wxT(" head: %s"), ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str() : wxEmptyString) ); wxLogTrace( FILECONF_TRACE_MASK, - _T(" tail: %s"), + wxT(" tail: %s"), ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str() : wxEmptyString) ); @@ -1372,7 +1379,7 @@ void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine) // for a normal (i.e. not root) group this method shouldn't be called twice // unless we are resetting the line wxASSERT_MSG( !m_pParent || !m_pLine || !pLine, - _T("changing line for a non-root group?") ); + wxT("changing line for a non-root group?") ); m_pLine = pLine; } @@ -1414,13 +1421,13 @@ void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine) wxFileConfigLineList *wxFileConfigGroup::GetGroupLine() { wxLogTrace( FILECONF_TRACE_MASK, - _T(" GetGroupLine() for Group '%s'"), + wxT(" GetGroupLine() for Group '%s'"), Name().c_str() ); if ( !m_pLine ) { wxLogTrace( FILECONF_TRACE_MASK, - _T(" Getting Line item pointer") ); + wxT(" Getting Line item pointer") ); wxFileConfigGroup *pParent = Parent(); @@ -1428,7 +1435,7 @@ wxFileConfigLineList *wxFileConfigGroup::GetGroupLine() if ( pParent ) { wxLogTrace( FILECONF_TRACE_MASK, - _T(" checking parent '%s'"), + wxT(" checking parent '%s'"), pParent->Name().c_str() ); wxString strFullName; @@ -1459,7 +1466,7 @@ wxFileConfigLineList *wxFileConfigGroup::GetLastGroupLine() { wxFileConfigLineList *pLine = m_pLastGroup->GetLastGroupLine(); - wxASSERT_MSG( pLine, _T("last group must have !NULL associated line") ); + wxASSERT_MSG( pLine, wxT("last group must have !NULL associated line") ); return pLine; } @@ -1474,14 +1481,14 @@ wxFileConfigLineList *wxFileConfigGroup::GetLastGroupLine() wxFileConfigLineList *wxFileConfigGroup::GetLastEntryLine() { wxLogTrace( FILECONF_TRACE_MASK, - _T(" GetLastEntryLine() for Group '%s'"), + wxT(" GetLastEntryLine() for Group '%s'"), Name().c_str() ); if ( m_pLastEntry ) { wxFileConfigLineList *pLine = m_pLastEntry->GetLine(); - wxASSERT_MSG( pLine, _T("last entry must have !NULL associated line") ); + wxASSERT_MSG( pLine, wxT("last entry must have !NULL associated line") ); return pLine; } @@ -1499,7 +1506,7 @@ void wxFileConfigGroup::SetLastEntry(wxFileConfigEntry *pEntry) // the only situation in which a group without its own line can have // an entry is when the first entry is added to the initially empty // root pseudo-group - wxASSERT_MSG( !m_pParent, _T("unexpected for non root group") ); + wxASSERT_MSG( !m_pParent, wxT("unexpected for non root group") ); // let the group know that it does have a line in the file now m_pLine = pEntry->GetLine(); @@ -1514,10 +1521,10 @@ void wxFileConfigGroup::UpdateGroupAndSubgroupsLines() { // update the line of this group wxFileConfigLineList *line = GetGroupLine(); - wxCHECK_RET( line, _T("a non root group must have a corresponding line!") ); + wxCHECK_RET( line, wxT("a non root group must have a corresponding line!") ); // +1: skip the leading '/' - line->SetText(wxString::Format(_T("[%s]"), GetFullName().c_str() + 1)); + line->SetText(wxString::Format(wxT("[%s]"), GetFullName().c_str() + 1)); // also update all subgroups as they have this groups name in their lines @@ -1530,7 +1537,7 @@ void wxFileConfigGroup::UpdateGroupAndSubgroupsLines() void wxFileConfigGroup::Rename(const wxString& newName) { - wxCHECK_RET( m_pParent, _T("the root group can't be renamed") ); + wxCHECK_RET( m_pParent, wxT("the root group can't be renamed") ); if ( newName == m_strName ) return; @@ -1669,20 +1676,20 @@ bool wxFileConfigGroup::DeleteSubgroupByName(const wxString& name) // other data structures. bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup) { - wxCHECK_MSG( pGroup, false, _T("deleting non existing group?") ); + wxCHECK_MSG( pGroup, false, wxT("deleting non existing group?") ); wxLogTrace( FILECONF_TRACE_MASK, - _T("Deleting group '%s' from '%s'"), + wxT("Deleting group '%s' from '%s'"), pGroup->Name().c_str(), Name().c_str() ); wxLogTrace( FILECONF_TRACE_MASK, - _T(" (m_pLine) = prev: %p, this %p, next %p"), + wxT(" (m_pLine) = prev: %p, this %p, next %p"), m_pLine ? static_cast(m_pLine->Prev()) : 0, static_cast(m_pLine), m_pLine ? static_cast(m_pLine->Next()) : 0 ); wxLogTrace( FILECONF_TRACE_MASK, - _T(" text: '%s'"), + wxT(" text: '%s'"), m_pLine ? (const wxChar*)m_pLine->Text().c_str() : wxEmptyString ); @@ -1690,7 +1697,7 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup) size_t nCount = pGroup->m_aEntries.GetCount(); wxLogTrace(FILECONF_TRACE_MASK, - _T("Removing %lu entries"), (unsigned long)nCount ); + wxT("Removing %lu entries"), (unsigned long)nCount ); for ( size_t nEntry = 0; nEntry < nCount; nEntry++ ) { @@ -1699,7 +1706,7 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup) if ( pLine ) { wxLogTrace( FILECONF_TRACE_MASK, - _T(" '%s'"), + wxT(" '%s'"), pLine->Text().c_str() ); m_pConfig->LineListRemove(pLine); } @@ -1709,7 +1716,7 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup) nCount = pGroup->m_aSubgroups.GetCount(); wxLogTrace( FILECONF_TRACE_MASK, - _T("Removing %lu subgroups"), (unsigned long)nCount ); + wxT("Removing %lu subgroups"), (unsigned long)nCount ); for ( size_t nGroup = 0; nGroup < nCount; nGroup++ ) { @@ -1721,11 +1728,11 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup) if ( pLine ) { wxLogTrace( FILECONF_TRACE_MASK, - _T(" Removing line for group '%s' : '%s'"), + wxT(" Removing line for group '%s' : '%s'"), pGroup->Name().c_str(), pLine->Text().c_str() ); wxLogTrace( FILECONF_TRACE_MASK, - _T(" Removing from group '%s' : '%s'"), + wxT(" Removing from group '%s' : '%s'"), Name().c_str(), ((m_pLine) ? (const wxChar*)m_pLine->Text().c_str() : wxEmptyString) ); @@ -1735,7 +1742,7 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup) if ( pGroup == m_pLastGroup ) { wxLogTrace( FILECONF_TRACE_MASK, - _T(" Removing last group") ); + wxT(" Removing last group") ); // our last entry is being deleted, so find the last one which // stays by going back until we find a subgroup or reach the @@ -1769,7 +1776,7 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup) else { wxLogTrace( FILECONF_TRACE_MASK, - _T(" No line entry for Group '%s'?"), + wxT(" No line entry for Group '%s'?"), pGroup->Name().c_str() ); } @@ -1811,6 +1818,11 @@ bool wxFileConfigGroup::DeleteEntry(const wxString& name) // pNewLast can be NULL here -- it's ok and can happen if we have no // entries left m_pLastEntry = pNewLast; + + // For the root group only, we could be removing the first group line + // here, so update m_pLine to avoid keeping a dangling pointer. + if ( pLine == m_pLine ) + SetLine(NULL); } m_pConfig->LineListRemove(pLine); @@ -2075,7 +2087,7 @@ static wxString FilterInEntryName(const wxString& str) for ( const wxChar *pc = str.c_str(); *pc != '\0'; pc++ ) { if ( *pc == wxT('\\') ) { // we need to test it here or we'd skip past the NUL in the loop line - if ( *++pc == _T('\0') ) + if ( *++pc == wxT('\0') ) break; } @@ -2104,7 +2116,7 @@ static wxString FilterOutEntryName(const wxString& str) #if !wxUSE_UNICODE ((unsigned char)c < 127) && #endif // ANSI - !wxIsalnum(c) && !wxStrchr(wxT("@_/-!.*%"), c) ) + !wxIsalnum(c) && !wxStrchr(wxT("@_/-!.*%()"), c) ) { strResult += wxT('\\'); }