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

cli: remove iface keyword for 'nmcli device disconnect'

Browse Source 
'nmcli disconnect' allows specifying only one interface at a time.
This commit is contained in:
Jiří Klimeš
2013-04-02 19:18:32 +02:00
committed by Dan Williams
parent 60f54cd65d
commit 51f055f74c
1 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
cli/src/devices.c
View File

@@ -263,7 +263,7 @@ usage (void)
#endif #endif
" status\n" " status\n"
" list [iface <iface>]\n" " list [iface <iface>]\n"
" disconnect iface <iface> [--nowait] [--timeout <timeout>]\n" " disconnect <iface> [--nowait] [--timeout <timeout>]\n"
" wifi [list [iface <iface>] [bssid <BSSID>]]\n" " wifi [list [iface <iface>] [bssid <BSSID>]]\n"
" wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [iface <iface>] [bssid <BSSID>] [name <name>]\n" " wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [iface <iface>] [bssid <BSSID>] [name <name>]\n"
" [--private] [--nowait] [--timeout <timeout>]\n" " [--private] [--nowait] [--timeout <timeout>]\n"
@@ -1185,38 +1185,7 @@ do_device_disconnect (NmCli *nmc, int argc, char **argv)
goto error; goto error;
} }
} else { } else {
while (argc > 0) { iface = *argv;
if (strcmp (*argv, "iface") == 0) {
if (next_arg (&argc, &argv) != 0) {
g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1));
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error;
}
iface = *argv;
} else if (strcmp (*argv, "--nowait") == 0) {
wait = FALSE;
} else if (strcmp (*argv, "--timeout") == 0) {
if (next_arg (&argc, &argv) != 0) {
g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1));
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error;
}
errno = 0;
nmc->timeout = strtol (*argv, NULL, 10);
if (errno || nmc->timeout < 0) {
g_string_printf (nmc->return_text, _("Error: timeout value '%s' is not valid."), *argv);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error;
}
} else {
fprintf (stderr, _("Unknown parameter: %s\n"), *argv);
}
next_arg (&argc, &argv);
}
} }
if (!iface) { if (!iface) {
@@ -1224,6 +1193,34 @@ do_device_disconnect (NmCli *nmc, int argc, char **argv)
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto error;
} }
next_arg (&argc, &argv);
while (argc > 0) {
if (strcmp (*argv, "--nowait") == 0) {
wait = FALSE;
} else if (strcmp (*argv, "--timeout") == 0) {
if (next_arg (&argc, &argv) != 0) {
g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1));
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error;
}
errno = 0;
nmc->timeout = strtol (*argv, NULL, 10);
if (errno || nmc->timeout < 0) {
g_string_printf (nmc->return_text, _("Error: timeout value '%s' is not valid."), *argv);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error;
}
} else {
g_string_printf (nmc->return_text, _("Error: unknown argument '%s'."), *argv);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error;
}
next_arg (&argc, &argv);
}
nmc->get_client (nmc); nmc->get_client (nmc);