Merge branch 'maint' into next

[tools/e2fsprogs.git] / debugfs / extent_inode.c

diff --git a/debugfs/extent_inode.c b/debugfs/extent_inode.c
index d726b2b..ada1308 100644 (file)
--- a/debugfs/extent_inode.c
+++ b/debugfs/extent_inode.c
@@ -25,8 +25,8 @@ extern char *optarg;
 
 #include "debugfs.h"
 
-ext2_ino_t     current_ino;
-ext2_extent_handle_t current_handle;
+static ext2_ino_t      current_ino;
+static ext2_extent_handle_t current_handle;
 
 static void dbg_print_extent(char *desc, struct ext2fs_extent *extent)
 {
@@ -47,9 +47,9 @@ static void dbg_print_extent(char *desc, struct ext2fs_extent *extent)
 
 }
 
-int common_extent_args_process(int argc, char *argv[], int min_argc,
-                              int max_argc, const char *cmd,
-                              const char *usage, int flags)
+static int common_extent_args_process(int argc, char *argv[], int min_argc,
+                                     int max_argc, const char *cmd,
+                                     const char *usage, int flags)
 {
        if (common_args_process(argc, argv, min_argc, max_argc, cmd,
                                usage, flags))
@@ -64,7 +64,8 @@ int common_extent_args_process(int argc, char *argv[], int min_argc,
 
 static char *orig_prompt, *extent_prompt;
 
-void do_extent_open(int argc, char *argv[])
+void do_extent_open(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                   void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      inode;
        int             ret;
@@ -97,6 +98,11 @@ void do_extent_open(int argc, char *argv[])
 
        orig_prompt = ss_get_prompt(sci_idx);
        extent_prompt = malloc(strlen(orig_prompt) + 32);
+       if (extent_prompt == NULL) {
+               com_err(argv[1], retval, "out of memory");
+               return;
+       }
+
        strcpy(extent_prompt, orig_prompt);
        cp = strchr(extent_prompt, ':');
        if (cp)
@@ -108,11 +114,13 @@ void do_extent_open(int argc, char *argv[])
        return;
 }
 
-void do_extent_close(int argc, char *argv[])
+void do_extent_close(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                    void *infop EXT2FS_ATTR((unused)))
 {
        int ret;
 
-       if (check_fs_open(argv[0]))
+       if (common_args_process(argc, argv, 1, 1,
+                               "extent_close", "", 0))
                return;
 
        if (!current_handle) {
@@ -129,93 +137,109 @@ void do_extent_close(int argc, char *argv[])
        extent_prompt = NULL;
 }
 
-void generic_goto_node(char *cmd_name, int op)
+static void generic_goto_node(const char *my_name, int argc,
+                             char **argv, int op)
 {
        struct ext2fs_extent    extent;
        errcode_t               retval;
 
-       if (check_fs_open(cmd_name))
+       if (my_name && common_args_process(argc, argv, 1, 1,
+                                          my_name, "", 0))
                return;
 
        if (!current_handle) {
-               com_err(cmd_name, 0, "Extent handle not open");
+               com_err(argv[0], 0, "Extent handle not open");
                return;
        }
 
        retval = ext2fs_extent_get(current_handle, op, &extent);
        if (retval) {
-               com_err(cmd_name, retval, 0);
+               com_err(argv[0], retval, 0);
                return;
        }
        dbg_print_extent(0, &extent);
 }
 
-void do_current_node(int argc, char *argv[])
+void do_current_node(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                    void *infop EXT2FS_ATTR((unused)))
 {
-       generic_goto_node(argv[0], EXT2_EXTENT_CURRENT);
+       generic_goto_node("current_node", argc, argv, EXT2_EXTENT_CURRENT);
 }
 
-void do_root_node(int argc, char *argv[])
+void do_root_node(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                 void *infop EXT2FS_ATTR((unused)))
 {
-       generic_goto_node(argv[0], EXT2_EXTENT_ROOT);
+       generic_goto_node("root_node", argc, argv, EXT2_EXTENT_ROOT);
 }
 
-void do_last_leaf(int argc, char *argv[])
+void do_last_leaf(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                 void *infop EXT2FS_ATTR((unused)))
 {
-       generic_goto_node(argv[0], EXT2_EXTENT_LAST_LEAF);
+       generic_goto_node("last_leaf", argc, argv, EXT2_EXTENT_LAST_LEAF);
 }
 
-void do_first_sib(int argc, char *argv[])
+void do_first_sib(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                 void *infop EXT2FS_ATTR((unused)))
 {
-       generic_goto_node(argv[0], EXT2_EXTENT_FIRST_SIB);
+       generic_goto_node("first_sib", argc, argv, EXT2_EXTENT_FIRST_SIB);
 }
 
-void do_last_sib(int argc, char *argv[])
+void do_last_sib(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                void *infop EXT2FS_ATTR((unused)))
 {
-       generic_goto_node(argv[0], EXT2_EXTENT_LAST_SIB);
+       generic_goto_node("next_sib", argc, argv, EXT2_EXTENT_LAST_SIB);
 }
 
-void do_next_sib(int argc, char *argv[])
+void do_next_sib(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                void *infop EXT2FS_ATTR((unused)))
 {
-       generic_goto_node(argv[0], EXT2_EXTENT_NEXT_SIB);
+       generic_goto_node("next_sib", argc, argv, EXT2_EXTENT_NEXT_SIB);
 }
 
-void do_prev_sib(int argc, char *argv[])
+void do_prev_sib(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                void *infop EXT2FS_ATTR((unused)))
 {
-       generic_goto_node(argv[0], EXT2_EXTENT_PREV_SIB);
+       generic_goto_node("prev_sib", argc, argv, EXT2_EXTENT_PREV_SIB);
 }
 
-void do_next_leaf(int argc, char *argv[])
+void do_next_leaf(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                void *infop EXT2FS_ATTR((unused)))
 {
-       generic_goto_node(argv[0], EXT2_EXTENT_NEXT_LEAF);
+       generic_goto_node("next_leaf", argc, argv, EXT2_EXTENT_NEXT_LEAF);
 }
 
-void do_prev_leaf(int argc, char *argv[])
+void do_prev_leaf(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                 void *infop EXT2FS_ATTR((unused)))
 {
-       generic_goto_node(argv[0], EXT2_EXTENT_PREV_LEAF);
+       generic_goto_node("prev_leaf", argc, argv, EXT2_EXTENT_PREV_LEAF);
 }
 
-void do_next(int argc, char *argv[])
+void do_next(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+            void *infop EXT2FS_ATTR((unused)))
 {
-       generic_goto_node(argv[0], EXT2_EXTENT_NEXT);
+       generic_goto_node("next", argc, argv, EXT2_EXTENT_NEXT);
 }
 
-void do_prev(int argc, char *argv[])
+void do_prev(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+            void *infop EXT2FS_ATTR((unused)))
 {
-       generic_goto_node(argv[0], EXT2_EXTENT_PREV);
+       generic_goto_node("prev", argc, argv, EXT2_EXTENT_PREV);
 }
 
-void do_up(int argc, char *argv[])
+void do_up(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+          void *infop EXT2FS_ATTR((unused)))
 {
-       generic_goto_node(argv[0], EXT2_EXTENT_UP);
+       generic_goto_node("up", argc, argv, EXT2_EXTENT_UP);
 }
 
-void do_down(int argc, char *argv[])
+void do_down(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+            void *infop EXT2FS_ATTR((unused)))
 {
-       generic_goto_node(argv[0], EXT2_EXTENT_DOWN);
+       generic_goto_node("down", argc, argv, EXT2_EXTENT_DOWN);
 }
 
-void do_delete_node(int argc, char *argv[])
+void do_delete_node(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                   void *infop EXT2FS_ATTR((unused)))
 {
        struct ext2fs_extent extent;
        errcode_t       retval;
@@ -237,7 +261,8 @@ void do_delete_node(int argc, char *argv[])
        dbg_print_extent(0, &extent);
 }
 
-void do_replace_node(int argc, char *argv[])
+void do_replace_node(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                    void *infop EXT2FS_ATTR((unused)))
 {
        const char      *usage = "[--uninit] <lblk> <len> <pblk>";
        errcode_t       retval;
@@ -261,15 +286,15 @@ void do_replace_node(int argc, char *argv[])
                return;
        }
 
-       extent.e_lblk = parse_ulong(argv[1], argv[0], "logical block", &err);
+       err = strtoblk(argv[0], argv[1], "logical block", &extent.e_lblk);
        if (err)
                return;
 
-       extent.e_len = parse_ulong(argv[2], argv[0], "logical block", &err);
+       extent.e_len = parse_ulong(argv[2], argv[0], "length", &err);
        if (err)
                return;
 
-       extent.e_pblk = parse_ulong(argv[3], argv[0], "logical block", &err);
+       err = strtoblk(argv[0], argv[3], "physical block", &extent.e_pblk);
        if (err)
                return;
 
@@ -278,10 +303,11 @@ void do_replace_node(int argc, char *argv[])
                com_err(argv[0], retval, 0);
                return;
        }
-       do_current_node(argc, argv);
+       generic_goto_node(NULL, argc, argv, EXT2_EXTENT_CURRENT);
 }
 
-void do_split_node(int argc, char *argv[])
+void do_split_node(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                  void *infop EXT2FS_ATTR((unused)))
 {
        errcode_t       retval;
 
@@ -294,10 +320,11 @@ void do_split_node(int argc, char *argv[])
                com_err(argv[0], retval, 0);
                return;
        }
-       do_current_node(argc, argv);
+       generic_goto_node(NULL, argc, argv, EXT2_EXTENT_CURRENT);
 }
 
-void do_insert_node(int argc, char *argv[])
+void do_insert_node(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+                   void *infop EXT2FS_ATTR((unused)))
 {
        const char      *usage = "[--after] [--uninit] <lblk> <len> <pblk>";
        errcode_t       retval;
@@ -335,18 +362,15 @@ void do_insert_node(int argc, char *argv[])
                return;
        }
 
-       extent.e_lblk = parse_ulong(argv[1], cmd,
-                                   "logical block", &err);
+       err = strtoblk(cmd, argv[1], "logical block", &extent.e_lblk);
        if (err)
                return;
 
-       extent.e_len = parse_ulong(argv[2], cmd,
-                                   "length", &err);
+       extent.e_len = parse_ulong(argv[2], cmd, "length", &err);
        if (err)
                return;
 
-       extent.e_pblk = parse_ulong(argv[3], cmd,
-                                   "pysical block", &err);
+       err = strtoblk(cmd, argv[3], "physical block", &extent.e_pblk);
        if (err)
                return;
 
@@ -355,16 +379,17 @@ void do_insert_node(int argc, char *argv[])
                com_err(cmd, retval, 0);
                return;
        }
-       do_current_node(argc, argv);
+       generic_goto_node(NULL, argc, argv, EXT2_EXTENT_CURRENT);
 }
 
-void do_set_bmap(int argc, char **argv)
+void do_set_bmap(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                void *infop EXT2FS_ATTR((unused)))
 {
        const char      *usage = "[--uninit] <lblk> <pblk>";
        struct ext2fs_extent extent;
        errcode_t       retval;
-       blk_t           logical;
-       blk_t           physical;
+       blk64_t         logical;
+       blk64_t         physical;
        char            *cmd = argv[0];
        int             flags = 0;
        int             err;
@@ -384,18 +409,16 @@ void do_set_bmap(int argc, char **argv)
                return;
        }
 
-       logical = parse_ulong(argv[1], cmd,
-                                   "logical block", &err);
+       err = strtoblk(cmd, argv[1], "logical block", &logical);
        if (err)
                return;
 
-       physical = parse_ulong(argv[2], cmd,
-                                   "physical block", &err);
+       err = strtoblk(cmd, argv[2], "physical block", &physical);
        if (err)
                return;
 
        retval = ext2fs_extent_set_bmap(current_handle, logical,
-                                       (blk64_t) physical, flags);
+                                       physical, flags);
        if (retval) {
                com_err(cmd, retval, 0);
                return;
@@ -408,7 +431,8 @@ void do_set_bmap(int argc, char **argv)
        dbg_print_extent(0, &extent);
 }
 
-void do_print_all(int argc, char **argv)
+void do_print_all(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                 void *infop EXT2FS_ATTR((unused)))
 {
        const char      *usage = "[--leaf-only|--reverse|--reverse-leaf]";
        struct ext2fs_extent    extent;
@@ -459,7 +483,8 @@ void do_print_all(int argc, char **argv)
        }
 }
 
-void do_fix_parents(int argc, char **argv)
+void do_fix_parents(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                   void *infop EXT2FS_ATTR((unused)))
 {
        errcode_t               retval;
 
@@ -474,7 +499,8 @@ void do_fix_parents(int argc, char **argv)
        }
 }
 
-void do_info(int argc, char **argv)
+void do_info(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+            void *infop EXT2FS_ATTR((unused)))
 {
        struct ext2fs_extent    extent;
        struct ext2_extent_info info;
@@ -507,7 +533,8 @@ void do_info(int argc, char **argv)
               info.max_uninit_len);
 }
 
-void do_goto_block(int argc, char **argv)
+void do_goto_block(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+                  void *infop EXT2FS_ATTR((unused)))
 {
        errcode_t               retval;
        blk64_t                 blk;
@@ -517,7 +544,7 @@ void do_goto_block(int argc, char **argv)
                                       "block [level]", 0))
                return;
 
-       if (strtoblk(argv[0], argv[1], &blk))
+       if (strtoblk(argv[0], argv[1], NULL, &blk))
                return;
 
        if (argc == 3) {
@@ -535,5 +562,5 @@ void do_goto_block(int argc, char **argv)
                return;
        }
 
-       generic_goto_node(argv[0], EXT2_EXTENT_CURRENT);
+       generic_goto_node(NULL, argc, argv, EXT2_EXTENT_CURRENT);
 }