btrfs-progs: add getopt stubs where needed

[platform/upstream/btrfs-progs.git] / cmds-inspect.c

diff --git a/cmds-inspect.c b/cmds-inspect.c
index 932765b..dbc6656 100644 (file)
--- a/cmds-inspect.c
+++ b/cmds-inspect.c
@@ -31,6 +31,8 @@
 #include "disk-io.h"
 #include "commands.h"
 #include "btrfs-list.h"
+#include "cmds-inspect-dump-tree.h"
+#include "cmds-inspect-dump-super.h"
 
 static const char * const inspect_cmd_group_usage[] = {
        "btrfs inspect-internal <command> <args>",
@@ -50,7 +52,7 @@ static int __ino_to_path_fd(u64 inum, int fd, int verbose, const char *prepend)
        ipa.fspath = ptr_to_u64(fspath);
 
        ret = ioctl(fd, BTRFS_IOC_INO_PATHS, &ipa);
-       if (ret) {
+       if (ret < 0) {
                printf("ioctl ret=%d, error: %s\n", ret, strerror(errno));
                goto out;
        }
@@ -189,7 +191,7 @@ static int cmd_inspect_logical_resolve(int argc, char **argv)
        }
 
        ret = ioctl(fd, BTRFS_IOC_LOGICAL_INO, &loi);
-       if (ret) {
+       if (ret < 0) {
                printf("ioctl ret=%d, error: %s\n", ret, strerror(errno));
                goto out;
        }
@@ -266,22 +268,24 @@ static int cmd_inspect_subvolid_resolve(int argc, char **argv)
        char path[PATH_MAX];
        DIR *dirstream = NULL;
 
-       if (check_argc_exact(argc, 3))
+       clean_args_no_options(argc, argv, cmd_inspect_subvolid_resolve_usage);
+
+       if (check_argc_exact(argc - optind, 2))
                usage(cmd_inspect_subvolid_resolve_usage);
 
-       fd = btrfs_open_dir(argv[2], &dirstream, 1);
+       fd = btrfs_open_dir(argv[optind], &dirstream, 1);
        if (fd < 0) {
                ret = -ENOENT;
                goto out;
        }
 
-       subvol_id = arg_strtou64(argv[1]);
+       subvol_id = arg_strtou64(argv[optind]);
        ret = btrfs_subvolid_resolve(fd, path, sizeof(path), subvol_id);
 
        if (ret) {
                fprintf(stderr,
-                       "%s: btrfs_subvolid_resolve(subvol_id %llu) failed with ret=%d\n",
-                       argv[0], (unsigned long long)subvol_id, ret);
+                       "btrfs_subvolid_resolve(subvol_id %llu) failed with ret=%d\n",
+                       (unsigned long long)subvol_id, ret);
                goto out;
        }
 
@@ -306,10 +310,12 @@ static int cmd_inspect_rootid(int argc, char **argv)
        u64 rootid;
        DIR *dirstream = NULL;
 
-       if (check_argc_exact(argc, 2))
+       clean_args_no_options(argc, argv, cmd_inspect_rootid_usage);
+
+       if (check_argc_exact(argc - optind, 1))
                usage(cmd_inspect_rootid_usage);
 
-       fd = btrfs_open_dir(argv[1], &dirstream, 1);
+       fd = btrfs_open_dir(argv[optind], &dirstream, 1);
        if (fd < 0) {
                ret = -ENOENT;
                goto out;
@@ -317,8 +323,7 @@ static int cmd_inspect_rootid(int argc, char **argv)
 
        ret = lookup_ino_rootid(fd, &rootid);
        if (ret) {
-               fprintf(stderr, "%s: rootid failed with ret=%d\n",
-                       argv[0], ret);
+               fprintf(stderr, "rootid failed with ret=%d\n", ret);
                goto out;
        }
 
@@ -619,6 +624,16 @@ out:
        return !!ret;
 }
 
+static int cmd_inspect_dump_tree_hook(int ac, char **av)
+{
+       return cmd_inspect_dump_tree(ac, av);
+}
+
+static int cmd_inspect_dump_super_hook(int ac, char **av)
+{
+       return cmd_inspect_dump_super(ac, av);
+}
+
 static const char inspect_cmd_group_info[] =
 "query various internal information";
 
@@ -634,6 +649,10 @@ const struct cmd_group inspect_cmd_group = {
                        0 },
                { "min-dev-size", cmd_inspect_min_dev_size,
                        cmd_inspect_min_dev_size_usage, NULL, 0 },
+               { "dump-tree", cmd_inspect_dump_tree_hook,
+                               cmd_inspect_dump_tree_usage, NULL, 0 },
+               { "dump-super", cmd_inspect_dump_super_hook,
+                               cmd_inspect_dump_super_usage, NULL, 0 },
                NULL_CMD_STRUCT
        }
 };