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

cli: accept shortcuts for --mode and --escape arguments

Browse Source 
--mode tabular | multiline  -->  --mode t | m
--escape yes | no           -->  --escape y | n
This commit is contained in:
Jiří Klimeš
2013-04-17 09:27:39 +02:00
parent ef151c3f04
commit 5f523d8f4d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cli/src/nmcli.c
View File

@@ -190,9 +190,9 @@ parse_command_line (NmCli *nmc, int argc, char **argv)
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
return nmc->return_value; return nmc->return_value;
} }
if (!strcmp (argv[1], "tabular")) if (matches (argv[1], "tabular") == 0)
nmc->multiline_output = FALSE; nmc->multiline_output = FALSE;
else if (!strcmp (argv[1], "multiline")) else if (matches (argv[1], "multiline") == 0)
nmc->multiline_output = TRUE; nmc->multiline_output = TRUE;
else { else {
g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[1], opt); g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[1], opt);
@@ -206,9 +206,9 @@ parse_command_line (NmCli *nmc, int argc, char **argv)
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
return nmc->return_value; return nmc->return_value;
} }
if (!strcmp (argv[1], "yes")) if (matches (argv[1], "yes") == 0)
nmc->escape_values = TRUE; nmc->escape_values = TRUE;
else if (!strcmp (argv[1], "no")) else if (matches (argv[1], "no") == 0)
nmc->escape_values = FALSE; nmc->escape_values = FALSE;
else { else {
g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[1], opt); g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), argv[1], opt);