colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: handle global usage with nmc_do_cmd()

Browse Source
This commit is contained in:
Lubomir Rintel
2016-07-06 16:25:02 +02:00
parent 33cd5149f8
commit 60f992c5d3
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
clients/cli/nmcli.c
View File

@@ -78,9 +78,9 @@ nmcli_error_quark (void)
} }
static void static void
usage (const char *prog_name) usage (void)
{ {
g_printerr (_("Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n" g_printerr (_("Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
"\n" "\n"
"OPTIONS\n" "OPTIONS\n"
" -t[erse] terse output\n" " -t[erse] terse output\n"
@@ -103,15 +103,7 @@ usage (const char *prog_name)
" d[evice] devices managed by NetworkManager\n" " d[evice] devices managed by NetworkManager\n"
" a[gent] NetworkManager secret agent or polkit agent\n" " a[gent] NetworkManager secret agent or polkit agent\n"
" m[onitor] monitor NetworkManager changes\n" " m[onitor] monitor NetworkManager changes\n"
"\n"), "\n"));
prog_name);
}
static NMCResultCode
do_help (NmCli *nmc, int argc, char **argv)
{
usage ("nmcli");
return NMC_RESULT_SUCCESS;
} }
static const NMCCommand nmcli_cmds[] = { static const NMCCommand nmcli_cmds[] = {
@@ -122,8 +114,7 @@ static const NMCCommand nmcli_cmds[] = {
{ "connection", do_connections, NULL }, { "connection", do_connections, NULL },
{ "device", do_devices, NULL }, { "device", do_devices, NULL },
{ "agent", do_agent, NULL }, { "agent", do_agent, NULL },
{ "help", do_help, NULL }, { NULL, do_overview, usage }
{ NULL, do_overview, NULL },
}; };
static NMCResultCode static NMCResultCode
@@ -270,7 +261,7 @@ parse_command_line (NmCli *nmc, int argc, char **argv)
g_print (_("nmcli tool, version %s\n"), NMCLI_VERSION); g_print (_("nmcli tool, version %s\n"), NMCLI_VERSION);
return NMC_RESULT_SUCCESS; return NMC_RESULT_SUCCESS;
} else if (matches (opt, "-help") == 0) { } else if (matches (opt, "-help") == 0) {
usage (base); usage ();
return NMC_RESULT_SUCCESS; return NMC_RESULT_SUCCESS;
} else { } else {
g_string_printf (nmc->return_text, _("Error: Option '%s' is unknown, try 'nmcli -help'."), opt); g_string_printf (nmc->return_text, _("Error: Option '%s' is unknown, try 'nmcli -help'."), opt);