On Thu, Jan 28, 2016 at 6:56 AM, Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> wrote:
> Similar to the previous commit, we can't use kws on icase search
> outside ascii range. But we can't simply pass the pattern to
> regcomp/pcre like the previous commit because it may contain regex
> special characters, so we need to quote the regex first.
>
> To avoid misquote traps that could lead to undefined behavior, we
> always stick to basic regex engine in this case. We don't need fancy
> features for grepping a literal string anyway.
>
> basic_regex_quote_buf() assumes that if the pattern is in a multibyte
> encoding, ascii chars must be unambiguously encoded as single
> bytes. This is true at least for UTF-8. For others, let's wait until
> people yell up. Chances are nobody uses multibyte, non utf-8 charsets
> any more..
s/any more../anymore./
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
> ---
> diff --git a/grep.c b/grep.c
> @@ -397,6 +398,24 @@ static int is_fixed(const char *s, size_t len)
> +static void compile_fixed_regexp(struct grep_pat *p, struct grep_opt *opt)
> +{
> + struct strbuf sb = STRBUF_INIT;
> + int err;
> +
> + basic_regex_quote_buf(&sb, p->pattern);
> + err = regcomp(&p->regexp, sb.buf, opt->regflags & ~REG_EXTENDED);
> + if (opt->debug)
> + fprintf(stderr, "fixed%s\n", sb.buf);
Did you want a space or colon or something after "fixed" for human
consumption? (I realize that the test case doesn't care.)
> + strbuf_release(&sb);
> + if (err) {
> + char errbuf[1024];
> + regerror(err, &p->regexp, errbuf, 1024);
I guess this was copy/pasted from compile_regexp(), but for this new
code, perhaps: s/1024/sizeof(errbuf)/
> + regfree(&p->regexp);
> + compile_regexp_failed(p, errbuf);
> + }
> +}
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html