userlibandfileserver/fileserver/etshell/ts_com.cpp
branchRCL_3
changeset 28 5b5d147c7838
parent 26 c734af59ce98
child 42 a179b74831c9
--- a/userlibandfileserver/fileserver/etshell/ts_com.cpp	Tue May 11 17:28:22 2010 +0300
+++ b/userlibandfileserver/fileserver/etshell/ts_com.cpp	Tue May 25 14:09:55 2010 +0300
@@ -256,7 +256,7 @@
 			aPath.Insert(0,TheShell->currentPath.Left(2));
 		}
 
-	RFile file;
+	RFile64 file;
 	r=file.Open(CShell::TheFs,aPath,EFileStream);
 	if (r!=KErrNone)	//		File could not be opened
 		{
@@ -1199,11 +1199,23 @@
                 //-- print out cluster size that FS reported
                 TVolumeIOParamInfo volIoInfo;
                 nRes = aFs.VolumeIOParam(aDrvNum, volIoInfo);
-                if(nRes == KErrNone && volIoInfo.iClusterSize >= 512)
+                if(nRes == KErrNone)
                 {
-                    Buf.AppendFormat(_L(", Cluster Sz:%d"), volIoInfo.iClusterSize);
+                    if(volIoInfo.iBlockSize >= 0)
+                    {
+                        Buf.AppendFormat(_L(", BlkSz:%d"), volIoInfo.iBlockSize);
+                    }
+                    
+                    if(volIoInfo.iClusterSize >= 0)
+                    {
+                        Buf.AppendFormat(_L(", ClSz:%d"), volIoInfo.iClusterSize);
+                    }
+
+                    Buf.AppendFormat(_L(", CacheFlags:0x%x"), volInfo.iFileCacheFlags);
+                
                 }
 
+
                 if(Buf.Length())
                 {
                     Buf.Append(_L("\n"));
@@ -1972,7 +1984,7 @@
 	ShellFunction::StripQuotes(aPath);
 
 	ParsePath(aPath);
-	RFile file;
+	RFile64 file;
 	TInt r=file.Open(TheShell->TheFs,aPath,EFileStream);
 	if (r!=KErrNone)
 		return(r);
@@ -3108,7 +3120,7 @@
 TInt ShellFunction::Type(TDes& aPath,TUint aSwitches)
 	{
 	ParsePath(aPath);
-	RFile file;
+	RFile64 file;
 	TInt r=file.Open(TheShell->TheFs,aPath,EFileStreamText|EFileShareReadersOnly);
 	if (r!=KErrNone)
 		return r;