| -rw-r--r-- | libopie/pim/odatebookaccessbackend_xml.cpp | 29 | ||||
| -rw-r--r-- | libopie/pim/otodoaccessxml.cpp | 30 | ||||
| -rw-r--r-- | libopie/pim/test/oevent_test.cpp | 21 |
3 files changed, 57 insertions, 23 deletions
diff --git a/libopie/pim/odatebookaccessbackend_xml.cpp b/libopie/pim/odatebookaccessbackend_xml.cpp index bc51996..24b69fe 100644 --- a/libopie/pim/odatebookaccessbackend_xml.cpp +++ b/libopie/pim/odatebookaccessbackend_xml.cpp @@ -25,2 +25,29 @@ namespace { + // FROM TT again +char *strstrlen(const char *haystack, int hLen, const char* needle, int nLen) +{ + char needleChar; + char haystackChar; + if (!needle || !haystack || !hLen || !nLen) + return 0; + + const char* hsearch = haystack; + + if ((needleChar = *needle++) != 0) { + nLen--; //(to make up for needle++) + do { + do { + if ((haystackChar = *hsearch++) == 0) + return (0); + if (hsearch >= haystack + hLen) + return (0); + } while (haystackChar != needleChar); + } while (strncmp(hsearch, needle, QMIN(hLen - (hsearch - haystack), nLen)) != 0); + hsearch--; + } + return ((char *)hsearch); +} +} + +namespace { time_t start, end, created, rp_end; @@ -344,3 +371,3 @@ bool ODateBookAccessBackend_XML::loadFile() { int *find; - while ( dt + 1 != 0 && (( point = ::strstr( dt+i, collectionString ) ) != 0 ) ) { + while ( ( point = ::strstrlen( dt+i, len -i, collectionString, strLen ) ) != 0 ) { i = point -dt; diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp index 22b2469..cda300b 100644 --- a/libopie/pim/otodoaccessxml.cpp +++ b/libopie/pim/otodoaccessxml.cpp @@ -19,2 +19,30 @@ +namespace { + // FROM TT again +char *strstrlen(const char *haystack, int hLen, const char* needle, int nLen) +{ + char needleChar; + char haystackChar; + if (!needle || !haystack || !hLen || !nLen) + return 0; + + const char* hsearch = haystack; + + if ((needleChar = *needle++) != 0) { + nLen--; //(to make up for needle++) + do { + do { + if ((haystackChar = *hsearch++) == 0) + return (0); + if (hsearch >= haystack + hLen) + return (0); + } while (haystackChar != needleChar); + } while (strncmp(hsearch, needle, QMIN(hLen - (hsearch - haystack), nLen)) != 0); + hsearch--; + } + return ((char *)hsearch); +} +} + + OTodoAccessXML::OTodoAccessXML( const QString& appName, @@ -87,3 +115,3 @@ bool OTodoAccessXML::load() { int strLen = strlen(collectionString); - while ( dt+i != 0 && ( point = strstr( dt+i, collectionString ) ) != 0l ) { + while ( ( point = strstrlen( dt+i, len -i, collectionString, strLen ) ) != 0l ) { i = point -dt; diff --git a/libopie/pim/test/oevent_test.cpp b/libopie/pim/test/oevent_test.cpp index 247b83b..d83ee0b 100644 --- a/libopie/pim/test/oevent_test.cpp +++ b/libopie/pim/test/oevent_test.cpp @@ -6,20 +6,2 @@ int main(int argc, char* argv ) { - OEvent ev; -// ev.setUid( 20 ); - - ev.setDescription( "Foo Descsfewrf" ); - - OEvent ev2 = ev; - ev2.setDescription("Foo3"); - qWarning("%s", ev2.description().latin1() ); - qWarning("%s", ev.description().latin1() ); - - QDateTime time = QDateTime::currentDateTime(); - ev2.setStartDateTime( time ); - ev2.setTimeZone( "Europe/London" ); - - qWarning("%s", ev2.startDateTime().toString().latin1() ); - qWarning("%s", ev2.startDateTimeInZone().toString().latin1() ); - qWarning("%d %d", ev.isAllDay(), ev2.isAllDay() ); - ODateBookAccess acc; @@ -48,5 +30,2 @@ int main(int argc, char* argv ) { } - ev.setUid( 1 ); - acc.add( ev ); - acc.save(); |