bcachefs-tools: add usage function for fs subcommand
PATCH 1/1 bcachefs-tools: add usage function for fs subcommand
Add the missing usage function for "fs" subcommand; when no matching subcommand exists, print the usage and return -EINVAL.
--- c_src/bcachefs.c | 9 ++++----- c_src/cmd_fs.c | 12 ++++++++++++ c_src/cmds.h | 1 + 3 files changed, 17 insertions(+), 5 deletions(-)
c_src/bcachefs.c +4 -5
@@ -113,14 +113,13 @@ int fs_cmds(int argc, char *argv[]) {char *cmd =pop_cmd (&argc, argv); -if (argc <1 ) { -bcachefs_usage (); -exit (EXIT_FAILURE ); - } +if (argc <1 ) +return fs_usage ();if (!strcmp (cmd,"usage" ))return cmd_fs_usage (argc, argv); -return 0 ; +fs_usage (); +return -EINVAL ; }int device_cmds (int argc,char *argv[])
c_src/cmd_fs.c +12 -0
@@ -487,6 +487,18 @@ devs:bcache_fs_close (fs); } +int fs_usage (void ) +{ +puts ("bcachefs fs - manage a running filesystem\n" +"Usage: bcachefs fs <CMD> [OPTIONS]\n" +"\n" +"Commands:\n" +" usage Display detailed filesystem usage\n" +"\n" +"Report bugs to <[email protected]>" ); +return 0 ; +} +static void fs_usage_usage (void ) { puts("bcachefs fs usage - display detailed filesystem usage\n"
c_src/cmds.h +1 -0
@@ -14,6 +14,7 @@ int cmd_show_super(int argc, char *argv[]);int cmd_reset_counters (int argc,char *argv[]);int cmd_set_option (int argc,char *argv[]); +int fs_usage (void );int cmd_fs_usage (int argc,char *argv[]);int device_usage (void );
--
2.47.0
Quoted 19 lines · Integral
Add the missing usage function for "fs" subcommand; when no matching subcommand exists, print the usage and return
-EINVAL.Signed-off-by Integral <[email protected]>--- c_src/bcachefs.c | 9 ++++----- c_src/cmd_fs.c | 12 ++++++++++++ c_src/cmds.h | 1 + 3 files changed, 17 insertions(+), 5 deletions(-)c_src/bcachefs.c +0
-1@@ -113,14 +113,13 @@ int fs_cmds(int argc, char *argv[]) {char *cmd =pop_cmd (&argc, argv); -if (argc <1 ) {
c_src/bcachefs.c int fs_cmds(int argc, char *argv[]) · line 121
Quoted 10 lines
c_src/bcachefs.c +3
-4-bcachefs_usage (); -exit (EXIT_FAILURE ); - } +if (argc <1 ) +return fs_usage ();if (!strcmp (cmd,"usage" ))return cmd_fs_usage (argc, argv); -return 0 ; +fs_usage ();
Your previous patch also made changes here. Perhaps you could pack them into a patchset or one patch which would make it more independent.
Quoted 9 lines
c_src/bcachefs.c +1
-0+return -EINVAL ; }int device_cmds (int argc,char *argv[])c_src/cmd_fs.c +0
-0
c_src/cmd_fs.c devs: · line 493
Quoted 7 lines
c_src/cmd_fs.c +4
-0@@ -487,6 +487,18 @@ devs:bcache_fs_close (fs); } +int fs_usage (void ) +{ +puts ("bcachefs fs - manage a running filesystem\n" + "Usage: bcachefs fs <CMD> [OPTIONS]\n"
May be the OPTIONS also should be displayed. ie like device_add_usage ...
Thanks,
Hongbo
Quoted 26 lines
c_src/cmd_fs.c +8
-0+"\n" +"Commands:\n" +" usage Display detailed filesystem usage\n" +"\n" + "Report bugs to <[email protected]>"); +return 0 ; +} +static void fs_usage_usage (void ) { puts("bcachefs fs usage - display detailed filesystem usage\n"c_src/cmds.h +1
-1@@ -14,6 +14,7 @@ int cmd_show_super(int argc, char *argv[]);int cmd_reset_counters (int argc,char *argv[]);int cmd_set_option (int argc,char *argv[]); +int fs_usage (void );int cmd_fs_usage (int argc,char *argv[]);int device_usage (void ); --2.47.0
PATCH v2 1/1 bcachefs-tools: add fs_usage & return -EINVAL when no matching subcommand
Add the missing usage function for "fs" subcommand; when no matching subcommand exists, print the usage and return -EINVAL.
--- c_src/bcachefs.c | 15 ++++++++------- c_src/cmd_fs.c | 12 ++++++++++++ c_src/cmds.h | 1 + 3 files changed, 21 insertions(+), 7 deletions(-)
c_src/bcachefs.c +8 -7
@@ -113,14 +113,13 @@ int fs_cmds(int argc, char *argv[]) {char *cmd =pop_cmd (&argc, argv); -if (argc <1 ) { -bcachefs_usage (); -exit (EXIT_FAILURE ); - } +if (argc <1 ) +return fs_usage ();if (!strcmp (cmd,"usage" ))return cmd_fs_usage (argc, argv); -return 0 ; +fs_usage (); +return -EINVAL ; }int device_cmds (int argc,char *argv[])
@@ -146,7 +145,8 @@ int device_cmds(int argc, char *argv[])if (!strcmp (cmd,"resize-journal" ))return cmd_device_resize_journal (argc, argv); -return 0 ; +device_usage (); +return -EINVAL ; }int data_cmds (int argc,char *argv[])
@@ -160,5 +160,6 @@ int data_cmds(int argc, char *argv[])if (!strcmp (cmd,"job" ))return cmd_data_job (argc, argv); -return 0 ; +data_usage (); +return -EINVAL ; }
c_src/cmd_fs.c +12 -0
@@ -487,6 +487,18 @@ devs:bcache_fs_close (fs); } +int fs_usage (void ) +{ +puts ("bcachefs fs - manage a running filesystem\n" +"Usage: bcachefs fs <CMD> [OPTIONS]\n" +"\n" +"Commands:\n" +" usage Display detailed filesystem usage\n" +"\n" +"Report bugs to <[email protected]>" ); +return 0 ; +} +static void fs_usage_usage (void ) { puts("bcachefs fs usage - display detailed filesystem usage\n"
c_src/cmds.h +1 -0
@@ -14,6 +14,7 @@ int cmd_show_super(int argc, char *argv[]);int cmd_reset_counters (int argc,char *argv[]);int cmd_set_option (int argc,char *argv[]); +int fs_usage (void );int cmd_fs_usage (int argc,char *argv[]);int device_usage (void );
--
2.47.0