FCL/sftools/dev/build: comparison imgtools/romtools/rofsbuild/r

equal deleted inserted replaced

-:122d2b873fd1
+:30b30f9da0b7
 * Description:
 * @internalComponent * @released
 * Rofsbuild Obey file class and its reader class.
 *
 */
+#include <strstream>
+#include <iomanip>
 #include <string.h>
-#ifdef __VC32__
-#ifdef __MSVCDOTNET__
-#include <strstream>
-#include <iomanip>
-#else //__MSVCDOTNET__
-#include <strstrea.h>
-#include <iomanip.h>
-#endif  //__MSVCDOTNET__
-#else // !__VC32__
-#ifdef __TOOLS2__
-	#include <sstream>
-	#include <iomanip>
-	#include <sys/stat.h>
-	using namespace std;
-#else
-	#include <strstrea.h>
-	#include <iomanip.h>
-#endif
-#endif //__VC32__
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
 #include <assert.h>
 #include <errno.h>
 #include "h_utl.h"
 #include "r_obey.h"
 #include "r_coreimage.h"
 #include "patchdataprocessor.h"
-#include "filesysteminterface.h"
+#include "fatimagegenerator.h"
 #include "r_driveimage.h"
 extern TInt gCodePagingOverride;
 extern TInt gDataPagingOverride;
 extern ECompression gCompress;
 extern TBool gEnableStdPathWarning; // Default to not warn if destination path provided for a file is not in standard path.
+extern TBool gKeepGoing;
 #define _P(word)	word, sizeof(word)-1	// match prefix, optionally followed by [HWVD]
 #define _K(word)	word, 0					// match whole word
+static char* const NullString = "" ;
 const ObeyFileKeyword ObeyFileReader::iKeywords[] =
 {
 	{_K("file"),		2,-2, EKeywordFile, "File to be copied into ROFS"},
 	{_K("data"),		2,-2, EKeywordData, "same as file"},
+	{_K("dir"),         2,1, EKeywordDir, "Directory to be created into FAT image"},
 	{_K("rofsname"),	1, 1, EKeywordRofsName, "output file for ROFS image"},
 	{_K("romsize"),		1, 1, EKeywordRomSize, "size of ROM image"},
 	{_P("hide"),	    2, -1, EKeywordHide, "Exclude named file from ROM directory structure"},
 	{_P("alias"),	    2, -2, EKeywordAlias, "Create alias for existing file in ROM directory structure"},
 	{_K("payloadflags"), 1, 1, EKeywordSmrFlags, "payload flags for the HCR SMR image"},
 	{_K("payloaduid"), 1, 1, EKeywordSmrUID, "payload UID for the HCR SMR image"},
 	{0,0,0,0,EKeywordNone,""}
 };
-extern TInt isNumber(TText *aString);
+void ObeyFileReader::KeywordHelp() { // static
-extern TInt getNumber(TText *aStr);
-void ObeyFileReader::KeywordHelp() // static
-	{
 	cout << "Obey file keywords:\n";
 	const ObeyFileKeyword* k=0;
 	for (k=iKeywords; k->iKeyword!=0; k++)
-		{
+	{
-		if (k->iHelpText==0)
+		if (k->iHelpText == 0)
 			continue;
 		if (k->iHelpText[0]=='(' && !H.iVerbose)
 			continue;	// don't normally report things in (parentheses)
 		char buf[32];
 		if (k->iKeywordLength)
 			memcpy(buf+k->iKeywordLength,"[HWVD]",6);
 		if (H.iVerbose)
 			sprintf(buf+20,"%2d",k->iNumArgs);
 		cout << "    " << buf << " " << k->iHelpText << endl;
-		}
+	}
 	cout << endl;
 	cout << "File attributes:\n";
 	const FileAttributeKeyword* f=0;
 	for (f=iAttributeKeywords; f->iKeyword!=0; f++)
-		{
+	{
-		if (f->iHelpText==0)
+		if (f->iHelpText == 0)
 			continue;
 		if (f->iHelpText[0]=='(' && !H.iVerbose)
 			continue;	// don't normally report things in (parentheses)
 		char buf[32];
 		sprintf(buf, "%-20s", f->iKeyword);
 		if (H.iVerbose)
 			sprintf(buf+20,"%2d",k->iNumArgs);
 		cout << "    " << buf << " " << f->iHelpText << endl;
-		}
+	}
 	cout << endl;
-	}
+}
-ObeyFileReader::ObeyFileReader(TText* aFileName):
+ObeyFileReader::ObeyFileReader(const char* aFileName):iCurrentLine(0),
-iObeyFile(0),iMark(0), iMarkLine(0), iCurrentMark(0), iCurrentLine(0), imaxLength(0)
+iFileName(aFileName),iNumWords(0),iLine(0),iMarkLine(0),iCurrentObeyStatement(0)	{
-	{
+	for(TUint i = 0 ; i < KNumWords ; i++)
+		iWord[i] = NullString;
-	iFileName = new TText[strlen((const char *)aFileName)+1];
+	*iSuffix = 0 ;
-	strcpy((char *)iFileName,(const char *)aFileName);
+}
-	iNumWords = 0 ;
-	for(unsigned int i = 0 ; i < KNumWords ; i++)
+ObeyFileReader::~ObeyFileReader() {
-		iWord[i] = 0 ;
+	if(iCurrentObeyStatement) {
-	iSuffix = new TText();
+		delete []iCurrentObeyStatement;
-	iLine = 0 ;
+		iCurrentObeyStatement = 0 ;
-	iCurrentObeyStatement = 0 ;
+	}
-	 }
+	if(iLine) {
+		delete []iLine;
+		iLine = 0 ;
-ObeyFileReader::~ObeyFileReader()
+	}
-	{
+}
-	if (iObeyFile)
-		fclose(iObeyFile);
-	iObeyFile=0;
-	delete [] iFileName;
-	delete [] iLine;
-	delete [] iCurrentObeyStatement;
-	}
-TBool ObeyFileReader::Open()
 //
 // Open the file & return a status
 //
-{
+TBool ObeyFileReader::Open() {
-if (!iFileName)
+	ifstream ifs(iFileName.c_str(),ios_base::in + ios_base::binary);
-{
+	if (!ifs.is_open()) {
-return EFalse;
+		Print(EError,"Cannot open obey file %s\n",iFileName.c_str());
-}
+		return EFalse;
+	}
-iObeyFile = fopen((const char *)iFileName,"r");
+	iLines.clear();
-if (!iObeyFile)
+	if(iLine){
-{
+		delete []iLine;
-Print(EError,"Cannot open obey file %s\n",iFileName);
+		iLine = 0 ;
-return EFalse;
+	}
-}
+	ifs.seekg(0,ios_base::end);
-if (SetLineLengthBuffer() != KErrNone)
+	size_t length = ifs.tellg();
-{
+	char* buffer = new char[length + 2];
-Print(EError,"Insufficent Memory to Continue.");
+	if (0 == buffer) {
-return EFalse;
+		Print(EError,"Insufficent Memory to Continue.");
-}
+		ifs.close();
-return ETrue;
+		return EFalse;
-}
+	}
+	ifs.seekg(0,ios_base::beg);
-TInt ObeyFileReader::SetLineLengthBuffer()
+	ifs.read(buffer,length);
-// Get the Max Line length for the given obey file and allocate the buffer.
+	size_t readcout = ifs.gcount() ;
-	{
+	if(readcout != length){
-	char ch = '\0';
+		Print(EError,"Cannot Read All of File.");
-	TInt length = 0;
+		delete []buffer ;
+		ifs.close();
-	Rewind();
+		return EFalse;
-	while ((ch = (char)fgetc(iObeyFile)) != EOF)
+	}
-		{
+	buffer[length] = '\n';
-		length++;
+	buffer[length + 1] = 0 ;
-		if (ch == '\n')
+	ifs.close();
-			{
+	char* lineStart = buffer ;
-			if (length > imaxLength)
+	char* end = buffer + length ;
-				imaxLength = length;
+	string line ;
-			length = 0;
+	size_t maxLengthOfLine = 0 ;
-			}
+	while(lineStart < end){
-		}
+		while(*lineStart == ' ' || *lineStart == '\t') //trimleft
+			lineStart ++ ;
-	if (length > imaxLength)
+		char* lineEnd = lineStart ;
-		imaxLength = length;
+		while(*lineEnd != '\r' && *lineEnd != '\n')
+			lineEnd ++ ;
-	if (0 == imaxLength)
+		if(strnicmp(lineStart,"REM",3) == 0){
-		{
+			line = "" ; // REMOVE "REM ... "
-		Print(EError,"Empty obey file passed as input.");
+		}
-		exit(-1);
+		else {
-		}
+			TInt lastIndex = lineEnd - lineStart - 1;
-	else if (imaxLength < 2)
+			while(lastIndex >= 0 &&  // trimright
-		{
+				(lineStart[lastIndex] == ' ' || lineStart[lastIndex] == '\t'))
-		Print(EError,"Invalid obey file passed as input.");
+				lastIndex -- ;
-		exit(-1);
+			if(lastIndex >= 0)
-		}
+				line.assign(lineStart,lastIndex + 1);
+			else
-	Rewind();
+				line = "";
-	iLine = new TText[imaxLength+1];
+		}
+		if(line.length() > maxLengthOfLine)
-	if(!iLine)
+			maxLengthOfLine = line.length();
-		return KErrNoMemory;
+		iLines.push_back(line);
+		if(*lineEnd == '\r') {
-	return KErrNone;
+			if(lineEnd[1] == '\n')
-	}
+				lineStart = lineEnd + 2 ;
+			else
-void ObeyFileReader::Mark()
+				lineStart = lineEnd + 1 ;
-	{
+		}
+		else // '\n'
-	iMark = iCurrentMark;
+			lineStart = lineEnd + 1 ;
-	iMarkLine = iCurrentLine-1;
+	}
-	}
+	delete []buffer ;
+	iLine = new char[maxLengthOfLine + 1];
-void ObeyFileReader::MarkNext()
+	iCurrentObeyStatement = new char[maxLengthOfLine + 1];
-	{
+	*iCurrentObeyStatement = 0 ;
+	*iLine = 0 ;
-	iMark = ftell(iObeyFile);
+	iCurrentLine = 0 ;
+	iMarkLine = 0 ;
+	return ETrue;
+}
+void ObeyFileReader::Mark()	{
+	iMarkLine = iCurrentLine - 1;
+}
+void ObeyFileReader::MarkNext() {
 	iMarkLine = iCurrentLine;
-	}
+}
-void ObeyFileReader::Rewind()
+void ObeyFileReader::Rewind() {
-	{
-	fseek(iObeyFile,iMark,SEEK_SET);
-	iCurrentMark = iMark;
 	iCurrentLine = iMarkLine;
-	}
+}
-void ObeyFileReader::CopyWord(TInt aIndex, TText*& aString)
+char* ObeyFileReader::DupWord(TInt aIndex) const {
-	{
+	char* retVal = 0 ;
-	aString = new TText[strlen((const char *)iWord[aIndex])+1];
+	if(aIndex >= 0 && aIndex < (TInt)KNumWords){
-	strcpy((char *)aString, (const char *)iWord[aIndex]);
+		size_t len = strlen(iWord[aIndex]) + 1;
-	}
+		retVal = new char[len];
+		if(retVal)
-TInt ObeyFileReader::ReadAndParseLine()
+			memcpy(retVal,iWord[aIndex],len);
-	{
+	}
-	if (feof(iObeyFile))
+	return retVal ;
+}
+TInt ObeyFileReader::ReadAndParseLine() {
+	if (iCurrentLine >= (TInt)iLines.size())
 		return KErrEof;
 	iCurrentLine++;
-	iCurrentMark = ftell(iObeyFile);
-	iLine[0]='\0';
-	fgets((char*)iLine,imaxLength+1,iObeyFile);
-	iCurrentObeyStatement = new TText[imaxLength+1];
-	strcpy((char*)iCurrentObeyStatement,(char*)iLine);
 	iNumWords = Parse();
 	return KErrNone;
-	}
+}
-TInt ObeyFileReader::NextLine(TInt aPass, enum EKeyword& aKeyword)
+TInt ObeyFileReader::NextLine(TInt aPass, enum EKeyword& aKeyword) {
-	{
 NextLine:
 	TInt err = ReadAndParseLine();
 	if (err == KErrEof)
 		return KErrEof;
-	if (iNumWords == 0 || stricmp((const char*)iWord[0], "rem")==0)
+	if(iNumWords == 0)
 		goto NextLine;
-	if (stricmp((const char*)iWord[0], "stop")==0)
+	if (stricmp(iWord[0], "stop")==0)
 		return KErrEof;
 	const ObeyFileKeyword* k=0;
-	for (k=iKeywords; k->iKeyword!=0; k++)
+	for (k=iKeywords; k->iKeyword!=0; k++) {
-		{
+		if (k->iKeywordLength == 0) {
-		if (k->iKeywordLength == 0)
-			{
 			// Exact case-insensitive match on keyword
-			if (stricmp((const char*)iWord[0], k->iKeyword) != 0)
+			if (stricmp(iWord[0], k->iKeyword) != 0)
 				continue;
-			iSuffix = 0;
+			*iSuffix = 0;
-			}
+		}
-		else
+		else {
-			{
 			// Prefix match
-			if (strnicmp((const char*)iWord[0], k->iKeyword, k->iKeywordLength) != 0)
+			if (strnicmp(iWord[0], k->iKeyword, k->iKeywordLength) != 0)
 				continue;
 			// Suffix must be empty, or a variant number in []
-			iSuffix = iWord[0]+k->iKeywordLength;
+			strncpy(iSuffix,iWord[0] + k->iKeywordLength,80);
 			if (*iSuffix != '\0' && *iSuffix != '[')
 				continue;
-			}
+		}
 		// found a match
 		if ((k->iPass & aPass) == 0)
 			goto NextLine;
-		if (k->iNumArgs>=0 && (1+k->iNumArgs != iNumWords))
+		if (k->iNumArgs>=0 && (1+k->iNumArgs != iNumWords)) {
-			{
 			Print(EError, "Incorrect number of arguments for keyword %s on line %d.\n",
 				iWord[0], iCurrentLine);
 			goto NextLine;
-			}
+		}
-		if (k->iNumArgs<0 && (1-k->iNumArgs > iNumWords))
+		if (k->iNumArgs<0 && (1-k->iNumArgs > iNumWords)) {
-			{
 			Print(EError, "Too few arguments for keyword %s on line %d.\n",
 				iWord[0], iCurrentLine);
 			goto NextLine;
-			}
+		}
 		aKeyword = k->iKeywordEnum;
 		return KErrNone;
-		}
+	}
 	if (aPass == 1)
 		Print(EWarning, "Unknown keyword '%s'.  Line %d ignored\n", iWord[0], iCurrentLine);
 	goto NextLine;
-	}
+}
-inline TBool ObeyFileReader::IsGap(char ch)
-	{
-	return (ch==' ' || ch=='=' || ch=='\t');
-	}
-TInt ObeyFileReader::Parse()
 //
 // splits a line into words, and returns the number of words found
 //
-	{
+TInt ObeyFileReader::Parse() {
-	TInt i;
+	for (TUint i = 0; i < KNumWords; i++)
-	TText *letter=iLine;
+		iWord[i] = NullString;
-	TText *end=iLine+strlen((char *)iLine);
-	for (i=0; (TUint)i<KNumWords; i++)
-		iWord[i]=end;
 	enum TState {EInWord, EInQuotedWord, EInGap};
-	TState state=EInGap;
+	TState state = EInGap;
+	const string& line = iLines[iCurrentLine - 1];
-	i=0;
+	size_t len = line.length();
-	while ((TUint)i<KNumWords && letter<end)
+	memcpy(iLine,line.c_str(),len);
+	memcpy(iCurrentObeyStatement,iLine,len);
+	iLine[len] = 0 ;
+	iCurrentObeyStatement[len] = 0 ;
+	TUint i = 0;
+	char* linestr = iLine;
+	while (i < KNumWords && *linestr != 0) {
+		switch (state)
 		{
-		char ch=*letter;
-		if (ch==0)
-			break;
-		if (ch=='\n')
-			{
-			*letter='\0';	// remove trailing newline left by fgets
-			break;
-			}
-		switch (state)
-			{
 		case EInGap:
-			if (ch=='\"')
+			if (*linestr =='\"') {
-				{
+				if (linestr[1] != 0 && linestr[1]!='\"')
-				if (letter[1]!=0 && letter[1]!='\"')
+					iWord[i++] = linestr + 1;
-					iWord[i++]=letter+1;
+				state = EInQuotedWord;
+			}
+			else if (!IsGap(*linestr)) {
+				iWord[i++] = linestr;
+				state=EInWord;
+			}
+			else
+				*linestr=0;
+			break;
+		case EInWord:
+			if (*linestr == '\"') {
+				*linestr = 0;
+				if (linestr[1] != 0 && linestr[1] != '\"')
+					iWord[i++] = linestr+1;
 				state=EInQuotedWord;
-				}
+			}
-			else if (!IsGap(ch))
+			else if (IsGap(*linestr)) {
-				{
+				*linestr=0;
-				iWord[i++]=letter;
-				state=EInWord;
-				}
-			else
-				*letter=0;
-			break;
-		case EInWord:
-			if (ch=='\"')
-				{
-				*letter=0;
-				if (letter[1]!=0 && letter[1]!='\"')
-					iWord[i++]=letter+1;
-				state=EInQuotedWord;
-				}
-			else if (IsGap(ch))
-				{
-				*letter=0;
 				state=EInGap;
-				}
+			}
 			break;
 		case EInQuotedWord:
-			if (ch=='\"')
+			if (*linestr == '\"'){
-				{
+				*linestr = 0;
-				*letter=0;
+				state = EInGap;
-				state=EInGap;
+			}
-				}
+			break;
-			break;
+		}
-			}
+		linestr++;
-		letter++;
+	}
-		}
 	return i;
-	}
+}
-void ObeyFileReader::ProcessTime(TInt64& aTime)
 //
 // Process the timestamp
 //
-	{
+void ObeyFileReader::ProcessTime(TInt64& aTime) {
 	char timebuf[256];
 	if (iNumWords>2)
 		sprintf(timebuf, "%s_%s", iWord[1], iWord[2]);
 	else
-		strcpy(timebuf, (char*)iWord[1]);
+		strncpy(timebuf, iWord[1],256);
-	TInt r=StringToTime(aTime, timebuf);
+	TInt r = StringToTime(aTime, timebuf);
-	if (r==KErrGeneral)
+	if (r==KErrGeneral) {
-		{
 		Print(EError, "incorrect format for time keyword on line %d\n", iCurrentLine);
 		exit(0x670);
-		}
+	}
-	if (r==KErrArgument)
+	if (r==KErrArgument){
-		{
 		Print(EError, "Time out of range on line %d\n", iCurrentLine);
 		exit(0x670);
-		}
+	}
-	}
+}
-TInt64 ObeyFileReader::iTimeNow=0;
+TInt64 ObeyFileReader::iTimeNow = 0;
-void ObeyFileReader::TimeNow(TInt64& aTime)
+void ObeyFileReader::TimeNow(TInt64& aTime) {
-	{
+	if (iTimeNow==0) {
-	if (iTimeNow==0)
+		TInt sysTime = time(0);					// seconds since midnight Jan 1st, 1970
-		{
+		sysTime -= (30*365*24*60*60+7*24*60*60);	// seconds since midnight Jan 1st, 2000
-		TInt sysTime=time(0);					// seconds since midnight Jan 1st, 1970
-		sysTime-=(30*365*24*60*60+7*24*60*60);	// seconds since midnight Jan 1st, 2000
 		TInt64 daysTo2000AD=730497;
 		TInt64 t=daysTo2000AD*24*3600+sysTime;	// seconds since 0000
-		t=t+3600;								// BST (?)
+		t = t+3600;								// BST (?)
 		iTimeNow=t*1000000;						// milliseconds
-		}
+	}
 	aTime=iTimeNow;
-	}
+}
-/**
-Funtion to get the current oby file line
-*/
-TText* ObeyFileReader::GetCurrentObeyStatement() const
-{
-	return iCurrentObeyStatement;
-}
 // File attributes.
 const FileAttributeKeyword ObeyFileReader::iAttributeKeywords[] =
 {
 	{"attrib",3			,0,1,EAttributeAtt, "File attributes in ROM file system"},
 	{"exattrib",3		,0,1,EAttributeAttExtra, "File extra attributes in ROM file system"},
-//	{_K("compress")		,1,1,EAttributeCompress, "Compress file"},
 	{"stack",3			,1,1,EAttributeStack, "?"},
 	{"fixed",3			,1,0,EAttributeFixed, "Relocate to a fixed address space"},
 	{"priority",3		,1,1,EAttributePriority, "Override process priority"},
 	{_K("uid1")			,1,1,EAttributeUid1, "Override first UID"},
 	{_K("uid2")			,1,1,EAttributeUid2, "Override second UID"},
 	{_K("unpageddata")	,1,0,EAttributeUnpagedData, "Don't page data for this file"},
 	{_K("pageddata")	,1,0,EAttributePagedData, "Page data for this file"},
 	{0,0,0,0,EAttributeAtt,0}
 };
-TInt ObeyFileReader::NextAttribute(TInt& aIndex, TInt aHasFile, enum EFileAttribute& aKeyword, TText*& aArg)
+TInt ObeyFileReader::NextAttribute(TInt& aIndex, TInt aHasFile, enum EFileAttribute& aKeyword, char*& aArg)
-	{
+{
 NextAttribute:
 	if (aIndex >= iNumWords)
 		return KErrEof;
-	TText* word=iWord[aIndex++];
+	char* word=iWord[aIndex++];
 	const FileAttributeKeyword* k;
 	for (k=iAttributeKeywords; k->iKeyword!=0; k++)
+	{
+		if (k->iKeywordLength == 0)
 		{
-		if (k->iKeywordLength == 0)
-			{
 			// Exact match on keyword
-			if (stricmp((const char*)word, k->iKeyword) != 0)
+			if (stricmp(word, k->iKeyword) != 0)
 				continue;
-			}
+		}
 		else
-			{
+		{
 			// Prefix match
-			if (strnicmp((const char*)word, k->iKeyword, k->iKeywordLength) != 0)
+			if (strnicmp(word, k->iKeyword, k->iKeywordLength) != 0)
 				continue;
-			}
+		}
 		// found a match
 		if (k->iNumArgs>0)
-			{
+		{
 			TInt argIndex = aIndex;
 			aIndex += k->iNumArgs;		// interface only really supports 1 argument
 			if (aIndex>iNumWords)
-				{
+			{
 				Print(EError, "Missing argument for attribute %s on line %d\n", word, iCurrentLine);
 				return KErrArgument;
-				}
+			}
 			aArg=iWord[argIndex];
-			}
+		}
 		if (k->iIsFileAttribute && !aHasFile)
-			{
+		{
 			Print(EError, "File attribute %s applied to non-file on line %d\n", word, iCurrentLine);
 			return KErrNotSupported;
-			}
+		}
 		aKeyword=k->iAttributeEnum;
 		return KErrNone;
-		}
+	}
 	Print(EWarning, "Unknown attribute '%s' skipped on line %d\n", word, iCurrentLine);
 	goto NextAttribute;
-	}
+}
 /**
 Constructor:
 2.used by both rofs and datadrive image.
 @param aReader - obey file reader object.
 */
 CObeyFile::CObeyFile(ObeyFileReader& aReader):
-	iRomFileName(NULL),
+iRomFileName(NULL),
-	iExtensionRofsName(0),
+iExtensionRofsName(0),
-	iKernelRofsName(0),
+iKernelRofsName(0),
-	iRomSize(0),
+iRomSize(0),
-	iVersion(0,0,0),
+iVersion(0,0,0),
-	iCheckSum(0),
+iCheckSum(0),
-	iNumberOfFiles(0),
+iNumberOfFiles(0),
-	iTime(0),
+iTime(0),
-	iRootDirectory(0),
+iRootDirectory(0),
-	iNumberOfDataFiles(0),
+iNumberOfDataFiles(0),
-	iDriveFileName(0),
+iDriveFileName(0),
-	iDataSize(0),
+iDriveFileFormat(0),
-	iDriveFileFormat(0),
+iReader(aReader),
-	iConfigurableFatAttributes(new ConfigurableFatAttributes),
+iMissingFiles(0),
-	iReader(aReader),
+iLastExecutable(0),
-	iMissingFiles(0),
+iFirstFile(0),
-	iLastExecutable(0),
+iCurrentFile(0),
-	iFirstFile(0),
+iAutoSize(EFalse),
-	iCurrentFile(0),
+iAutoPageSize(4096),
-	iAutoSize(EFalse),
+iPagingOverrideParsed(0),
-	iAutoPageSize(4096),
+iCodePagingOverrideParsed(0),
-	iPagingOverrideParsed(0),
+iDataPagingOverrideParsed(0),
-	iCodePagingOverrideParsed(0),
+iPatchData(new CPatchDataProcessor)
-	iDataPagingOverrideParsed(0),
+{
-	iPatchData(new CPatchDataProcessor)
+	iNextFilePtrPtr = &iFirstFile ;
-	{
+}
-		iNextFilePtrPtr = &iFirstFile ;
-	}
 /**
 Obey file Destructor.
 1.Release the tree memory.
 2.Release all allocated memory if any.
 */
-CObeyFile::~CObeyFile()
+CObeyFile::~CObeyFile() {
-//
+	if(iDriveFileName){
-// Destructor
-//
-	{
-	if(iDriveFileName)
 		delete[] iDriveFileName;
-	if(iDriveFileFormat)
+		iDriveFileName = 0 ;
+	}
+	if(iDriveFileFormat) {
 		delete[] iDriveFileFormat;
+		iDriveFileFormat = 0 ;
+	}
 	iRootDirectory->deleteTheFirstNode();
 	iRootDirectory->InitializeCount();
 	Release();
-	delete [] iRomFileName;
+	if(iRomFileName){
+		delete [] iRomFileName;
+		iRomFileName = 0 ;
+	}
 	if (iRootDirectory)
 		iRootDirectory->Destroy();
+	if(iPatchData)
-	delete iConfigurableFatAttributes;
+		delete iPatchData;
-	delete iPatchData;
+}
-	}
-TBool CObeyFile::AutoSize()
-{
-	return iAutoSize;
-}
-TUint32 CObeyFile::AutoPageSize()
-{
-	return iAutoPageSize;
-}
-void CObeyFile::Release()
 //
 // Free resources not needed after building a ROM
 //
-	{
+void CObeyFile::Release() {
 	iFirstFile = 0;
 	iNextFilePtrPtr = &iFirstFile;
-	}
+}
-TRomBuilderEntry *CObeyFile::FirstFile()
+TRomBuilderEntry *CObeyFile::FirstFile() {
-	{
 	iCurrentFile = iFirstFile;
 	return iCurrentFile;
-	}
+}
-TRomBuilderEntry *CObeyFile::NextFile()
+TRomBuilderEntry *CObeyFile::NextFile() {
-	{
 	iCurrentFile = iCurrentFile ? iCurrentFile->iNext : 0;
 	return iCurrentFile;
-	}
+}
-TText* CObeyFile::ProcessCoreImage()
+char* CObeyFile::ProcessCoreImage() const {
-	{
+	// check for coreimage keyword and return filename
-	// check for coreimage keyword and return filename
+	enum EKeyword keyword;
+	char* coreImageFileName = 0;
+	iReader.Rewind();
+	while (iReader.NextLine(1,keyword) != KErrEof) {
+		if (keyword == EKeywordCoreImage) {
+			coreImageFileName = iReader.DupWord(1);
+			iReader.MarkNext();
+			break;
+		}
+	}
+	return coreImageFileName;
+}
+void CObeyFile::SkipToExtension() {
 	iReader.Rewind();
 	enum EKeyword keyword;
-	TText* coreImageFileName = 0;
+	while (iReader.NextLine(1,keyword) != KErrEof) {
-	while (iReader.NextLine(1,keyword) != KErrEof)
+		if (keyword == EKeywordExtensionRofs) {
-		{
+			iReader.Mark(); // ready for processing extension
-		  if (keyword == EKeywordCoreImage)
+			break;
-			  {
+		}
-			  #if defined(__TOOLS2__) && defined (_STLP_THREADS)
+	}
-			  istringstream val(iReader.Word(1),(ios_base::in+ios_base::out));
+}
-			  #elif __TOOLS2__
-			  istringstream val(iReader.Word(1),(std::_Ios_Openmode)(ios_base::in+ios_base::out));
+TInt CObeyFile::ProcessRofs() {
-			  #else
-			  istrstream val(iReader.Word(1),strlen(iReader.Word(1)));
-			  #endif
-			  iReader.CopyWord(1, coreImageFileName);
-			  iReader.MarkNext(); // ready for processing extension
-			  break;
-			  }
-		}
-	return coreImageFileName;
-	}
-void CObeyFile::SkipToExtension()
-	{
-	iReader.Rewind();
-	enum EKeyword keyword;
-	while (iReader.NextLine(1,keyword) != KErrEof)
-		{
-		  if (keyword == EKeywordExtensionRofs)
-			  {
-			  iReader.Mark(); // ready for processing extension
-			  break;
-			  }
-		}
-	}
-TInt CObeyFile::ProcessRofs()
-	{
 	//
 	// First pass through the obey file to set up key variables
 	//
 	iReader.Rewind();
 	TInt count=0;
 	enum EKeyword keyword;
-	while (iReader.NextLine(1,keyword) != KErrEof)
+	while (iReader.NextLine(1,keyword) != KErrEof) {
-		{
+		if (keyword == EKeywordExtensionRofs){
-		  if (keyword == EKeywordExtensionRofs)
+			if (count==0)
-		    {
+				return KErrNotFound;		// no core ROFS, just extension ROFSs.
-		      if (count==0)
+			break;
-			return KErrNotFound;		// no core ROFS, just extension ROFSs.
+		}
-		      break;
-		    }
 		count++;
 		if (! ProcessKeyword(keyword))
 			return KErrGeneral;
-		}
+	}
 	if (!GotKeyVariables())
 		return KErrGeneral;
 	//
 	// second pass to process the file specifications in the obey file building
 	// up the TRomNode directory structure and the TRomBuilderEntry list
 	//
 	iReader.Rewind();
-	iRootDirectory = new TRomNode((TText*)"");
+	iRootDirectory = new TRomNode("");
 	iLastExecutable = iRootDirectory;
 	TInt align=0;
-	while (iReader.NextLine(2,keyword)!=KErrEof)
+	while (iReader.NextLine(2,keyword)!=KErrEof) {
-		{
 		if (keyword == EKeywordExtensionRofs)
 			break;
 		if (keyword == EKeywordHide)
 			keyword = EKeywordHideV2;
 		switch (keyword)
-			{
+		{
 		case EKeywordHide:
 		case EKeywordAlias:
 		case EKeywordRename:
 			if (!ProcessRenaming(keyword))
 				return KErrGeneral;
 			break;
 		case EKeywordPatchDllData:
-		{
+			{
-			// Collect patchdata statements to process at the end
+				// Collect patchdata statements to process at the end
-			StringVector patchDataTokens;
+				StringVector patchDataTokens;
-			SplitPatchDataStatement(patchDataTokens);
+				SplitPatchDataStatement(patchDataTokens);
-			iPatchData->AddPatchDataStatement(patchDataTokens);
+				iPatchData->AddPatchDataStatement(patchDataTokens);
-			break;
+				break;
-		}
+			}
 		default:
-		        if (!ProcessFile(align, keyword))
+			if (!ProcessFile(align, keyword))
-		        return KErrGeneral;
+				return KErrGeneral;
-		        align=0;
+			align=0;
-		        break;
+			break;
-			}
+		}
-		}
+	}
 	if(!ParsePatchDllData())
 		return KErrGeneral;
 	iReader.Mark();			// ready for processing the extension rom(s)
-	if (iMissingFiles!=0)
+	if (iMissingFiles!=0) {
-		{
 		return KErrGeneral;
-		}
+	}
-	if ( 0 == iNumberOfFiles )
+	if ( 0 == iNumberOfFiles ){
-		{
 		Print(EError, "No files specified.\n");
 		return KErrGeneral;
-		}
+	}
 	return KErrNone;
-	}
+}
-TBool CObeyFile::Process()
+TBool CObeyFile::Process() {
-{
 	TBool result = ETrue;
 	iReader.Rewind();
 	enum EKeyword keyword;
-	while(iReader.NextLine(1, keyword) != KErrEof)
+	while(iReader.NextLine(1, keyword) != KErrEof){
-	{
+		string key = iReader.Word(0);
-		String key = iReader.Word(0);
+		string value = iReader.Word(1);
-		String value = iReader.Word(1);
+		if(iKeyValues.find(key) != iKeyValues.end()){
-		if(iKeyValues.find(key) != iKeyValues.end())
-		{
 			iKeyValues[key].push_back(value);
 		}
-		else
+		else {
-		{
 			StringVector values;
 			values.push_back(value);
 			iKeyValues[key]=values;
 		}
 	}
 	return result;
 }
-StringVector CObeyFile::getValues(const String& aKey)
+StringVector CObeyFile::getValues(const string& aKey) {
-{
 	StringVector values;
-	if(iKeyValues.find(aKey) != iKeyValues.end())
+	if(iKeyValues.find(aKey) != iKeyValues.end()){
-	{
 		values = iKeyValues[aKey];
 	}
 	return values;
 }
 /**
 Process drive obey file and construct the tree.
 @return - Return the status,
 'KErrnone' for Success,
 'KErrGeneral' for failure (required keywords not there in obey file or failed
-									 to construct the tree).
+to construct the tree).
 */
-TInt CObeyFile::ProcessDataDrive()
+TInt CObeyFile::ProcessDataDrive() {
-	{
 	iReader.Rewind();
 	enum EKeyword keyword;
 	// First pass through the obey file to set up key variables
-	while (iReader.NextLine(1,keyword) != KErrEof)
+	while (iReader.NextLine(1,keyword) != KErrEof) {
-		{
 		if (!ProcessDriveKeyword(keyword))
 			return KErrGeneral;
-		}
+	}
 	if (!GotKeyDriveVariables())
 		return KErrGeneral;
 	// Second pass to process the file specifications in the obey file.
 	// Build the TRomNode directory structure and the TRomBuilderEntry list
 	iReader.Rewind();
-	iRootDirectory = new TRomNode((TText*)"//");
+	iRootDirectory = new TRomNode("//");
 	iLastExecutable = iRootDirectory;
-	while(iReader.NextLine(2,keyword)!=KErrEof)
+	while(iReader.NextLine(2,keyword)!=KErrEof) {
+		switch (keyword)
 		{
-		switch (keyword)
+		case EKeywordPatchDllData:
-			{
-			case EKeywordPatchDllData:
 			{	// Collect patchdata statements to process at the end
 				StringVector patchDataTokens;
 				SplitPatchDataStatement(patchDataTokens);
 				iPatchData->AddPatchDataStatement(patchDataTokens);
 				break;
 			}
-			case EKeywordHide:
+		case EKeywordHide:
-			case EKeywordFile:
+		case EKeywordFile:
-			case EKeywordData:
+		case EKeywordDir:
-			case EKeywordFileCompress:
+		case EKeywordData:
-			case EKeywordFileUncompress:
+		case EKeywordFileCompress:
-		        if (!ProcessDriveFile(keyword))
+		case EKeywordFileUncompress:
-				  return KErrGeneral;
+			if (!ProcessDriveFile(keyword))
-		        break;
+				return KErrGeneral;
+			break;
-			default:
-		        break;
+		default:
-			}
+			break;
 		}
+	}
 	if(!ParsePatchDllData())
 		return KErrGeneral;
-if (iMissingFiles)
+	if (iMissingFiles) {
-		{
 		Print(EError, "Source Files Missing.\n");
 		return KErrGeneral;
-		}
+	}
 	if (!iNumberOfFiles)
 		Print(EWarning,"No files specified.\n");
 	return KErrNone;
-	}
+}
 /**
 Process and stores the keyword information.
 @param aKeyword - keyword to update its value to variables.
 @return - Return the status i.e Success,
 */
-TBool CObeyFile::ProcessDriveKeyword(enum EKeyword aKeyword)
+TBool CObeyFile::ProcessDriveKeyword(enum EKeyword aKeyword) {
-	{
 	TBool success = ETrue;
 	switch (aKeyword)
+	{
+	case EKeywordDataImageName:
+		iDriveFileName = iReader.DupWord(1);
+		break;
+	case EKeywordDataImageFileSystem:
+		iDriveFileFormat = iReader.DupWord(1);
+		break;
+	case EKeywordDataImageSize:
 		{
-		case EKeywordDataImageName:
+			const char* bigString = iReader.Word(1);
-			iReader.CopyWord(1, iDriveFileName);
+			if(*bigString == '\0')
-			break;
-		case EKeywordDataImageFileSystem:
-			iReader.CopyWord(1, iDriveFileFormat);
-			break;
-		case EKeywordDataImageSize:
 			{
-			char* bigString = iReader.Word(1);
-			if(*bigString == '\0')
-				{
 				Print(EWarning,"Not a valid Image Size. Default size is considered\n");
 				break;
-				}
+			}
-#ifdef __LINUX__
-			errno = 0;
+			Val(iConfigurableFatAttributes.iImageSize,bigString);
-			iDataSize = strtoll(bigString,NULL,10);
+		}
-			if((iDataSize == LONG_MAX) || (iDataSize == LONG_MIN) ||(errno == ERANGE))
+		break;
-				{
+	case EKeywordDataImageVolume:
-				Print(EWarning,"Invalid Range. Default size is considered\n");
+		{
-				}
+			// Get the volume label provided by using "volume" keyword.
-#else
+			// e.g. vlolume = NO NAME
-			iDataSize = _atoi64(bigString);
+			string volumeLabel = iReader.GetCurrentObeyStatement();
-#endif
+			string volumeLabelKeyword = "volume";
-			}
-			break;
+			TUint position = volumeLabel.find(volumeLabelKeyword.c_str(),0,volumeLabelKeyword.size());
-		case EKeywordDataImageVolume:
+			position += volumeLabelKeyword.size();
-			{
+			if (volumeLabel.find('=',position) != string::npos) {
-				// Get the volume label provided by using "volume" keyword.
+				position=volumeLabel.find('=',position);
-				// e.g. vlolume = NO NAME
+				++position;
-				String volumeLabel = (char*)iReader.GetCurrentObeyStatement();
+			}
-				String volumeLabelKeyword = "volume";
+			position = volumeLabel.find_first_not_of(' ',position);
-				TUint position = volumeLabel.find(volumeLabelKeyword.c_str(),0,volumeLabelKeyword.size());
+			if (position != string::npos) {
-				position += volumeLabelKeyword.size();
+				volumeLabel = volumeLabel.substr(position);
-				if (volumeLabel.find('=',position) != std::string::npos)
-				{
+				// Remove the new line character from the end
-					position=volumeLabel.find('=',position);
+				position = volumeLabel.find_first_of("\r\n");
-					++position;
+				if (position != string::npos)
-				}
+					volumeLabel = volumeLabel.substr(0,position);
+				size_t length = volumeLabel.length() ;
-				position = volumeLabel.find_first_not_of(' ',position);
+				if(length > 11)
-				if (position != std::string::npos)
+						length = 11 ;
-				{
+				memcpy(iConfigurableFatAttributes.iDriveVolumeLabel,volumeLabel.c_str(),length) ;
-					volumeLabel = volumeLabel.substr(position);
+				while(length != 11)
+					iConfigurableFatAttributes.iDriveVolumeLabel[length++] = ' ';
-					// Remove the new line character from the end
+				iConfigurableFatAttributes.iDriveVolumeLabel[length] = 0;
-					position = volumeLabel.find_first_of("\r\n");
+			}
-					if (position != std::string::npos)
+			else {
-						volumeLabel = volumeLabel.substr(0,position);
+				Print(EWarning,"Value for Volume Label is not provided. Default value is considered.\n");
+			}
-					iConfigurableFatAttributes->iDriveVolumeLabel = volumeLabel.data();
+			break;
-				}
+		}
-				else
+	case EKeywordDataImageSectorSize:
-				{
+		{
-					Print(EWarning,"Value for Volume Label is not provided. Default value is considered.\n");
+			const char* bigString = iReader.Word(1);
-				}
+			TInt sectorSize = atoi(bigString);
-				break;
+			if(sectorSize <= 0)	{
-			}
+				Print(EWarning,"Invalid Sector Size value. Default value is considered.\n");
-		case EKeywordDataImageSectorSize:
+			}
-			{
+			else {
-				char* bigString = iReader.Word(1);
+				iConfigurableFatAttributes.iDriveSectorSize = atoi(bigString);
-				TInt sectorSize = atoi(bigString);
+			}
-				if(sectorSize <= 0)
+		}
-				{
+		break;
-					Print(EWarning,"Invalid Sector Size value. Default value is considered.\n");
+	case EKeywordDataImageNoOfFats:
-				}
+		{
-				else
+			const char* bigString = iReader.Word(1);
-				{
+			TInt noOfFats = atoi(bigString);
-					iConfigurableFatAttributes->iDriveSectorSize = atoi(bigString);
+			if (noOfFats <=0)
-				}
+				Print(EWarning,"Invalid No of FATs specified. Default value is considered.\n");
-			}
+			else
-			break;
+				iConfigurableFatAttributes.iDriveNoOfFATs = atoi(bigString);
-		case EKeywordDataImageNoOfFats:
+		}
-			{
+		break;
-				char* bigString = iReader.Word(1);
+	default:
-				TInt noOfFats = atoi(bigString);
+		// unexpected keyword iReader.Word(0), keep going.
-				if (noOfFats <=0)
+		break;
-				{
+	}
-					Print(EWarning,"Invalid No of FATs specified. Default value is considered.\n");
-				}
-				else
-				{
-					iConfigurableFatAttributes->iDriveNoOfFATs = atoi(bigString);
-				}
-			}
-			break;
-		default:
-			// unexpected keyword iReader.Word(0), keep going.
-			break;
-		}
 	return success;
-	}
+}
 /**
 Checks whether obeyfile has supplied enough variables to continue.
 @return - Return the status
-		  ETrue - Supplied valid values,
+ETrue - Supplied valid values,
-		  EFalse- Not valied values.
+EFalse- Not valied values.
 */
-TBool CObeyFile::GotKeyDriveVariables()
+TBool CObeyFile::GotKeyDriveVariables() {
-	{
 	TBool retVal=ETrue;
 	// Mandatory keywords
-	if (iDriveFileName==0)
+	if (iDriveFileName==0) {
-		{
 		Print(EError,"The name of the image file has not been supplied.\n");
 		Print(EError,"Use the keyword \"dataimagename\".\n");
 		retVal = EFalse;
-		}
+	}
 	// Check for '-'ve entered value.
-	if(iDataSize <= 0)
+	if(iConfigurableFatAttributes.iImageSize <= 0){
-		{
 		Print(EWarning,"Image Size should be positive. Default size is Considered.\n");
-		}
+	}
 	// File system format.
-	if(iDriveFileFormat==0)
+	if(iDriveFileFormat==0) {
-		{
 		Print(EError,"The name of the file system not been supplied.\n");
 		Print(EError,"Use the keyword \"dataimagefilesystem\".\n");
 		retVal = EFalse;
-		}
+	}
 	// Checking the validity of file system format.
-	if(iDriveFileFormat)
+	if(iDriveFileFormat){
-		{
+		if(stricmp(iDriveFileFormat,"FAT16") && stricmp(iDriveFileFormat,"FAT32")) {
-		strupr((char *)iDriveFileFormat);
-		enum TFileSystem check = (TFileSystem)0;
-		if(!(CDriveImage::FormatTranslation(iDriveFileFormat,check)))
-			{
 			Print(EError,"The name of the file system not supported : %s\n",iDriveFileFormat);
 			retVal = EFalse;
-			}
+		}
-		}
+	}
 	if(retVal)
 		Print(ELog,"\nCreating Data Drive image : %s\n", iDriveFileName);
 	return retVal;
-	}
+}
 /**
 Process a parsed line to set up one or more new TRomBuilder entry objects.
 @param  - obey file keyword.
 // iWord[1] = the PC pathname
 // iWord[2] = the EPOC pathname
 // iWord[3] = start of the file attributes
 @return - Return the status
-		  ETrue - Successful generation of tree.
+ETrue - Successful generation of tree.
-		  EFalse- Fail to generate the tree.
+EFalse- Fail to generate the tree.
 */
-TBool CObeyFile::ProcessDriveFile(enum EKeyword aKeyword)
+TBool CObeyFile::ProcessDriveFile(enum EKeyword aKeyword) {
-	{
 	TBool isPeFile = ETrue;
 	TBool aFileCompressOption, aFileUncompressOption;
 	TInt epocPathStart=2;
 	aFileCompressOption = aFileUncompressOption = EFalse;
 	// do some validation of the keyword
 	TInt currentLine = iReader.CurrentLine();
 	switch (aKeyword)
-		{
+	{
-		case EKeywordData:
+	case EKeywordData:
-		case EKeywordHide:
+	case EKeywordDir:
-			isPeFile = EFalse;
+	case EKeywordHide:
-			break;
+		isPeFile = EFalse;
+		break;
-		case EKeywordFile:
-			break;
+	case EKeywordFile:
+		break;
-		case EKeywordFileCompress:
-			aFileCompressOption = ETrue;
+	case EKeywordFileCompress:
-			break;
+		aFileCompressOption = ETrue;
+		break;
-		case EKeywordFileUncompress:
-			aFileUncompressOption = ETrue;
+	case EKeywordFileUncompress:
-			break;
+		aFileUncompressOption = ETrue;
+		break;
-		default:
-			return EFalse;
+	default:
-		}
+		return EFalse;
+	}
-	if (aKeyword!=EKeywordHide)
-		{
+	if (aKeyword!=EKeywordHide && aKeyword!=EKeywordDir) {
 		// check the PC file exists
 		char* nname = NormaliseFileName(iReader.Word(1));
-#if defined(__MSVCDOTNET__) || defined(__TOOLS2__)
 		ifstream test(nname);
-#else //!__MSVCDOTNET__
+		if(!test.is_open()){
-		ifstream test(nname, ios::nocreate);
-#endif //__MSVCDOTNET__
-		if (!test)
-			{
 			Print(EError,"Cannot open file %s for input.\n",iReader.Word(1));
 			iMissingFiles++;
-			}
+		}
 		test.close();
-		if(nname)
+		delete []nname ;
-			free(nname);
-		nname = 0;
+	}
-		}
 	else
 		epocPathStart=1;
-	iNumberOfFiles++;
+	if(aKeyword != EKeywordDir)
+		iNumberOfFiles++;
 	TBool endOfName=EFalse;
-	TText *epocStartPtr=IsValidFilePath(iReader.Text(epocPathStart));
+	const char *epocStartPtr;
-	TText *epocEndPtr=epocStartPtr;
+	if(aKeyword != EKeywordDir)
+		epocStartPtr = IsValidFilePath(iReader.Word(epocPathStart));
-	if (epocStartPtr==NULL)
+	else
-		{
+		epocStartPtr = IsValidDirPath(iReader.Word(epocPathStart));
+	char *epocEndPtr = const_cast<char*>(epocStartPtr);
+	if (epocStartPtr == NULL) {
 		Print(EError, "Invalid destination path on line %d\n",currentLine);
 		return EFalse;
-		}
+	}
 	TRomNode* dir=iRootDirectory;
 	TRomNode* subDir=0;
 	TRomBuilderEntry *file=0;
-	while (!endOfName)
+	while (!endOfName) {
-		{
+		endOfName = GetNextBitOfFileName(epocEndPtr);
-		endOfName = GetNextBitOfFileName(&epocEndPtr);
+		if (endOfName && (aKeyword!=EKeywordDir)) { // file
-		if (endOfName) // file
-			{
 			TRomNode* alreadyExists=dir->FindInDirectory(epocStartPtr);
+			if ((aKeyword != EKeywordHide) && alreadyExists) { // duplicate file
-			if ((aKeyword != EKeywordHide) && alreadyExists) // duplicate file
+				if (gKeepGoing) {
-				{
+					Print(EWarning, "Duplicate file for %s on line %d, will be ignored\n",iReader.Word(1),iReader.CurrentLine());
-				Print(EError, "Duplicate file for %s on line %d\n",iReader.Word(1),iReader.CurrentLine());
+					iNumberOfFiles--;
-				return EFalse;
+					return ETrue;
 				}
-			else if((aKeyword == EKeywordHide) && (alreadyExists))
+				else {
-				{
+					Print(EError, "Duplicate file for %s on line %d\n",iReader.Word(1),iReader.CurrentLine());
+					return EFalse;
+				}
+			}
+			else if((aKeyword == EKeywordHide) && (alreadyExists)) {
 				alreadyExists->iEntry->iHidden = ETrue;
 				alreadyExists->iHidden = ETrue;
 				return ETrue;
-				}
+			}
-			else if((aKeyword == EKeywordHide) && (!alreadyExists))
+			else if((aKeyword == EKeywordHide) && (!alreadyExists)) {
-				{
 				Print(EWarning, "Hiding non-existent file %s on line %d\n",iReader.Word(1),iReader.CurrentLine());
 				return ETrue;
-				}
+			}
 			file = new TRomBuilderEntry(iReader.Word(1), epocStartPtr);
 			file->iExecutable=isPeFile;
-			if( aFileCompressOption )
+			if( aFileCompressOption ) {
-			{
+				file->iCompressEnabled = ECompressionCompress;
-			file->iCompressEnabled = ECompressionCompress;
+			}
-			}
+			else if(aFileUncompressOption )	{
-			else if(aFileUncompressOption )
+				file->iCompressEnabled = ECompressionUncompress;
-			{
+			}
-			file->iCompressEnabled = ECompressionUncompress;
-			}
 			TRomNode* node=new TRomNode(epocStartPtr, file);
 			if (node==0)
 				return EFalse;
 			TInt r=ParseFileAttributes(node, file, aKeyword);
 			if (r!=KErrNone)
 				return EFalse;
-			if(gCompress != ECompressionUnknown)
+			if(gCompress != ECompressionUnknown) {
-			{
+				node->iFileUpdate = ETrue;
-			node->iFileUpdate = ETrue;
+			}
-			}
+			if((node->iOverride) || (aFileCompressOption) || (aFileUncompressOption)) {
-			if((node->iOverride) || (aFileCompressOption) || (aFileUncompressOption))
+				node->iFileUpdate = ETrue;
-			{
-			node->iFileUpdate = ETrue;
 			}
 			dir->AddFile(node);	// to drive directory structure.
-			}
+		}
-		else
+		else {
-		{
+			// directory
-		// directory
+			//for directory creation, given /sys/bin/, it's possible to reach 0 at the end, just ignore that...
-		subDir = dir->FindInDirectory(epocStartPtr);
+			if(!*epocStartPtr)
-		if (!subDir) // sub directory does not exist
+				break;
-			{
-			if(aKeyword==EKeywordHide)
+			subDir = dir->FindInDirectory(epocStartPtr);
-			{
+			if (!subDir){ // sub directory does not exist
-			Print(EWarning, "Hiding non-existent file %s on line %d\n",iReader.Word(1),iReader.CurrentLine());
+				if(aKeyword==EKeywordHide) {
-			return ETrue;
+					Print(EWarning, "Hiding non-existent file %s on line %d\n",
-			}
+						iReader.Word(1),iReader.CurrentLine());
-			subDir = dir->NewSubDir(epocStartPtr);
+					return ETrue;
-			if (!subDir)
+				}
-				return EFalse;
+				subDir = dir->NewSubDir(epocStartPtr);
+				if (!subDir)
+					return EFalse;
 			}
 			dir=subDir;
 			epocStartPtr = epocEndPtr;
-			}  // end of else.
+		}  // end of else.
-		}
+	}
 	return ETrue;
-	}
+}
-TInt CObeyFile::SetStackSize(TRomNode *aNode, TText *aStr)
+TInt CObeyFile::SetStackSize(TRomNode *aNode, const char* aStr) {
-	{
+	if (EFalse == IsValidNumber(aStr))
-	if (isNumber(aStr)==0)
+		return Print(EError, "Number required as argument for keyword 'stack'.\n");
-		return Print(EError, "Number required as argument for keyword 'stack'.\n");
+	TInt size ;
-	aNode->SetStackSize( getNumber(aStr) );
+	TInt err = Val(size,aStr);
-	return KErrNone;
+	if(KErrNone == err){
-	}
+		aNode->SetStackSize(size );
+	}
-TInt CObeyFile::SetHeapSizeMin(TRomNode *aNode, TText *aStr)
+	return err;
-	{
+}
-	if (isNumber(aStr)==0)
+TInt CObeyFile::SetHeapSizeMin(TRomNode *aNode, const char* aStr) {
+	if (EFalse == IsValidNumber(aStr))
 		return Print(EError, "Number required as argument for keyword 'heapmin'.\n");
-	aNode->SetHeapSizeMin( getNumber(aStr) );
+	TInt size ;
-	return KErrNone;
+	TInt err = Val(size,aStr);
-	}
+	if(KErrNone == err){
+		aNode->SetHeapSizeMin(size );
-TInt CObeyFile::SetHeapSizeMax(TRomNode *aNode, TText *aStr)
+	}
-	{
+	return err;
-	if (isNumber(aStr)==0)
+}
+TInt CObeyFile::SetHeapSizeMax(TRomNode *aNode, const char* aStr) {
+	if (EFalse == IsValidNumber(aStr))
 		return Print(EError, "Number required as argument for keyword 'heapmax'.\n");
-	aNode->SetHeapSizeMax( getNumber(aStr) );
+	TInt size ;
-	return KErrNone;
+	TInt err = Val(size,aStr);
-	}
+	if(KErrNone == err){
+		aNode->SetHeapSizeMax(size );
-TInt CObeyFile::SetCapability(TRomNode *aNode, TText *aStr)
+	}
-	{
+	return err;
-	if (isNumber(aStr))
-		{
+}
+TInt CObeyFile::SetCapability(TRomNode *aNode, const char* aStr) {
+	if ( IsValidNumber(aStr)){
 		Print(EDiagnostic,"Old style numeric CAPABILTY specification ignored.\n");
 		return KErrNone;
-		}
+	}
 	SCapabilitySet cap;
 	TInt r = ParseCapabilitiesArg(cap, (char*)aStr);
-	if( KErrNone == r )
+	if( KErrNone == r ) {
-		{
 		aNode->SetCapability( cap );
-		}
+	}
 	return r;
-	}
+}
-TInt CObeyFile::SetPriority(TRomNode *aNode, TText *aStr)
+TInt CObeyFile::SetPriority(TRomNode *aNode, const char* aStr) {
-	{
+	TProcessPriority priority;
-	TProcessPriority priority;
-	if (isNumber(aStr))
+	if ( IsValidNumber(aStr)) {
-		{
+		TUint32 temp = 0;
-		priority = (TProcessPriority)getNumber(aStr);
+		Val(temp,aStr) ;
-		}
+		priority = (TProcessPriority)temp ;
-	else
+	}
-		{
+	else {
-		char *str=(char *)aStr;
+		if (stricmp(aStr, "low")==0)
-		if (stricmp(str, "low")==0)
 			priority=EPriorityLow;
-		else if (strnicmp(str, "background", 4)==0)
+		else if (strnicmp(aStr, "background", 4)==0)
 			priority=EPriorityBackground;
-		else if (strnicmp(str, "foreground", 4)==0)
+		else if (strnicmp(aStr, "foreground", 4)==0)
 			priority=EPriorityForeground;
-		else if (stricmp(str, "high")==0)
+		else if (stricmp(aStr, "high")==0)
 			priority=EPriorityHigh;
-		else if (strnicmp(str, "windowserver",3)==0)
+		else if (strnicmp(aStr, "windowserver",3)==0)
 			priority=EPriorityWindowServer;
-		else if (strnicmp(str, "fileserver",4)==0)
+		else if (strnicmp(aStr, "fileserver",4)==0)
 			priority=EPriorityFileServer;
-		else if (strnicmp(str, "realtimeserver",4)==0)
+		else if (strnicmp(aStr, "realtimeserver",4)==0)
 			priority=EPriorityRealTimeServer;
-		else if (strnicmp(str, "supervisor",3)==0)
+		else if (strnicmp(aStr, "supervisor",3)==0)
 			priority=EPrioritySupervisor;
 		else
 			return Print(EError, "Unrecognised priority keyword.\n");
-		}
+	}
 	if (priority<EPriorityLow || priority>EPrioritySupervisor)
 		return Print(EError, "Priority out of range.\n");
 	aNode->SetPriority( priority );
 	return KErrNone;
-	}
+}
-TInt CObeyFile::SetUid1(TRomNode *aNode, TText *aStr)
+TInt CObeyFile::SetUid1(TRomNode *aNode, const char* aStr){
-	{
+	if (EFalse == IsValidNumber(aStr))
-	if (isNumber(aStr)==0)
 		return Print(EError, "Number required as argument for keyword 'uid1'.\n");
-	aNode->SetUid1( getNumber(aStr) );
+	TInt size ;
-	return KErrNone;
+	TInt err = Val(size,aStr);
-	}
+	if(KErrNone == err){
-TInt CObeyFile::SetUid2(TRomNode *aNode, TText *aStr)
+		aNode->SetUid1(size );
-	{
+	}
-	if (isNumber(aStr)==0)
+	return err;
+}
+TInt CObeyFile::SetUid2(TRomNode *aNode, const char* aStr) {
+	if (EFalse == IsValidNumber(aStr))
 		return Print(EError, "Number required as argument for keyword 'uid2'.\n");
-	aNode->SetUid2( getNumber(aStr) );
+	TInt size ;
-	return KErrNone;
+	TInt err = Val(size,aStr);
-	}
+	if(KErrNone == err){
-TInt CObeyFile::SetUid3(TRomNode *aNode, TText *aStr)
+		aNode->SetUid2(size );
-	{
+	}
-	if (isNumber(aStr)==0)
+	return err;
+}
+TInt CObeyFile::SetUid3(TRomNode *aNode, const char* aStr) {
+	if (EFalse == IsValidNumber(aStr))
 		return Print(EError, "Number required as argument for keyword 'uid3'.\n");
-	aNode->SetUid3( getNumber(aStr) );
+	TInt size ;
-	return KErrNone;
+	TInt err = Val(size,aStr);
-	}
+	if(KErrNone == err){
+		aNode->SetUid3(size );
+	}
-TInt CObeyFile::ParseFileAttributes(TRomNode *aNode, TRomBuilderEntry* aFile, enum EKeyword aKeyword)
+	return err;
+}
 //
 // Process any inline keywords
 //
-	{
+TInt CObeyFile::ParseFileAttributes(TRomNode *aNode, TRomBuilderEntry* aFile, enum EKeyword aKeyword) {
 	TInt currentLine = iReader.CurrentLine();
 	enum EFileAttribute attribute;
 	TInt r=KErrNone;
 	TInt index=3;
-	TText* arg=0;
+	char* arg=0;
-	while(r==KErrNone)
+	while(r==KErrNone) {
-		{
 		r=iReader.NextAttribute(index,(aFile!=0),attribute,arg);
 		if (r!=KErrNone)
 			break;
 		switch(attribute)
-			{
+		{
 		case EAttributeAtt:
 			r=aNode->SetAtt(arg);
 			break;
 		case EAttributeAttExtra:
 			r=aNode->SetAttExtra(arg, aFile, aKeyword);
 		case EAttributeUnpaged:
 			aNode->iOverride |= KOverrideCodeUnpaged|KOverrideDataUnpaged;
 			aNode->iOverride &= ~(KOverrideCodePaged|KOverrideDataPaged);
 			break;
 		case EAttributePaged:
-			aNode->iOverride |= KOverrideCodePaged|KOverrideDataPaged;
+			aNode->iOverride |= KOverrideCodePaged;
-			aNode->iOverride &= ~(KOverrideCodeUnpaged|KOverrideDataUnpaged);
+			aNode->iOverride &= ~(KOverrideCodeUnpaged);
 			break;
 		case EAttributeUnpagedCode:
 			aNode->iOverride |= KOverrideCodeUnpaged;
 			aNode->iOverride &= ~KOverrideCodePaged;
 			break;
 			break;
 		case EAttributePagedData:
 			aNode->iOverride |= KOverrideDataPaged;
 			aNode->iOverride &= ~KOverrideDataUnpaged;
 			break;
 		default:
 			return Print(EError, "Unrecognised keyword in file attributes on line %d.\n",currentLine);
-			}
+		}
-		}
+	}
 	if (r==KErrEof)
 		return KErrNone;
 	return r;
-	}
+}
-TBool CObeyFile::ProcessFile(TInt /*aAlign*/, enum EKeyword aKeyword)
 //
 // Process a parsed line to set up one or more new TRomBuilder entry objects.
 // iWord[0] = the keyword (file, primary or secondary)
 // iWord[1] = the PC pathname
 // iWord[2] = the EPOC pathname
 // iWord[3] = start of the file attributes
 //
-	{
+TBool CObeyFile::ProcessFile(TInt /*aAlign*/, enum EKeyword aKeyword){
 	TBool isPeFile = ETrue;
 	TBool aFileCompressOption, aFileUncompressOption;
 	TInt epocPathStart=2;
 	aFileCompressOption = aFileUncompressOption = EFalse;
 	TBool warnFlag = EFalse;
 	static const char aStdPath[] = "SYS\\BIN\\";
 	static const int sysBinLength = sizeof(aStdPath)-1;
 	// do some validation of the keyword
 	TInt currentLine = iReader.CurrentLine();
 	switch (aKeyword)
-		{
+	{
 	case EKeywordData:
 	case EKeywordHideV2:
 		iNumberOfDataFiles++;
 		isPeFile = EFalse;
 		break;
 		break;
 	default:
 		Print(EError,"Unexpected keyword '%s' on line %d.\n",iReader.Word(0),currentLine);
 		return EFalse;
-		}
+	}
-	if (aKeyword!=EKeywordHideV2)
+	if (aKeyword!=EKeywordHideV2) {
-		{
 		// check the PC file exists
 		char* nname = NormaliseFileName(iReader.Word(1));
-#if defined(__MSVCDOTNET__) || defined(__TOOLS2__)
 		ifstream test(nname);
-#else //!__MSVCDOTNET__
+		if (!test) {
-		ifstream test(nname, ios::nocreate);
-#endif //__MSVCDOTNET__
-		if (!test)
-			{
 			Print(EError,"Cannot open file %s for input.\n",iReader.Word(1));
 			iMissingFiles++;
-			}
+		}
 		test.close();
-		free(nname);
+		delete []nname;
-		}
+	}
 	else
 		epocPathStart=1;
 	iNumberOfFiles++;
 	TBool endOfName=EFalse;
-	TText *epocStartPtr=IsValidFilePath(iReader.Text(epocPathStart));
+	const char *epocStartPtr=IsValidFilePath(iReader.Word(epocPathStart));
-	TText *epocEndPtr=epocStartPtr;
+	char *epocEndPtr=const_cast<char*>(epocStartPtr);
-	if (epocStartPtr==NULL)
+	if (epocStartPtr==NULL) {
-		{
 		Print(EError, "Invalid destination path on line %d\n",currentLine);
 		return EFalse;
-		}
+	}
-	if(warnFlag)	// Check for the std destination path(for executables) as per platsec.
+	if(warnFlag){	// Check for the std destination path(for executables) as per platsec.
-		{
+		if(strnicmp(aStdPath,epocStartPtr,sysBinLength) != 0) {
-		if(strnicmp(aStdPath,(const char*)epocStartPtr,sysBinLength) != 0)
+			Print(EWarning,"Invalid destination path on line %d. \"%s\" \n",currentLine,epocStartPtr);
-			{
+		}
-			Print(EWarning,"Invalid destination path on line %d. \"%s\" \n",currentLine,epocStartPtr);
+	}
-			}
-		}
 	TRomNode* dir=iRootDirectory;
 	TRomNode* subDir=0;
 	TRomBuilderEntry *file=0;
-	while (!endOfName)
+	while (!endOfName) {
-		{
+		endOfName = GetNextBitOfFileName(epocEndPtr);
-		endOfName = GetNextBitOfFileName(&epocEndPtr);
+		if (endOfName) {// file
-		if (endOfName) // file
-			{
 			TRomNode* alreadyExists=dir->FindInDirectory(epocStartPtr);
 			/*
-			 * The EKeywordHideV2 keyword is used to indicate that:
+			* The EKeywordHideV2 keyword is used to indicate that:
-			 *	1. if the file exists in the same image and then hidden, mark it hidden
+			*	1. if the file exists in the same image and then hidden, mark it hidden
-			 *	2. if the file exists in another image, but in this (ROFS) image, it is
+			*	2. if the file exists in another image, but in this (ROFS) image, it is
-			 *		required to hide that file, create a 0 length file entry setting the 'hide'
+			*		required to hide that file, create a 0 length file entry setting the 'hide'
-			 *		flag so that at runtime, file gets hidden in the composite filesystem.
+			*		flag so that at runtime, file gets hidden in the composite filesystem.
-			 */
+			*/
-			if ((aKeyword != EKeywordHideV2) && alreadyExists) // duplicate file
+			if ((aKeyword != EKeywordHideV2) && alreadyExists){ // duplicate file
-				{
+				if(gKeepGoing){
-				Print(EError, "Duplicate file for %s on line %d\n",iReader.Word(1),iReader.CurrentLine());
+					Print(EWarning, "Duplicate file for %s on line %d, will be ignored\n",iReader.Word(1),iReader.CurrentLine());
-				return EFalse;
+					switch (aKeyword)
+					{
+					case EKeywordData:
+					case EKeywordHideV2:
+						iNumberOfDataFiles--;
+					default:
+						break;
+					}
+					iNumberOfFiles--;
+					return ETrue;
 				}
+				else {
+					Print(EError, "Duplicate file for %s on line %d\n",iReader.Word(1),iReader.CurrentLine());
+					return EFalse;
+				}
+			}
 			TBool aHidden = aKeyword==EKeywordHideV2;
 			/* The file is only marked hidden and hence the source file name isn't known
-			 * here as hide statement says :
+			* here as hide statement says :
-			 *	hide <filename as in ROM>
+			*	hide <filename as in ROM>
-			 * Therefore, create TRomBuilderEntry with iFileName as 0 for hidden file when
+			* Therefore, create TRomBuilderEntry with iFileName as 0 for hidden file when
-			 * the file doesn't exist in the same ROM image. Otherwise, the src file name
+			* the file doesn't exist in the same ROM image. Otherwise, the src file name
-			 * is known because of alreadyExists (which comes from the 'file'/'data' statement).
+			* is known because of alreadyExists (which comes from the 'file'/'data' statement).
-			 */
+			*/
 			if(aHidden)
 				file = new TRomBuilderEntry(0, epocStartPtr);
 			else
 				file = new TRomBuilderEntry(iReader.Word(1), epocStartPtr);
 			file->iExecutable=isPeFile;
 			file->iHidden= aHidden;
-			if( aFileCompressOption )
+			if( aFileCompressOption ){
-			{
 				file->iCompressEnabled = ECompressionCompress;
 			}
-			else if(aFileUncompressOption )
+			else if(aFileUncompressOption )	{
-			{
 				file->iCompressEnabled = ECompressionUncompress;
 			}
 			TRomNode* node=new TRomNode(epocStartPtr, file);
 			if (node==0)
 				return EFalse;
 			if (r!=KErrNone)
 				return EFalse;
 			dir->AddFile(node);	// to ROFS directory structure
 			AddFile(file);		// to our list of files
-			}
+		}
-		else // directory
+		else { // directory
-			{
 			subDir = dir->FindInDirectory(epocStartPtr);
-			if (!subDir) // sub directory does not exist
+			if (!subDir) { // sub directory does not exist
-				{
 				subDir = dir->NewSubDir(epocStartPtr);
 				if (!subDir)
 					return EFalse;
-				}
+			}
 			dir=subDir;
 			epocStartPtr = epocEndPtr;
-			}
+		}
-		}
+	}
 	return ETrue;
-	}
+}
-TBool CObeyFile::ProcessRenaming(enum EKeyword aKeyword)
+TBool CObeyFile::ProcessRenaming(enum EKeyword aKeyword) {
-	{
 	// find existing file
 	TBool endOfName=EFalse;
-	TText *epocStartPtr=IsValidFilePath(iReader.Text(1));
+	const char *epocStartPtr=IsValidFilePath(iReader.Word(1));
 	// Store the current name and new name to maintain renamed file map
-	String currentName=iReader.Word(1);
+	string currentName=iReader.Word(1);
-	String newName=iReader.Word(2);
+	string newName=iReader.Word(2);
-	TText *epocEndPtr=epocStartPtr;
+	char *epocEndPtr= const_cast<char*>(epocStartPtr);
-	if (epocStartPtr==NULL)
+	if (epocStartPtr == NULL) {
-		{
 		Print(EError, "Invalid source path on line %d\n",iReader.CurrentLine());
 		return EFalse;
-		}
+	}
 	char saved_srcname[257];
-	strcpy(saved_srcname, iReader.Word(1));
+	strncpy(saved_srcname, iReader.Word(1),257);
 	TRomNode* dir=iRootDirectory;
 	TRomNode* existingFile=0;
-	while (!endOfName)
+	while (!endOfName){
-		{
+		endOfName = GetNextBitOfFileName(epocEndPtr);
-		endOfName = GetNextBitOfFileName(&epocEndPtr);
+		if (endOfName) { // file
-		if (endOfName) // file
-			{
 			existingFile=dir->FindInDirectory(epocStartPtr);
-			if (existingFile)
+			if (existingFile) {
-				{
 				TInt fileCount=0;
 				TInt dirCount=0;
 				existingFile->CountDirectory(fileCount, dirCount);
-				if (dirCount != 0 || fileCount != 0)
+				if (dirCount != 0 || fileCount != 0) {
-					{
+					Print(EError, "Keyword %s not applicable to directories - line %d\n",
-					Print(EError, "Keyword %s not applicable to directories - line %d\n",iReader.Word(0),iReader.CurrentLine());
+						iReader.Word(0),iReader.CurrentLine());
 					return EFalse;
-					}
 				}
 			}
-		else // directory
+		}
-			{
+		else { // directory
 			TRomNode* subDir = dir->FindInDirectory(epocStartPtr);
 			if (!subDir) // sub directory does not exist
 				break;
 			dir=subDir;
 			epocStartPtr = epocEndPtr;
-			}
+		}
-		}
+	}
-	if (aKeyword == EKeywordHide)
+	if (aKeyword == EKeywordHide) {
-		{
+		/*
-			/*
+		* The EKeywordHide keyword is used to indicate that if the file exists in
-			 * The EKeywordHide keyword is used to indicate that if the file exists in
+		* the primary ROFS image and then hidden in extension ROFS, mark it hidden.
-			 * the primary ROFS image and then hidden in extension ROFS, mark it hidden.
+		*/
-			 */
+		if (!existingFile) {
-		if (!existingFile)
-			{
 			Print(EWarning, "Hiding non-existent file %s on line %d\n",
 				saved_srcname, iReader.CurrentLine());
 			// Just a warning, as we've achieved the right overall effect.
-			}
+		}
-		else if (existingFile->iFileStartOffset==(TUint)KFileHidden)
+		else if (existingFile->iFileStartOffset==(TUint)KFileHidden){
-			{
 			Print(EWarning, "Hiding already hidden file %s on line %d\n",
 				saved_srcname, iReader.CurrentLine());
 			// We will igrore this request, otherwise it will "undelete" it.
-			}
+		}
-		else
+		else {
-			{
+			//hidden files will not be placed to the image
-			  //hidden files will not be placed to the image
+			existingFile->iHidden = ETrue;
-			  existingFile->iHidden = ETrue;
+		}
-			}
 		return ETrue;
-		}
+	}
-	if (!existingFile)
+	if (!existingFile) {
-		{
 		Print(EError, "Can't %s non-existent source file %s on line %d\n",
 			iReader.Word(0), saved_srcname, iReader.CurrentLine());
 		return EFalse;
-		}
+	}
-	epocStartPtr=IsValidFilePath(iReader.Text(2));
+	epocStartPtr = IsValidFilePath(iReader.Word(2));
-	epocEndPtr=epocStartPtr;
+	epocEndPtr = const_cast<char*>(epocStartPtr);
-	endOfName=EFalse;
+	endOfName = EFalse;
-	if (epocStartPtr==NULL)
+	if (epocStartPtr == NULL) {
-		{
 		Print(EError, "Invalid destination path on line %d\n",iReader.CurrentLine());
 		return EFalse;
-		}
+	}
 	TRomNode* newdir=iRootDirectory;
-	while (!endOfName)
+	while (!endOfName) {
-		{
+		endOfName = GetNextBitOfFileName(epocEndPtr);
-		endOfName = GetNextBitOfFileName(&epocEndPtr);
+		if (endOfName) {// file
-		if (endOfName) // file
-			{
 			TRomNode* alreadyExists=newdir->FindInDirectory(epocStartPtr);
-			if (alreadyExists && !(alreadyExists->iHidden)) // duplicate file
+			if (alreadyExists && !(alreadyExists->iHidden)) {// duplicate file
-				{
+				if(gKeepGoing){
-				Print(EError, "Duplicate file for %s on line %d\n",saved_srcname,iReader.CurrentLine());
+					Print(EWarning, "Duplicate file for %s on line %d, renaming will be skipped\n",saved_srcname,iReader.CurrentLine());
-				return EFalse;
+					return ETrue;
 				}
-			}
+				else {
-		else // directory
+					Print(EError, "Duplicate file for %s on line %d\n",saved_srcname,iReader.CurrentLine());
-			{
+					return EFalse;
+				}
+			}
+		}
+		else { // directory
 			TRomNode* subDir = newdir->FindInDirectory(epocStartPtr);
-			if (!subDir) // sub directory does not exist
+			if (!subDir) {// sub directory does not exist
-				{
 				subDir = newdir->NewSubDir(epocStartPtr);
 				if (!subDir)
 					return EFalse;
-				}
+			}
 			newdir=subDir;
 			epocStartPtr = epocEndPtr;
-			}
+		}
-		}
+	}
-	if (aKeyword == EKeywordRename)
+	if (aKeyword == EKeywordRename) {
-		{
 		// rename => remove existingFile and insert into tree at new place
 		// has no effect on the iNextExecutable or iNextNodeForSameFile links
 		TInt r=ParseFileAttributes(existingFile, existingFile->iEntry, aKeyword);
 		if (r!=KErrNone)
 			return EFalse;
 		existingFile->Rename(dir, newdir, epocStartPtr);
 		// Store the current and new name of file in the renamed file map.
 		iPatchData->AddToRenamedFileMap(currentName, newName);
 		return ETrue;
-		}
+	}
 	// alias => create new TRomNode entry and insert into tree
 	TRomNode* node = new TRomNode(epocStartPtr, 0);
-	if (node == 0)
+	if (node == 0) {
-		{
 		Print(EError, "Out of memory\n");
 		return EFalse;
-		}
+	}
 	node->Alias(existingFile);
 	TInt r=ParseFileAttributes(node, 0, aKeyword);
 	if (r!=KErrNone)
 		return EFalse;
 	newdir->AddFile(node);	// to ROFS directory structure, though possibly hidden
 	return ETrue;
-	}
+}
-TInt ParsePagingPolicy(const char* policy)
+TInt ParsePagingPolicy(const char* policy){
-	{
+	if(stricmp(policy,"NOPAGING") == 0)
-	if(stricmp(policy,"NOPAGING")==0)
 		return EKernelConfigPagingPolicyNoPaging;
-	else if (stricmp(policy,"ALWAYSPAGE")==0)
+	else if (stricmp(policy,"ALWAYSPAGE") == 0)
 		return EKernelConfigPagingPolicyAlwaysPage;
-	else if(stricmp(policy,"DEFAULTUNPAGED")==0)
+	else if(stricmp(policy,"DEFAULTUNPAGED") == 0)
 		return EKernelConfigPagingPolicyDefaultUnpaged;
-	else if(stricmp(policy,"DEFAULTPAGED")==0)
+	else if(stricmp(policy,"DEFAULTPAGED") == 0)
 		return EKernelConfigPagingPolicyDefaultPaged;
 	return KErrArgument;
-	}
+}
-TBool CObeyFile::ProcessKeyword(enum EKeyword aKeyword)
+TBool CObeyFile::ProcessKeyword(enum EKeyword aKeyword) {
+	TBool success = ETrue;
+	switch (aKeyword)
 	{
-	#ifdef __TOOLS2__
+	case EKeywordRofsName:
-	istringstream val(iReader.Word(1));
+		iRomFileName = iReader.DupWord(1);
-	#else
+		break;
-	istrstream val(iReader.Word(1),strlen(iReader.Word(1)));
+	case EKeywordRofsSize:
-	#endif
+		Val(iRomSize,iReader.Word(1));
+		break;
-#if defined(__MSVCDOTNET__) || defined(__TOOLS2__)
+	case EKeywordVersion:
-	val >> setbase(0);
-#endif //__MSVCDOTNET__
-	TBool success = ETrue;
-	switch (aKeyword)
 		{
-	case EKeywordRofsName:
+			istringstream val(iReader.Word(1));
-		iReader.CopyWord(1, iRomFileName);
+			val >> iVersion;
-		break;
+		}
-	case EKeywordRofsSize:
-		val >> iRomSize;
-		break;
-	case EKeywordVersion:
-		val >> iVersion;
 		break;
 	case EKeywordRofsChecksum:
-		val >> iCheckSum;
+		Val(iCheckSum,iReader.Word(1));
 		break;
 	case EKeywordTime:
 		iReader.ProcessTime(iTime);
 		break;
 	case EKeywordPagingOverride:
 		{
-		if(iPagingOverrideParsed)
+			if(iPagingOverrideParsed)
-			Print(EWarning, "PagingOverride redefined - previous PagingOverride values lost\n");
+				Print(EWarning, "PagingOverride redefined - previous PagingOverride values lost\n");
-		if(iCodePagingOverrideParsed)
+			if(iCodePagingOverrideParsed)
-			Print(EWarning, "PagingOverride defined - previous CodePagingOverride values lost\n");
+				Print(EWarning, "PagingOverride defined - previous CodePagingOverride values lost\n");
-		if(iDataPagingOverrideParsed)
+			iPagingOverrideParsed = true;
-			Print(EWarning, "PagingOverride defined - previous DataPagingOverride values lost\n");
+			TInt policy = ParsePagingPolicy(iReader.Word(1));
-		iPagingOverrideParsed = true;
+			if(policy < 0) {
-		TInt policy = ParsePagingPolicy(iReader.Word(1));
+				Print(EError,"Unrecognized option for PAGINGOVERRIDE keyword\n");
-		if(policy<0)
+				success = false;
-			{
+			}
-			Print(EError,"Unrecognised option for PAGINGOVERRIDE keyword\n");
+			else {
-			success = false;
+				gCodePagingOverride = policy;
-			}
+				if((policy == EKernelConfigPagingPolicyNoPaging) || (policy == EKernelConfigPagingPolicyDefaultUnpaged))
-		else
+					gDataPagingOverride = policy;
-			{
-			gCodePagingOverride = policy;
-			gDataPagingOverride = policy;
 			}
 		}
 		break;
 	case EKeywordCodePagingOverride:
 		{
-		if(iCodePagingOverrideParsed)
+			if(iCodePagingOverrideParsed)
-			Print(EWarning, "CodePagingOverride redefined - previous CodePagingOverride values lost\n");
+				Print(EWarning, "CodePagingOverride redefined - previous CodePagingOverride values lost\n");
-		if(iPagingOverrideParsed)
+			if(iPagingOverrideParsed)
-			Print(EWarning, "CodePagingOverride defined - previous PagingOverride values lost\n");
+				Print(EWarning, "CodePagingOverride defined - previous PagingOverride values lost\n");
-		iCodePagingOverrideParsed = true;
+			iCodePagingOverrideParsed = true;
-		TInt policy = ParsePagingPolicy(iReader.Word(1));
+			TInt policy = ParsePagingPolicy(iReader.Word(1));
-		if(policy<0)
+			if(policy<0)
 			{
-			Print(EError,"Unrecognised option for CODEPAGINGOVERRIDE keyword\n");
+				Print(EError,"Unrecognized option for CODEPAGINGOVERRIDE keyword\n");
-			success = false;
+				success = false;
 			}
-		else
+			else
-			gCodePagingOverride = policy;
+				gCodePagingOverride = policy;
 		}
 		break;
 	case EKeywordDataPagingOverride:
 		{
-		if(iDataPagingOverrideParsed)
+			if(iDataPagingOverrideParsed)
-			Print(EWarning, "DataPagingOverride redefined - previous DataPagingOverride values lost\n");
+				Print(EWarning, "DataPagingOverride redefined - previous DataPagingOverride values lost\n");
-		if(iPagingOverrideParsed)
+/*			if(iPagingOverrideParsed){
-			{
+				Print(EError, "DataPagingOverride defined - previous PagingOverride values lost\n");
-			Print(EError, "DataPagingOverride defined - previous PagingOverride values lost\n");
+				success = false;
-			success = false;
+				break;
-			break;
+			}
-			}
+*/
-		iDataPagingOverrideParsed = true;
+			iDataPagingOverrideParsed = true;
-		TInt policy = ParsePagingPolicy(iReader.Word(1));
+			TInt policy = ParsePagingPolicy(iReader.Word(1));
-		if(policy<0)
+			if(policy < 0) {
-			{
+				Print(EError,"Unrecognized option for DATAPAGINGOVERRIDE keyword\n");
-			Print(EError,"Unrecognised option for DATAPAGINGOVERRIDE keyword\n");
+				success = false;
-			success = false;
+			}
-			}
+			else
-		else
+				gDataPagingOverride = policy;
-			gDataPagingOverride = policy;
 		}
 		break;
 	case EKeywordRofsAutoSize:
 		iAutoSize = ETrue;
-		val >> iAutoPageSize;
+		Val(iAutoPageSize,iReader.Word(1));
 		break;
 	default:
 		// unexpected keyword iReader.Word(0)
 		break;
-		}
+	}
 	return success;
-	}
+}
-TBool CObeyFile::GotKeyVariables()
 //
 // Checks that the obeyfile has supplied enough variables to continue
 //
-	{
+TBool CObeyFile::GotKeyVariables() {
 	TBool retVal=ETrue;
 	// Mandatory keywords
+	if (iRomFileName == 0) {
-	if (iRomFileName==0)
-		{
 		Print(EAlways,"The name of the image file has not been supplied.\n");
 		Print(EAlways,"Use the keyword \"rofsname\".\n");
 		retVal = EFalse;
-		}
+	}
-	if (iRomSize==0)
+	if (iRomSize == 0) {
-		{
 		Print(EAlways,"The size of the image has not been supplied.\n");
 		Print(EAlways,"Use the keyword \"rofssize\".\n");
 		retVal = EFalse;
-		}
+	}
 	// Apply defaults as necessary
-	if (iTime==0)
+	if (iTime == 0)	{
-		{
 		Print(ELog, "No timestamp specified. Using current time...\n");
 		ObeyFileReader::TimeNow(iTime);
-		}
+	}
 	Print(ELog, "\nCreating Rofs image %s\n", iRomFileName);
 	return retVal;
-	}
+}
-TText *CObeyFile::IsValidFilePath(TText *aPath)
 //
 // Check the path is valid
 //
-	{
+const char* CObeyFile::IsValidFilePath(const char* aPath) {
 	// skip leading "\"
-	if (*aPath=='\\')
+	if (*aPath == '/' || *aPath == '\\')
 		aPath++;
-	if (*aPath==0)
+	if (*aPath == 0)
 		return NULL; // file ends in a backslash
-	TText *p=aPath;
+	const char *p = aPath;
 	TInt len=0;
-	FOREVER
+	while(*p) {
-		{
+		if (*p == '/' || *p == '\\') {
-		if (*p==0)
+			if (len == 0)
-			return (len ? aPath : NULL);
-		if (*p=='\\')
-			{
-			if (len==0)
 				return NULL;
 			len=0;
-			}
+			p++;
+			continue;
+		}
 		len++;
 		p++;
-		}
+	}
-	}
+	return (len ? aPath : NULL);
+}
-TBool CObeyFile::GetNextBitOfFileName(TText **epocEndPtr)
+const char* CObeyFile::IsValidDirPath(const char* aPath)
+{
+	const char* walker = aPath;
+	//validate path...
+	while(*walker)
+	{
+		if(((*walker=='/') || (*walker=='\\')) && ((*(walker+1)=='/') || (*(walker+1)=='\\')))
+			return (const char*)0;
+		walker++;
+	}
+	if((*aPath=='/') || (*aPath=='\\'))
+		aPath++;
+	return aPath;
+}
 //
 // Move the end pointer past the next directory separator, replacing it with 0
 //
-	{
+TBool CObeyFile::GetNextBitOfFileName(char*& epocEndPtr) {
-	while (**epocEndPtr != '\\') // until reach the directory separator
+	while (*epocEndPtr != '/' && *epocEndPtr != '\\'){ // until reach the directory separator
-		{
+		if (*epocEndPtr == 0) // if reach end of string, return TRUE, it's the filename
-		if (**epocEndPtr==0) // if reach end of string, return TRUE, it's the filename
 			return ETrue;
-		(*epocEndPtr)++;
+		epocEndPtr++;
-		}
+	}
-	**epocEndPtr=0; // overwrite the directory separator with a 0
+	*epocEndPtr = 0; // overwrite the directory separator with a 0
-	(*epocEndPtr)++; // point past the 0 ready for the next one
+	epocEndPtr++; // point past the 0 ready for the next one
 	return EFalse;
-	}
+}
+void CObeyFile::AddFile(TRomBuilderEntry* aFile) {
-void CObeyFile::AddFile(TRomBuilderEntry* aFile)
-	{
 	*iNextFilePtrPtr = aFile;
 	iNextFilePtrPtr = &(aFile->iNext);
-	}
+}
+//
+// First pass through the obey file to set up key variables
-TInt CObeyFile::ProcessExtensionRofs(MRofsImage* aKernelRom)
+//
-	{
+TInt CObeyFile::ProcessExtensionRofs(MRofsImage* aKernelRom) {
-	//
-	// First pass through the obey file to set up key variables
+	iReader.Rewind();
-	//
-iReader.Rewind();
 	enum EKeyword keyword;
 	// Deal with the "extensionrofs" keyword, which should be first
+	// however, you may've found "time" before it.
-	if (iReader.NextLine(1,keyword) != KErrNone)
+	while(iReader.NextLine(1,keyword) != KErrEof) {
-		return KErrEof;
+		if(EKeywordExtensionRofs == keyword)
-	if (keyword != EKeywordExtensionRofs)
+			break ;
-		return Print(EError, "Unexpected keyword '%s' at start of extension rom - line %d\n",
+	}
-			iReader.Word(0), iReader.CurrentLine());
+	if(EKeywordExtensionRofs != keyword) return KErrEof;
+	iRomFileName = iReader.DupWord(1);
-	iReader.CopyWord(1, iRomFileName);
 	Print(ELog, "\n========================================================\n");
 	Print(ELog, "Extension ROFS %s starting at line %d\n\n", iRomFileName, iReader.CurrentLine());
 	iReader.MarkNext();		// so that we rewind to the line after the extensionrom keyword
-	while (iReader.NextLine(1,keyword) != KErrEof)
+	while (iReader.NextLine(1,keyword) != KErrEof) {
-		{
 		if (keyword == EKeywordExtensionRofs)
 			break;
-			ProcessExtensionKeyword(keyword);
+		ProcessExtensionKeyword(keyword);
-		}
+	}
 	if (!GotExtensionVariables(aKernelRom))
 		return KErrGeneral;
 	// second pass to process the file specifications in the obey file building
 	// up the TRomNode directory structure and the TRomBuilderEntry list
 	//
 	iReader.Rewind();
 	//
-	if (aKernelRom==0)
+	if (aKernelRom == 0)
 		return Print(EError, "Option to extend a kernel ROFS image not yet implemented\n");
+	iRootDirectory = new TRomNode("");
-	iRootDirectory = new TRomNode((TText*)"");
 	iLastExecutable = 0;
 	(aKernelRom->RootDirectory())->deleteTheFirstNode();
 	iRootDirectory = aKernelRom->CopyDirectory(iLastExecutable);
 	aKernelRom->SetRootDirectory(iRootDirectory);
 	TInt align=0;
-	while (iReader.NextLine(2,keyword)!=KErrEof)
+	while (iReader.NextLine(2,keyword)!=KErrEof) {
+		if (keyword == EKeywordExtensionRofs)
+			break;
+		switch (keyword)
 		{
-		if (keyword == EKeywordExtensionRofs)
-			break;
-		switch (keyword)
-			{
 		case EKeywordHide:
 		case EKeywordAlias:
 		case EKeywordRename:
 			if (!ProcessRenaming(keyword))
 				return KErrGeneral;
 			break;
 		case EKeywordPatchDllData:
-		{
+			{
-			// Collect patchdata statements to process at the end
+				// Collect patchdata statements to process at the end
-			StringVector patchDataTokens;
+				StringVector patchDataTokens;
-			SplitPatchDataStatement(patchDataTokens);
+				SplitPatchDataStatement(patchDataTokens);
-			iPatchData->AddPatchDataStatement(patchDataTokens);
+				iPatchData->AddPatchDataStatement(patchDataTokens);
-			break;
+				break;
-		}
+			}
 		default:
 			if (!ProcessFile(align, keyword))
 				return KErrGeneral;
 			align=0;
 			break;
-			}
+		}
-		}
+	}
 	if(!ParsePatchDllData() )
 		return KErrGeneral;
-	iReader.Mark();			// ready for processing the next extension rom(s)
+	iReader.MarkNext();			// ready for processing the next extension rom(s)
 	if (iMissingFiles!=0)
 		return KErrGeneral;
-	if (iNumberOfFiles==0)
+	if (iNumberOfFiles == 0) {
-		{
 		Print(EError, "No files specified.\n");
 		return KErrGeneral;
-		}
+	}
 	return KErrNone;
-	}
+}
+void CObeyFile::ProcessExtensionKeyword(enum EKeyword aKeyword)	{
+	switch (aKeyword)
-void CObeyFile::ProcessExtensionKeyword(enum EKeyword aKeyword)
 	{
-	#ifdef __TOOLS2__
-	istringstream val(iReader.Word(1));
-	#else
-	istrstream val(iReader.Word(1),strlen(iReader.Word(1)));
-	#endif
-#if defined(__MSVCDOTNET__) || defined(__TOOLS2__)
-	val >> setbase(0);
-#endif //__MSVCDOTNET__
-	switch (aKeyword)
-		{
 	case EKeywordCoreRofsName:
-		iReader.CopyWord(1, iKernelRofsName);
+		iKernelRofsName = iReader.DupWord(1);
 		return;
 	case EKeywordRofsSize:
-		val >> iRomSize;
+		Val(iRomSize,iReader.Word(1));
 		return;
 	case EKeywordVersion:
-		val >> iVersion;
+		{
+			istringstream val(iReader.Word(1));
+			val >> iVersion;
+		}
 		return;
 	case EKeywordRomChecksum:
-		val >> iCheckSum;
+		Val(iCheckSum,iReader.Word(1)); //--
 		return;
 	case EKeywordTime:
 		iReader.ProcessTime(iTime);
 		return;
 	case EKeywordRofsAutoSize:
 		iAutoSize = ETrue;
-		val >> iAutoPageSize;
+		Val(iAutoPageSize , iReader.Word(1));
 		return;
 	default:
 		Print(EError,"Keyword '%s' not valid in extension ROFS - line %d\n", iReader.Word(0), iReader.CurrentLine());
 		break;
-		}
+	}
 	return;
-	}
+}
-TBool CObeyFile::GotExtensionVariables(MRofsImage* aRom)
 //
 // Checks that the obeyfile has supplied enough variables to continue
 //
-	{
+TBool CObeyFile::GotExtensionVariables(MRofsImage* aRom) {
 	TBool retVal=ETrue;
-	TText* kernelRofsName = iKernelRofsName;
+	const char* kernelRofsName = iKernelRofsName;
 	// Mandatory keywords
-	if (iRomSize==0)
+	if (iRomSize == 0){
-		{
 		Print(EAlways,"The size of the extension ROFS has not been supplied.\n");
 		Print(EAlways,"Use the keyword \"rofssize\".\n");
 		retVal = EFalse;
-		}
+	}
 	// keywords we need if we don't already have a ROFS image to work from
+	if (aRom == 0) {
-	if (aRom==0)
+		if (iKernelRofsName == 0) {
-		{
-		if (iKernelRofsName==0)
-			{
 			Print(EAlways,"The name of the core ROFS has not been supplied.\n");
 			Print(EAlways,"Use the keyword \"rofsname\".\n");
 			retVal = EFalse;
-			}
+		}
-		}
+	}
-	else
+	else {
-		{
+		if (iKernelRofsName != 0){
-		if (iKernelRofsName != 0)
-			{
 			Print(EWarning,"Keyword \"rofsname\" ignored.\n");
-			}
+		}
 		kernelRofsName = aRom->RomFileName();
-		}
+	}
 	// validation
 	// Apply defaults as necessary
-	if (iTime==0)
+	if (iTime == 0)	{
-		{
 		Print(ELog, "No timestamp specified. Using current time...\n");
 		ObeyFileReader::TimeNow(iTime);
-		}
+	}
 	// fix up "*" in rofsname
-	TText newname[256];
+	char newname[256];
-	TText* p=newname;
+	char* p=newname;
-	TText* q=iRomFileName;
+	char* q=iRomFileName;
-	TText c;
+	char c;
-	while ((c=*q++)!='\0')
+	while ((c=*q++)!='\0'){
-		{
+		if (c!='*') {
-		if (c!='*')
-			{
 			*p++=c;
 			continue;
-			}
+		}
-		TText *r=kernelRofsName;
+		const char *r = kernelRofsName;
 		while ((c=*r++)!='\0')
 			*p++=c;
-		}
+	}
-	*p = '\0';
+	*p++ = '\0';
-	free(iRomFileName);
+	delete []iRomFileName;
-	iRomFileName = (TText*)strdup((char*)newname);
+	size_t len = p - newname ;
+	iRomFileName = new char[len];
+	memcpy(iRomFileName,newname,len);
 	Print(ELog, "\nCreating ROFS image %s\n", iRomFileName);
 	return retVal;
-	}
+}
 // Fuction to split patchdata statement
-void CObeyFile::SplitPatchDataStatement(StringVector& aPatchDataTokens)
+void CObeyFile::SplitPatchDataStatement(StringVector& aPatchDataTokens) {
-{
 	// Get the value of symbol size, address/ordinal and new value
 	// to be patched from the patchdata statement.
 	// Syntax of patchdata statements is as follows:
 	// 1)	patchdata dll_name  ordinal OrdinalNumber size_in_bytes   new_value
 	// 2)   patchdata dll_name  addr    Address       size_in_bytes   new_value
-	for(TInt count=1; count<=5; count++)
+	for(TInt count=1; count<=5; count++) {
-	{
 		aPatchDataTokens.push_back(iReader.Word(count));
 	}
 	// Store the the value of current line which will be used
 	// when displaying error messages.
-	OutputStringStream outStrStream;
+	ostringstream outStrStream;
 	outStrStream<<iReader.CurrentLine();
-aPatchDataTokens.push_back(outStrStream.str());
+	aPatchDataTokens.push_back(outStrStream.str());
 }
-TBool CObeyFile::ParsePatchDllData()
+TBool CObeyFile::ParsePatchDllData() {
-{
 	// Get the list of patchdata statements
 	VectorOfStringVector patchDataStatements=iPatchData->GetPatchDataStatements();
 	// Get the list of renamed file map
 	MapOfString RenamedFileMap=iPatchData->GetRenamedFileMap();
-	for(TUint count=0; count<patchDataStatements.size(); count++)
+	for(TUint count=0; count < patchDataStatements.size(); count++) {
-	{
 		StringVector strVector = patchDataStatements.at(count);
-		String filename=strVector.at(0);
+		string filename=strVector.at(0);
-		String lineNoStr = strVector.at(5);
+		string lineNoStr = strVector.at(5);
-		TUint lineNo=getNumber(((TText*)lineNoStr.c_str()));
+		TUint lineNo = 0 ;
+		Val(lineNo,lineNoStr.c_str());
 		TRomNode* existingFile = NULL;
-		do
+		do {
-		{
 			TRomNode* dir=iRootDirectory;
 			TBool endOfName=EFalse;
-			TText *epocStartPtr=IsValidFilePath((TText*)filename.c_str());
+			if (!IsValidFilePath(filename.c_str())) {
-			if (epocStartPtr==NULL)
-			{
 				Print(EError, "Invalid source path on line %d\n",lineNo);
 				return EFalse;
 			}
-			epocStartPtr = (TText*)NormaliseFileName((const char*)epocStartPtr);
+			char* epocStartPtr =NormaliseFileName(filename.c_str());
-			TText *epocEndPtr=epocStartPtr;
+			char* savedPtr = epocStartPtr;
+			if(*epocStartPtr == '/' ||*epocStartPtr == '\\')
-			while (!endOfName)
+				epocStartPtr++ ;
-			{
+			char* epocEndPtr = epocStartPtr;
-				endOfName = GetNextBitOfFileName(&epocEndPtr);
-				if (endOfName) // file
+			while (!endOfName) {
-				{
+				endOfName = GetNextBitOfFileName(epocEndPtr);
+				if (endOfName) {// file
 					existingFile=dir->FindInDirectory(epocStartPtr);
-					if (existingFile)
+					if (existingFile) {
-					{
 						TInt fileCount=0;
 						TInt dirCount=0;
 						existingFile->CountDirectory(fileCount, dirCount);
-						if (dirCount != 0 || fileCount != 0)
+						if (dirCount != 0 || fileCount != 0) {
-						{
 							Print(EError, "Keyword %s not applicable to directories - line %d\n","patchdata",lineNo);
 							return EFalse;
 						}
 					}
 				}
-				else // directory
+				else {// directory
-				{
 					TRomNode* subDir = dir->FindInDirectory(epocStartPtr);
 					if (!subDir) // sub directory does not exist
 						break;
 					dir=subDir;
 					epocStartPtr = epocEndPtr;
 				}
 			}
+			delete []savedPtr;
-			if(!existingFile)
-			{
+			if(!existingFile) {
 				// If the E32Image file to be patched is not included then check if the
 				// file was renamed.
 				MapOfStringIterator RenamedFileMapIterator;
 				if ((RenamedFileMapIterator=RenamedFileMap.find(filename)) != RenamedFileMap.end())
 					filename = (*RenamedFileMapIterator).second;
-				else
+				else {
-				{
 					Print(EError, "File %s not found - line %d\n", filename.c_str(), lineNo);
 					return EFalse;
 				}
 			}
 		}while(!existingFile);
 		aOrdinal = (TUint32)-1;
 		aDataAddr = (TUint32)-1;
 		aOffset = 0;
-		String symbolSize=strVector.at(3);
+		string symbolSize=strVector.at(3);
-		aSize = getNumber((TText*)symbolSize.c_str());
+		Val(aSize,symbolSize.c_str());
-		String aValue=strVector.at(4);
+		string aValue=strVector.at(4);
-		aNewValue = getNumber((TText*)aValue.c_str());
+		Val(aNewValue,aValue.c_str());
 		DllDataEntry *dataEntry = new DllDataEntry(aSize, aNewValue);
 		// Set the address of the data or the ordinal number specified in OBY statement.
-		String keyword=strVector.at(1);
+		string keyword=strVector.at(1);
-		String keywordValue=strVector.at(2);
+		string keywordValue=strVector.at(2);
 		/* Check for +OFFSET at the end of the ordinal number or address */
 		TUint plus = keywordValue.find("+",0);
-		if (plus != std::string::npos)
+		if (plus != string::npos) {
-		{
 			/* Get the offset that we found after the + sign */
-			String offset = keywordValue.substr(plus+1);
+			string offset = keywordValue.substr(plus+1);
-			aOffset = getNumber((TText*)offset.c_str());
+			Val(aOffset,offset.c_str());
 			keywordValue.resize(plus);
 		}
 		if(stricmp (keyword.c_str(), "addr") == 0)
-			aDataAddr = getNumber((TText*)keywordValue.c_str());
+			Val(aDataAddr,keywordValue.c_str());
 		else
-			 aOrdinal = getNumber((TText*)keywordValue.c_str());
+			Val(aOrdinal,keywordValue.c_str());
 		dataEntry->iDataAddress = aDataAddr;
 		dataEntry->iOrdinal = aOrdinal;
 		dataEntry->iOffset = aOffset;
 		existingFile->SetDllData();
 		DllDataEntry *aDllDataEntry= existingFile->iEntry->GetFirstDllDataEntry();
-		if (aDllDataEntry==NULL)
+		if (aDllDataEntry == NULL) {
-		{
 			// Set the first node of the patchdata linked list
 			aDllDataEntry=dataEntry;
 			existingFile->iEntry->SetFirstDllDataEntry(aDllDataEntry);
 		}
-		else
+		else {
-		{
 			// Goto the last node
-			while((aDllDataEntry->NextDllDataEntry()) != NULL)
+			while((aDllDataEntry->NextDllDataEntry()) != NULL) {
-			{
 				aDllDataEntry = aDllDataEntry->NextDllDataEntry();
 			}
 			// Add the new node at the end of linked list
 			aDllDataEntry->AddDllDataEntry(dataEntry);
 		}
 	}
 	return ETrue;
 }

changeset 606	30b30f9da0b7
parent 0	044383f39525
child 607	378360dbbdba