MCL/sf/os/kernelhwsrv: comparison userlibandfileserver/fileserver/sfat32/sl

equal deleted inserted replaced

-:e7d2d738d3c2
+:2f92ad2dc5db
 void CFatMountCB::InvalidateLeafDirCache()
 	{
 if (iLeafDirCache)
 	{
 iLeafDirCache->Reset();
-	}
-else
-	{
-User::Free(iLastLeafDir);
-iLastLeafDir=NULL;
 	}
 	}
 //-------------------------------------------------------------------------------------------------------------------
 Setup 1st cluster of the new directory
 @param  aStartCluster   this entry start cluster number
 @param  aParentCluster  parent entry start cluster number
 */
-void CFatMountCB::InitializeFirstDirClusterL(TInt aStartCluster,TInt aParentCluster)
+void CFatMountCB::InitializeFirstDirClusterL(TUint32 aStartCluster, TUint32 aParentCluster)
 {
 const TUint32 KClusterSz= 1<<ClusterSizeLog2();
 const TUint32 KMaxBufSz = KClusterSz;           //-- max. nuffer size is a cluster
 const TUint32 KMinBufSz = 1<<SectorSizeLog2();  //-- min. buffer size is 1 sector (for OOM case)
 WriteDirEntryL(firstEntryPos,firstEntry);
 }
 //-----------------------------------------------------------------------------------------
-void CFatMountCB::DoCheckFatForLoopsL(TInt aCluster, TInt& aPreviousCluster, TInt& aChangePreviousCluster, TInt& aCount) const
+void CFatMountCB::DoCheckFatForLoopsL(TUint32 aCluster, TUint32& aPreviousCluster, TUint32& aChangePreviousCluster, TUint32& aCount) const
 //
 // Check one fat cluster for loops.
 //
 {
 //
 // Check for loops
 //
 {
-TInt cluster=StartCluster(anEntry);
+TUint32 cluster = StartCluster(anEntry);
 if (cluster==0 && anEntry.Size()==0)
 return;
-TInt previousCluster=cluster;
+TUint32 previousCluster=cluster;
-TInt changePreviousCluster=1;
+TUint32 changePreviousCluster=1;
-TInt count=0;
+TUint32 count=0;
 for(;;)
 {
 if ((TUint)cluster < KFatFirstSearchCluster || (!IsEndOfClusterCh(cluster) && (TUint)cluster>MaxClusterNumber()))
 else
 WriteDirEntryL(firstEntryPos,firstEntry,name);
 }
 CFatFileCB& file=(*((CFatFileCB*)aFile));
-file.SetL(firstEntry,(TShare)(aMode&KFileShareMask),firstEntryPos);
+file.SetupL(firstEntry, firstEntryPos);
 if (anOpen==EFileReplace && file.Size())
 {
 file.SetSizeL(0);
-file.SetSize(0);
+}
-}
-if (file.IsSeekIndex()==EFalse)
-file.CreateSeekIndex();
 if (anOpen==EFileReplace || anOpen==EFileCreate)
 file.SetArchiveAttribute();
 if(!IsRuggedFSys())
 FAT().FlushL();
 }
 //-----------------------------------------------------------------------------------------
-TBool CFatMountCB::IsDirectoryEmptyL(TInt aCluster)
 //
 // Check aCluster contains no directory entries other than . and ..
 //
+TBool CFatMountCB::IsDirectoryEmptyL(TUint32 aCluster)
 {
 __PRINT(_L("CFatMountCB::IsDirectoryEmptyL"));
 TEntryPos dirEntryPos(aCluster,0);
 TFatDirEntry dirEntry;
 //-----------------------------------------------------------------------------------------
 /**
 Overwrite as many contiguous file clusters as possible.
 */
-void CFatMountCB::DoWriteToClusterListL(TEntryPos& aPos,TInt aLength,const TAny* aSrc,const RMessagePtr2& aMessage,TInt anOffset, TInt aLastcluster, TInt &aBadcluster, TInt &aGoodcluster)
+void CFatMountCB::DoWriteToClusterListL(TEntryPos& aPos,TInt aLength,const TAny* aSrc,const RMessagePtr2& aMessage,TInt anOffset, TUint aLastcluster, TUint& aBadcluster, TUint& aGoodcluster)
 {
 __PRINT(_L("CFatMountCB::DoWriteToClusterListL"));
 __ASSERT_ALWAYS(aPos.Cluster()>=KFatFirstSearchCluster,User::Leave(KErrCorrupt));
-TInt endCluster=0;
+TUint32 endCluster=0;
 const TInt clusterRelativePos=ClusterRelativePos(aPos.iPos);
 const TInt maxClusters=((aLength+clusterRelativePos-1)>>ClusterSizeLog2())+1;
 const TInt clusterListLen=FAT().CountContiguousClustersL(aPos.iCluster,endCluster,maxClusters);
 const TInt writeLength=Min(aLength,(clusterListLen<<ClusterSizeLog2())-clusterRelativePos);
 r = iRawDisk->GetLastErrorInfo(errinf);
 if(r == KErrNone && errinf().iReasonCode == TErrorInfo::EBadSector) // GetLastErrorInfo succeded and Last Error was caused by bad sector
 {
-const TInt badcluster = (TInt)(((dataStart + errinf().iErrorPos) - ClusterBasePosition())>>ClusterSizeLog2())+KFatFirstSearchCluster;
+const TUint32 badcluster = (TInt)(((dataStart + errinf().iErrorPos) - ClusterBasePosition())>>ClusterSizeLog2())+KFatFirstSearchCluster;
-TInt goodcluster = FAT().AllocateSingleClusterL(badcluster);
+TUint32 goodcluster = FAT().AllocateSingleClusterL(badcluster);
 //Calculate cluster number to check whether this write started at the beginning of new cluster or middle of previous cluster.
-TInt cluster = aPos.iCluster;
+TUint32 cluster = aPos.iCluster;
 if ( (aPos.iPos) && ((aPos.iPos)==((aPos.iPos >> ClusterSizeLog2())<<ClusterSizeLog2())))
 cluster--;
 if((aPos.iPos != 0) && (badcluster == aPos.iCluster) && (aLastcluster == 0) && (aPos.iCluster == cluster))
 { //Copy the contents already present in this cluster to new cluster allocated.
 User::Leave(KErrCorrupt);
 }
 //-----------------------------------------------------------------------------------------
-void CFatMountCB::WriteToClusterListL(TEntryPos& aPos,TInt aLength,const TAny* aSrc,const RMessagePtr2& aMessage,TInt anOffset, TInt &aBadcluster, TInt& aGoodcluster)
+void CFatMountCB::WriteToClusterListL(TEntryPos& aPos,TInt aLength,const TAny* aSrc,const RMessagePtr2& aMessage,TInt anOffset, TUint& aBadcluster, TUint& aGoodcluster)
 //
 // Overwrite cluster list.
 //
 {
 //
 {
 __PRINT(_L("CFatMountCB::DoReadFromClusterListL"));
-TInt endCluster=0;
+TUint32 endCluster=0;
 const TInt clusterRelativePos=ClusterRelativePos(aPos.iPos);
 const TInt maxClusters=((aLength+clusterRelativePos-1)>>ClusterSizeLog2())+1;
 const TInt clusterListLen=FAT().CountContiguousClustersL(aPos.iCluster,endCluster,maxClusters);
 const TInt readLength=Min(aLength,(clusterListLen<<ClusterSizeLog2())-clusterRelativePos);
 // Navigate the path to find the leaf directory.
 // Returns the startcluster of data for the directory found.
 //
 {
-__PRINT(_L("CFatMountCB::FindLeafDirL"));
+__PRINT2(_L("CFatMountCB::FindLeafDirL drv:%d, dir:%S"),DriveNumber() ,&aLeafDir);
 TLex lex(aName);
 TInt r;
 TEntryPos entryPos(RootIndicator(),0);
-if (iLeafDirCache == NULL)
+ASSERT(iLeafDirCache);
-	{
-TInt leaflen=(iLastLeafDir) ? iLastLeafDir->Length() : 0;
-TInt namelen=aName.Length();
-if (leaflen>1 && namelen>=leaflen && *iLastLeafDir==aName.Left(leaflen))
-{
-if (leaflen==namelen)
-return(iLastLeafDirCluster);
-lex.Inc(leaflen-1);
-entryPos.iCluster=iLastLeafDirCluster;
-}
-	}
-else
-	{
-// Skip root directory
 if (iLeafDirCache->CacheCount() > 0 && aName.Length() > 1)
 	{
-	TInt err = iLeafDirCache->FindInCache(aName, aLeafDir);
+const TInt err = iLeafDirCache->FindInCache(aName, aLeafDir);
 	if (err == KErrNone)
 		{
-		ASSERT(aLeafDir.iClusterNum > 0);
+	ASSERT(ClusterNumberValid(aLeafDir.iClusterNum));
 		return aLeafDir.iClusterNum;
 		}
 	else if (err != KErrNotFound)
 		{
 		User::LeaveIfError(err);
 		}
 	}
-	}
+TFatDirEntry entry;
-FOREVER
+TFileName fileName;
+TEntryPos startPos;
+TFatDirEntry startEntry;
+for(;;)
 {
 lex.Inc(); // Skip path delimiter
 lex.Mark();
 r=lex.Remainder().Locate(KPathDelimiter);
 if (r==KErrNotFound)
 r=lex.Remainder().Length();
 if (r==0) // End of the path
 break;
 lex.Inc(r); // Set the token length
-TFatDirEntry entry;
-TFileName fileName;
-TEntryPos startPos;
-TFatDirEntry startEntry;
 DoFindL(lex.MarkedToken(),
 		KEntryAttMatchMask|KEntryAttMatchExclusive,
 		startPos, startEntry, entryPos, entry,
 		fileName, KErrPathNotFound,
 		NULL,
 		aLeafDir);
 entryPos.iCluster=StartCluster(entry);
 entryPos.iPos=0;
-}
+}// for(;;)
-if (iLeafDirCache == NULL)
-	{
-AllocBufferL(((CFatMountCB*)this)->iLastLeafDir,aName);
-((CFatMountCB*)this)->iLastLeafDirCluster=entryPos.iCluster;
-	}
-else
-	{
 if (aName.Length() > 1)
 	{
 	aLeafDir = TLeafDirData(entryPos.iCluster);
 iLeafDirCache->AddToCacheL(aName, aLeafDir);
 	}
-	}
 return entryPos.iCluster;
 }
 //-----------------------------------------------------------------------------------------
 	DosEntryPos1 = aLeafDir.iMRUPos;
 	}
 	TInt numFound = 0;
 	TEntryPos startPos = DosEntryPos1;
-	TInt clusterNum = DosEntryPos1.iCluster;
+	TUint32 clusterNum = DosEntryPos1.iCluster;
 for(TUint32 entryCnt=0; entryCnt < maxDirEntries; ++entryCnt)
 {//-- walk through directory cluster list. The loop is limited by maximal number of dir entries
 //-- that can be cached. Helps to avoid problems with infinite (looped) directories
 //-- extract dir entries from the cached page and see if they match given name (aName)
 /// until it reaches the next page
 for(;;)
 {
 StartEntryPos1 = DosEntryPos1;
-TInt clSave = DosEntryPos1.iCluster; //-- need to save current cluster number because GetDirEntry() & MoveToNextEntryL() can change it
+TUint32 clSave = DosEntryPos1.iCluster; //-- need to save current cluster number because GetDirEntry() & MoveToNextEntryL() can change it
 //-- get directory entry from the cache. We know that the DosEntryPos1 is cached.
 nErr = GetDirEntry(DosEntryPos1, DosEntry1, StartEntry1, aFileName);
 if(nErr != KErrNone)
 break;
 if (IsRootDir(aDosEntryPos)&&(aDosEntryPos.iPos+StartOfRootDirInBytes()>=RootDirEnd()))
 User::Leave(anError);//Allows maximum number of entries in root directory
 __PRINT2(_L("CFatMountCB::DoFindL() drv:%d, %S"),Drive().DriveNumber(),&aTrgtName);
-TInt previousCluster=aDosEntryPos.iCluster;
+TUint32 previousCluster=aDosEntryPos.iCluster;
 TUint previousPosition=aDosEntryPos.iPos;
-TInt changePreviousCluster=1;
+TUint32 changePreviousCluster=1;
-TInt count=0;
+TUint32 count=0;
 TBool trgNameIsWildCard     = EFalse; //-- ETrue if the name we are looking for is a wildcard
 TBool trgNameFullySpecified = ETrue;  //-- ETrue if the name we are looking for doesn't contain wildcards
 /**
 Zero fill a cluster
 @param  aCluster cluster number to zero-fill
 */
-void CFatMountCB::ZeroDirClusterL(TInt aCluster)
+void CFatMountCB::ZeroDirClusterL(TUint32 aCluster)
 {
 __PRINT1(_L("CFatMountCB::ZeroDirClusterL %d"),aCluster);
 const TUint32 KClusterSz= 1<<ClusterSizeLog2();
 }
 //-----------------------------------------------------------------------------------------
 /** Read the Uid of the entry starting at aCluster */
-void CFatMountCB::ReadUidL(TInt aCluster,TEntry& anEntry) const
+void CFatMountCB::ReadUidL(TUint32 aCluster,TEntry& anEntry) const
 {
 __PRINT1(_L("CFatMountCB::ReadUidL(%d)"), aCluster);
-if((TUint)aCluster < KFatFirstSearchCluster || (TUint)aCluster >= UsableClusters()+KFatFirstSearchCluster)
+if(aCluster < KFatFirstSearchCluster || aCluster >= UsableClusters()+KFatFirstSearchCluster)
 User::Leave(KErrCorrupt);
 TBuf8<sizeof(TCheckedUid)> uidBuf;
 iRawDisk->ReadCachedL(FAT().DataPositionInBytes(aCluster),sizeof(TCheckedUid),uidBuf);
 __ASSERT_DEBUG(uidBuf.Length()==sizeof(TCheckedUid),Fault(EFatReadUidFailed));
 User::Leave(KErrEof);
 if ((TUint)(aPos+aLength)>fileSize)
 aLength=fileSize-aPos;
-TInt cluster=StartCluster(dosEntry);
+TUint32 cluster=StartCluster(dosEntry);
 	TInt pos = aPos;
-TInt endCluster;
+TUint32 endCluster;
 TInt clusterSize=1<<ClusterSizeLog2();      //  Size of file clusters
 	TInt readTotal = 0;
 	// Total number of clusters in file
 TInt maxClusters=((fileSize+clusterSize-1)>>ClusterSizeLog2());
 }
 }
 //-----------------------------------------------------------------------------------------
+/**
+Write a FAT directory entry to disk. Assumes sufficient space has been created for it by AddDirEntry.
+@param  aPos        dir. entry position
+@param  aDirEntry   entry data
+*/
 void CFatMountCB::WriteDirEntryL(const TEntryPos& aPos,const TFatDirEntry& aDirEntry)
-//
+{
-// Write a FAT directory entry to disk.
-// Assumes sufficient space has been created for it by AddDirEntry.
+__PRINT2(_L("CFatMountCB::WriteDirEntryL cl:%d, pos:%d"), aPos.Cluster(), aPos.Pos());
-//
-{
-__PRINT(_L("CFatMountCB::WriteDirEntryL"));
 //-- use special interface to access FAT directory file
 DirWriteL(aPos,TPtrC8((TUint8*)&aDirEntry,KSizeOfFatDirEntry));
 }
 //-----------------------------------------------------------------------------------------
+/**
+Mark a dir entry as erased
+@param  aPos dir. entry position
+*/
 void CFatMountCB::EraseDirEntryL(const TEntryPos& aPos)
-//
+{
-// Mark a dir entry as erased
+__PRINT2(_L("CFatMountCB::EraseDirEntryL cl:%d, pos:%d"), aPos.Cluster(), aPos.Pos());
-//
-{
-__PRINT(_L("CFatMountCB::EraseDirEntryL"));
-if(!iLeafDirCache && iLastLeafDir)
-iLastLeafDir->Des().SetLength(0);
 //-- use special interface to access FAT directory file
 DirWriteL(aPos,TPtrC8((TUint8*)&KEntryErasedMarker,sizeof(TUint8)));
 }
 //-----------------------------------------------------------------------------------------
+/**
+Read a FAT directory entry
+@param  aPos        dir. entry position
+@param  aDirEntry   entry data
+*/
 void CFatMountCB::ReadDirEntryL(const TEntryPos& aPos,TFatDirEntry& aDirEntry) const
-//
-// Read a FAT directory entry to disk
-//
 {
 //  __PRINT(_L("CFatMountCB::ReadDirEntryL"));
 if (IsEndOfClusterCh(aPos.iCluster))
 {
 /**
 Extend a file or directory, zeroing cluster chain and flushing after every write to FAT.
 This method is called for rugged FAT only.
 for parameters see CFatTable::ExtendClusterListL
 */
-void CFatMountCB::ExtendClusterListZeroedL(TInt aNumber,TInt& aCluster)
+void CFatMountCB::ExtendClusterListZeroedL(TUint32 aNumber, TUint32& aCluster)
 {
 __PRINT(_L("CFatMountCB::ExtendClusterListZeroedL"));
 __ASSERT_DEBUG(aNumber>0,Fault(EFatBadParameter));
 while(aNumber && FAT().GetNextClusterL(aCluster))
 {
 __PRINT(_L("-CFatMountCB::FindVolumeLabelFileL: abort, exceeds root"));
 User::Leave(KErrNotFound); // Allows maximum number of entries in root directory
 }
-TInt previousCluster= aDosEntryPos.iCluster;
+TUint32 previousCluster= aDosEntryPos.iCluster;
 TUint previousPosition= aDosEntryPos.iPos;
-TInt changePreviousCluster=1;
+TUint32 changePreviousCluster=1;
-TInt count=0;
+TUint32 count=0;
 TFatDirEntry startEntry;
 TFileName dummyLongName;
 FOREVER
 TBlockMapEntry blockMapEntry;
 TUint i = 0;
 TInt clusterRelativePos;
 TInt maxClusters;
-TInt endCluster;
+TUint32 endCluster;
 TInt clusterListLen;
 TInt readLength;
 TInt temp;
 TInt currentPos;
 TLocalDriveCapsBuf caps;
 //-- leave itself means a problem
 chkDskRes = CScanDrive::EUnknownError;
 }
 delete pScnDrv;
+pScnDrv = NULL;
 if(chkDskRes != KErrNone)
 {
 __PRINT2(_L("CFatMountCB::CheckDisk() drv:%d, result:%d"), DriveNumber(), chkDskRes);
 }
 TRAPD(nScnDrvRes, pScnDrv->StartL(CScanDrive::EScanAndFix));
 const TBool bNeedFatRemount = (nScnDrvRes!=KErrNone) || pScnDrv->ProblemsDiscovered();
 delete pScnDrv;
+pScnDrv = NULL;
 if(bNeedFatRemount)
 {//-- ScanDrive found and probably fixed some errors.
 // ensure cached fat and free cluster count are updated
 DoDismount(); //-- dismount

branch	RCL_3
changeset 22	2f92ad2dc5db
parent 20	597aaf25e343
child 41	0ffb4e86fcc9