mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
120 lines
2.8 KiB
Diff
120 lines
2.8 KiB
Diff
|
|
--- a/src/search.c 2007-10-01 14:47:55.000000000 +0200
|
|
+++ b/src/search.c 2007-09-30 23:38:45.000000000 +0200
|
|
@@ -282,6 +282,7 @@
|
|
static int use_dfa_checked = 0;
|
|
size_t i, ret_val;
|
|
#ifdef MBS_SUPPORT
|
|
+ const char *last_char = NULL;
|
|
int mb_cur_max = MB_CUR_MAX;
|
|
mbstate_t mbs;
|
|
memset (&mbs, '\0', sizeof (mbstate_t));
|
|
@@ -338,6 +341,8 @@
|
|
while (bytes_left)
|
|
{
|
|
size_t mlen = mbrlen (beg, bytes_left, &mbs);
|
|
+
|
|
+ last_char = beg;
|
|
if (mlen == (size_t) -1 || mlen == 0)
|
|
{
|
|
/* Incomplete character: treat as single-byte. */
|
|
@@ -398,6 +403,8 @@
|
|
while (bytes_left)
|
|
{
|
|
size_t mlen = mbrlen (beg, bytes_left, &mbs);
|
|
+
|
|
+ last_char = beg;
|
|
if (mlen == (size_t) -1 || mlen == 0)
|
|
{
|
|
/* Incomplete character: treat as single-byte. */
|
|
@@ -475,10 +483,84 @@
|
|
if (match_words)
|
|
while (match <= best_match)
|
|
{
|
|
+ int lword_match = 0;
|
|
+ if (match == buf)
|
|
+ lword_match = 1;
|
|
+ else
|
|
+ {
|
|
+ assert (start > 0);
|
|
+#ifdef MBS_SUPPORT
|
|
+ if (mb_cur_max > 1)
|
|
+ {
|
|
+ const char *s;
|
|
+ int mr;
|
|
+ wchar_t pwc;
|
|
+ if (using_utf8)
|
|
+ {
|
|
+ s = match - 1;
|
|
+ while (s > buf
|
|
+ && (unsigned char) *s >= 0x80
|
|
+ && (unsigned char) *s <= 0xbf)
|
|
+ --s;
|
|
+ }
|
|
+ else
|
|
+ s = last_char;
|
|
+ mr = mbtowc (&pwc, s, match - s);
|
|
+ if (mr <= 0)
|
|
+ {
|
|
+ memset (&mbs, '\0', sizeof (mbstate_t));
|
|
+ lword_match = 1;
|
|
+ }
|
|
+ else if (!(iswalnum (pwc) || pwc == L'_')
|
|
+ && mr == (int) (match - s))
|
|
+ lword_match = 1;
|
|
+ }
|
|
+ else
|
|
+#endif /* MBS_SUPPORT */
|
|
+ if (!WCHAR ((unsigned char) match[-1]))
|
|
+ lword_match = 1;
|
|
+ }
|
|
+
|
|
+ if (lword_match)
|
|
+ {
|
|
+ int rword_match = 0;
|
|
+ if (start + len == end - beg - 1)
|
|
+ rword_match = 1;
|
|
+ else
|
|
+ {
|
|
+#ifdef MBS_SUPPORT
|
|
+ if (mb_cur_max > 1)
|
|
+ {
|
|
+ wchar_t nwc;
|
|
+ int mr;
|
|
+
|
|
+ mr = mbtowc (&nwc, buf + start + len,
|
|
+ end - buf - start - len - 1);
|
|
+ if (mr <= 0)
|
|
+ {
|
|
+ memset (&mbs, '\0', sizeof (mbstate_t));
|
|
+ rword_match = 1;
|
|
+ }
|
|
+ else if (!iswalnum (nwc) && nwc != L'_')
|
|
+ rword_match = 1;
|
|
+ }
|
|
+ else
|
|
+#endif /* MBS_SUPPORT */
|
|
+ if (!WCHAR ((unsigned char) match[len]))
|
|
+ rword_match = 1;
|
|
+ }
|
|
+
|
|
+ if (rword_match)
|
|
+ {
|
|
+ if (!start_ptr)
|
|
+ /* Returns the whole line. */
|
|
+ goto success;
|
|
+ else
|
|
+ {
|
|
+ goto assess_pattern_match;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
- if ((match == buf || !WCHAR ((unsigned char) match[-1]))
|
|
- && (len == end - beg - 1
|
|
- || !WCHAR ((unsigned char) match[len])))
|
|
- goto assess_pattern_match;
|
|
if (len > 0)
|
|
{
|
|
/* Try a shorter length anchored at the same place. */
|
|
|