Removed redundant (and incorrect) code in prline. Fixes grep -i --color "",

among other things.

PR:		79063
Obtained from:	Fedora (Tim Waugh)
This commit is contained in:
Tim J. Robbins 2005-05-14 05:35:04 +00:00
parent 833d4d167b
commit 712fe40aed
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=146204

View File

@ -631,33 +631,6 @@ prline (char const *beg, char const *lim, int sep)
{
size_t match_size;
size_t match_offset;
if(match_icase)
{
/* Yuck, this is tricky */
char *buf = (char*) xmalloc (lim - beg);
char *ibeg = buf;
char *ilim = ibeg + (lim - beg);
int i;
for (i = 0; i < lim - beg; i++)
ibeg[i] = tolower (beg[i]);
while ((match_offset = (*execute) (ibeg, ilim-ibeg, &match_size, 1))
!= (size_t) -1)
{
char const *b = beg + match_offset;
if (b == lim)
break;
fwrite (beg, sizeof (char), match_offset, stdout);
printf ("\33[%sm", grep_color);
fwrite (b, sizeof (char), match_size, stdout);
fputs ("\33[00m", stdout);
beg = b + match_size;
ibeg = ibeg + match_offset + match_size;
}
fwrite (beg, 1, lim - beg, stdout);
free (buf);
lastout = lim;
return;
}
while (lim-beg && (match_offset = (*execute) (beg, lim - beg, &match_size, 1))
!= (size_t) -1)
{