Merge branch 'master' into unicode

1 files changed, 15 insertions, 15 deletions

diff --git a/src/unstable/myriadfs.cpp b/src/unstable/myriadfs.cpp
index 7a87662..6b51195 100644
--- a/src/unstable/myriadfs.cpp
+++ b/src/unstable/myriadfs.cpp
@@ -121,7 +121,7 @@ Bu::MyriadStream Bu::MyriadFs::open( const Bu::String &sPath, int /*iMode*/,
     try
     {
         iNode = lookupInode( sPath, iParent );
-        sio << "File found." << sio.nl;
+//        sio << "File found." << sio.nl;
         // The file was found
         return openByInode( iNode );
     }
@@ -137,10 +137,10 @@ Bu::MyriadStream Bu::MyriadFs::open( const Bu::String &sPath, int /*iMode*/,
         // The file wasn't found, but the path leading up to it was.
         // first, figure out the final path element...
         Bu::String sName = filePart( sPath );
-        sio << "End filename: " << sName << sio.nl;
-        sio << "Parent inode: " << iParent << sio.nl;
+//        sio << "End filename: " << sName << sio.nl;
+//        sio << "Parent inode: " << iParent << sio.nl;
         iNode = create( iParent, sName, (uPerms&permMask)|typeRegFile, 0 );
-        sio << "New iNode: " << iNode << sio.nl;
+//        sio << "New iNode: " << iNode << sio.nl;
         return openByInode( iNode );
     }
 }
@@ -164,7 +164,7 @@ void Bu::MyriadFs::create( const Bu::String &sPath, uint16_t iPerms,
     try
     {
         iNode = lookupInode( sPath, iParent );
-        sio << "File found." << sio.nl;
+//        sio << "File found." << sio.nl;
     }
     catch( Bu::MyriadFsException &e )
     {
@@ -178,10 +178,10 @@ void Bu::MyriadFs::create( const Bu::String &sPath, uint16_t iPerms,
         // The file wasn't found, but the path leading up to it was.
         // first, figure out the final path element...
         Bu::String sName = filePart( sPath );
-        sio << "End filename: " << sName << sio.nl;
-        sio << "Parent inode: " << iParent << sio.nl;
+//        sio << "End filename: " << sName << sio.nl;
+//        sio << "Parent inode: " << iParent << sio.nl;
         iNode = create( iParent, sName, iPerms, uSpecial );
-        sio << "New iNode: " << iNode << sio.nl;
+//        sio << "New iNode: " << iNode << sio.nl;
     }
     // The file was found
     //throw Bu::MyriadFsException("Path already exists.");
@@ -213,10 +213,10 @@ void Bu::MyriadFs::mkSymLink( const Bu::String &sTarget,
         // The file wasn't found, but the path leading up to it was.
         // first, figure out the final path element...
         Bu::String sName = filePart( sPath );
-        sio << "End filename: " << sName << sio.nl;
-        sio << "Parent inode: " << iParent << sio.nl;
+//       sio << "End filename: " << sName << sio.nl;
+//        sio << "Parent inode: " << iParent << sio.nl;
         iNode = create( iParent, sName, 0777|typeSymLink, 0 );
-        sio << "New iNode: " << iNode << sio.nl;
+//        sio << "New iNode: " << iNode << sio.nl;
         MyriadStream ms = openByInode( iNode );
         ms.write( sTarget );
         return;
@@ -249,8 +249,8 @@ void Bu::MyriadFs::mkHardLink( const Bu::String &sTarget,
         // The file wasn't found, but the path leading up to it was.
         // first, figure out the final path element...
         Bu::String sName = filePart( sPath );
-        sio << "End filename: " << sName << sio.nl;
-        sio << "Parent inode: " << iParent << sio.nl;
+//        sio << "End filename: " << sName << sio.nl;
+//        sio << "Parent inode: " << iParent << sio.nl;
         addToDir( iParent, iNode, sName );
         MyriadStream is = mStore.openStream( 2 );
         RawStat rs;
@@ -558,8 +558,8 @@ int32_t Bu::MyriadFs::allocInode( uint16_t uPerms, uint32_t uSpecial )
                 
                 case typeDir:
                     rs.uStreamIndex = mStore.createStream();
-                    sio << "Creating directory node, storage: "
-                        << rs.uStreamIndex << sio.nl;
+//                    sio << "Creating directory node, storage: "
+//                        << rs.uStreamIndex << sio.nl;
                     {
                         Bu::MyriadStream msDir = mStore.openStream(
                             rs.uStreamIndex