Align function prototypes for libss's request handler function

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

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index 78b93ed..16a03d4 100644 (file)
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -50,7 +50,7 @@ int journal_enable_debug = -1;
 
 /*
  * There must be only one definition if we're hooking in extra commands or
- * chaging default prompt. Use -DSKIP_GLOBDEF for that.
+ * changing default prompt. Use -DSKIP_GLOBDEF for that.
  */
 #ifndef SKIP_GLOBDEFS
 ss_request_table *extra_cmds;
@@ -222,7 +222,7 @@ errout:
                com_err(device, retval, "while trying to close filesystem");
 }
 
-void do_open_filesys(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+void do_open_filesys(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
                     void *infop EXT2FS_ATTR((unused)))
 {
        int     c, err;
@@ -305,7 +305,7 @@ print_usage:
                "<device>\n", argv[0]);
 }
 
-void do_lcd(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+void do_lcd(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
            void *infop EXT2FS_ATTR((unused)))
 {
        if (argc != 2) {
@@ -343,7 +343,7 @@ static void close_filesystem(NOARGS)
        return;
 }
 
-void do_close_filesys(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+void do_close_filesys(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
                      void *infop EXT2FS_ATTR((unused)))
 {
        int     c;
@@ -372,7 +372,7 @@ void do_close_filesys(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
 }
 
 #ifndef READ_ONLY
-void do_init_filesys(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+void do_init_filesys(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
                     void *infop EXT2FS_ATTR((unused)))
 {
        struct ext2_super_block param;
@@ -433,7 +433,7 @@ static void print_bg_opts(ext2_filsys fs, dgrp_t group, int mask,
        }
 }
 
-void do_show_super_stats(int argc, char *argv[],
+void do_show_super_stats(int argc, ss_argv_t argv,
                         int sci_idx EXT2FS_ATTR((unused)),
                         void *infop EXT2FS_ATTR((unused)))
 {
@@ -531,7 +531,7 @@ print_usage:
 
 #ifndef READ_ONLY
 void do_dirty_filesys(int argc EXT2FS_ATTR((unused)),
-                     char **argv EXT2FS_ATTR((unused)),
+                     ss_argv_t argv EXT2FS_ATTR((unused)),
                      int sci_idx EXT2FS_ATTR((unused)),
                      void *infop EXT2FS_ATTR((unused)))
 {
@@ -831,11 +831,13 @@ void internal_dump_inode(FILE *out, const char *prefix,
        char frag, fsize;
        int os = current_fs->super->s_creator_os;
        struct ext2_inode_large *large_inode;
-       int is_large_inode = 0;
+       size_t inode_size;
 
-       if (EXT2_INODE_SIZE(current_fs->super) > EXT2_GOOD_OLD_INODE_SIZE)
-               is_large_inode = 1;
        large_inode = (struct ext2_inode_large *) inode;
+       if (EXT2_INODE_SIZE(current_fs->super) > EXT2_GOOD_OLD_INODE_SIZE)
+               inode_size = ext2fs_inode_actual_size(large_inode);
+       else
+               inode_size = EXT2_GOOD_OLD_INODE_SIZE;
 
        if (LINUX_S_ISDIR(inode->i_mode)) i_type = "directory";
        else if (LINUX_S_ISREG(inode->i_mode)) i_type = "regular";
@@ -848,7 +850,7 @@ void internal_dump_inode(FILE *out, const char *prefix,
        fprintf(out, "%sInode: %u   Type: %s    ", prefix, inode_num, i_type);
        fprintf(out, "%sMode:  0%03o   Flags: 0x%x\n",
                prefix, inode->i_mode & 07777, inode->i_flags);
-       if (is_large_inode && large_inode->i_extra_isize >= 24) {
+       if (ext2fs_inode_includes(inode_size, i_version_hi)) {
                fprintf(out, "%sGeneration: %u    Version: 0x%08x:%08x\n",
                        prefix, inode->i_generation, large_inode->i_version_hi,
                        inode->osd1.linux1.l_i_version);
@@ -858,7 +860,7 @@ void internal_dump_inode(FILE *out, const char *prefix,
        }
        fprintf(out, "%sUser: %5d   Group: %5d",
                prefix, inode_uid(*inode), inode_gid(*inode));
-       if (is_large_inode && large_inode->i_extra_isize >= 32)
+       if (ext2fs_inode_includes(inode_size, i_projid))
                fprintf(out, "   Project: %5d", large_inode->i_projid);
        fputs("   Size: ", out);
        if (LINUX_S_ISREG(inode->i_mode) || LINUX_S_ISDIR(inode->i_mode))
@@ -895,39 +897,51 @@ void internal_dump_inode(FILE *out, const char *prefix,
        }
        fprintf(out, "%sFragment:  Address: %u    Number: %u    Size: %u\n",
                prefix, inode->i_faddr, frag, fsize);
-       if (is_large_inode && large_inode->i_extra_isize >= 24) {
+       if (ext2fs_inode_includes(inode_size, i_ctime_extra))
                fprintf(out, "%s ctime: 0x%08x:%08x -- %s", prefix,
                        inode->i_ctime, large_inode->i_ctime_extra,
-                       inode_time_to_string(inode->i_ctime,
-                                            large_inode->i_ctime_extra));
+                       time_to_string(ext2fs_inode_xtime_get(large_inode,
+                                                             i_ctime)));
+       else
+               fprintf(out, "%sctime: 0x%08x -- %s", prefix, inode->i_ctime,
+                       time_to_string((__s32) inode->i_ctime));
+       if (ext2fs_inode_includes(inode_size, i_atime_extra))
                fprintf(out, "%s atime: 0x%08x:%08x -- %s", prefix,
                        inode->i_atime, large_inode->i_atime_extra,
-                       inode_time_to_string(inode->i_atime,
-                                            large_inode->i_atime_extra));
+                       time_to_string(ext2fs_inode_xtime_get(large_inode,
+                                                             i_atime)));
+       else
+               fprintf(out, "%satime: 0x%08x -- %s", prefix, inode->i_atime,
+                       time_to_string((__s32) inode->i_atime));
+       if (ext2fs_inode_includes(inode_size, i_mtime_extra))
                fprintf(out, "%s mtime: 0x%08x:%08x -- %s", prefix,
                        inode->i_mtime, large_inode->i_mtime_extra,
-                       inode_time_to_string(inode->i_mtime,
-                                            large_inode->i_mtime_extra));
+                       time_to_string(ext2fs_inode_xtime_get(large_inode,
+                                                             i_mtime)));
+       else
+               fprintf(out, "%smtime: 0x%08x -- %s", prefix, inode->i_mtime,
+                       time_to_string((__s32) inode->i_mtime));
+       if (ext2fs_inode_includes(inode_size, i_crtime_extra))
                fprintf(out, "%scrtime: 0x%08x:%08x -- %s", prefix,
                        large_inode->i_crtime, large_inode->i_crtime_extra,
-                       inode_time_to_string(large_inode->i_crtime,
-                                            large_inode->i_crtime_extra));
-               if (inode->i_dtime)
+                       time_to_string(ext2fs_inode_xtime_get(large_inode,
+                                                             i_crtime)));
+       if (inode->i_dtime) {
+               if (ext2fs_inode_includes(inode_size, i_ctime_extra)) {
+                       time_t tm;
+
+                       /* dtime doesn't have its own i_dtime_extra field, so
+                        * approximate this with i_ctime_extra instead. */
+                       tm = __decode_extra_sec(inode->i_dtime,
+                                               large_inode->i_ctime_extra);
                        fprintf(out, "%s dtime: 0x%08x:(%08x) -- %s", prefix,
-                               large_inode->i_dtime, large_inode->i_ctime_extra,
-                               inode_time_to_string(inode->i_dtime,
-                                                    large_inode->i_ctime_extra));
-       } else {
-               fprintf(out, "%sctime: 0x%08x -- %s", prefix, inode->i_ctime,
-                       time_to_string((__s32) inode->i_ctime));
-               fprintf(out, "%satime: 0x%08x -- %s", prefix, inode->i_atime,
-                       time_to_string((__s32) inode->i_atime));
-               fprintf(out, "%smtime: 0x%08x -- %s", prefix, inode->i_mtime,
-                       time_to_string((__s32) inode->i_mtime));
-               if (inode->i_dtime)
+                               inode->i_dtime, large_inode->i_ctime_extra,
+                               time_to_string(tm));
+               } else {
                        fprintf(out, "%sdtime: 0x%08x -- %s", prefix,
                                inode->i_dtime,
                                time_to_string((__s32) inode->i_dtime));
+               }
        }
        if (EXT2_INODE_SIZE(current_fs->super) > EXT2_GOOD_OLD_INODE_SIZE)
                internal_dump_inode_extra(out, prefix, inode_num,
@@ -935,11 +949,7 @@ void internal_dump_inode(FILE *out, const char *prefix,
        dump_inode_attributes(out, inode_num);
        if (ext2fs_has_feature_metadata_csum(current_fs->super)) {
                __u32 crc = inode->i_checksum_lo;
-               if (is_large_inode &&
-                   large_inode->i_extra_isize >=
-                               (offsetof(struct ext2_inode_large,
-                                         i_checksum_hi) -
-                                EXT2_GOOD_OLD_INODE_SIZE))
+               if (ext2fs_inode_includes(inode_size, i_checksum_hi))
                        crc |= ((__u32)large_inode->i_checksum_hi) << 16;
                fprintf(out, "Inode checksum: 0x%08x\n", crc);
        }
@@ -986,7 +996,7 @@ static void dump_inode(ext2_ino_t inode_num, struct ext2_inode *inode)
        close_pager(out);
 }
 
-void do_stat(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_stat(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
             void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      inode;
@@ -1018,7 +1028,7 @@ void do_stat(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
        return;
 }
 
-void do_dump_extents(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+void do_dump_extents(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
                     void *infop EXT2FS_ATTR((unused)))
 {
        struct ext2_inode inode;
@@ -1090,7 +1100,7 @@ static int print_blocks_proc(ext2_filsys fs EXT2FS_ATTR((unused)),
        return 0;
 }
 
-void do_blocks(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_blocks(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
               void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      inode;
@@ -1108,7 +1118,7 @@ void do_blocks(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
        return;
 }
 
-void do_chroot(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_chroot(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
               void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t inode;
@@ -1126,7 +1136,7 @@ void do_chroot(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
 }
 
 #ifndef READ_ONLY
-void do_clri(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_clri(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
             void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t inode;
@@ -1142,7 +1152,7 @@ void do_clri(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
                return;
 }
 
-void do_freei(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_freei(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
              void *infop EXT2FS_ATTR((unused)))
 {
        unsigned int    len = 1;
@@ -1173,7 +1183,7 @@ void do_freei(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
        ext2fs_mark_ib_dirty(current_fs);
 }
 
-void do_seti(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_seti(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
             void *infop EXT2FS_ATTR((unused)))
 {
        unsigned int    len = 1;
@@ -1205,7 +1215,7 @@ void do_seti(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
 }
 #endif /* READ_ONLY */
 
-void do_testi(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_testi(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
              void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t inode;
@@ -1220,7 +1230,7 @@ void do_testi(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
 }
 
 #ifndef READ_ONLY
-void do_freeb(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_freeb(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
              void *infop EXT2FS_ATTR((unused)))
 {
        blk64_t block;
@@ -1240,7 +1250,7 @@ void do_freeb(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
        ext2fs_mark_bb_dirty(current_fs);
 }
 
-void do_setb(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_setb(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
             void *infop EXT2FS_ATTR((unused)))
 {
        blk64_t block;
@@ -1261,7 +1271,7 @@ void do_setb(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
 }
 #endif /* READ_ONLY */
 
-void do_testb(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_testb(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
              void *infop EXT2FS_ATTR((unused)))
 {
        blk64_t block;
@@ -1348,7 +1358,7 @@ static void modify_u32(char *com, const char *prompt,
 }
 
 
-void do_modify_inode(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_modify_inode(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
                     void *infop EXT2FS_ATTR((unused)))
 {
        struct ext2_inode inode;
@@ -1426,7 +1436,7 @@ void do_modify_inode(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
 }
 #endif /* READ_ONLY */
 
-void do_change_working_dir(int argc, char *argv[],
+void do_change_working_dir(int argc, ss_argv_t argv,
                           int sci_idx EXT2FS_ATTR((unused)),
                           void *infop EXT2FS_ATTR((unused)))
 {
@@ -1445,7 +1455,7 @@ void do_change_working_dir(int argc, char *argv[],
        return;
 }
 
-void do_print_working_directory(int argc, char *argv[],
+void do_print_working_directory(int argc, ss_argv_t argv,
                                int sci_idx EXT2FS_ATTR((unused)),
                                void *infop EXT2FS_ATTR((unused)))
 {
@@ -1536,7 +1546,7 @@ static void make_link(char *sourcename, char *destname)
 }
 
 
-void do_link(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_link(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
             void *infop EXT2FS_ATTR((unused)))
 {
        if (common_args_process(argc, argv, 3, 3, "link",
@@ -1559,7 +1569,7 @@ static int mark_blocks_proc(ext2_filsys fs, blk64_t *blocknr,
        return 0;
 }
 
-void do_undel(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_undel(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
              void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      ino;
@@ -1623,7 +1633,7 @@ static void unlink_file_by_name(char *filename)
        return;
 }
 
-void do_unlink(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_unlink(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
               void *infop EXT2FS_ATTR((unused)))
 {
        if (common_args_process(argc, argv, 2, 2, "link",
@@ -1633,7 +1643,7 @@ void do_unlink(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
        unlink_file_by_name(argv[1]);
 }
 
-void do_copy_inode(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_copy_inode(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
                   void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      src_ino, dest_ino;
@@ -1662,7 +1672,7 @@ void do_copy_inode(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
 
 #endif /* READ_ONLY */
 
-void do_find_free_block(int argc, char *argv[],
+void do_find_free_block(int argc, ss_argv_t argv,
                        int sci_idx EXT2FS_ATTR((unused)),
                        void *infop EXT2FS_ATTR((unused)))
 {
@@ -1716,7 +1726,7 @@ void do_find_free_block(int argc, char *argv[],
        printf("\n");
 }
 
-void do_find_free_inode(int argc, char *argv[],
+void do_find_free_inode(int argc, ss_argv_t argv,
                        int sci_idx EXT2FS_ATTR((unused)),
                        void *infop EXT2FS_ATTR((unused)))
 {
@@ -1758,7 +1768,7 @@ void do_find_free_inode(int argc, char *argv[],
 }
 
 #ifndef READ_ONLY
-void do_write(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_write(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
              void *infop EXT2FS_ATTR((unused)))
 {
        errcode_t       retval;
@@ -1772,7 +1782,7 @@ void do_write(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
                com_err(argv[0], retval, 0);
 }
 
-void do_mknod(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_mknod(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
              void *infop EXT2FS_ATTR((unused)))
 {
        unsigned long   major, minor;
@@ -1807,9 +1817,12 @@ void do_mknod(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
        }
 
        if (nr == 5) {
-               major = strtoul(argv[3], argv+3, 0);
-               minor = strtoul(argv[4], argv+4, 0);
-               if (major > 65535 || minor > 65535 || argv[3][0] || argv[4][0])
+               char *end1 = NULL, *end2 = NULL;
+
+               major = strtoul(argv[3], &end1, 0);
+               minor = strtoul(argv[4], &end2, 0);
+               if (major > 65535 || minor > 65535 ||
+                   (end1 && *end1) || (end2 && *end2))
                        nr = 0;
        }
 
@@ -1823,7 +1836,7 @@ void do_mknod(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
                com_err(argv[0], retval, 0);
 }
 
-void do_mkdir(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_mkdir(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
              void *infop EXT2FS_ATTR((unused)))
 {
        errcode_t retval;
@@ -1877,7 +1890,7 @@ static void kill_file_by_inode(ext2_ino_t inode)
 }
 
 
-void do_kill_file(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_kill_file(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
                  void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t inode_num;
@@ -1888,7 +1901,7 @@ void do_kill_file(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
        kill_file_by_inode(inode_num);
 }
 
-void do_rm(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_rm(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
           void *infop EXT2FS_ATTR((unused)))
 {
        int retval;
@@ -1950,7 +1963,7 @@ static int rmdir_proc(ext2_ino_t dir EXT2FS_ATTR((unused)),
        return 0;
 }
 
-void do_rmdir(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_rmdir(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
              void *infop EXT2FS_ATTR((unused)))
 {
        int retval;
@@ -2009,7 +2022,7 @@ void do_rmdir(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
 #endif /* READ_ONLY */
 
 void do_show_debugfs_params(int argc EXT2FS_ATTR((unused)),
-                           char *argv[] EXT2FS_ATTR((unused)),
+                           ss_argv_t argv EXT2FS_ATTR((unused)),
                            int sci_idx EXT2FS_ATTR((unused)),
                            void *infop EXT2FS_ATTR((unused)))
 {
@@ -2021,7 +2034,7 @@ void do_show_debugfs_params(int argc EXT2FS_ATTR((unused)),
 }
 
 #ifndef READ_ONLY
-void do_expand_dir(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_expand_dir(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
                    void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t inode;
@@ -2036,7 +2049,7 @@ void do_expand_dir(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
        return;
 }
 
-void do_features(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_features(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
                 void *infop EXT2FS_ATTR((unused)))
 {
        int     i;
@@ -2058,7 +2071,7 @@ void do_features(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
 }
 #endif /* READ_ONLY */
 
-void do_bmap(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_bmap(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
             void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      ino;
@@ -2123,7 +2136,7 @@ void do_bmap(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
        fputc('\n', stdout);
 }
 
-void do_imap(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_imap(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
             void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      ino;
@@ -2155,7 +2168,7 @@ void do_imap(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
 
 }
 
-void do_idump(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_idump(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
              void *infop EXT2FS_ATTR((unused)))
 {
        struct ext2_inode_large *inode;
@@ -2226,7 +2239,7 @@ err:
 }
 
 #ifndef READ_ONLY
-void do_set_current_time(int argc, char *argv[],
+void do_set_current_time(int argc, ss_argv_t argv,
                         int sci_idx EXT2FS_ATTR((unused)),
                         void *infop EXT2FS_ATTR((unused)))
 {
@@ -2287,7 +2300,7 @@ static int find_supp_feature(__u32 *supp, int feature_type, char *name)
        return 0;
 }
 
-void do_supported_features(int argc, char *argv[],
+void do_supported_features(int argc, ss_argv_t argv,
                           int sci_idx EXT2FS_ATTR((unused)),
                           void *infop EXT2FS_ATTR((unused)))
 {
@@ -2317,7 +2330,7 @@ void do_supported_features(int argc, char *argv[],
 }
 
 #ifndef READ_ONLY
-void do_punch(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_punch(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
              void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      ino;
@@ -2353,7 +2366,7 @@ void do_punch(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
        }
 }
 
-void do_fallocate(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_fallocate(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
                  void *infop EXT2FS_ATTR((unused)))
 {
        ext2_ino_t      ino;
@@ -2390,7 +2403,7 @@ void do_fallocate(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
        }
 }
 
-void do_symlink(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
+void do_symlink(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),
                void *infop EXT2FS_ATTR((unused)))
 {
        errcode_t       retval;
@@ -2407,7 +2420,7 @@ void do_symlink(int argc, char *argv[], int sci_idx EXT2FS_ATTR((unused)),
 #endif /* READ_ONLY */
 
 #if CONFIG_MMP
-void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[],
+void do_dump_mmp(int argc EXT2FS_ATTR((unused)), ss_argv_t argv,
                 int sci_idx EXT2FS_ATTR((unused)),
                 void *infop EXT2FS_ATTR((unused)))
 {
@@ -2473,7 +2486,7 @@ void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[],
 }
 #else
 void do_dump_mmp(int argc EXT2FS_ATTR((unused)),
-                char *argv[] EXT2FS_ATTR((unused)),
+                ss_argv_t argv EXT2FS_ATTR((unused)),
                 int sci_idx EXT2FS_ATTR((unused)),
                 void *infop EXT2FS_ATTR((unused)))
 {