Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2

[tpg/acess2.git] / Tools / DiskTool / src / main.c

diff --git a/Tools/DiskTool/src/main.c b/Tools/DiskTool/src/main.c
index 58ce6d2..2de26a6 100644 (file)
--- a/Tools/DiskTool/src/main.c
+++ b/Tools/DiskTool/src/main.c
@@ -13,32 +13,32 @@ int main(int argc, char *argv[])
        // Parse arguments
        for( int i = 1; i < argc; i ++ )
        {
-               if( strcmp("--image", argv[i]) == 0 || strcmp("-i", argv[i]) == 0 ) {
+               if( strcmp("mount", argv[i]) == 0 || strcmp("-i", argv[i]) == 0 ) {
                        // Mount an image
                        if( argc - i < 3 ) {
-                               fprintf(stderr, "--image/-i takes 2 arguments (ident and path)\n");
+                               fprintf(stderr, "mount takes 2 arguments (image and mountpoint)\n");
                                exit(-1);
                        }
 
-                       if( DiskTool_MountImage(argv[i+1], argv[i+2]) ) {
-                               fprintf(stderr, "Unable to mount '%s' as '%s'\n", argv[i+2], argv[i+1]);
-                               exit(-1);
+                       if( DiskTool_MountImage(argv[i+2], argv[i+1]) ) {
+                               fprintf(stderr, "Unable to mount '%s' as '%s'\n", argv[i+1], argv[i+2]);
+                               break;
                        }
 
                        i += 2;
                        continue ;
                }
                
-               if( strcmp("mountlvm", argv[i]) == 0 ) {
+               if( strcmp("mountlvm", argv[i]) == 0 || strcmp("lvm", argv[i]) == 0 ) {
                        
                        if( argc - i < 3 ) {
-                               fprintf(stderr, "mountlvm takes 2 arguments (ident and path)\n");
+                               fprintf(stderr, "lvm takes 2 arguments (iamge and ident)\n");
                                exit(-1);
                        }
 
-                       if( DiskTool_RegisterLVM(argv[i+1], argv[i+2]) ) {
-                               fprintf(stderr, "Unable to register '%s' as LVM '%s'\n", argv[i+2], argv[i+1]);
-                               exit(-1);
+                       if( DiskTool_RegisterLVM(argv[i+2], argv[i+1]) ) {
+                               fprintf(stderr, "Unable to register '%s' as LVM '%s'\n", argv[i+1], argv[i+2]);
+                               break;
                        }
                        
                        i += 2;
@@ -47,8 +47,8 @@ int main(int argc, char *argv[])
                
                if( strcmp("ls", argv[i]) == 0 ) {
                        if( argc - i < 2 ) {
-                               fprintf(stderr, "ls 1 argument (path)\n");
-                               exit(-1);
+                               fprintf(stderr, "ls takes 1 argument (path)\n");
+                               break;
                        }
 
                        DiskTool_ListDirectory(argv[i+1]);
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
                        
                        if( argc - i < 3 ) {
                                fprintf(stderr, "cp takes 2 arguments (source and destination)\n");
-                               exit(-1);
+                               break;
                        }
 
                        DiskTool_Copy(argv[i+1], argv[i+2]);                    
@@ -68,10 +68,24 @@ int main(int argc, char *argv[])
                        i += 2;
                        continue ;
                }
+
+               if( strcmp("cat", argv[i]) == 0 ) {
+
+                       if( argc - 1 < 2 ) {
+                               fprintf(stderr, "cat takes 1 argument (path)\n");
+                               break;
+                       }
+
+                       DiskTool_Cat(argv[i+1]);
+
+                       i += 1;
+                       continue;
+               }
+       
+               fprintf(stderr, "Unknown command '%s'\n", argv[i]);
        }
        
-       // Unmount all
-       // Clear LVM
+       DiskTool_Cleanup();
        
        return 0;
 }
@@ -120,3 +134,7 @@ uint64_t DivMod64U(uint64_t value, uint64_t divisor, uint64_t *remainder)
        return value / divisor;
 }
 
+size_t _fwrite_stdout(size_t bytes, const void *data)
+{
+       return fwrite(data, bytes, 1, stdout);
+}