From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 6 Jun 2023 10:24:08 +0000 (+0000)
Subject: networkctl: Fix parsing commands
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4028bc3f6b422a45f8f2ad41df2e59152474b6e;p=network.git

networkctl: Fix parsing commands

We used to send the argument that was last parsed to the next function
which probably isn't very useful.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/networkctl/command.c b/src/networkctl/command.c
index 7114efe6..99202dd0 100644
--- a/src/networkctl/command.c
+++ b/src/networkctl/command.c
@@ -36,10 +36,6 @@ static const struct command* command_find(const struct command* commands, const
 int command_dispatch(sd_bus* bus, const struct command* commands, int argc, char* argv[]) {
 	const struct command* command = NULL;
 
-	argc -= optind;
-	argv += optind;
-	optind = 1;
-
 	if (!argc) {
 		fprintf(stderr, "Command required\n");
 		return -EINVAL;
@@ -54,5 +50,5 @@ int command_dispatch(sd_bus* bus, const struct command* commands, int argc, char
 		return -EINVAL;
 	}
 
-	return command->callback(bus, argc, argv);
+	return command->callback(bus, argc - 1, argv + 1);
 }
diff --git a/src/networkctl/main.c b/src/networkctl/main.c
index 73908f8f..0ba72849 100644
--- a/src/networkctl/main.c
+++ b/src/networkctl/main.c
@@ -115,7 +115,7 @@ int main(int argc, char* argv[]) {
 	}
 
 	// Run a command
-	r = networkctl_main(bus, argc, argv);
+	r = networkctl_main(bus, argc - 1, argv + 1);
 
 ERROR:
 	if (bus)