FCL/sftools/dev/build: comparison imgtools/imglib/filesystem/source/longname.cpp

equal deleted inserted replaced

-:c7c26511138f
+:360bd6b35136
 @internalComponent
 @released
 @param aLongEntry - the long entry
 */
-void ClongName::WriteLongEntry(CLongEntry* aLongEntry,String& longEntryString)
+void ClongName::WriteLongEntry(CLongEntry* aLongEntry,string& longEntryString)
 {
 	longEntryString.append(KWriteOnce, aLongEntry->GetDirOrder());
 	WriteSubName(aLongEntry->GetSubName1(),(ESubName1Length*2),longEntryString);
 	longEntryString.append(KWriteOnce, aLongEntry->GetAttribute());
 	longEntryString.append(KWriteOnce, aLongEntry->GetDirType());
 @param aName - Sub name of a long entry
 @param aSubNameLength - No of characters to be filled
 @param alongEntryString - formatted sub name appended to this string
 */
-void ClongName::WriteSubName(String& aSubName,unsigned short aSubNameLength,String& alongEntryString)
+void ClongName::WriteSubName(string& aSubName,unsigned short aSubNameLength,string& alongEntryString)
 {
 	unsigned int subNameCurrLength = aSubName.length();
 	if(subNameCurrLength == 0)
 	{
 		iFirstNullName = true;
 		}
 		//Apply padding with two zero's to mention Long Name end.
 		if(subNameCurrLength < aSubNameLength)
 		{
 			aSubName.insert(subNameCurrLength, KPaddingCharCnt, 0);
+			iSubNameProperEnd = false;
 		}
 	}
 	subNameCurrLength = aSubName.length();
 	if((iSubNameProperEnd == true) && (iFirstNullName == true))
 	{
 @param aFirstName - first sub name
 @param aSecondName - Second sub name
 @param aThirdName - third sub name
 */
-void ClongName::PushAndErase(String& aFirstName,String& aSecondName,String& aThirdName)
+void ClongName::PushAndErase(string& aFirstName,string& aSecondName,string& aThirdName)
 {
 	iSubNamesList.push_back(aFirstName);
 	aFirstName.erase();
 	iSubNamesList.push_back(aSecondName);
 	aSecondName.erase();
 @param aStartIndex - Sub name starting index
 @param aStringLength - total string length
 @param aSubNameLength - Length of the Sub Name of required length
 @param aSubName - splitted Sub Name assigned using this string
 */
-void ClongName::GetSubName(String& aLongName,
+void ClongName::GetSubName(string& aLongName,
 						   int& aStartIndex,
 						   int& aStringLength,
 						   int aSubNameLength,
-						   String& aSubName)
+						   string& aSubName)
 {
 	if((aStartIndex + aSubNameLength) <= aStringLength)
 	{
 		aSubName = aLongName.substr(aStartIndex,aSubNameLength);
 		aStartIndex += aSubNameLength;
 iNameList container.
 @internalComponent
 @released
 */
-void ClongName::FormatLongFileName(String& aLongName)
+void ClongName::FormatLongFileName(string& aLongName)
 {
 	int stringLength = aLongName.length();
 	int startIndex = 0;
-	String iSubName1;
+	string iSubName1;
-	String iSubName2;
+	string iSubName2;
-	String iSubName3;
+	string iSubName3;
 	while(startIndex < stringLength)
 	{
 		GetSubName(aLongName,startIndex,stringLength,ESubName1Length,iSubName1);
 		GetSubName(aLongName,startIndex,stringLength,ESubName2Length,iSubName2);
 @internalComponent
 @released
 @return - returns the short name
 */
-void ClongName::CheckAndUpdateShortName(String& aShortName)
+void ClongName::CheckAndUpdateShortName(string& aShortName)
 {
 	char trailingChar;
 	StringList::iterator beginIter = GShortEntryList.begin();
 	StringList::iterator endIter = GShortEntryList.end();
-	String tempString;
+	string tempString;
 	while(beginIter != endIter)
 	{
 		tempString = (*beginIter);
 		if(strcmp(tempString.c_str(),aShortName.c_str()) == 0)
 		{
 			aShortName[iTildeNumberPosition] = ++trailingChar; //Increment the character value by 1
 			continue;
 		}
 		++beginIter;
 	}
+int gap = ENameLengthWithExtension - aShortName.length();
+if(gap >0 )
+aShortName.append(gap,KSpace);
 }
 /**
 Function responsible to take the long file name as input and to prepare the short name.
 e.g. Long File Name.pl to LONGFI~1PL
 @released
 @return - returns the short name
 */
-String ClongName::GetShortEntryName()
+string ClongName::GetShortEntryName()
 {
-	String shortName;
+	string shortName;
 	unsigned int extensionIndex = iLongName.find_last_of(KDot);
 	unsigned int dotIndex = extensionIndex;
 	//Erase all the dots from the string, but keep the extension index
-	while(dotIndex != String::npos)
+	while(dotIndex != string::npos)
 	{
 		iLongName.erase(dotIndex,1); //Erase the dot
 		dotIndex = iLongName.find_first_of(KDot);
-		if(dotIndex != String::npos)
+		if(dotIndex != string::npos)
 		{
 			//Decrement only if more than one dot exists
 			--extensionIndex;
 		}
 	}
 	{
 		if(shortName.length() < ENameLength)
 		{
 			shortName.append((ENameLength - shortName.length()),KSpace);
 		}
-		String shortNameString = iLongName.substr(extensionIndex,EExtensionLength);
+		string shortNameString = iLongName.substr(extensionIndex,EExtensionLength);
 		shortName.append(ToUpper(shortNameString));
 		CheckAndUpdateShortName(shortName);
 		return shortName;
 	}
 	//extension padding
 @param aEntry - directory entry which has long file name
 @return shortEntry - returns the initialized short Directory entry
 */
 CDirectory* ClongName::CreateShortEntry(CDirectory* aEntry)
 {
-	CDirectory* shortEntry = new CDirectory((char*)iShortName.c_str());
+	CDirectory* shortEntry = new CDirectory(iShortName.c_str(),NULL);
 	shortEntry->SetEntryAttribute(aEntry->GetEntryAttribute());
 	if(aEntry->IsFile())
 	{
 		shortEntry->SetFilePath((char*)aEntry->GetFilePath().c_str());
 	}
 @internalComponent
 @released
 @return - returns the formatted long name string
 */
-String ClongName::CreateLongEntries()
+string ClongName::CreateLongEntries()
 {
-	String longEntryString;
+	string longEntryString;
 	CLongEntry* longEntryObject;
 	unsigned char chckSum = CalculateCheckSum();
 	unsigned char dirOrderNumber = 0x00;
 	while(iSubNamesList.size() > 0)
 	{

changeset 590	360bd6b35136
parent 0	044383f39525