From 390841a40ad9e9abc651a6aa8bd875ca9aef7934 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 16 Jan 2010 09:29:53 +0100 Subject: [PATCH] Make empire, empsched and files catch extra operands This also avoids a dead increment ap++ in src/client/main.c reported by the Clang Static Analyzer. --- src/client/main.c | 5 +++++ src/util/empsched.c | 6 ++++++ src/util/files.c | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/src/client/main.c b/src/client/main.c index 06d60cd85..0a55067fb 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -138,6 +138,11 @@ main(int argc, char **argv) } uname = pwd->pw_name; } + if (*ap) { + fprintf(stderr, "%s: extra operand %s\n", argv[0], *ap); + fprintf(stderr, "Try -h for help.\n"); + exit(1); + } getsose(); if (auxfname && (auxfp = fopen(auxfname, "a")) == NULL) { diff --git a/src/util/empsched.c b/src/util/empsched.c index 6fd252db7..185959686 100644 --- a/src/util/empsched.c +++ b/src/util/empsched.c @@ -92,6 +92,12 @@ main(int argc, char *argv[]) } } + if (argc - optind > 1) { + fprintf(stderr, "%s: extra operand %s\n", argv[0], argv[optind+1]); + fprintf(stderr, "Try -h for help.\n"); + exit(1); + } + if (emp_config(config_file) < 0) exit(1); diff --git a/src/util/files.c b/src/util/files.c index 03ad037f2..71233c685 100644 --- a/src/util/files.c +++ b/src/util/files.c @@ -105,6 +105,12 @@ main(int argc, char *argv[]) } } + if (argv[optind]) { + fprintf(stderr, "%s: does not take operands\n", argv[0]); + fprintf(stderr, "Try -h for help.\n"); + exit(1); + } + empfile_init(); if (emp_config(config_file) < 0) exit(1); -- 2.43.0