Fail on superfluous command line arguments

cgzones · Apr 20, 2024 · d658cd6 · d658cd6
1 parent cda8ad3
commit d658cd6
Showing 5 changed files with 25 additions and 0 deletions.
diff --git a/src/arpobserver-checkd.c b/src/arpobserver-checkd.c
@@ -550,6 +550,11 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	if (optind < argc) {
+		usage();
+		return EXIT_FAILURE;
+	}
+
 	log_open(CHECK_ARGV0);
 	log_mode(lmode);
 	if (verbose)

diff --git a/src/arpobserver-dumpstate.c b/src/arpobserver-dumpstate.c
@@ -81,6 +81,11 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	if (optind < argc) {
+		usage();
+		return EXIT_FAILURE;
+	}
+
 	log_open(DUMP_ARGV0);
 	if (verbose)
 		log_max_priority(LOG_DEBUG);

diff --git a/src/arpobserver-mysql.c b/src/arpobserver-mysql.c
@@ -384,6 +384,11 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	if (optind < argc) {
+		usage();
+		return EXIT_FAILURE;
+	}
+
 	log_open(MYSQL_ARGV0);
 	if (verbose)
 		log_max_priority(LOG_DEBUG);

diff --git a/src/arpobserver-stdout.c b/src/arpobserver-stdout.c
@@ -82,6 +82,11 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	if (optind < argc) {
+		usage();
+		return EXIT_FAILURE;
+	}
+
 	log_open("arpobserver-syslog");
 	log_mode(LOG_MODE_STDOUT);
 	if (verbose)

diff --git a/src/arpobserver-syslog.c b/src/arpobserver-syslog.c
@@ -84,6 +84,11 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	if (optind < argc) {
+		usage();
+		return EXIT_FAILURE;
+	}
+
 	log_open("arpobserver-syslog");
 	log_mode(LOG_MODE_SYSLOG);
 	if (verbose)