From ebeecabae342834629326008f4efdb023813b599 Mon Sep 17 00:00:00 2001
From: "Tim J. Robbins" <tjr@FreeBSD.org>
Date: Tue, 25 Oct 2005 09:18:50 +0000
Subject: [PATCH] Fix 'grep -Fw' for encodings other than UTF-8 (RH bug
 #161700).

PR:		87969
Obtained from:	Fedora (Tim Waugh)
---
 gnu/usr.bin/grep/search.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/usr.bin/grep/search.c b/gnu/usr.bin/grep/search.c
index 1e5769465cf..a1951567e0d 100644
--- a/gnu/usr.bin/grep/search.c
+++ b/gnu/usr.bin/grep/search.c
@@ -960,7 +960,7 @@ Fexecute (char const *buf, size_t size, size_t *match_size, int exact)
 		    }
 		  else
 #endif /* MBS_SUPPORT */
-		  if (!WCHAR ((unsigned char) beg[-1]))
+		  if (WCHAR ((unsigned char) beg[-1]))
 		    goto next_char;
 		}
 #ifdef MBS_SUPPORT
@@ -980,7 +980,7 @@ Fexecute (char const *buf, size_t size, size_t *match_size, int exact)
 		}
 	      else
 #endif /* MBS_SUPPORT */
-		if (beg + len >= buf + size && !WCHAR ((unsigned char) beg[len]))
+		if (beg + len >= buf + size || !WCHAR ((unsigned char) beg[len]))
 		  word_match = 1;
 	      if (word_match)
 		{