From 004f4abe6e6e139f94aea16c6569ecada95f4fb8 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Mon, 21 Jan 2002 15:56:12 +0000 Subject: [w3m-dev 02877] some fixes for urimethodmap * config.h.dist (RC_DIR): remove tailing / * configure (mailer): if use_w3mmailer = y, don't ask mailer * configure (RC_DIR): remove tailing / * fm.h (Mailer): ifndef USE_W3MMAILER * main.c (MAIN): ifndef USE_W3MMAILER getenv("MAILER") * rc.c ("mailer"): ifndef USE_W3MMAILER * regex.c (newRegex0): \ escape kanji chars * url.c (searchURIMethods): need escape for - * scripts/w3mmail.cgi.in: move $url, $qurl * scripts/w3mmail.cgi.in: url_unquote $to From: Hironori Sakamoto --- regex.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'regex.c') diff --git a/regex.c b/regex.c index f26d9b8..7311eab 100644 --- a/regex.c +++ b/regex.c @@ -1,4 +1,4 @@ -/* $Id: regex.c,v 1.13 2002/01/16 04:38:06 ukai Exp $ */ +/* $Id: regex.c,v 1.14 2002/01/21 15:56:13 ukai Exp $ */ /* * regex: Regular expression pattern match library * @@ -152,8 +152,15 @@ newRegex0(char **ex, int igncase, Regex *regex, char **msg, int level) m = RE_WHICH; while (*p != ']') { if (*p == '\\') { - *(st_ptr++) = *(p + 1); - p += 2; + p++; +#ifdef JP_CHARSET + if (IS_KANJI1(*p)) { + *(st_ptr++) = RE_KANJI(p); + p += 2; + } + else +#endif + *(st_ptr++) = (unsigned char)*(p++); } else if (*p == '-') { *(st_ptr++) = RE_WHICH_RANGE; -- cgit v1.2.3