FCL/sf/os/kernelhwsrv: comparison userlibandfileserver/fileserver/etshell/ts

equal deleted inserted replaced

-:2d65c2f76d7b
+:947f0dc9f7a8
 //	TShellCommand(_L("BLANK"),_L("Help"),_L("-?"),TShellCommand::EDSwitch,ShellFunction::BLANK),
 	TShellCommand(_L("ATTRIB"),_L("Displays or changes file attributes"),_L("[drive:][path][filename] [+R | -R] [+H |-H] [+S | -S] [+A | -A] [/p]\n\n  /p - Pause after each screen of information"), TShellCommand::EPSwitch, ShellFunction::Attrib),
 	TShellCommand(_L("CD"),_L("Change the current directory for a drive"),_L("[path] [/d]\n\n  /d - Change drive"),TShellCommand::EDSwitch,ShellFunction::Cd),
 	TShellCommand(_L("CHKDEPS"),_L("Check the dependencies of an executable or a Dll (ARM only)"),_L("[Filename.EXE] or [Filename.DLL]"),0,ShellFunction::ChkDeps),
 	TShellCommand(_L("CHKDSK"),_L("Check disk for corruption"),_L("[drive:] [/s][/f|/u]\n\n/s - start ScanDrive instead of CheckDisk\n/f - finalise drive\n/u - unfinalise drive"),TShellCommand::ESSwitch|TShellCommand::EFSwitch|TShellCommand::EUSwitch,ShellFunction::ChkDsk),
-	TShellCommand(_L("COPY"),_L("Copy one (or more) file(s)"),_L("source [destination]"),TShellCommand::ESSwitch,ShellFunction::Copy),
+	TShellCommand(_L("COPY"),_L("Copy one (or more) file(s), overwriting existing one(s)"),_L("source [destination]"),TShellCommand::ESSwitch,ShellFunction::Copy),
 	TShellCommand(_L("DEL"),_L("Delete one file"),_L("[drive:][path][filename]"),TShellCommand::ESSwitch,ShellFunction::Del),
 	TShellCommand(_L("DIR"),_L("Show directory contents"),_L("[drive:][path][filename] [/p][/w]\n\n  /p - Pause after each screen of information\n  /w - Wide format"),TShellCommand::EPSwitch|TShellCommand::EWSwitch|TShellCommand::EASwitch,ShellFunction::Dir),
 //	TShellCommand(_L("EDLIN"),_L("Edit a text file"),_L("[drive:][path][filename] [/p]\n\n  /p - Pause after each screen of information"),TShellCommand::EPSwitch,ShellFunction::Edit),
 TShellCommand(_L("FORMAT"),_L("Format a disk"),ptrFormatHelp,TShellCommand::EQSwitch|TShellCommand::ESSwitch|TShellCommand::EESwitch|TShellCommand::EFSwitch,ShellFunction::Format),
 TShellCommand(_L("GOBBLE"),_L("Create a file"),_L("[filename] size [/e]\n\n /e - create an empty file, without writing any data"),TShellCommand::EESwitch,ShellFunction::Gobble),
 // /N			Uses short filename, if available, when copying a file with a non-8dot3 name.
 //
 // To append files, specify a single file for destination, but multiple files
 // for source (using wildcards or file1+file2+file3 format).
 //
+// Overwrites existing file(s).
+//
 // My spec:
 //
 // COPY source [destination]
 // source		Specifies the file or files to be copied to the current directory
 			if (r!=KErrNone)
 				return(r);
 			}
 		TBool recursive=((aSwitches&TShellCommand::ESSwitch)!=0);
+		// Automatically overwrites existing file(s)
 		TUint switches=(recursive) ? CFileMan::EOverWrite|CFileMan::ERecurse : CFileMan::EOverWrite;
 		r=CShell::TheFileMan->Copy(dirPath.FullName(),destination,switches);
 		if (r==KErrNone)
 			return(r);	//	Copy was successful
 	//-- Print out information about file system installed
 	if(aFlags & EFSInfo)
 {
+//-- print out drive properties
+Buf.Format(_L("\nDrive %c: No:%d"), 'A'+aDrvNum, aDrvNum);
-apConsole->Printf(_L("\nDrive %c: number:%d\n"), 'A'+aDrvNum, aDrvNum);
+//-- find out if the drive is synchronous / asynchronous
+TPckgBuf<TBool> drvSyncBuf;
+nRes = aFs.QueryVolumeInfoExt(aDrvNum, EIsDriveSync, drvSyncBuf);
+if(nRes == KErrNone)
+{
+Buf.AppendFormat(_L(", Sync:%d"), drvSyncBuf() ? 1:0);
+}
+//-- find out if drive runs a rugged FS (debug mode only)
+const TInt KControlIoIsRugged=4;
+TUint8 ruggedFS;
+TPtr8 pRugged(&ruggedFS, 1, 1);
+nRes=aFs.ControlIo(aDrvNum, KControlIoIsRugged, pRugged);
+if(nRes == KErrNone)
+{
+Buf.AppendFormat(_L(", Rugged:%d"), ruggedFS ? 1:0);
+}
+Buf.Append(_L("\n"));
+apConsole->Printf(Buf);
 	    //-- print the FS name
 	    if(aFs.FileSystemName(Buf, aDrvNum) == KErrNone)
 	    {
 	        TFSName fsName;
 apConsole->Printf(Buf);
 }
-//-- print out FileSystem volume finalisation info
 if(bVolumeOK && (aFlags & EFSInfoEx))
 {
+Buf.Zero();
+//-- print out FileSystem volume finalisation info
 TPckgBuf<TBool> boolPckg;
 nRes = aFs.QueryVolumeInfoExt(aDrvNum, EIsDriveFinalised, boolPckg);
 if(nRes == KErrNone)
 {
 if(boolPckg() >0)
-apConsole->Printf(_L("Volume Finalised\n"));
+Buf.Copy(_L("Volume: Finalised"));
 else
-apConsole->Printf(_L("Volume Not finalised\n"));
+Buf.Copy(_L("Volume: Not finalised"));
 }
+//-- print out cluster size that FS reported
+TVolumeIOParamInfo volIoInfo;
+nRes = aFs.VolumeIOParam(aDrvNum, volIoInfo);
+if(nRes == KErrNone && volIoInfo.iClusterSize >= 512)
+{
+Buf.AppendFormat(_L(", Cluster Sz:%d"), volIoInfo.iClusterSize);
+}
+if(Buf.Length())
+{
+Buf.Append(_L("\n"));
+apConsole->Printf(Buf);
+}
 }
 	    }
 }//if(aFlags & EFSInfo)
 	//-- print media attributes

changeset 90	947f0dc9f7a8
parent 33	0173bcd7697c
child 127	e408fc570bb5