New upstream release

[bcachefs-tools-debian] / bcachefs.c

diff --git a/bcachefs.c b/bcachefs.c
index 31d96287f7dc8343ef5b0f80f71cb3116ae282fc..a3fe6d8247e4e8969978391c3d0a288d480cbaa6 100644 (file)
--- a/bcachefs.c
+++ b/bcachefs.c
@@ -35,6 +35,11 @@ static void usage(void)
             "  show-super               Dump superblock information to stdout\n"
             "  set-option               Set a filesystem option\n"
             "\n"
+#ifndef BCACHEFS_NO_RUST
+            "Mount:\n"
+            "  mount                    Mount a filesystem\n"
+            "\n"
+#endif
             "Repair:\n"
             "  fsck                     Check an existing filesystem for errors\n"
             "\n"
@@ -82,7 +87,9 @@ static void usage(void)
             "Debug:\n"
             "These commands work on offline, unmounted filesystems\n"
             "  dump                     Dump filesystem metadata to a qcow2 image\n"
+#ifndef BCACHEFS_NO_RUST
             "  list                     List filesystem metadata in textual form\n"
+#endif
             "  list_journal             List contents of journal\n"
             "\n"
             "Miscellaneous:\n"
@@ -106,8 +113,10 @@ static int fs_cmds(int argc, char *argv[])
 {
        char *cmd = pop_cmd(&argc, argv);
 
-       if (argc < 1)
-               return fs_usage();
+       if (argc < 1) {
+               usage();
+               exit(EXIT_FAILURE);
+       }
        if (!strcmp(cmd, "usage"))
                return cmd_fs_usage(argc, argv);
 
@@ -178,7 +187,7 @@ int main(int argc, char *argv[])
        setvbuf(stdout, NULL, _IOLBF, 0);
 
        char *cmd = pop_cmd(&argc, argv);
-       if (argc < 1) {
+       if (!cmd) {
                puts("missing command\n");
                goto usage;
        }
@@ -203,12 +212,6 @@ int main(int argc, char *argv[])
        if (!strcmp(cmd, "set-option"))
                return cmd_set_option(argc, argv);
 
-       if (argc < 2) {
-               printf("%s: missing command\n", argv[0]);
-               usage();
-               exit(EXIT_FAILURE);
-       }
-
 #if 0
        if (!strcmp(cmd, "assemble"))
                return cmd_assemble(argc, argv);
@@ -234,8 +237,10 @@ int main(int argc, char *argv[])
 
        if (!strcmp(cmd, "dump"))
                return cmd_dump(argc, argv);
+#ifndef BCACHEFS_NO_RUST
        if (!strcmp(cmd, "list"))
                return cmd_list(argc, argv);
+#endif
        if (!strcmp(cmd, "list_journal"))
                return cmd_list_journal(argc, argv);
        if (!strcmp(cmd, "kill_btree_node"))
@@ -243,6 +248,12 @@ int main(int argc, char *argv[])
 
        if (!strcmp(cmd, "setattr"))
                return cmd_setattr(argc, argv);
+#ifndef BCACHEFS_NO_RUST
+       if (!strcmp(cmd, "mount")) {
+               cmd_mount(argc, argv);
+               return 0;
+       }
+#endif
 
 #ifdef BCACHEFS_FUSE
        if (!strcmp(cmd, "fusemount"))