Re: [PATH/RFC] parse-options: report invalid UTF-8 switches
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:56:07
Erik Faye-Lund [off-list ref] writes:
However, since git only looks at one byte at the time for short-options, it ends up reporting a partial UTF-8 sequence in such cases, leading to corruption of the output.
Isn't it a workable, easier and more robust alternative to punt and use the entire ctx.argv[0] as unrecognized?
quoted hunk
The "real fix" would probably be to add proper multi-byte support to the short-option parser, but this serves little purpose in Git; we don't internationalize the command-line switches. So perhaps this is a suitable band-aid instead? parse-options.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)diff --git a/parse-options.c b/parse-options.c index 67e98a6..20dc742 100644 --- a/parse-options.c +++ b/parse-options.c@@ -3,6 +3,7 @@ #include "cache.h" #include "commit.h" #include "color.h" +#include "utf8.h" static int parse_options_usage(struct parse_opt_ctx_t *ctx, const char * const *usagestr,@@ -462,7 +463,9 @@ int parse_options(int argc, const char **argv, const char *prefix, if (ctx.argv[0][1] == '-') { error("unknown option `%s'", ctx.argv[0] + 2); } else { - error("unknown switch `%c'", *ctx.opt); + const char *next = ctx.opt; + utf8_width(&next, NULL); + error("unknown switch `%.*s'", (int)(next - ctx.opt), ctx.opt); } usage_with_options(usagestr, options); }