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

equal deleted inserted replaced

-:2b433474f2ba
+:957c583b417b
 #include "u32std.h"
 #include <u32hal.h>
 #include <nkern/nk_trace.h>
 #include "filesystem_fat.h"
+#ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API
+#define	RFILE   RFile64
+#else
+#define	RFILE	RFile
+#endif
 _LIT(KCrNl, "\r\n");
 _LIT(KNl, "\n");
 TPtrC ptrFormatHelp=_L("Drive:[\\] [fat12|fat16|fat32] [spc:X] [rs:Y] [ft:Z] [/Q][/S][/E][/F]\nfat12 or fat16 or fat32 specifies explicit FAT type\nspc:X specifies \"X\" sectors per cluster\nrs:Y specifies \"Y\" reserved sectors\nft:Z specifies \"Z\" FAT tables (1 or 2)\n\n/q - QuickFormat, /s - SpecialFormat, /e - ForcedErase\n/f - force formatting (ignore volume being in use)");
 TPtrC ptrMountHelp=_L("Drive:[\\]  <fsy:X> <fs:Y> [pext:Z] [/S][/U][/F][/R]\n'X' *.fsy module name, like elocal.fsy\n'Y' file system name, like 'FAT'\n'Z' optional primary extension module name\n/U - dismount FS from the drive e.g 'mount d: /u' \n/U /F force dismounting the FS even if there are opened files on it \n/F - force mounting with dismounting existing FS \n/S - mount drive as synchronous\n/R - remount the file system ");
 TBool CShell::iDbgPrint = EFalse;
 //	lint -e40,e30
 const TShellCommand CShell::iCommand[ENoShellCommands]=
 	{
+//	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), 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),
 	TShellCommand(_L("HEXDUMP"),_L("Display the contents of a file in hexadecimal"),_L("[drive:][path][filename] [/p]\n\n  /p - Pause after each screen of information\n\n  Hit escape to exit from hexdump "),TShellCommand::EPSwitch,ShellFunction::Hexdump),
 	TShellCommand(_L("LABEL"),_L("Set or return the volume label"),_L("[newlabel]"),0,ShellFunction::VolumeLabel),
 	TShellCommand(_L("MD"),_L("Make a new directory"),_L("name"),0,ShellFunction::Md),
 		aPath.Insert(0,TheShell->currentPath);
 		else
 			aPath.Insert(0,TheShell->currentPath.Left(2));
 		}
-	RFile64 file;
+	RFILE file;
 	r=file.Open(CShell::TheFs,aPath,EFileStream);
 	if (r!=KErrNone)	//		File could not be opened
 		{
 		if (appendedExe)	//	If .EXE was appended earlier
 			{
 //
 	{
 	ShellFunction::StripQuotes(aPath);
 	RDir    dir;
-	RFile64 file;
+	RFILE file;
 	TParse dirParse;
 //	Parses the given path to give a full path
 	GetFullPath(aPath,dirParse);
 //	Sets aPath to a full path name
 	aPath=dirParse.FullName();
 	TParse dirParse;
 	GetFullPath(aPath,dirParse);
 	aPath=dirParse.FullName();
-	RFile64 file;
+	RFILE file;
 	if (aPath[aPath.Length()-1]==KPathDelimiter)
 		aPath.Append('*');
 	else if( (aPath.Locate(KMatchAny)==KErrNotFound) && (aPath.Locate(KMatchOne)==KErrNotFound) )
 		{
 		TInt error=file.Open(TheShell->TheFs,aPath,KEntryAttMatchExclude|KEntryAttDir);
 	{
 	ShellFunction::StripQuotes(aPath);
 	ParsePath(aPath);
-RFile64 file;
+RFILE file;
 	TInt r=file.Open(TheShell->TheFs,aPath,EFileStream);
 	if (r!=KErrNone)
 		return(r);
-		const TInt KLineLength = 16;
+	const TInt KLineLength = 16;
 TBuf<0x100> buf;
 TBuf<KLineLength> asciiBuf;
-		TBuf8<KLineLength> line;
+	TBuf8<KLineLength> line;
 	for (;;)
 		{
 		r=file.Read(line);
 		if (r != KErrNone || line.Length() == 0)
 	if (aPath.Length()==0)
 		aPath=_L("GOBBLE.DAT");
 	TParse fileName;
 	GetFullPath(aPath,fileName);
-	RFile64 file;
+	RFILE file;
 const TInt    KBufSize=65536; //-- buffer size for writing data
 const TUint32 K1Megabyte = 1<<20; //-- 1M, 1048576
 TInt64 cntBytes = 0;
 TUint32 cntMegaBytes =0;
 if(r != KErrNone)
 goto fail;
 if(!(aSwitches&TShellCommand::EESwitch))
-{//-- fill created file with random data
+{//-- fill created file with randomn data
 	    while(rem)
 	    {
 	        const TInt s=(TInt)Min((TInt64)KBufSize, rem);
 //	Modified to add more helpful error messages and allow spaced filenames
 	ShellFunction::StripQuotes(aPath);
 	TBuf<KShellMaxCommandLine> newName;
 	TBuf<KShellMaxCommandLine> tempPath=aPath;
-	RFile64 file;
+	RFILE file;
 	TWord   word(aPath);
 	TInt r=word.FindNextWord(aPath);
 //	Check if the word returned is a valid filename.  If not, scan the next
 //	word too in case the filename contains spaces.  If, at the end of the
 	{
 //	Modified December 1997 to allow for filenames containing spaces
 	TBuf<KShellMaxCommandLine> newName;
 	TBuf<KShellMaxCommandLine> tempPath=aPath;
-	RFile64 file;
+	RFILE file;
 	TWord   word(aPath);
 	TInt r=word.FindNextWord(aPath);
 //	Check if the word returned is a valid filename.  If not, scan the next
 //	word too in case the filename contains spaces.  If, at the end of the
 	}
 TInt ShellFunction::Type(TDes& aPath,TUint aSwitches)
 	{
 	ParsePath(aPath);
-	RFile64 file;
+	RFILE file;
 	TInt r=file.Open(TheShell->TheFs,aPath,EFileStreamText|EFileShareReadersOnly);
 	if (r!=KErrNone)
 		return r;
 	TBuf8<0x200> tmpbuf;
 	TBuf<0x200> ubuf;
 		return KErrNone;
 		}
 	TParse fileName;
 	GetFullPath(aPath,fileName);
-	RFile64 file;
+	RFILE file;
 	r=file.Open(CShell::TheFs,fileName.FullName(),EFileRead|EFileWrite);
 	if(r==KErrNotFound)
 		r=file.Create(CShell::TheFs,fileName.FullName(),EFileRead|EFileWrite);
 	if (r==KErrNone)
 		{

changeset 279	957c583b417b
parent 254	1560c419b176
child 291	206a6eaaeb71