MyriadFs improvements and new helper tool.

I think the interface could be a lot better...but it does work and we
can use it examine and work with MyriadFs files.

6 files changed, 278 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index 9009abe..532bcbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 /myriad.exe

 /jsontool.exe

 /rununits.exe

+/myriadfs.exe

 /autoconfig

 /bin2cpp

 /mkunit

@@ -14,6 +15,7 @@
 /viewcsv

 /jsontool

 /rununits

+/myriadfs

 .*.swp

 .*.un~

 /src/autoconfig.h

diff --git a/default.bld b/default.bld
index aed9dee..07b562c 100644
--- a/default.bld
+++ b/default.bld
@@ -54,9 +54,9 @@ action "unit"
     build: targets("unit tests");
 }
 
-action "myriadfs"
+action "mount.myriadfs"
 {
-    build: "myriadfs";
+    build: "mount.myriadfs";
 }
 
 target ["src/autoconfig.h", "src/version.h"]
@@ -181,12 +181,12 @@ target files("src/extra/*.cpp").replace("src/extra/","").replace(".cpp","")
 // I'm honestly not 100% sure what the policy should be yet, but this seems like
 // I shouldn't have to do it this way.
 //
-target "src/extra/myriadfs.o"
+target "src/extra/mount.myriadfs.o"
 {
     CXXFLAGS += "-D_FILE_OFFSET_BITS=64";
 }
 
-target "myriadfs"
+target "mount.myriadfs"
 {
     LDFLAGS += "-lfuse -lpthread";
 }
diff --git a/src/extra/myriadfs.cpp b/src/extra/mount.myriadfs.cpp
index ff2df3d..ff2df3d 100644
--- a/src/extra/myriadfs.cpp
+++ b/src/extra/mount.myriadfs.cpp
diff --git a/src/tests/myriadfs.cpp b/src/tests/myriadfs.cpp
index cb6c6c3..1266e4b 100644
--- a/src/tests/myriadfs.cpp
+++ b/src/tests/myriadfs.cpp
@@ -30,6 +30,14 @@ int main()
         Bu::MyriadStream ms = mfs.open("/etc/hello", Bu::MyriadFs::Read );
         ms.write("world, again!");
     }
+    {
+        Bu::MyriadStream ms = mfs.open("/etc/trunc", Bu::MyriadFs::Write );
+        ms.write("[longer text shouldn't be seen]");
+    }
+    {
+        Bu::MyriadStream ms = mfs.open("/etc/trunc", Bu::MyriadFs::Write|Bu::MyriadFs::Create|Bu::MyriadFs::Truncate );
+        ms.write("[short text]");
+    }
 
     sio << "Reading files..." << sio.nl;
     {
@@ -44,5 +52,11 @@ int main()
         buf[ms.read( buf, 512 )] = '\0';
         sio << "read: '" << buf << "'" << sio.nl;
     }
+    {
+        Bu::MyriadStream ms = mfs.open("/etc/trunc", Bu::MyriadFs::Read );
+        char buf[512];
+        buf[ms.read( buf, 512 )] = '\0';
+        sio << "read: '" << buf << "'" << sio.nl;
+    }
 }
 
diff --git a/src/tools/myriadfs.cpp b/src/tools/myriadfs.cpp
new file mode 100644
index 0000000..9051779
--- /dev/null
+++ b/src/tools/myriadfs.cpp
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2007-2023 Xagasoft, All rights reserved.
+ *
+ * This file is part of the libbu++ library and is released under the
+ * terms of the license contained in the file LICENSE.
+ */
+
+#include "bu/sio.h"
+#include "bu/streamstack.h"
+#include "bu/file.h"
+#include "bu/myriadfs.h"
+#include "bu/myriadstream.h"
+#include "bu/optparser.h"
+
+enum Mode
+{
+    modeList,
+    modeCat,
+    modeCopyIn,
+    modeCopyOut,
+    modeMkdir,
+    modeInitialize,
+
+    modeNone
+};
+
+Bu::Formatter &operator>>( Bu::Formatter &f, Mode & /*e*/ )
+{
+    Bu::sio << "Uh oh, the formatter was called..." << Bu::sio.nl;
+    return f;
+}
+
+class Options : public Bu::OptParser
+{
+public:
+    Options( int argc, char *argv[] ) :
+        eMode( modeNone ),
+        iBlockSize( 64 )
+    {
+        addHelpBanner("Options:");
+        addOption( sFile, 'f', "file", "Myriadfs file");
+        addOption( iBlockSize, 'b', "block-size",
+            "Specify the block size when initializing a new MyriadFs");
+
+        setNonOption( Bu::slot( this, &Options::nonOption ) );
+
+        addHelpOption();
+
+        parse( argc, argv );
+    }
+
+    int nonOption( Bu::Array<Bu::String> aParams )
+    {
+        if( eMode == modeNone )
+        {
+            //Bu::println("Checking mode");
+            // First param, must be the mode
+            if( aParams[0] == "ls" )
+                eMode = modeList;
+            else if( aParams[0] == "cat" )
+                eMode = modeCat;
+            else if( aParams[0] == "cp-in" )
+                eMode = modeCopyIn;
+            else if( aParams[0] == "cp-out" )
+                eMode = modeCopyOut;
+            else if( aParams[0] == "mkdir" )
+                eMode = modeMkdir;
+            else if( aParams[0] == "initialize" )
+                eMode = modeInitialize;
+            else
+                Bu::println("Unknown command, try --help");
+            return 0;
+        } else {
+            lParams.append( aParams[0] );
+        }
+        //Bu::println("Got option: \"%1\"").arg( aParams[0] );
+        return 0;
+    }
+
+    Mode eMode;
+    Bu::String sFile;
+    Bu::StringList lParams;
+    int iBlockSize;
+};
+
+int main( int argc, char *argv[] )
+{
+    Options opt( argc, argv );
+
+    if( opt.sFile.isEmpty() )
+    {
+        Bu::println("You must specify a MyriadFs stream (see -f).\n");
+        return 1;
+    }
+
+    if( opt.eMode == modeNone )
+    {
+        Bu::println("Specify an operation to perfrom.\n");
+        return 1;
+    }
+
+    int iFlags = Bu::File::ReadWrite;
+
+    if( opt.eMode == modeInitialize )
+    {
+        iFlags |= Bu::File::Create|Bu::File::Truncate;
+    }
+
+    Bu::File fFs( opt.sFile, iFlags );
+    Bu::MyriadFs mFs( fFs, opt.iBlockSize );
+
+    switch( opt.eMode )
+    {
+                case modeList:
+            {
+                Bu::String sPath = "/";
+                if( opt.lParams.getSize() > 0 )
+                {
+                    sPath = opt.lParams.first();
+                }
+                Bu::MyriadFs::Dir lEnt = mFs.readDir( sPath );
+                for( Bu::MyriadFs::Dir::iterator i = lEnt.begin(); i; i++ )
+                {
+                    Bu::String sPerm;
+                    sPerm += ((*i).uPerms&Bu::MyriadFs::typeDir)?"d":
+                        ((*i).uPerms&Bu::MyriadFs::typeChrDev)?"c":
+                        ((*i).uPerms&Bu::MyriadFs::typeBlkDev)?"b":
+                        ((*i).uPerms&Bu::MyriadFs::typeSymLink)?"l":
+                        ((*i).uPerms&Bu::MyriadFs::typeSocket)?"s":"-";
+                    sPerm += ((*i).uPerms&Bu::MyriadFs::permUsrR)?"r":"-";
+                    sPerm += ((*i).uPerms&Bu::MyriadFs::permUsrW)?"w":"-";
+                    sPerm += ((*i).uPerms&Bu::MyriadFs::permUsrX)?"x":"-";
+                    sPerm += ((*i).uPerms&Bu::MyriadFs::permGrpR)?"r":"-";
+                    sPerm += ((*i).uPerms&Bu::MyriadFs::permGrpW)?"w":"-";
+                    sPerm += ((*i).uPerms&Bu::MyriadFs::permGrpX)?"x":"-";
+                    sPerm += ((*i).uPerms&Bu::MyriadFs::permOthR)?"r":"-";
+                    sPerm += ((*i).uPerms&Bu::MyriadFs::permOthW)?"w":"-";
+                    sPerm += ((*i).uPerms&Bu::MyriadFs::permOthX)?"x":"-";
+                    Bu::println("%1 %2 %3:%4 %5 %6")
+                        .arg( sPerm )
+                        .arg( (*i).iNode )
+                        .arg( (*i).iUser )
+                        .arg( (*i).iGroup )
+                        .arg( (*i).iSize )
+                        .arg( (*i).sName );
+                }
+            }
+                        break;
+
+                case modeCat:
+            {
+                if( opt.lParams.isEmpty() )
+                {
+                    Bu::println("Specify at least one file.");
+                    return 1;
+                }
+                int iBlockSize = 1024*1024;
+                char *pBuf = new char[iBlockSize];
+                for( Bu::StringList::iterator i = opt.lParams.begin(); i; i++ )
+                {
+                    Bu::MyriadStream ms = mFs.open( *i, Bu::MyriadFs::Read );
+                    int iRead = 0;
+                    do
+                    {
+                        iRead = ms.read( pBuf, iBlockSize );
+                        if( iRead > 0 )
+                        {
+                            Bu::sioRaw.write( pBuf, iRead );
+                        }
+                    } while( iRead == iBlockSize );
+                }
+                delete[] pBuf;
+            }
+                        break;
+
+                case modeCopyIn:
+            {
+                if( opt.lParams.getSize() != 2 )
+                {
+                    Bu::println("Specify a source file and destination file.");
+                    return 1;
+                }
+                int iBlockSize = 1024*1024;
+                char *pBuf = new char[iBlockSize];
+                Bu::File fs = Bu::File(
+                    opt.lParams.first(), Bu::File::Read );
+                Bu::MyriadStream ms = mFs.open(
+                    opt.lParams.last(), Bu::MyriadFs::WriteNew );
+                int iRead = 0;
+                do
+                {
+                    iRead = fs.read( pBuf, iBlockSize );
+                    if( iRead > 0 )
+                    {
+                        ms.write( pBuf, iRead );
+                    }
+                } while( iRead == iBlockSize );
+                delete[] pBuf;
+            }
+                        break;
+
+                case modeCopyOut:
+            {
+                if( opt.lParams.getSize() != 2 )
+                {
+                    Bu::println("Specify a source file and destination file.");
+                    return 1;
+                }
+                int iBlockSize = 1024*1024;
+                char *pBuf = new char[iBlockSize];
+                Bu::MyriadStream ms = mFs.open(
+                    opt.lParams.first(), Bu::MyriadFs::Read );
+                Bu::File fs = Bu::File(
+                    opt.lParams.last(), Bu::File::WriteNew );
+                int iRead = 0;
+                do
+                {
+                    iRead = ms.read( pBuf, iBlockSize );
+                    if( iRead > 0 )
+                    {
+                        fs.write( pBuf, iRead );
+                    }
+                } while( iRead == iBlockSize );
+                delete[] pBuf;
+            }
+                        break;
+
+                case modeMkdir:
+            {
+                if( opt.lParams.isEmpty() )
+                {
+                    Bu::println("Specify at least one directory.");
+                    return 1;
+                }
+                for( Bu::StringList::iterator i = opt.lParams.begin(); i; i++ )
+                {
+                    mFs.mkDir( *i, 0777 );
+                }
+            }
+                        break;
+
+                case modeInitialize:
+            Bu::println("MyriadFs initialized.\n");
+                        break;
+
+                case modeNone:
+                        break;
+    }
+
+    return 0;
+}
diff --git a/src/unstable/myriadfs.cpp b/src/unstable/myriadfs.cpp
index 919f8b9..e02620d 100644
--- a/src/unstable/myriadfs.cpp
+++ b/src/unstable/myriadfs.cpp
@@ -113,7 +113,7 @@ void Bu::MyriadFs::stat( const Bu::String &sPath, Bu::MyriadFs::Stat &rBuf )
     stat( iNode, rBuf, is );
 }
 
-Bu::MyriadStream Bu::MyriadFs::open( const Bu::String &sPath, int /*iMode*/,
+Bu::MyriadStream Bu::MyriadFs::open( const Bu::String &sPath, int iMode,
         uint16_t uPerms )
 {
     int32_t iParent = -1;
@@ -123,7 +123,12 @@ Bu::MyriadStream Bu::MyriadFs::open( const Bu::String &sPath, int /*iMode*/,
         iNode = lookupInode( sPath, iParent );
 //        sio << "File found." << sio.nl;
         // The file was found
-        return openByInode( iNode );
+        Bu::MyriadStream ms = openByInode( iNode );
+        if( (iMode&Truncate) ) 
+        {
+            ms.setSize( 0 );
+        }
+        return ms;
     }
     catch( Bu::MyriadFsException &e )
     {