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

equal deleted inserted replaced

-:22486c9c7b15
+:378360dbbdba
 #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;
 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"},
 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"},
 iCheckSum(0),
 iNumberOfFiles(0),
 iTime(0),
 iRootDirectory(0),
 iNumberOfDataFiles(0),
 iDriveFileName(0),
-iDataSize(0),
+iDriveFileFormat(0),
-iDriveFileFormat(0),
-iConfigurableFatAttributes(new ConfigurableFatAttributes),
 iReader(aReader),
 iMissingFiles(0),
 iLastExecutable(0),
 iFirstFile(0),
 iCurrentFile(0),
 	if(iRomFileName){
 		delete [] iRomFileName;
 		iRomFileName = 0 ;
 	}
 	if (iRootDirectory)
 		iRootDirectory->Destroy();
-	if(iConfigurableFatAttributes)
-		delete iConfigurableFatAttributes;
 	if(iPatchData)
 		delete iPatchData;
 }
 //
 				break;
 			}
 		case EKeywordHide:
 		case EKeywordFile:
+		case EKeywordDir:
 		case EKeywordData:
 		case EKeywordFileCompress:
 		case EKeywordFileUncompress:
 			if (!ProcessDriveFile(keyword))
 				return KErrGeneral;
 			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))
-			{
-				Print(EWarning,"Invalid Range. Default size is considered\n");
-			}
-#else
-			iDataSize = _atoi64(bigString);
-#endif
 		}
 		break;
 	case EKeywordDataImageVolume:
 		{
 			// Get the volume label provided by using "volume" keyword.
 				// Remove the new line character from the end
 				position = volumeLabel.find_first_of("\r\n");
 				if (position != string::npos)
 					volumeLabel = volumeLabel.substr(0,position);
+				size_t length = volumeLabel.length() ;
-				iConfigurableFatAttributes->iDriveVolumeLabel = volumeLabel.data() ;
+				if(length > 11)
+						length = 11 ;
+				memcpy(iConfigurableFatAttributes.iDriveVolumeLabel,volumeLabel.c_str(),length) ;
+				while(length != 11)
+					iConfigurableFatAttributes.iDriveVolumeLabel[length++] = ' ';
+				iConfigurableFatAttributes.iDriveVolumeLabel[length] = 0;
 			}
 			else {
 				Print(EWarning,"Value for Volume Label is not provided. Default value is considered.\n");
 			}
 			break;
 			TInt sectorSize = atoi(bigString);
 			if(sectorSize <= 0)	{
 				Print(EWarning,"Invalid Sector Size value. Default value is considered.\n");
 			}
 			else {
-				iConfigurableFatAttributes->iDriveSectorSize = atoi(bigString);
+				iConfigurableFatAttributes.iDriveSectorSize = atoi(bigString);
 			}
 		}
 		break;
 	case EKeywordDataImageNoOfFats:
 		{
 			const char* bigString = iReader.Word(1);
 			TInt noOfFats = atoi(bigString);
 			if (noOfFats <=0)
 				Print(EWarning,"Invalid No of FATs specified. Default value is considered.\n");
 			else
-				iConfigurableFatAttributes->iDriveNoOfFATs = atoi(bigString);
+				iConfigurableFatAttributes.iDriveNoOfFATs = atoi(bigString);
 		}
 		break;
 	default:
 		// unexpected keyword iReader.Word(0), keep going.
 		break;
 		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) {
 		Print(EError,"Use the keyword \"dataimagefilesystem\".\n");
 		retVal = EFalse;
 	}
 	// Checking the validity of file system format.
 	if(iDriveFileFormat){
-		strupr((char *)iDriveFileFormat);
+		if(stricmp(iDriveFileFormat,"FAT16") && stricmp(iDriveFileFormat,"FAT32")) {
-		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)
 	TInt currentLine = iReader.CurrentLine();
 	switch (aKeyword)
 	{
 	case EKeywordData:
+	case EKeywordDir:
 	case EKeywordHide:
 		isPeFile = EFalse;
 		break;
 	case EKeywordFile:
 	default:
 		return EFalse;
 	}
-	if (aKeyword!=EKeywordHide) {
+	if (aKeyword!=EKeywordHide && aKeyword!=EKeywordDir) {
 		// check the PC file exists
 		char* nname = NormaliseFileName(iReader.Word(1));
 		ifstream test(nname);
 		if(!test.is_open()){
 			Print(EError,"Cannot open file %s for input.\n",iReader.Word(1));
 	}
 	else
 		epocPathStart=1;
-	iNumberOfFiles++;
+	if(aKeyword != EKeywordDir)
+		iNumberOfFiles++;
 	TBool endOfName=EFalse;
-	const char *epocStartPtr= IsValidFilePath(iReader.Word(epocPathStart));
+	const char *epocStartPtr;
+	if(aKeyword != EKeywordDir)
+		epocStartPtr = IsValidFilePath(iReader.Word(epocPathStart));
+	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* subDir=0;
 	TRomBuilderEntry *file=0;
 	while (!endOfName) {
 		endOfName = GetNextBitOfFileName(epocEndPtr);
-		if (endOfName) { // file
+		if (endOfName && (aKeyword!=EKeywordDir)) { // file
 			TRomNode* alreadyExists=dir->FindInDirectory(epocStartPtr);
 			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());
 					iNumberOfFiles--;
 			dir->AddFile(node);	// to drive directory structure.
 		}
 		else {
 			// directory
+			//for directory creation, given /sys/bin/, it's possible to reach 0 at the end, just ignore that...
+			if(!*epocStartPtr)
+				break;
 			subDir = dir->FindInDirectory(epocStartPtr);
 			if (!subDir){ // sub directory does not exist
 				if(aKeyword==EKeywordHide) {
 					Print(EWarning, "Hiding non-existent file %s on line %d\n",
 						iReader.Word(1),iReader.CurrentLine());
 	while(*p) {
 		if (*p == '/' || *p == '\\') {
 			if (len == 0)
 				return NULL;
 			len=0;
+			p++;
+			continue;
 		}
 		len++;
 		p++;
 	}
 	return (len ? aPath : NULL);
+}
+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
 //

changeset 607	378360dbbdba
parent 590	360bd6b35136
parent 606	30b30f9da0b7
child 609	f76e0f94b7ab