Commit Diff

Commit:
7e29fc4a3e7217cea06735afda36eac20159ae18
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
correctly handle arguments for sub-commands things like "--" should be skipped etc, easier to rely on getopt(3).
Actions:
Patch | Tree
commit - f44b3c4e5f075af1be265b896f3fcb320c831ad8
commit + 7e29fc4a3e7217cea06735afda36eac20159ae18
blob - 91ea7d77e060ed8ae96c11b778fe39880c883239
blob + 8a370275771816bd0e4995567875db671c3a809c
--- ctl.c
+++ ctl.c
@@ -553,17 +553,32 @@ end:
 int
 ctl_noarg(struct parse_result *res, int argc, char **argv)
 {
-	if (argc > 1)
+	int ch;
+
+	while ((ch = getopt(argc, argv, "")) != -1)
+		ctl_usage(res->ctl);
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 0)
 		ctl_usage(res->ctl);
+
 	return ctlaction(res);
 }
 
 int
 ctl_add(struct parse_result *res, int argc, char **argv)
 {
-	if (argc < 2)
+	int ch;
+
+	while ((ch = getopt(argc, argv, "")) != -1)
 		ctl_usage(res->ctl);
-	res->files = argv+1;
+	argc -= optind;
+	argv += optind;
+
+	if (argc == 0)
+		ctl_usage(res->ctl);
+	res->files = argv;
 
 	if (pledge("stdio rpath", NULL) == -1)
 		fatal("pledge");
@@ -592,10 +607,17 @@ ctl_show(struct parse_result *res, int argc, char **ar
 int
 ctl_load(struct parse_result *res, int argc, char **argv)
 {
-	if (argc < 2)
+	int ch;
+
+	while ((ch = getopt(argc, argv, "")) != -1)
+		ctl_usage(res->ctl);
+	argc -= optind;
+	argv += optind;
+
+	if (argc == 0)
 		res->file = NULL;
-	else if (argc == 2)
-		res->file = argv[1];
+	else if (argc == 1)
+		res->file = argv[0];
 	else
 		ctl_usage(res->ctl);