Author: pfg
Date: Thu Jan 10 02:59:19 2019
New Revision: 342910
URL: https://svnweb.freebsd.org/changeset/base/342910
Log:
grep(1) outputs NOT-matched lines with multi-byte characters
PR 113343
MFC after: 2 months
Modified:
head/gnu/usr.bin/grep/search.c
Modified: head/gnu/usr.bin/grep/search.c
==============================================================================
--- head/gnu/usr.bin/grep/search.c Thu Jan 10 02:01:20 2019
(r342909)
+++ head/gnu/usr.bin/grep/search.c Thu Jan 10 02:59:19 2019
(r342910)
@@ -401,9 +401,12 @@ EGexecute (char const *buf, size_t size, size_t *match
}
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
}
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_
}
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_
{
/* Offset points inside multibyte character:
* no good. */
+ memset (&mbs, '\0', sizeof (mbstate_t));
break;
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
