Re: [PATH/RFC] parse-options: report invalid UTF-8 switches
From: Matthieu Moy <hidden>
Date: 2016-06-15 22:56:07
Erik Faye-Lund [off-list ref] writes:
quoted hunk
--- 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); }
You should be careful with the case where the user has a non-UTF8 environment, and entered a non-ascii sequence. I can see two cases: 1) The non-ascii sequence is valid UTF-8, then I guess your patch would show two characters instead of one. Not really correct, but not really serious either. 2) The non-ascii sequence is NOT valid UTF-8, then if I read correctly (I didn't test) utf8_width would set next to NULL, and then you are in big trouble. -- Matthieu Moy http://www-verimag.imag.fr/~moy/