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

equal deleted inserted replaced

-:345b1ca54e88
+:039a3e647356
 #include "u32std.h"
 #include <u32hal.h>
 #include <nkern/nk_trace.h>
 #include "filesystem_fat.h"
-_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 ");
+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/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),
 	TShellCommand(_L("DEBUGPORT"),_L("Set or get debug port"),_L("[port]"),0,ShellFunction::DebugPort),
 	TShellCommand(_L("PLUGIN"),_L("Manage Plugins"),_L("[name][/A][/R][/M][/D]"),TShellCommand::EASwitch|TShellCommand::ERSwitch|TShellCommand::EMSwitch|TShellCommand::EDSwitch,ShellFunction::Plugin),
 TShellCommand(_L("DRVINFO"),_L("Print information about present drive(s) in the system"),_L("[DriveLetter:[\\]] [/p]\n/p - pause after each drive"),TShellCommand::EPSwitch,ShellFunction::DrvInfo),
 	TShellCommand(_L("SYSINFO"),_L("Print information about system features and status"),_L(""),0,ShellFunction::SysInfo),
 TShellCommand(_L("MOUNT"),_L("Mount / dismount file system on specified drive"),ptrMountHelp,TShellCommand::EUSwitch|TShellCommand::ESSwitch|TShellCommand::EFSwitch|TShellCommand::ERSwitch,ShellFunction::MountFileSystem),
-TShellCommand(_L("ECHO"),_L("Print out the command line to the console and standard debug port."),_L("[line to print out] [/Y/N]\n /Y turn ON copying console output to debug port\n /N turn it OFF "),TShellCommand::EYSwitch|TShellCommand::ENSwitch,ShellFunction::ConsoleEcho),
+TShellCommand(_L("ECHO"),_L("Print out the command line to the console and standard debug port."),_L("[line to print out]"),0,ShellFunction::ConsoleEcho),
 	TShellCommand(_L("RUNEXEC"),_L("Run a program in a loop"),_L("count filename[.exe] [/E/S/R]\n	/E - exit early on error\n	/S - count in seconds\n	     zero - run forever\n	/R - reset debug regs after each run"),TShellCommand::EESwitch|TShellCommand::ESSwitch|TShellCommand::ERSwitch,ShellFunction::RunExec),
 };
 LOCAL_C TInt pswd_DrvNbr(TDes &aPath, TInt &aDN);
 LOCAL_C TInt pswd_Password(TDes &aPath, TInt aPWNbr, TMediaPassword &aPW);
+_LIT(KLitNewLine,"\n");
 void CShell::NewLine()
 	{
-	Printf(KNl);
+	TheConsole->Printf(KLitNewLine());
 	}
 //
 // Skip the hexadecimal prefix if present and return EHex.  Return
 // EDecimal otherwise.
 {//-- run CheckDisk on the specified drive
 nRes=TheShell->TheFs.CheckDisk(aPath);
 	    if (nRes<0)
 		    return(nRes);
-	    //-- this is, actually, FAT FS specific error codes. Other file systems can report different values.
 	    switch(nRes)
 		    {
 	    case 0:
-		    CShell::TheConsole->Printf(_L("Completed - no errors found\n"));
+		    CShell::TheConsole->Printf(_L("Complete - no errors\n"));
 		    break;
 	    case 1:
 		    CShell::TheConsole->Printf(_L("Error - File cluster chain contains a bad value (<2 or >maxCluster)\n"));
 		    break;
 	    case 2:
 	TVolumeInfo vol;
 	TInt drive;
 	TInt r=CShell::TheFs.CharToDrive(CShell::currentPath[0], drive);
 	if (r!=KErrNone)
 		return(r);
 	if (aPath.Length()==0)
 		{
 		r=CShell::TheFs.Volume(vol, drive);
 		if (r==KErrNone)
-			CShell::Printf(_L("Volume Label:%S\n"),&vol.iName);
+			CShell::TheConsole->Printf(_L("Volume = %S\n"),&vol.iName);
 		return(r);
 		}
 	r=CShell::TheFs.SetVolumeLabel(aPath, drive);
 	return(r);
 	}
 TInt ShellFunction::Del(TDes& aPath,TUint aSwitches)
 		aText.Remove(j);
 		}
 }
-/**
-outputs content of the buffer to console according to settings passed in aSwitches
+void ShellFunction::OutputContentsToConsole(RPointerArray<HBufC>& aText,TUint aSwitches)
-@return ETrue if the user pressed Esc key
+//outputs content of the buffer to console according to settings passed in aSwitches
-*/
-TBool ShellFunction::OutputContentsToConsole(RPointerArray<HBufC>& aText,TUint aSwitches)
 	{
 	if ((aText.Count()>0)&&((aSwitches&TShellCommand::EWSwitch)!=0))
 		AlignTextIntoColumns(aText);
-	TKeyCode key=EKeyNull;
+	for (TInt i=0;i<aText.Count();i++)
-TInt i;
+		{
+		CShell::OutputStringToConsole(((aSwitches&TShellCommand::EPSwitch)!=0),*aText[i]);
-for(i=0;i<aText.Count();i++)
+		CShell::OutputStringToConsole(EFalse,_L("\n"));
-		{
-		key = CShell::WriteBufToConsole(((aSwitches&TShellCommand::EPSwitch)!=0),*aText[i]);
-		if(key == EKeyEscape)
-break;
-key = CShell::WriteBufToConsole(EFalse,_L("\n"));
-		if(key == EKeyEscape)
-break;
-		}
-//-- clean up string array
-for(i=0; i<aText.Count(); i++)
-{
 		delete aText[i];
 		}
+	//empty string array
 	aText.Reset();
-return (key == EKeyEscape);
 	}
 void ShellFunction::OutputDirContentL(CDir* aDirList,RPointerArray<HBufC>& aText,TUint aSwitches)
 //outputs content of a directory to console according to settings passed in aSwitches
 	{
 	TInt count=aDirList->Count();
 	TInt fileCount=0, dirCount=0, printCount=0;
 	TInt64 byteCount=0;
-TBool bBreak=EFalse;
 	//compose an array of strings describing entries in the directory
 	for (TInt j=0;j<count;j++)
 		{
 		HBufC* buf=NULL;
 			buf = HBufC::NewL(KMaxFileName+100);//reserve additional space for the creation time information
 			CleanupStack::PushL(buf);
 			TPtr name=buf->Des();
 			name=entry.iName;
-const TPtrC desName(entry.iName);
-const TBool bNameCut = desName.Length() > 26;
-_LIT(KDots, ">.."); //-- will be displayed if the name is longer than 26 characters
-_LIT(KSpc,  "   ");
 			if (entry.IsDir())
 				{
 				dirCount++;
+				name.Format(_L(" %- 26S   <DIR>         %+02d/%+02d/%- 4d  %02d:%02d:%02d.%06d"),
-name.Format(_L(" %- 26S%S<DIR>         %+02d/%+02d/%- 4d  %02d:%02d:%02d.%03d"),
+											&entry.iName,modTime.Day()+1,modTime.Month()+1,modTime.Year(),modTime.Hour(),modTime.Minute(),modTime.Second(),modTime.MicroSecond());
-				    &desName,
-bNameCut ? &KDots : &KSpc,
-modTime.Day()+1,modTime.Month()+1,modTime.Year(),modTime.Hour(),modTime.Minute(),modTime.Second(),modTime.MicroSecond());
-//name.Format(_L(" %- 26S   <DIR>         %+02d/%+02d/%- 4d  %02d:%02d:%02d.%06d"),
-				//							&entry.iName,modTime.Day()+1,modTime.Month()+1,modTime.Year(),modTime.Hour(),modTime.Minute(),modTime.Second(),modTime.MicroSecond());
 				}
 			else
 				{
 				TInt64 entrySize = entry.FileSize();
 				byteCount+=entrySize;
 				fileCount++;
+				name.Format(_L(" %- 32S%+ 15Lu   %+02d/%+02d/%- 4d  %02d:%02d:%02d.%06d"),
-name.Format(_L(" %- 26S%S%-11Lu   %+02d/%+02d/%- 4d  %02d:%02d:%02d.%03d"),
+											&entry.iName,entrySize,modTime.Day()+1,modTime.Month()+1,modTime.Year(),modTime.Hour(),modTime.Minute(),modTime.Second(),modTime.MicroSecond());
-				    &desName,
-bNameCut ? &KDots : &KSpc,
-entrySize,
-modTime.Day()+1,modTime.Month()+1,modTime.Year(),modTime.Hour(),modTime.Minute(),modTime.Second(),modTime.MicroSecond());
-//name.Format(_L(" %- 32S%+ 15Lu   %+02d/%+02d/%- 4d  %02d:%02d:%02d.%06d"),
-				//							&entry.iName,entrySize,modTime.Day()+1,modTime.Month()+1,modTime.Year(),modTime.Hour(),modTime.Minute(),modTime.Second(),modTime.MicroSecond());
 				}
 			}
 		User::LeaveIfError(aText.Append(buf ));
 		printCount++;
 		//print the contents if a screen size of data is available. This will prevent huge buffer allocation.
 		if(printCount == CShell::TheConsole->ScreenSize().iHeight)
 			{
-			bBreak = OutputContentsToConsole(aText,aSwitches);
+			OutputContentsToConsole(aText,aSwitches);
 			printCount=0;
 			}
 		CleanupStack::Pop();
-if(bBreak)
+		}
-break;
-		}
-if(bBreak)
-return; //-- the user has interrupted the listing
 	OutputContentsToConsole(aText,aSwitches);
-	//---------------------------------
+	//output summary information
-//-- print out summary information
+	CShell::OutputStringToConsole(((aSwitches&TShellCommand::EPSwitch)!=0),_L("    %d File%c\n"),fileCount,(fileCount==1)?' ':'s');
-	TBuf<100> buf;
+	if (fileCount!=0)
-buf.Format(_L("    %d File%c"), fileCount, (fileCount==1) ? ' ':'s');
+		{
-if(fileCount > 0)
+		CShell::OutputStringToConsole(((aSwitches&TShellCommand::EPSwitch)!=0),_L("  %lu byte%c\n"),byteCount,(fileCount==1)?' ':'s');
-		{
+		}
-buf.AppendFormat(_L(", %LU bytes"), byteCount);
-		}
+	TBuf<50> buf;// allocate string long enough for additional information(number of directories)
-buf.Append(KNl);
-CShell::OutputStringToConsole(((aSwitches&TShellCommand::EPSwitch)!=0), buf);
 	buf.Format(_L("    %d Director"),dirCount);
 	if (dirCount==1)
 		buf.AppendFormat(_L("y\n"));
 	else
 		buf.AppendFormat(_L("ies\n"));
 	CShell::OutputStringToConsole(((aSwitches&TShellCommand::EPSwitch)!=0),buf);
 	}
 TInt ShellFunction::Dir(TDes& aPath,TUint aSwitches)
 //
 //	Modified December 1997, to sort entries alphabetically
 	else file.Close();
 	TInt r=dir.Open(TheShell->TheFs,aPath,KEntryAttMaskSupported);
 	if (r!=KErrNone)
 		{
-		CShell::Printf(_L("File or directory not found\n"));
+		CShell::TheConsole->Printf(_L("File or directory not found\n"));
 		return(KErrNone);
 		}
 	CDir* anEntryList;
 	r=TheShell->TheFs.GetDir(aPath,KEntryAttMaskSupported,ESortByName,anEntryList);
 		}
 CleanupStack::PushL(anEntryList);
 	//Sets the new length of path to the position of the last path delimiter +1
 	aPath.SetLength(aPath.LocateReverse(KPathDelimiter)+1);
-	CShell::Printf(_L("Directory of %S\n"),&aPath);
+	CShell::TheConsole->Printf(_L("Directory of %S\n"),&aPath);
 	//allocate array to be used as an output buffer
 	RPointerArray<HBufC>* text=new(ELeave) RPointerArray<HBufC>();
 	TRAPD(error,OutputDirContentL(anEntryList,*text,aSwitches));
 	//we are not interesed in the error code because we need empty the buffer in any case
 	else
 		return(KErrNone);
 	};
+TInt ShellFunction::Edit(TDes& /*aPath*/,TUint /*aSwitches*/)
+//
+//	Dummy, used by edlin (now retired)
+//
+	{
+	return(KErrNone);
+	}
 TInt ShellFunction::Attrib(TDes& aPath,TUint aSwitches)
 {
 	ShellFunction::StripQuotes(aPath);
 if(aDrvInfo.iDriveAtt & KDriveAttLocal)         aPrintBuf.Append(_L("KDriveAttLocal,"));
 if(aDrvInfo.iDriveAtt & KDriveAttRom)           aPrintBuf.Append(_L("KDriveAttRom,"));
 if(aDrvInfo.iDriveAtt & KDriveAttRedirected)    aPrintBuf.Append(_L("KDriveAttRedirected,"));
 if(aDrvInfo.iDriveAtt & KDriveAttSubsted)       aPrintBuf.Append(_L("KDriveAttSubsted,"));
 if(aDrvInfo.iDriveAtt & KDriveAttInternal)      aPrintBuf.Append(_L("KDriveAttInternal,"));
-if(aDrvInfo.iDriveAtt & KDriveAttRemovable)     aPrintBuf.Append(_L("KDriveAttRemovable,"));
+if(aDrvInfo.iDriveAtt & KDriveAttRemovable)     aPrintBuf.Append(_L("KDriveAttRemovable"));
-if(aDrvInfo.iDriveAtt & KDriveAttRemote)        aPrintBuf.Append(_L("KDriveAttRemote,"));
+if(aDrvInfo.iDriveAtt & KDriveAttRemote)        aPrintBuf.Append(_L("KDriveAttRemote"));
-if(aDrvInfo.iDriveAtt & KDriveAttTransaction)   aPrintBuf.Append(_L("KDriveAttTransaction,"));
+if(aDrvInfo.iDriveAtt & KDriveAttTransaction)   aPrintBuf.Append(_L("KDriveAttTransaction"));
-if(aDrvInfo.iDriveAtt & KDriveAttPageable)              aPrintBuf.Append(_L("KDriveAttPageable,"));
+if(aDrvInfo.iDriveAtt & KDriveAttPageable)              aPrintBuf.Append(_L("KDriveAttPageable"));
-if(aDrvInfo.iDriveAtt & KDriveAttLogicallyRemovable)    aPrintBuf.Append(_L("KDriveAttLogicallyRemovable,"));
+if(aDrvInfo.iDriveAtt & KDriveAttLogicallyRemovable)    aPrintBuf.Append(_L("KDriveAttLogicallyRemovable"));
-if(aDrvInfo.iDriveAtt & KDriveAttHidden)                aPrintBuf.Append(_L("KDriveAttHidden,"));
+if(aDrvInfo.iDriveAtt & KDriveAttHidden)                aPrintBuf.Append(_L("KDriveAttHidden"));
 aPrintBuf.Append(_L("\n"));
 }
 //--------------------------------------------------------
 if(aDrvInfo.iMediaAtt & KMediaAttVariableSize)      aPrintBuf.Append(_L("KMediaAttVariableSize,"));
 if(aDrvInfo.iMediaAtt & KMediaAttDualDensity)       aPrintBuf.Append(_L("KMediaAttDualDensity,"));
 if(aDrvInfo.iMediaAtt & KMediaAttFormattable)       aPrintBuf.Append(_L("KMediaAttFormattable,"));
 if(aDrvInfo.iMediaAtt & KMediaAttWriteProtected)    aPrintBuf.Append(_L("KMediaAttWriteProtected,"));
 if(aDrvInfo.iMediaAtt & KMediaAttLockable)          aPrintBuf.Append(_L("KMediaAttLockable,"));
-if(aDrvInfo.iMediaAtt & KMediaAttLocked)            aPrintBuf.Append(_L("KMediaAttLocked,"));
+if(aDrvInfo.iMediaAtt & KMediaAttLocked)            aPrintBuf.Append(_L("KMediaAttLocked"));
-if(aDrvInfo.iMediaAtt & KMediaAttHasPassword)       aPrintBuf.Append(_L("KMediaAttHasPassword,"));
+if(aDrvInfo.iMediaAtt & KMediaAttHasPassword)       aPrintBuf.Append(_L("KMediaAttHasPassword"));
-if(aDrvInfo.iMediaAtt & KMediaAttReadWhileWrite)    aPrintBuf.Append(_L("KMediaAttReadWhileWrite,"));
+if(aDrvInfo.iMediaAtt & KMediaAttReadWhileWrite)    aPrintBuf.Append(_L("KMediaAttReadWhileWrite"));
-if(aDrvInfo.iMediaAtt & KMediaAttDeleteNotify)      aPrintBuf.Append(_L("KMediaAttDeleteNotify,"));
+if(aDrvInfo.iMediaAtt & KMediaAttDeleteNotify)      aPrintBuf.Append(_L("KMediaAttDeleteNotify"));
-if(aDrvInfo.iMediaAtt & KMediaAttPageable)          aPrintBuf.Append(_L("KMediaAttPageable,"));
+if(aDrvInfo.iMediaAtt & KMediaAttPageable)          aPrintBuf.Append(_L("KMediaAttPageable"));
 aPrintBuf.Append(_L("\n"));
 }
 @param  volInfo     volume information
 @param  aPrintBuf   buffer where the information will be printed to.
 */
 void FormatVolInfo(const TVolumeInfo& volInfo , TDes& aPrintBuf)
 {
-	aPrintBuf.Format(_L("VolSz:%ld Free:%ld"),volInfo.iSize, volInfo.iFree);
+	aPrintBuf.Format(_L("VolSz:%ld Free:%ld\n"),volInfo.iSize, volInfo.iFree);
-	aPrintBuf.AppendFormat(_L("\r\nVolId:0x%x VolName:%S\n"),volInfo.iUniqueID, &volInfo.iName);
+	aPrintBuf.AppendFormat(_L("VolId:0x%x VolName:%S\n"),volInfo.iUniqueID, &volInfo.iName);
 }
 //--------------------------------------------------------
 /** Bit flags that specify which information will be printed by PrintDrvInfo() */
 @param  apConsole   pointer to the console to print information into
 @param  aFlags      specifies which information to print out, @see TPrintDrvInfoFlags
 @return standard error code
 */
-TInt PrintDrvInfo(RFs& aFs, TInt aDrvNum, TUint aFlags = EAll)
+TInt PrintDrvInfo(RFs& aFs, TInt aDrvNum, CConsoleBase* apConsole, TUint aFlags = EAll)
 {
 	TInt        nRes;
 	TDriveInfo 	driveInfo;
 	TVolumeInfo volInfo;
 	TBuf<256>   Buf;
 	//-- get drive info
 	nRes = aFs.Drive(driveInfo, aDrvNum);
 	if(nRes != KErrNone)
 		{
-CShell::Printf(_L("Error: %d\n"), nRes);
+		CShell::TheConsole->Printf(_L("Error: %d\n"), nRes);
 		return nRes;   //-- can't get information about the drive
 		}
 nRes = aFs.Volume(volInfo, aDrvNum);
 const TBool bVolumeOK  = (nRes == KErrNone);
 	if(!bVolumeOK)
 	{//-- can't get information about the volume. It might be just corrupt/unformatted
-CShell::Printf(_L("Error getting volume info. code: %d\n"), nRes);
+		CShell::TheConsole->Printf(_L("Error getting volume info. code: %d\n"), nRes);
 if(nRes == KErrCorrupt)
 {
-CShell::Printf(_L("The volume might be corrupted or not formatted.\n"));
+CShell::TheConsole->Printf(_L("The volume might be corrupted or not formatted.\n"));
 }
 	}
 	//-- Print out information about file system installed
 	if(aFlags & EFSInfo)
 {
 //-- print out drive properties
-Buf.Format(_L("Drive %c: No:%d"), 'A'+aDrvNum, aDrvNum);
+Buf.Format(_L("\nDrive %c: No:%d"), '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);
+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.AppendFormat(_L(", Rugged:%d"), ruggedFS ? 1:0);
 }
-CShell::Printf(KNl);
+Buf.Append(_L("\n"));
-Buf.Append(KNl);
+apConsole->Printf(Buf);
-CShell::Printf(Buf);
 	    //-- print the FS name
 	    if(aFs.FileSystemName(Buf, aDrvNum) == KErrNone)
 	    {
 	        TFSName fsName;
 if(nRes == KErrNone)
 {
 Buf.AppendFormat(_L(" PExt:%S"), &fsName);
 }
-CShell::Printf(_L("Mounted FS:%S\n"), &Buf);
+apConsole->Printf(_L("Mounted FS:%S\n"), &Buf);
-//-- print out the list of supported file systems if there are more than 0
-nRes = aFs.SupportedFileSystemName(fsName, aDrvNum, 0); //-- try to get 1st child name
+//-- print out the list of supported file systems if there are more than 1
+nRes = aFs.SupportedFileSystemName(fsName, aDrvNum, 0+1); //-- try to get 2nd child name
 if(nRes == KErrNone)
 {
 Buf.Copy(_L("Supported FS: "));
 for(TInt i=0; ;++i)
 {
 break;
 Buf.AppendFormat(_L("%S, "), &fsName);
 }
-Buf.Append(KNl);
+Buf.Append(_L("\n"));
-CShell::Printf(Buf);
+apConsole->Printf(Buf);
 }
 TPckgBuf<TBool> boolPckg;
 nRes = aFs.QueryVolumeInfoExt(aDrvNum, EIsDriveFinalised, boolPckg);
 if(nRes == KErrNone)
 {
 if(boolPckg() >0)
-Buf.Copy(_L("Vol:Finalised "));
+Buf.Copy(_L("Volume: Finalised"));
 else
-Buf.Copy(_L("Vol:Not finalised "));
+Buf.Copy(_L("Volume: Not finalised"));
 }
 //-- print out cluster size that FS reported
 TVolumeIOParamInfo volIoInfo;
 nRes = aFs.VolumeIOParam(aDrvNum, volIoInfo);
 if(nRes == KErrNone)
 {
 if(volIoInfo.iBlockSize >= 0)
 {
-Buf.AppendFormat(_L("BlkSz:%d "), volIoInfo.iBlockSize);
+Buf.AppendFormat(_L(", BlkSz:%d"), volIoInfo.iBlockSize);
 }
 if(volIoInfo.iClusterSize >= 0)
 {
-Buf.AppendFormat(_L("ClSz:%d "), volIoInfo.iClusterSize);
+Buf.AppendFormat(_L(", ClSz:%d"), volIoInfo.iClusterSize);
 }
-Buf.AppendFormat(_L("CacheFlags:0x%x "), volInfo.iFileCacheFlags);
+Buf.AppendFormat(_L(", CacheFlags:0x%x"), volInfo.iFileCacheFlags);
 }
 if(Buf.Length())
 {
-Buf.Append(KNl);
+Buf.Append(_L("\n"));
-CShell::Printf(Buf);
+apConsole->Printf(Buf);
 }
 }
 	    }
 }//if(aFlags & EFSInfo)
 	//-- print media attributes
 	if(aFlags & EMediaTypeInfo)
 {
 FormatDrvMediaTypeInfo(driveInfo, Buf);
-CShell::Printf(Buf);
+	    apConsole->Printf(Buf);
 	}
 //-- print drive attributes
 	if(aFlags & EDrvAttInfo)
 {
 FormatDriveAttInfo(driveInfo, Buf);
-CShell::Printf(Buf);
+	    apConsole->Printf(Buf);
 }
 //-- print media attributes
 	if(aFlags & EMediaAttInfo)
 {
 	    FormatMediaAttInfo(driveInfo, Buf);
-CShell::Printf(Buf);
+	    apConsole->Printf(Buf);
 }
 	//-- print volume information
 	if(bVolumeOK && (aFlags & EVolInfo))
 {
 	    FormatVolInfo(volInfo, Buf);
-CShell::Printf(Buf);
+	    apConsole->Printf(Buf);
 }
 return KErrNone;
 	}
 	else
 		{//-- print info about specified drive
 		nDrv = DoExtractDriveLetter(aArgs);
 if(nDrv < 0)
 {
-CShell::Printf(_L("Invalid drive specification\n"));
+CShell::TheConsole->Printf(_L("Invalid drive specifier!\n"));
 return KErrNone;
 }
 		}
 	TInt nRes;
 	//-- get drives list
 	nRes=TheShell->TheFs.DriveList(driveList);
 	if(nRes != KErrNone)
 		{
-CShell::Printf(_L("\nError: %d"), nRes);
+		CShell::TheConsole->Printf(_L("\nError: %d"), nRes);
 		return nRes;
 		}
 	if(nDrv >=0)
 		{//-- the drive is specified
 		if(!driveList[nDrv])
 			{
-CShell::Printf(_L("Invalid drive specification\n"));
+			CShell::TheConsole->Printf(_L("Invalid drive specification\n"));
 			return KErrNone;
 			}
-		PrintDrvInfo(TheShell->TheFs, nDrv);
+		PrintDrvInfo(TheShell->TheFs, nDrv, CShell::TheConsole);
 		}
 	else
 		{//-- print information about all drives in the system
 		for (nDrv=0; nDrv < KMaxDrives; nDrv++)
 			{
 			if(!driveList[nDrv])
 				continue;   //-- skip unexisting drive
-			PrintDrvInfo(TheShell->TheFs, nDrv);
+			PrintDrvInfo(TheShell->TheFs, nDrv, CShell::TheConsole);
 			if(aSwitches & TShellCommand::EPSwitch)
 				{//-- /p switch, pause after each drive
-CShell::Printf(_L("\n--- press any key to continue or Esc to exit ---\n"));
+				CShell::TheConsole->Printf(_L("\n--- press any key to continue or Esc to exit ---\n"));
 				TKeyCode key = CShell::TheConsole->Getch();
 				if (key==EKeyEscape)
 					break;
 				}
 			else
 				{
-				CShell::Printf(_L("\n----------\n"));
+				CShell::TheConsole->Printf(_L("\n----------\n"));
-CShell::Printf(_L("\n--- press any key to continue or Esc to exit ---\n"));
 				}
 		}
 	}
 	return KErrNone;
 //-----------------------------------------------------------------------------------------------------------------------
-TInt DoDismountFS(RFs& aFs, TInt aDrvNum, TBool aForceDismount)
+TInt DoDismountFS(RFs& aFs, TInt aDrvNum)
 {
 TInt        nRes;
 TBuf<40>    fsName;
 nRes = aFs.FileSystemName(fsName, aDrvNum);
 if(nRes != KErrNone)
 return KErrNotFound;//-- nothing to dismount
-if(!aForceDismount)
-{//-- gaceful attempt to dismount the FS
 nRes = aFs.DismountFileSystem(fsName, aDrvNum);
 if(nRes != KErrNone)
 {
 CShell::TheConsole->Printf(_L("Can't dismount FS!\n"));
 return nRes;
 }
 else
 {
 CShell::TheConsole->Printf(_L("'%S' filesystem dismounted from drive %c:\n"), &fsName, 'A'+aDrvNum);
 return KErrNone;
-}
-}
-else
-{//-- dismount by force
-TRequestStatus rqStat;
-aFs.NotifyDismount(aDrvNum, rqStat, EFsDismountForceDismount);
-User::WaitForRequest(rqStat);
-CShell::TheConsole->Printf(_L("'%S' filesystem Forcedly dismounted from drive %c:\n"), &fsName, 'A'+aDrvNum);
-return rqStat.Int();
 }
 }
 //-----------------------------------------------------------------------------------------------------------------------
 TInt DoRemountFS(RFs& aFs, TInt aDrvNum)
 return KErrNotSupported;
 }
 }
 //-- 4. dismount the file system
-nRes = DoDismountFS(aFs, aDrvNum, EFalse);
+nRes = DoDismountFS(aFs, aDrvNum);
 if(nRes != KErrNone)
 return nRes;
 //-- 5. mount the FS back
 if(pextName.Length() > 0)
 //-----------------------------------------------------------------------------------------------------------------------
 /**
 Mount or dismount the file system on the specified drive.
-MOUNT <DriveLetter:[\]> <FSY:xxx> <FS:yyy> [PEXT:zzz] [/S] [/U] [/F]
+MOUNT <DriveLetter:[\]> <FSY:xxx> <FS:yyy> [PEXT:zzz] [/S] [/U]
 xxx is the *.fsy file system plugin name, like "elocal.fsy" or "elocal"
 yyy is the file system name that the fsy module exports, like "FAT"
 zzz is the optional parameter that specifies primary extension name
 /u dismounts a filesystem on the specified drive; e.g. "mount d: /u"
-additional switch /f in conjunction with /u will perform "forced unmounting" i.e. unmounting the FS
+/s for mounting FS specifies that the drive will be mounted as synchronous one.
-even it has opened files and / or directories. E.g. "mount d: /u /f"
+/f for forcing mounting the FS; the previous one will be automatically dismounted
+/r remount existing FS (dismount and mount it back)
-/s for mounting FS specifies that the drive will be mounted as a synchronous one.
-/f for forcing mounting the FS; the previous one will be automatically dismounted.
-example: "mount d: /f fsy:exfat fs:exfat" this command will dismount whatever FS ic currently mounted and
-mount exFAT FS instead
-/r remount existing FS (dismount and mount it back); example: "mount d: /r"
 */
 TInt ShellFunction::MountFileSystem(TDes& aArgs, TUint aSwitches)
 {
 	ShellFunction::StripQuotes(aArgs);
 aArgs.UpperCase();
 {
 nRes = DoRemountFS(fs, drvNum);
 return nRes;
 }
-//-- check if we dismounting the FS (/U switch).
+//-- check if we dismounting the FS (/U switch)
 if(aSwitches & TShellCommand::EUSwitch)
-{//-- also take nto account "/f" switch for forced dismounting
+{
-nRes = DoDismountFS(fs, drvNum, (aSwitches & TShellCommand::EFSwitch));
+nRes = DoDismountFS(fs, drvNum);
 if(nRes == KErrNotFound)
 {//-- nothing to dismount
 CShell::TheConsole->Printf(_L("specified drive doesn't have FS mounted\n"));
 return KErrNone;
 }
 //-- check if we need to forcedly dismount the existing FS (/F switch)
 if(aSwitches & TShellCommand::EFSwitch)
 {
-nRes = DoDismountFS(fs, drvNum, EFalse);
+nRes = DoDismountFS(fs, drvNum);
 if(nRes != KErrNotFound && nRes !=KErrNone)
 return nRes;
 }
 CShell::TheConsole->Printf(_L("Error mounting the filesystem! (%d)\n"), nRes);
 return nRes;
 }
-PrintDrvInfo(fs, drvNum, EFSInfo | EVolInfo);
+PrintDrvInfo(fs, drvNum, CShell::TheConsole, EFSInfo | EVolInfo);
 return KErrNone;
 }
 return nRes;
 }
 //-----------------------------------------------------------------------------------------------------------------------
-/**
-Hex Dump of a file
-*/
 TInt ShellFunction::Hexdump(TDes& aPath,TUint aSwitches)
 	{
 	ShellFunction::StripQuotes(aPath);
 	ParsePath(aPath);
 	RFile64 file;
 	TInt r=file.Open(TheShell->TheFs,aPath,EFileStream);
 	if (r!=KErrNone)
 		return(r);
+	TInt offset=0;
+	for (;;)
+		{
 		const TInt KLineLength = 16;
-TBuf<0x100> buf;
-TBuf<KLineLength> asciiBuf;
 		TBuf8<KLineLength> line;
-	for (;;)
-		{
 		r=file.Read(line);
 		if (r != KErrNone || line.Length() == 0)
 			break;
-		buf.Zero();
+		TBuf<KLineLength*3+2> hexaRep;
-asciiBuf.Zero();
+		TBuf<KLineLength> asciiRep;
 		for (TInt i=0; i<KLineLength; i++)
 			{
 			if (i == KLineLength/2)
 				{
-				buf.Append(' ');
+				hexaRep.Append(' ');
-				buf.Append(i<line.Length() ? '|' : ' ');
+				hexaRep.Append(i<line.Length() ? '|' : ' ');
 				}
-buf.Append(' ');
+			hexaRep.Append(' ');
 			if (i<line.Length())
 				{
-				buf.AppendNumFixedWidth(line[i], EHex, 2);
+				hexaRep.AppendNumFixedWidth(line[i], EHex, 2);
-				asciiBuf.Append(TChar(line[i]).IsPrint() ? line[i] : '.');
+				asciiRep.Append(TChar(line[i]).IsPrint() ? line[i] : '.');
 				}
 			else
-				buf.AppendFill(' ', 2);
+				hexaRep.AppendFill(' ', 2);
 			}
 		_LIT(KPrompt , " Hit escape to quit hexdump or any other key to continue\n");
+		_LIT(KLineFmt, " %+07x0:%S %S\n");
-buf.Append(_L(" "));
+		TKeyCode key=CShell::OutputStringToConsole(KPrompt ,(aSwitches&TShellCommand::EPSwitch)!=0,KLineFmt, offset++,&hexaRep, &asciiRep);
-buf.Append(asciiBuf);
-buf.Append(KNl);
-TKeyCode key= CShell::WriteBufToConsole((aSwitches&TShellCommand::EPSwitch)!=0, buf, KPrompt);
 		if (key==EKeyEscape)
 				break;
 		}
 	if (r == KErrNone)
 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);
 	{
 public:
 	TInt DisplayHelp();
 	TInt DisplayMessage(const TFullName& aName);
 	TInt DisplayCmdUnknown();
-	void GetAll(const TDes& aName);
+	TInt GetAll(const TDes& aName);
-	void GetProcesses(const TDes& aName);
+	TInt GetProcesses(const TDes& aName);
-	void GetThreads(const TDes& aName);
+	TInt GetThreads(const TDes& aName);
-	void GetChunks(const TDes& aName);
+	TInt GetChunks(const TDes& aName);
-	void GetServers(const TDes& aName);
+	TInt GetServers(const TDes& aName);
 //	TInt GetSessions(const TDes& aName);
-	void GetLibraries(const TDes& aName);
+	TInt GetLibraries(const TDes& aName);
 //	TInt GetLogicalChannels(const TDes& aName);
-	void GetLogicalDevices(const TDes& aName);
+	TInt GetLogicalDevices(const TDes& aName);
-	void GetPhysicalDevices(const TDes& aName);
+	TInt GetPhysicalDevices(const TDes& aName);
-	void GetSemaphores(const TDes& aName);
+	TInt GetSemaphores(const TDes& aName);
-	void GetMutexes(const TDes& aName);
+	TInt GetMutexes(const TDes& aName);
 private:
 	void DisplayHelpLine(const TDesC& aCommand, const TDesC& aDescription);
-	TBool Prepare(const TFullName& aName);
+	TInt Prepare(const TFullName& aName);
-	TBool Prepare(const TFullName& aName,TCallBack& aCallBack);
+	TInt Prepare(const TFullName& aName,TCallBack& aCallBack);
 	TInt Display(TFullName& aName);
 	TFullName iPrevName;
 	TCallBack iCallBack;
 	TBool useCallBack;
 	};
 	{
 	CShell::OutputStringToConsole(ETrue,_L("Not supported\n"));
 	return KErrNone;
 	}
-void TShowProcInfo::GetAll(const TDes& aName)
+TInt TShowProcInfo::GetAll(const TDes& aName)
 	{
 	GetProcesses(aName);
 	GetThreads(aName);
 	GetChunks(aName);
 	GetServers(aName);
 //	GetSessions(aName);
 //	GetLogicalChannels(aName);
 	GetLogicalDevices(aName);
 	GetPhysicalDevices(aName);
 	GetSemaphores(aName);
 	GetMutexes(aName);
+	return KErrNone;
 	}
-void TShowProcInfo::GetProcesses(const TDes& aName)
+TInt TShowProcInfo::GetProcesses(const TDes& aName)
 	{
 	TFindProcess findHb;
 	findHb.Find(aName);
 	TFullName name;
+	Prepare(_L("PROCESSES"));
-if(!Prepare(_L("PROCESSES")))
-return;
 	while (findHb.Next(name)==KErrNone)
 		{
 		Display(name);
 		}
+	return KErrNone;
 	}
-void TShowProcInfo::GetThreads(const TDes& aName)
+TInt TShowProcInfo::GetThreads(const TDes& aName)
 	{
 	TInt threads=0;
 	TFindThread findHb;
 	findHb.Find(aName);
 	TFullName name;
 	TAny* findPtr=(TAny*)&findHb;
 //	Modified by WR, November 1997
 	TCallBack threadCallBack(GetThreadInfo,findPtr);
+	Prepare(_L("THREADS"),threadCallBack);
-if(!Prepare(_L("THREADS"),threadCallBack))
-return;
 	while (findHb.Next(name)==KErrNone)
 		{
 		Display(name);
 		threads += 1;
 		}
 		{
 		TFullName message;
 		message.Format(_L("? No threads called %S"), &aName);
 		DisplayMessage(message);
 		}
+	return KErrNone;
+//	End of modification
 	}
-void TShowProcInfo::GetChunks(const TDes& aName)
+TInt TShowProcInfo::GetChunks(const TDes& aName)
 	{
 	TFindChunk findHb;
 	findHb.Find(aName);
 	TFullName name;
 	TAny* namePtr=(TAny*)&name;
 	TCallBack chunkCallBack(GetChunkInfo,namePtr);
+	Prepare(_L("CHUNKS & SIZES"),chunkCallBack);
-if(!Prepare(_L("CHUNKS & SIZES"),chunkCallBack))
-return;
 	TInt totalChunkSize=0;
 	TInt protectedChunks = 0;
 	while (findHb.Next(name)==KErrNone)
 		{
 		Display(name);
 */
 		}
 	CShell::OutputStringToConsole(ETrue,_L("  Total Chunk Size = %dk\n"),totalChunkSize);
 	if(protectedChunks)
 		CShell::OutputStringToConsole(ETrue,_L("  %d Protected chunks not counted\n"),protectedChunks);
+	return KErrNone;
+	}
-	}
+TInt TShowProcInfo::GetServers(const TDes& aName)
-void TShowProcInfo::GetServers(const TDes& aName)
 	{
 	TFindServer findHb;
 	findHb.Find(aName);
 	TFullName name;
-	if(!Prepare(_L("SERVERS")))
+	Prepare(_L("SERVERS"));
-return;
 	while (findHb.Next(name)==KErrNone)
 		{
 		Display(name);
 		}
+	return KErrNone;
 	}
 /*	TInt TShowProcInfo::GetSessions(const TDes& aName)
 	{
 		Display(name);
 		}
 	return KErrNone;
 	}
 */
-void TShowProcInfo::GetLibraries(const TDes& aName)
+TInt TShowProcInfo::GetLibraries(const TDes& aName)
 	{
 	TFindLibrary findHb;
 	findHb.Find(aName);
 	TFullName name;
-	if(!Prepare(_L("LIBRARIES")))
+	Prepare(_L("LIBRARIES"));
-return;
 	while (findHb.Next(name)==KErrNone)
 		{
 		Display(name);
 		}
+	return KErrNone;
 	}
 /*
 TInt TShowProcInfo::GetLogicalChannels(const TDes& aName)
 	{
 		}
 	return KErrNone;
 	}
 */
-void TShowProcInfo::GetLogicalDevices(const TDes& aName)
+TInt TShowProcInfo::GetLogicalDevices(const TDes& aName)
 	{
 	TFindLogicalDevice findHb;
 	findHb.Find(aName);
 	TFullName name;
+	Prepare(_L("LOGICAL DEVICES"));
-	if(!Prepare(_L("LOGICAL DEVICES")))
-return;
 	while (findHb.Next(name)==KErrNone)
 		{
 		Display(name);
 		}
+	return KErrNone;
 	}
-void TShowProcInfo::GetPhysicalDevices(const TDes& aName)
+TInt TShowProcInfo::GetPhysicalDevices(const TDes& aName)
 	{
 	TFindPhysicalDevice findHb;
 	findHb.Find(aName);
 	TFullName name;
+	Prepare(_L("PHYSICAL DEVICES"));
-if(!Prepare(_L("PHYSICAL DEVICES")))
-return;
 	while (findHb.Next(name)==KErrNone)
 		{
 		Display(name);
 		}
+	return KErrNone;
 	}
-void TShowProcInfo::GetSemaphores(const TDes& aName)
+TInt TShowProcInfo::GetSemaphores(const TDes& aName)
 	{
 	TFindSemaphore findHb;
 	findHb.Find(aName);
 	TFullName name;
-	if(!Prepare(_L("SEMAPHORES")))
+	Prepare(_L("SEMAPHORES"));
-return;
 	while (findHb.Next(name)==KErrNone)
 		{
 		Display(name);
 		}
+	return KErrNone;
 	}
-void TShowProcInfo::GetMutexes(const TDes& aName)
+TInt TShowProcInfo::GetMutexes(const TDes& aName)
 	{
 	TFindMutex findHb;
 	findHb.Find(aName);
 	TFullName name;
-	if(!Prepare(_L("MUTEXES")))
+	Prepare(_L("MUTEXES"));
-return;
 	while (findHb.Next(name)==KErrNone)
 		{
 		Display(name);
 		}
+	return KErrNone;
 	}
 void TShowProcInfo::DisplayHelpLine(const TDesC& aCommand, const TDesC& aDescription)
 	{
 	CShell::OutputStringToConsole(ETrue,_L("%- *S%S\n"),8,&aCommand,&aDescription);
 	}
-TBool TShowProcInfo::Prepare(const TFullName& aName)
+TInt TShowProcInfo::Prepare(const TFullName& aName)
 	{
 	iPrevName=_L("");
-	TKeyCode key = CShell::OutputStringToConsole(ETrue,_L("--%S-->\n"),&aName);
+	CShell::OutputStringToConsole(ETrue,_L("--%S-->\n"),&aName);
-if(key==EKeyEscape)
-return EFalse;
 	useCallBack=EFalse;
-return ETrue;
+	return KErrNone;
 	}
-TBool  TShowProcInfo::Prepare(const TFullName& aName,TCallBack& aCallBack)
+TInt TShowProcInfo::Prepare(const TFullName& aName,TCallBack& aCallBack)
 	{
 	iPrevName=_L("");
-	TKeyCode key = CShell::OutputStringToConsole(ETrue,_L("--%S-->\n"),&aName);
+	CShell::OutputStringToConsole(ETrue,_L("--%S-->\n"),&aName);
-if(key==EKeyEscape)
-return EFalse;
 	useCallBack=ETrue;
 	iCallBack=aCallBack;
+	return KErrNone;
-return ETrue;
 	}
 TInt TShowProcInfo::Display(TFullName& aName)
 //	Modifications by WR, November 1997
 				break;
 			}
 		while (posA>=0)
 			{
 			TPtrC16 temp_desc=aName.Left(posA);
+			CShell::OutputStringToConsole(ETrue,_L("%+ *S\n"),toTab+temp_desc.Left(posA).Length(),&temp_desc);
-TKeyCode key = CShell::OutputStringToConsole(ETrue,_L("%+ *S\n"),toTab+temp_desc.Left(posA).Length(),&temp_desc);
-			if (key==EKeyEscape)
-			    break;
 			toTab+=3;
 			aName.Delete(0,posA+2);
 			posA=aName.Match(_L("*::*"));
 			}
 		}
 TBuf<0x1> asterisk=_L("*");
 	TName processPrefix=asterisk;
 	TBool abort=EFalse;
 	TBool processSelected=EFalse;
 	TBuf<0x16> prompt=_L("ps>");
-	showProcInfo.GetProcesses(processPrefix);
+	r=showProcInfo.GetProcesses(processPrefix);
 	do
 		{
 		TBuf<0x10> command;
 		CShell::TheEditor->Edit(prompt, &command, ETrue);
 		while (command.Length() && !abort && r==KErrNone)
 					else
 						{
 						if (findP.Next(findName)==KErrNone)
 							{
 							r=showProcInfo.DisplayMessage(_L("command prefixes more than one process"));
-							showProcInfo.GetProcesses(chosenP);
+							r=showProcInfo.GetProcesses(chosenP);
 							}
 						else
 							{
 							processSelected=ETrue;
 							processPrefix=chosenP;
 						}
 					}
 					break;
 				case 'A':
 					{
-					showProcInfo.GetAll(processPrefix);
+					r=showProcInfo.GetAll(processPrefix);
 					command.Zero();
 					}
 					break;
 				case 'P':
-					showProcInfo.GetProcesses(asterisk);
+					r=showProcInfo.GetProcesses(asterisk);
 					break;
 				case 'T':
-					showProcInfo.GetThreads(processPrefix);
+					r=showProcInfo.GetThreads(processPrefix);
 					break;
 				case 'C':
-					showProcInfo.GetChunks(processPrefix);
+					r=showProcInfo.GetChunks(processPrefix);
 					break;
 				case 'S':
-					showProcInfo.GetServers(processPrefix);
+					r=showProcInfo.GetServers(processPrefix);
 					break;
 /*				case 'I':
 					r=showProcInfo.GetSessions(processPrefix);
 					break;
 */				case 'L':
-					showProcInfo.GetLibraries(processPrefix);
+					r=showProcInfo.GetLibraries(processPrefix);
 					break;
 //				case 'G':
 //					r=showProcInfo.GetLogicalChannels(processPrefix);
 //					break;
 				case 'V':
-					showProcInfo.GetLogicalDevices(processPrefix);
+					r=showProcInfo.GetLogicalDevices(processPrefix);
 					break;
 				case 'D':
-					showProcInfo.GetPhysicalDevices(processPrefix);
+					r=showProcInfo.GetPhysicalDevices(processPrefix);
 					break;
 				case 'E':
-					showProcInfo.GetSemaphores(processPrefix);
+					r=showProcInfo.GetSemaphores(processPrefix);
 					break;
 				case 'M':
-					showProcInfo.GetMutexes(processPrefix);
+					r=showProcInfo.GetMutexes(processPrefix);
 					break;
 				default:
 					{
 					showProcInfo.DisplayCmdUnknown();
 					command.Zero();
 	TUint8 c;
 	for (; p<pE; p+=2)
 		c=*p, *p=p[1], p[1]=c;
 	}
+_LIT(KLitPercentS, "%S");
 TInt ShellFunction::Type(TDes& aPath,TUint aSwitches)
 	{
 	ParsePath(aPath);
 	RFile64 file;
 	TInt r=file.Open(TheShell->TheFs,aPath,EFileStreamText|EFileShareReadersOnly);
 			}
 		while ((r=buf.Locate('\n'))!=KErrNotFound)
 			{
 			nchars=0;
 			TPtrC bufLeft=buf.Left(r+1);
-key = CShell::WriteBufToConsole((aSwitches&TShellCommand::EPSwitch)!=0, bufLeft);
+			key = CShell::OutputStringToConsole((aSwitches&TShellCommand::EPSwitch)!=0,KLitPercentS(), &bufLeft);
 			buf.Set(buf.Mid(r+1));
 		if(key == EKeyEscape)
 goto exit;
 			}
 		nchars=buf.Length();
 		if (nchars)
 			{
-		key = CShell::WriteBufToConsole((aSwitches&TShellCommand::EPSwitch)!=0, buf);
+key = CShell::OutputStringToConsole((aSwitches&TShellCommand::EPSwitch)!=0,KLitPercentS(), &buf);
 		if(key == EKeyEscape)
 goto exit;
 }
 			}
 		}
 	return err;
 	}
+_LIT(KCrNl, "\r\n");
-//----------------------------------------------------------------------
-void CShell::Print(const TDesC16& aBuf)
-{
-TheConsole->Write(aBuf);
-if(iDbgPrint)
-{
-const TInt bufLen = aBuf.Length();
-if(bufLen >1 && aBuf[bufLen-1] == '\n' && aBuf[bufLen-2] != '\r')
-{
-RDebug::RawPrint(aBuf.Left(bufLen-1));
-RDebug::RawPrint(_L8("\r\n"));
-}
-else if(bufLen == 1 && aBuf[bufLen-1] == '\n')
-{
-RDebug::RawPrint(_L8("\r\n"));
-}
-else
-{
-RDebug::RawPrint(aBuf);
-}
-}
-}
-void CShell::Printf(TRefByValue<const TDesC16> aFmt, ...)
-{
-	TBuf<0x200> buf;
-	VA_LIST list;
-	VA_START(list, aFmt);
-	// coverity[uninit_use_in_call]
-	buf.FormatList(aFmt, list);
-if(!buf.Length())
-return;
-Print(buf);
-}
 void SIPrintf(TRefByValue<const TDesC16> aFmt, ...)
 	{
-	TBuf<0x200> buf;
+	TBuf<256> buf;
 	VA_LIST list;
 	VA_START(list, aFmt);
 	// coverity[uninit_use_in_call]
 	buf.FormatList(aFmt, list);
 	buf.Append(KCrNl);
 	aProg.UpperCase();
 	if (aProg.FindF(_L(".EXE")) == KErrNotFound && (aProg.Length()+4) <= KShellMaxCommandLine)
 		aProg.Append(_L(".EXE"));
 #ifdef _DEBUG
-	CShell::Printf(_L("RUNEXEC: command %S, parameters %S, count %d, forever %d, issecs %d, exiterr %d"),
+	SIPrintf(_L("RUNEXEC: command %S, parameters %S, count %d, forever %d, issecs %d, exiterr %d"),
 		&aProg, &parameters, count, forever, countIsSecs, exitOnErr);
 #endif
 	TInt i=0;
 	FOREVER
 		{
 		TBuf<KMaxExitCategoryName> exitCat(0);
 		r = newProcess.Create(aProg, parameters);
 		if (r != KErrNone)
 			{
-			CShell::Printf(KRunExecFailedProcessCreate, &aProg, r);
+			SIPrintf(KRunExecFailedProcessCreate, &aProg, r);
 			return (r);						// this is systematic - must return
 			}
 		newProcess.Logon(status);
 		newProcess.Resume();
 		User::WaitForRequest(status);
 		newProcess.Close();
 		timeCurrent.HomeTime();
 		timeTaken = timeCurrent.MicroSecondsFrom(timeStart);
 		TInt msecs = I64LOW(timeTaken.Int64() / 1000);
-		CShell::Printf(KRunExecReportStatusAndTime, msecs, i+1, exitType, retcode, &exitCat);
+		SIPrintf(KRunExecReportStatusAndTime, msecs, i+1, exitType, retcode, &exitCat);
 		if (resetDebugRegs)
 			{
 			TheShell->TheFs.SetDebugRegister(0);
 			User::SetDebugMask(0);
 //-------------------------------------------------------------------------
 /**
 Print out the command line to the console and standard debug port.
-echo [some text] [/y] [/n]
-		/Y : switches ON copying console output to the debug port
-		/N : switches OFF copying console output to the debug port
 */
-TInt ShellFunction::ConsoleEcho(TDes& aArgs, TUint aSwitches)
+TInt ShellFunction::ConsoleEcho(TDes& aArgs, TUint /*aSwitches*/)
 {
-if(aSwitches & TShellCommand::EYSwitch)
-{
-CShell::SetDbgConsoleEcho(ETrue);
-}
-else
-if(aSwitches & TShellCommand::ENSwitch)
-{
-CShell::SetDbgConsoleEcho(EFalse);
-}
-if(aArgs.Length())
 SIPrintf(aArgs);
 return KErrNone;
 }

branch	RCL_3
changeset 294	039a3e647356
parent 257	3e88ff8f41d5