d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grep(1) outputs NOT-matched lines with multi-byte characters

Browse Source 
PR	113343
MFC after:	2 months
This commit is contained in:
Pedro F. Giffuni 2019-01-10 02:59:19 +00:00
parent 3b1522c229
commit aa52c719ea
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gnu/usr.bin/grep/search.c
View File

@ -401,9 +401,12 @@ EGexecute (char const *buf, size_t size, size_t *match_size, int exact)
}
if (mlen == (size_t) -2)
/* Offset points inside multibyte character:
* no good. */
break;
{
/* Offset points inside multibyte character:
* no good. */
memset (&mbs, '\0', sizeof (mbstate_t));
break;
}
beg += mlen;
bytes_left -= mlen;
@ -463,9 +466,12 @@ EGexecute (char const *buf, size_t size, size_t *match_size, int exact)
}
if (mlen == (size_t) -2)
/* Offset points inside multibyte character:
* no good. */
break;
{
/* Offset points inside multibyte character:
* no good. */
memset (&mbs, '\0', sizeof (mbstate_t));
break;
}
beg += mlen;
bytes_left -= mlen;
@ -926,15 +932,21 @@ Fexecute (char const *buf, size_t size, size_t *match_size, int exact)
}
if (mlen == (size_t) -2)
/* Offset points inside multibyte character: no good. */
break;
{
/* Offset points inside multibyte character: no good. */
memset (&mbs, '\0', sizeof (mbstate_t));
break;
}
beg += mlen;
bytes_left -= mlen;
}
if (bytes_left)
continue;
{
beg += bytes_left;
continue;
}
}
else
#endif /* MBS_SUPPORT */
@ -1052,6 +1064,7 @@ Fexecute (char const *buf, size_t size, size_t *match_size, int exact)
{
/* Offset points inside multibyte character:
* no good. */
memset (&mbs, '\0', sizeof (mbstate_t));
break;
}