cli: allow next_arg() to move arguments past the last one

2012-11-16 22:43:29 +01:00
parent dc05592b76
commit 35689c7bd0
3 changed files with 28 additions and 26 deletions
--- a/cli/src/utils.c
+++ b/cli/src/utils.c
@@ -45,13 +45,15 @@ matches (const char *cmd, const char *pattern)
 int
 next_arg (int *argc, char ***argv)
 {
-	if (*argc <= 1) {
-		return -1;
-	}
-	else {
+	int arg_num = *argc;
+
+	if (arg_num > 0) {
 		(*argc)--;
 		(*argv)++;
 	}
+	if (arg_num <= 1)
+		return -1;
+
 	return 0;
 }