gptman: reorganize commands in a cmd module

7 files changed, 21 insertions, 23 deletions

diff --git a/convert/convert.ha b/cmd/convert/convert.ha
index dbf4ef4..807ae7f 100644
--- a/convert/convert.ha
+++ b/cmd/convert/convert.ha
@@ -1,5 +1,6 @@
 use fmt;
 
+use cmd;
 use mbr;
 use gpt;
 use sector;
@@ -11,8 +12,6 @@ use strings;
 use errors;
 use rt;
 
-use volume;
-
 export fn convert(vol: str, args: []str) void = {
 	if (len(args) < 2) {
 		fmt::fatalf("convert: needs disk");
@@ -23,7 +22,7 @@ export fn convert(vol: str, args: []str) void = {
 
 	const source = mbr::from(source)!;
 
-	const vol = volume::openvol(vol);
+	const vol = cmd::openvol(vol);
 	let vol = gpt::from(vol)!;
 	defer {
 		gpt::chksums(vol);
diff --git a/create/create.ha b/cmd/create/create.ha
index b7dc0f7..124d86e 100644
--- a/create/create.ha
+++ b/cmd/create/create.ha
@@ -6,22 +6,22 @@ use os;
 use strconv;
 
 use gpt;
-use volume;
+use cmd;
 
 export fn create(vol: str, args: []str) void = {
 	// XXX this is a stub
 
-	const cmd = getopt::parse(args,
+	const c = getopt::parse(args,
 		"create a volume",
 		('f', "file", "specify another partition file to fit"),
 		('l', "length", "specify another length margin")
 	);
-	defer getopt::finish(&cmd);
+	defer getopt::finish(&c);
 	
 	let length = 0z;
 
-	for (let i = 0z; i < len(cmd.opts); i += 1) {
-		const opt = cmd.opts[i];
+	for (let i = 0z; i < len(c.opts); i += 1) {
+		const opt = c.opts[i];
 		switch (opt.0) {
 		case 'l' =>
 			length += (strconv::stoi(opt.1)! / 512 + 1): size;
@@ -31,7 +31,7 @@ export fn create(vol: str, args: []str) void = {
 		};
 	};
 
-	const vol = volume::mkvol(vol);
+	const vol = cmd::mkvol(vol);
 	const vol = gpt::create(vol, length);
 	defer {
 		gpt::chksums(vol);
diff --git a/info/info.ha b/cmd/info/info.ha
index 7df9ee2..75ab499 100644
--- a/info/info.ha
+++ b/cmd/info/info.ha
@@ -2,13 +2,13 @@ use fmt;
 use io;
 
 use gpt;
-use volume;
+use cmd;
 
 fn booltonum(a: bool) str = if (a) { return "1"; } else { return "0"; };
 
 export fn info(vol: str, args: []str) void = {
 	const name = vol;
-	const vol = volume::opengpt(vol);
+	const vol = cmd::opengpt(vol);
 	defer gpt::finish(vol);
 
 	const header = vol.primary.header;
diff --git a/mkbackup/mkbackup.ha b/cmd/mkbackup/mkbackup.ha
index 55f8464..12093b5 100644
--- a/mkbackup/mkbackup.ha
+++ b/cmd/mkbackup/mkbackup.ha
@@ -1,11 +1,11 @@
 use fmt;
 use io;
 
-use volume;
+use cmd;
 use gpt;
 
 export fn mkbackup(vol: str, args: []str) void = {
-	const vol = volume::openvol(vol);
+	const vol = cmd::openvol(vol);
 	const vol = match(gpt::from(vol)) {
 	case let g: *gpt::gpt =>
 		yield g;
diff --git a/part/part.ha b/cmd/part/part.ha
index 7584daf..a4b114f 100644
--- a/part/part.ha
+++ b/cmd/part/part.ha
@@ -4,8 +4,7 @@ use os;
 use strconv;
 
 use gpt;
-use volume;
-
+use cmd;
 
 export fn part(vol: str, args: []str) void = {
 	if (len(args) <= 1) {
@@ -15,7 +14,7 @@ export fn part(vol: str, args: []str) void = {
 	
 	match (strconv::stou(args[1])) {
 	case let i: uint =>
-		const vol = volume::opengpt(vol);
+		const vol = cmd::opengpt(vol);
 		defer gpt::finish(vol);
 		partno(vol, i, args[2..]);
 		return;
@@ -30,7 +29,7 @@ export fn part(vol: str, args: []str) void = {
 };
 
 export fn partnew(vol: str, args: []str) void = {
-	const vol = volume::opengpt(vol);
+	const vol = cmd::opengpt(vol);
 	defer {
 		gpt::chksums(vol);
 		gpt::commit(vol)!;
@@ -48,7 +47,7 @@ export fn partnew(vol: str, args: []str) void = {
 };
 
 export fn partlist(vol: str, args: []str) void = {
-	const vol = volume::opengpt(vol);
+	const vol = cmd::opengpt(vol);
 	defer gpt::finish(vol);
 	const header = vol.primary.header;
 	const entries = vol.primary.entries;
diff --git a/volume/volume.ha b/cmd/util.ha
index 832a96f..832a96f 100644
--- a/volume/volume.ha
+++ b/cmd/util.ha
diff --git a/main.ha b/main.ha
index b82aa3d..304b56c 100644
--- a/main.ha
+++ b/main.ha
@@ -7,11 +7,11 @@ use io;
 use mbr;
 use gpt;
 
-use convert;
-use create;
-use info;
-use mkbackup;
-use part;
+use cmd::convert;
+use cmd::create;
+use cmd::info;
+use cmd::mkbackup;
+use cmd::part;
 
 
 export fn main() void = {