diff -r 57b9594f5772 -r 0008ccd16016 userlibandfileserver/fileserver/etshell/ts_std.h --- a/userlibandfileserver/fileserver/etshell/ts_std.h Thu Sep 02 21:54:16 2010 +0300 +++ b/userlibandfileserver/fileserver/etshell/ts_std.h Fri Sep 17 08:37:04 2010 +0300 @@ -144,10 +144,14 @@ 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: @@ -274,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); };