Date: Sun, 15 May 2011 02:21:39 +0000 (UTC) From: Gabor Kovesdan <gabor@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r221941 - user/gabor/tre-integration/contrib/tre/lib Message-ID: <201105150221.p4F2LdnE023071@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gabor Date: Sun May 15 02:21:39 2011 New Revision: 221941 URL: http://svn.freebsd.org/changeset/base/221941 Log: - Also implement REG_STARTEND for wchar matching Modified: user/gabor/tre-integration/contrib/tre/lib/regexec.c Modified: user/gabor/tre-integration/contrib/tre/lib/regexec.c ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/regexec.c Sun May 15 02:09:12 2011 (r221940) +++ user/gabor/tre-integration/contrib/tre/lib/regexec.c Sun May 15 02:21:39 2011 (r221941) @@ -246,7 +246,29 @@ tre_regwnexec(const regex_t *preg, const size_t nmatch, regmatch_t pmatch[], int eflags) { tre_tnfa_t *tnfa = (void *)preg->TRE_REGEX_T_FIELD; - return tre_match(tnfa, str, len, STR_WIDE, nmatch, pmatch, eflags); + + if (eflags & REG_STARTEND) + { + off_t s_off = pmatch[0].rm_so; + off_t e_off = pmatch[0].rm_eo; + size_t slen = e_off - s_off; + wchar_t *sstr = xmalloc(slen * sizeof(wint_t)); + wcsncpy(sstr, &str[s_off], slen); + int ret = tre_match(tnfa, sstr, slen, STR_WIDE, nmatch, pmatch, eflags); + if (!(eflags & REG_NOSUB)) + { + for (unsigned i = 0; i < nmatch; i++) + { + pmatch[i].rm_so += slen; + pmatch[i].rm_eo += slen; + } + } + return ret; + } + else + { + return tre_match(tnfa, str, len, STR_WIDE, nmatch, pmatch, eflags); + } } int
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105150221.p4F2LdnE023071>