From ef26c432619756d3c6f22c8ee4ab2165ad90f251 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@dahyabhai.net>
Date: Nov 28 2011 23:04:51 +0000
Subject: print the unrecognized-option error ourselves (#756291)


---

diff --git a/src/getcert.c b/src/getcert.c
index b4d6b8e..c71cb95 100644
--- a/src/getcert.c
+++ b/src/getcert.c
@@ -498,6 +498,7 @@ request(const char *argv0, int argc, char **argv)
 		krealm = NULL;
 	}
 
+	opterr = 0;
 	while ((c = getopt(argc, argv,
 			   "d:n:t:k:f:I:g:rRN:U:K:D:E:sSp:P:v"
 			   GETOPT_CA)) != -1) {
@@ -592,6 +593,8 @@ request(const char *argv0, int argc, char **argv)
 			verbose++;
 			break;
 		default:
+			fprintf(stderr, _("%s: invalid option -- '%c'\n"),
+				"request", optopt);
 			help(argv0, "request");
 			return 1;
 		}
@@ -1164,6 +1167,7 @@ set_tracking(const char *argv0, const char *category,
 		krealm = NULL;
 	}
 
+	opterr = 0;
 	while ((c = getopt(argc, argv,
 			   "d:n:t:k:f:g:p:P:rRi:I:U:K:D:E:sSv"
 			   GETOPT_CA)) != -1) {
@@ -1270,6 +1274,8 @@ set_tracking(const char *argv0, const char *category,
 			verbose++;
 			break;
 		default:
+			fprintf(stderr, _("%s: invalid option -- '%c'\n"),
+				category, optopt);
 			help(argv0, category);
 			return 1;
 		}
@@ -1545,6 +1551,7 @@ resubmit(const char *argv0, int argc, char **argv)
 		return 1;
 	}
 
+	opterr = 0;
 	while ((c = getopt(argc, argv,
 			   "d:n:N:t:U:K:E:D:f:i:I:sSp:P:v" GETOPT_CA)) != -1) {
 		switch (c) {
@@ -1629,6 +1636,8 @@ resubmit(const char *argv0, int argc, char **argv)
 			verbose++;
 			break;
 		default:
+			fprintf(stderr, _("%s: invalid option -- '%c'\n"),
+				"resubmit", optopt);
 			help(argv0, "resubmit");
 			return 1;
 		}
@@ -1818,6 +1827,8 @@ list(const char *argv0, int argc, char **argv)
 	long n1, n2;
 	char **as1, **as2, **as3, **as4, t[24];
 	int requests_only = 0, tracking_only = 0, verbose = 0, c, i, j;
+
+	opterr = 0;
 	while ((c = getopt(argc, argv, "rtsSvd:n:f:i:" GETOPT_CA)) != -1) {
 		switch (c) {
 		case 'c':
@@ -1856,6 +1867,8 @@ list(const char *argv0, int argc, char **argv)
 			verbose++;
 			break;
 		default:
+			fprintf(stderr, _("%s: invalid option -- '%c'\n"),
+				"list", optopt);
 			help(argv0, "list");
 			return 1;
 		}
@@ -2137,6 +2150,8 @@ list_cas(const char *argv0, int argc, char **argv)
 	char **cas, *s, *only_ca = DEFAULT_CA;
 	char **as;
 	int c, i, j, verbose = 0;
+
+	opterr = 0;
 	while ((c = getopt(argc, argv, "sSv" GETOPT_CA)) != -1) {
 		switch (c) {
 		case 'c':
@@ -2152,6 +2167,8 @@ list_cas(const char *argv0, int argc, char **argv)
 			verbose++;
 			break;
 		default:
+			fprintf(stderr, _("%s: invalid option -- '%c'\n"),
+				"list-cas", optopt);
 			help(argv0, "list-cas");
 			return 1;
 		}