cli: add NmCli argument to next_arg()

Will be useful in next commit.

6 files changed, 37 insertions, 37 deletions

diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 1a6f443950..26b5e57776 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -1734,7 +1734,7 @@ get_connection (NmCli *nmc, int *argc, char ***argv, int *pos, GError **error)
 	 * don't switch to next argument.
 	 */
 	if (!pos || !*pos)
-		next_arg (argc, argv);
+		next_arg (nmc, argc, argv);
 
 	return connection;
 }
@@ -1759,12 +1759,12 @@ do_connections_show (NmCli *nmc, int argc, char **argv)
 
 		if (!active_only && nmc_arg_is_option (*argv, "active")) {
 			active_only = TRUE;
-			next_arg (&argc, &argv);
+			next_arg (nmc, &argc, &argv);
 		} else if (!show_secrets && nmc_arg_is_option (*argv, "show-secrets")) {
 			/* --show-secrets is deprecated in favour of global --show-secrets */
 			/* Keep it here for backwards compatibility */
 			show_secrets = TRUE;
-			next_arg (&argc, &argv);
+			next_arg (nmc, &argc, &argv);
 		} else if (!order && nmc_arg_is_option (*argv, "order")) {
 			if (!argc) {
 				g_set_error_literal (&err, NMCLI_ERROR, 0,
@@ -1777,7 +1777,7 @@ do_connections_show (NmCli *nmc, int argc, char **argv)
 			order = parse_preferred_connection_order (*argv, &err);
 			if (err)
 				goto finish;
-			next_arg (&argc, &argv);
+			next_arg (nmc, &argc, &argv);
 		} else {
 			break;
 		}
@@ -1895,12 +1895,12 @@ do_connections_show (NmCli *nmc, int argc, char **argv)
 			if (!acon)
 				acon = get_ac_for_connection (active_cons, con);
 			if (active_only && !acon) {
-				next_arg (&argc, &argv);
+				next_arg (nmc, &argc, &argv);
 				continue;
 			}
 
 			if (nmc->complete) {
-				next_arg (&argc, &argv);
+				next_arg (nmc, &argc, &argv);
 				continue;
 			}
 
@@ -1938,7 +1938,7 @@ do_connections_show (NmCli *nmc, int argc, char **argv)
 			 * so process the same argument again.
 			 */
 			if (!pos)
-				next_arg (&argc, &argv);
+				next_arg (nmc, &argc, &argv);
 		}
 	}
 
@@ -2640,7 +2640,7 @@ do_connection_up (NmCli *nmc, int argc, char **argv)
 			g_printerr (_("Unknown parameter: %s\n"), *argv);
 		}
 
-		next_arg (&argc, &argv);
+		next_arg (nmc, &argc, &argv);
 	}
 
 	if (nmc->complete)
@@ -2822,7 +2822,7 @@ do_connection_down (NmCli *nmc, int argc, char **argv)
 		}
 
 		if (idx == 0)
-			next_arg (&arg_num, &arg_ptr);
+			next_arg (nmc->ask ? NULL : nmc, &arg_num, &arg_ptr);
 	}
 
 	if (!queue) {
@@ -4955,7 +4955,7 @@ read_properties:
 			 * options and properties to be separated with "--" */
 			g_clear_error (&error);
 			seen_dash_dash = TRUE;
-			next_arg (&argc, &argv);
+			next_arg (nmc, &argc, &argv);
 			goto read_properties;
 		} else if (g_strcmp0 (*argv, "save") == 0) {
 			/* It would be better if "save" was a separate argument and not
@@ -4977,7 +4977,7 @@ read_properties:
 				g_clear_error (&error);
 				goto finish;
 			}
-			next_arg (&argc, &argv);
+			next_arg (nmc, &argc, &argv);
 			goto read_properties;
 		}
 
@@ -8104,7 +8104,7 @@ do_connection_modify (NmCli *nmc,
 		if (nmc->complete)
 			goto finish;
 		temporary = TRUE;
-		next_arg (&argc, &argv);
+		next_arg (nmc, &argc, &argv);
 	}
 
 	connection = get_connection (nmc, &argc, &argv, NULL, &error);
@@ -8213,7 +8213,7 @@ do_connection_clone (NmCli *nmc, int argc, char **argv)
 		argc_ptr = &arg_num;
 	} else if (nmc_arg_is_option (*argv, "temporary")) {
 		temporary = TRUE;
-		next_arg (&argc, &argv);
+		next_arg (nmc, &argc, &argv);
 	}
 
 	connection = get_connection (nmc, argc_ptr, argv_ptr, NULL, &error);
@@ -8236,7 +8236,7 @@ do_connection_clone (NmCli *nmc, int argc, char **argv)
 		goto finish;
 	}
 
-	if (next_arg (argc_ptr, argv_ptr) == 0) {
+	if (next_arg (nmc->ask ? NULL : nmc, argc_ptr, argv_ptr) == 0) {
 		g_string_printf (nmc->return_text, _("Error: unknown extra argument: '%s'."), *argv);
 		nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
 		goto finish;
@@ -8598,7 +8598,7 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 			nmc_complete_strings (*argv, "temporary", "type", "file", NULL);
 		if (nmc_arg_is_option (*argv, "temporary")) {
 			temporary = TRUE;
-			next_arg (&argc, &argv);
+			next_arg (nmc, &argc, &argv);
 		}
 
 		if (strcmp (*argv, "type") == 0) {
@@ -8638,7 +8638,7 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 			goto finish;
 		}
 
-		next_arg (&argc, &argv);
+		next_arg (nmc, &argc, &argv);
 	}
 
 	if (nmc->complete)
@@ -8746,7 +8746,7 @@ do_connection_export (NmCli *nmc, int argc, char **argv)
 		argv++;
 	}
 
-	if (next_arg (argc_ptr, argv_ptr) == 0) {
+	if (next_arg (nmc->ask ? NULL : nmc, argc_ptr, argv_ptr) == 0) {
 		g_string_printf (nmc->return_text, _("Error: unknown extra argument: '%s'."), *argv);
 		nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
 		goto finish;
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index 47ee294019..25d0e983d7 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -613,7 +613,7 @@ get_device_list (NmCli *nmc, int argc, char **argv)
 		}
 
 		/* Take next argument */
-		next_arg (&arg_num, &arg_ptr);
+		next_arg (nmc->ask ? NULL : nmc, &arg_num, &arg_ptr);
 	}
 	g_free (devices);
 
@@ -642,7 +642,7 @@ get_device (NmCli *nmc, int *argc, char ***argv, GError **error)
 		}
 	} else {
 		ifname = **argv;
-		next_arg (argc, argv);
+		next_arg (nmc, argc, argv);
 	}
 
 	devices = nmc_get_devices_sorted (nmc->client);
@@ -1496,7 +1496,7 @@ do_devices_status (NmCli *nmc, int argc, char **argv)
 
 	while (argc > 0) {
 		g_printerr (_("Unknown parameter: %s\n"), *argv);
-		next_arg (&argc, &argv);
+		next_arg (nmc, &argc, &argv);
 	}
 
 	if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0)
@@ -2289,7 +2289,7 @@ do_device_set (NmCli *nmc, int argc, char **argv)
 	gs_free_error GError *error = NULL;
 
 	if (argc >= 1 && g_strcmp0 (*argv, "ifname") == 0) {
-		next_arg (&argc, &argv);
+		next_arg (nmc, &argc, &argv);
 	}
 
 	device = get_device (nmc, &argc, &argv, &error);
@@ -2348,7 +2348,7 @@ do_device_set (NmCli *nmc, int argc, char **argv)
 			g_string_printf (nmc->return_text, _("Error: property '%s' is not known."), *argv);
 			return NMC_RESULT_ERROR_USER_INPUT;
 		}
-	} while (next_arg (&argc, &argv) == 0);
+	} while (next_arg (nmc, &argc, &argv) == 0);
 
 	if (nmc->complete)
 		return nmc->return_value;
@@ -2657,7 +2657,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
 			g_printerr (_("Unknown parameter: %s\n"), *argv);
 		}
 
-		next_arg (&argc, &argv);
+		next_arg (nmc, &argc, &argv);
 	}
 
 	if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0)
@@ -2854,7 +2854,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 		if (argc == 1 && nmc->complete)
 			complete_aps (devices, NULL, param_user, param_user);
 
-		next_arg (&argc, &argv);
+		next_arg (nmc, &argc, &argv);
 	} else {
 		/* nmc_do_cmd() should not call this with argc=0. */
 		g_assert (!nmc->complete);
@@ -2981,7 +2981,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 			g_printerr (_("Unknown parameter: %s\n"), *argv);
 		}
 
-		next_arg (&argc, &argv);
+		next_arg (nmc, &argc, &argv);
 	}
 
 	if (nmc->complete)
@@ -3408,7 +3408,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
 			return NMC_RESULT_ERROR_USER_INPUT;
 		}
 
-		next_arg (&argc, &argv);
+		next_arg (nmc, &argc, &argv);
 	}
 	show_password = nmc->show_secrets || show_password;
 
@@ -3587,7 +3587,7 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv)
 		} else if (!nmc->complete)
 			g_printerr (_("Unknown parameter: %s\n"), *argv);
 
-		next_arg (&argc, &argv);
+		next_arg (nmc, &argc, &argv);
 	}
 
 	if (nmc->complete)
@@ -3761,7 +3761,7 @@ do_device_lldp_list (NmCli *nmc, int argc, char **argv)
 			return NMC_RESULT_ERROR_USER_INPUT;
 		}
 
-		next_arg (&argc, &argv);
+		next_arg (nmc, &argc, &argv);
 	}
 
 	if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0)
diff --git a/clients/cli/general.c b/clients/cli/general.c
index 24718ad468..9810c37957 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -687,7 +687,7 @@ do_general_logging (NmCli *nmc, int argc, char **argv)
 				g_string_printf (nmc->return_text, _("Error: property '%s' is not known."), *argv);
 				return NMC_RESULT_ERROR_USER_INPUT;
 			}
-		} while (next_arg (&argc, &argv) == 0);
+		} while (next_arg (nmc, &argc, &argv) == 0);
 
 		if (nmc->complete)
 			return nmc->return_value;
@@ -737,7 +737,7 @@ do_general_hostname (NmCli *nmc, int argc, char **argv)
 		/* hostname provided -> set it */
 		const char *hostname = *argv;
 
-		if (next_arg (&argc, &argv) == 0)
+		if (next_arg (nmc, &argc, &argv) == 0)
 			g_print ("Warning: ignoring extra garbage after '%s' hostname\n", hostname);
 
 		nmc->should_wait++;
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index 3951e7b1a0..a5c2359b9c 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -219,9 +219,9 @@ process_command_line (NmCli *nmc, int argc, char **argv)
 	if (argc > 1 && nm_streq (argv[1], "--complete-args")) {
 		nmc->complete = TRUE;
 		argv[1] = argv[0];
-		next_arg (&argc, &argv);
+		next_arg (nmc, &argc, &argv);
 	}
-	next_arg (&argc, &argv);
+	next_arg (nmc, &argc, &argv);
 
 	/* parse options */
 	while (argc) {
@@ -239,7 +239,7 @@ process_command_line (NmCli *nmc, int argc, char **argv)
 			opt++;
 			/* '--' ends options */
 			if (opt[1] == '\0') {
-				next_arg (&argc, &argv);
+				next_arg (nmc, &argc, &argv);
 				break;
 			}
 		}
@@ -393,7 +393,7 @@ process_command_line (NmCli *nmc, int argc, char **argv)
 			nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
 			return FALSE;
 		}
-		next_arg (&argc, &argv);
+		next_arg (nmc, &argc, &argv);
 	}
 
 	/* Now run the requested command */
diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index 580db7b95d..08039e6f3f 100644
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -39,7 +39,7 @@ matches (const char *cmd, const char *pattern)
 }
 
 int
-next_arg (int *argc, char ***argv)
+next_arg (NmCli *nmc, int *argc, char ***argv)
 {
 	int arg_num = *argc;
 
@@ -153,7 +153,7 @@ nmc_parse_args (nmc_arg_t *arg_arr, gboolean last, int *argc, char ***argv, GErr
 			return FALSE;
 		}
 
-		next_arg (argc, argv);
+		next_arg (NULL, argc, argv);
 	}
 
 	return TRUE;
diff --git a/clients/cli/utils.h b/clients/cli/utils.h
index b48b86ce39..d889962df7 100644
--- a/clients/cli/utils.h
+++ b/clients/cli/utils.h
@@ -40,7 +40,7 @@ typedef enum {
 
 /* === Functions === */
 gboolean matches (const char *cmd, const char *pattern);
-int next_arg (int *argc, char ***argv);
+int next_arg (NmCli *nmc, int *argc, char ***argv);
 gboolean nmc_arg_is_help (const char *arg);
 gboolean nmc_arg_is_option (const char *arg, const char *opt_name);
 gboolean nmc_parse_args (nmc_arg_t *arg_arr, gboolean last, int *argc, char ***argv, GError **error);