More rust improvements

 - passing of arguments from c -> rust code now works correctly
 - 'bcachefs mount' now handles being passed a device or devices

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

1 files changed, 6 insertions, 14 deletions

diff --git a/bcachefs.c b/bcachefs.c
index 1876823c..871482eb 100644
--- a/bcachefs.c
+++ b/bcachefs.c
@@ -177,20 +177,7 @@ int main(int argc, char *argv[])
 
 	setvbuf(stdout, NULL, _IOLBF, 0);
 
-	if (argc < 2) {
-		puts("missing command\n");
-		goto usage;
-	}
-
-	/* Rust commands first - rust can't handle us mutating argv */
-	char *cmd = argv[1];
-
-	if (!strcmp(cmd, "mount")) {
-		cmd_mount();
-		return 0;
-	}
-
-	cmd = pop_cmd(&argc, argv);
+	char *cmd = pop_cmd(&argc, argv);
 	if (!cmd) {
 		puts("missing command\n");
 		goto usage;
@@ -257,6 +244,11 @@ int main(int argc, char *argv[])
 	if (!strcmp(cmd, "setattr"))
 		return cmd_setattr(argc, argv);
 
+	if (!strcmp(cmd, "mount")) {
+		cmd_mount(argc, argv);
+		return 0;
+	}
+
 #ifdef BCACHEFS_FUSE
 	if (!strcmp(cmd, "fusemount"))
 		return cmd_fusemount(argc, argv);