diff -r 0ffb4e86fcc9 -r a179b74831c9 userlibandfileserver/fileserver/etshell/ts_std.h --- a/userlibandfileserver/fileserver/etshell/ts_std.h Thu Jul 15 20:11:42 2010 +0300 +++ b/userlibandfileserver/fileserver/etshell/ts_std.h Thu Aug 19 11:14:22 2010 +0300 @@ -144,8 +144,16 @@ void SetDrivePath(const TDesC& aDes); static void NewLine(); static TKeyCode OutputStringToConsole(TBool aPageSwitch,TRefByValue aFmt,...); - static TKeyCode OutputStringToConsole(TBool aPageSwitch, const TDesC& aBuf); static TKeyCode OutputStringToConsole(const TDesC& aNotification,TBool aPageSwitch,TRefByValue aFmt,...); + + static TKeyCode WriteBufToConsole(TBool aPageSwitch, const TDesC& aBuf); + static TKeyCode WriteBufToConsole(TBool aPageSwitch, const TDesC& aBuf, const TDesC& aNotification); + + + static void Printf(TRefByValue aFmt, ...); + static void Print(const TDesC16& aBuf); + static void SetDbgConsoleEcho(TBool aOn) {iDbgPrint = aOn;} + public: static CConsoleBase* TheConsole; static CFileMan* TheFileMan; @@ -166,6 +174,7 @@ static TInt RunBatch(TDes& aCommand); static TInt RunExecutable(TDes& aCommand,TBool aWaitForCompletion); static TKeyCode PageSwitchDisplay(const TDesC& aBuf); + private: static TBuf currentPath; static TBuf drivePaths[KMaxDrives]; @@ -174,6 +183,9 @@ static CLineEdit* TheEditor; friend class ShellFunction; friend class CDllChecker; + + static TBool iDbgPrint; ///< if ETrue, the output from CShell::Printf is copied to the debug port + }; @@ -266,7 +278,7 @@ private: static TInt ShowDirectoryTree(TDes& aPath,TUint aSwitches,TDes& aTreeGraph); static TBool Certain(); - static void OutputContentsToConsole(RPointerArray& aText,TUint aSwitches); + static TBool OutputContentsToConsole(RPointerArray& aText,TUint aSwitches); static void OutputDirContentL(CDir* aDirList,RPointerArray& aText,TUint aSwitches); };