X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=inline;f=Tools%2FDiskTool%2Fsrc%2Fmain.c;h=2de26a6db1d50f81cbe262478d6944a3e849a16c;hb=d0b4559f2936f6d9f06be0f7c3c51527a480ec0d;hp=7dd85833448cd338cb2933c6904d4cebd9aedbf6;hpb=aa3975dc61be78c0e6860cafad7278017fd456d5;p=tpg%2Facess2.git

diff --git a/Tools/DiskTool/src/main.c b/Tools/DiskTool/src/main.c
index 7dd85833..2de26a6d 100644
--- a/Tools/DiskTool/src/main.c
+++ b/Tools/DiskTool/src/main.c
@@ -10,26 +10,83 @@
 // === CODE ===
 int main(int argc, char *argv[])
 {
-	// Setup
-
 	// 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]);
+			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 || strcmp("lvm", argv[i]) == 0 ) {
+			
+			if( argc - i < 3 ) {
+				fprintf(stderr, "lvm takes 2 arguments (iamge and ident)\n");
 				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;
+			continue ;
+		}
+		
+		if( strcmp("ls", argv[i]) == 0 ) {
+			if( argc - i < 2 ) {
+				fprintf(stderr, "ls takes 1 argument (path)\n");
+				break;
+			}
+
+			DiskTool_ListDirectory(argv[i+1]);
+			i += 1;
+			continue ;
+		}
+		
+		if( strcmp("cp", argv[i]) == 0 ) {
+			
+			if( argc - i < 3 ) {
+				fprintf(stderr, "cp takes 2 arguments (source and destination)\n");
+				break;
+			}
+
+			DiskTool_Copy(argv[i+1], argv[i+2]);			
+
 			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]);
 	}
+	
+	DiskTool_Cleanup();
+	
 	return 0;
 }
 
@@ -64,3 +121,20 @@ int strpos(const char *Str, char Ch)
 	if(!r)	return -1;
 	return r - Str;
 }
+
+int strucmp(const char *s1, const char *s2)
+{
+	return strcasecmp(s1, s2);
+}
+
+uint64_t DivMod64U(uint64_t value, uint64_t divisor, uint64_t *remainder)
+{
+	if(remainder)
+		*remainder = value % divisor;
+	return value / divisor;
+}
+
+size_t _fwrite_stdout(size_t bytes, const void *data)
+{
+	return fwrite(data, bytes, 1, stdout);
+}