From b141a47801d6fb2d68ec48adfe7597ec3ce49c0d Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 12 Feb 2013 00:13:48 +0100 Subject: [PATCH] parse-options: report uncorrupted multi-byte options Because our command-line parser considers only one byte at the time for short-options, we incorrectly report only the first byte when multi-byte input was provided. This makes user-errors slightly awkward to diagnose for instance under UTF-8 locale and non-English keyboard layouts. Report the whole argument-string when a non-ASCII short-option is detected. Signed-off-by: Erik Faye-Lund Improved-by: Jeff King Signed-off-by: Junio C Hamano --- parse-options.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/parse-options.c b/parse-options.c index c1c66bd408..052bf72bb8 100644 --- a/parse-options.c +++ b/parse-options.c @@ -470,8 +470,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); } -- 2.11.4.GIT