From 9794094a5b3ac975d661643fc0bde6f6340ceafb Mon Sep 17 00:00:00 2001 From: Tom Smeding Date: Mon, 22 Jul 2024 21:23:46 +0200 Subject: Geen Engelse foutmelding bij ongeldige opties --- main.c | 4 ++++ src/aardig.c | 1 + src/hoofd.c | 1 + src/ja.c | 1 + src/kat.c | 1 + src/omd.c | 1 + src/spons.c | 1 + src/tak.c | 1 + src/toilet.c | 1 + src/weerklank.c | 1 + src/wiebenik.c | 1 + 11 files changed, 14 insertions(+) diff --git a/main.c b/main.c index e251f5f..898c821 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,6 @@ #include #include +#include #define X(name) int entry_ ## name (int argc, char **argv); PROGNAMES_XLIST @@ -14,6 +15,9 @@ static char* basename(char *path) { } int main(int argc, char **argv) { + // Ensure getopt(3) does not print an (English) error + opterr = 0; + const char *prognamearg = basename(argv[0]); if (strcmp(prognamearg, "drukkedoos") == 0) { diff --git a/src/aardig.c b/src/aardig.c index 5772054..0388782 100644 --- a/src/aardig.c +++ b/src/aardig.c @@ -41,6 +41,7 @@ static char** parse_options(int argc, char **argv, int *niceness) { exit(0); case '?': + fprintf(stderr, "aardig: Ongeldige optie: -%c\n", optopt); usage(stderr); exit(1); } diff --git a/src/hoofd.c b/src/hoofd.c index 62d1151..9e428e9 100644 --- a/src/hoofd.c +++ b/src/hoofd.c @@ -44,6 +44,7 @@ static char** parse_options(int argc, char **argv, int *n, int *c) { exit(0); case '?': + fprintf(stderr, "hoofd: Ongeldige optie: -%c\n", optopt); usage(stderr); exit(1); } diff --git a/src/ja.c b/src/ja.c index 6b37b02..3d6135d 100644 --- a/src/ja.c +++ b/src/ja.c @@ -30,6 +30,7 @@ static char** parse_options(int argc, char **argv) { exit(0); case '?': + fprintf(stderr, "ja: Ongeldige optie: -%c\n", optopt); usage(stderr); exit(1); } diff --git a/src/kat.c b/src/kat.c index 5549b24..0a17ddc 100644 --- a/src/kat.c +++ b/src/kat.c @@ -30,6 +30,7 @@ static char** parse_options(int argc, char **argv) { exit(0); case '?': + fprintf(stderr, "kat: Ongeldige optie: -%c\n", optopt); usage(stderr); exit(1); } diff --git a/src/omd.c b/src/omd.c index 2291a6c..71b8dee 100644 --- a/src/omd.c +++ b/src/omd.c @@ -29,6 +29,7 @@ static char** parse_options(int argc, char **argv) { exit(0); case '?': + fprintf(stderr, "omd: Ongeldige optie: -%c\n", optopt); usage(stderr); exit(1); } diff --git a/src/spons.c b/src/spons.c index f59bd25..51bb109 100644 --- a/src/spons.c +++ b/src/spons.c @@ -36,6 +36,7 @@ static char** parse_options(int argc, char **argv, bool *a) { exit(0); case '?': + fprintf(stderr, "spons: Ongeldige optie: -%c\n", optopt); usage(stderr); exit(1); } diff --git a/src/tak.c b/src/tak.c index cbe5a3b..245a85c 100644 --- a/src/tak.c +++ b/src/tak.c @@ -31,6 +31,7 @@ static char** parse_options(int argc, char **argv) { exit(0); case '?': + fprintf(stderr, "tak: Ongeldige optie: -%c\n", optopt); usage(stderr); exit(1); } diff --git a/src/toilet.c b/src/toilet.c index ce42aca..aa4fbfa 100644 --- a/src/toilet.c +++ b/src/toilet.c @@ -58,6 +58,7 @@ static char** parse_options(int argc, char **argv, int *modeMap) { exit(0); case '?': + fprintf(stderr, "toilet: Ongeldige optie: -%c\n", optopt); usage(stderr); exit(1); } diff --git a/src/weerklank.c b/src/weerklank.c index 477aef4..ad03389 100644 --- a/src/weerklank.c +++ b/src/weerklank.c @@ -45,6 +45,7 @@ static char** parse_options(int argc, char **argv, struct options *opts) { exit(0); case '?': + fprintf(stderr, "weerklank: Ongeldige optie: -%c\n", optopt); usage(stderr); exit(1); } diff --git a/src/wiebenik.c b/src/wiebenik.c index 71b321d..5d71ef4 100644 --- a/src/wiebenik.c +++ b/src/wiebenik.c @@ -31,6 +31,7 @@ static char** parse_options(int argc, char **argv) { exit(0); case '?': + fprintf(stderr, "wiebenik: Ongeldige optie: -%c\n", optopt); usage(stderr); exit(1); } -- cgit v1.2.3-70-g09d2