Merge branch 'ef/non-ascii-parse-options-error-diag' into maint

* ef/non-ascii-parse-options-error-diag: parse-options: report uncorrupted multi-byte options
git-mirror · Feb 27, 2013 · 6f0c336 · 6f0c336
2 parents 28db111 + b141a47
commit 6f0c336
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/parse-options.c b/parse-options.c
@@ -471,8 +471,11 @@ int parse_options(int argc, const char **argv, const char *prefix,
 	default: /* PARSE_OPT_UNKNOWN */
 		if (ctx.argv[0][1] == '-') {
 			error("unknown option `%s'", ctx.argv[0] + 2);
-		} else {
+		} else if (isascii(*ctx.opt)) {
 			error("unknown switch `%c'", *ctx.opt);
+		} else {
+			error("unknown non-ascii option in string: `%s'",
+			      ctx.argv[0]);
 		}
 		usage_with_options(usagestr, options);
 	}