diff -r bb1748e0dd9b -r c6e8afe0ba85 secureswitools/swisistools/source/rscparser/parse.cpp --- a/secureswitools/swisistools/source/rscparser/parse.cpp Tue Jun 29 16:50:12 2010 +0300 +++ b/secureswitools/swisistools/source/rscparser/parse.cpp Thu Jul 08 20:28:00 2010 +0300 @@ -205,7 +205,12 @@ { string iName; + #ifdef __LINUX__ + TInt i = Buf->rfind("/"); + #else TInt i = Buf->rfind("\\"); + #endif + if(i!=string::npos) iName.assign(*Buf, i, Buf->size()-4); else @@ -223,7 +228,12 @@ { string iName; + #ifdef __LINUX__ + TInt i = Buf->rfind("/"); + #else TInt i = Buf->rfind("\\"); + #endif + if(i!=string::npos) iName.assign(*Buf, i, Buf->size()); @@ -234,7 +244,12 @@ { string iName; + #ifdef __LINUX__ + TInt i = Buf->rfind("/"); + #else TInt i = Buf->rfind("\\"); + #endif + if(i!=string::npos) iName.assign(*Buf, 0, i); @@ -245,8 +260,14 @@ { string iName; + #ifdef __LINUX__ + TInt j = Buf->rfind("/"); + TInt i = Buf->find("/"); + #else TInt j = Buf->rfind("\\"); TInt i = Buf->find("\\"); + #endif + if(i!=string::npos) iName.assign(*Buf, i, Buf->size()-j); @@ -277,7 +298,12 @@ TInt ParsePtrC::NamePresent() { + #ifdef __LINUX__ + TInt i = Buf->rfind("/"); + #else TInt i = Buf->rfind("\\"); + #endif + if(i!=string::npos) iNamePresent = 1; else @@ -292,7 +318,12 @@ TInt ParsePtrC::PathPresent() { + #ifdef __LINUX__ + TInt i = Buf->find("/"); + #else TInt i = Buf->find("\\"); + #endif + if(i!=string::npos) iPathPresent = 1; else @@ -330,7 +361,12 @@ TInt ParsePtrC::IsValidName() { - string::size_type index = Buf->find_last_of("*?< > : \" / |"); + #ifdef __LINUX__ + string::size_type index = Buf->find_last_of("*?< > : \" \\ |"); + #else + string::size_type index = Buf->find_last_of("*?< > : \" |"); + #endif + if( index != string::npos ) return 1; return 0;