head	1.5;
access;
symbols
	pkgsrc-2013Q2:1.5.0.22
	pkgsrc-2013Q2-base:1.5
	pkgsrc-2012Q4:1.5.0.20
	pkgsrc-2012Q4-base:1.5
	pkgsrc-2011Q4:1.5.0.18
	pkgsrc-2011Q4-base:1.5
	pkgsrc-2011Q2:1.5.0.16
	pkgsrc-2011Q2-base:1.5
	pkgsrc-2009Q4:1.5.0.14
	pkgsrc-2009Q4-base:1.5
	pkgsrc-2008Q4:1.5.0.12
	pkgsrc-2008Q4-base:1.5
	pkgsrc-2008Q3:1.5.0.10
	pkgsrc-2008Q3-base:1.5
	cube-native-xorg:1.5.0.8
	cube-native-xorg-base:1.5
	pkgsrc-2008Q2:1.5.0.6
	pkgsrc-2008Q2-base:1.5
	pkgsrc-2008Q1:1.5.0.4
	pkgsrc-2008Q1-base:1.5
	pkgsrc-2007Q4:1.5.0.2
	pkgsrc-2007Q4-base:1.5
	pkgsrc-2007Q3:1.4.0.16
	pkgsrc-2007Q3-base:1.4
	pkgsrc-2007Q2:1.4.0.14
	pkgsrc-2007Q2-base:1.4
	pkgsrc-2007Q1:1.4.0.12
	pkgsrc-2007Q1-base:1.4
	pkgsrc-2006Q4:1.4.0.10
	pkgsrc-2006Q4-base:1.4
	pkgsrc-2006Q3:1.4.0.8
	pkgsrc-2006Q3-base:1.4
	pkgsrc-2006Q2:1.4.0.6
	pkgsrc-2006Q2-base:1.4
	pkgsrc-2006Q1:1.4.0.4
	pkgsrc-2006Q1-base:1.4
	pkgsrc-2005Q4:1.4.0.2
	pkgsrc-2005Q4-base:1.4
	pkgsrc-2005Q3:1.2.0.6
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.4
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.2
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.1.1.1.0.10
	pkgsrc-2004Q4-base:1.1.1.1
	pkgsrc-2004Q3:1.1.1.1.0.8
	pkgsrc-2004Q3-base:1.1.1.1
	pkgsrc-2004Q2:1.1.1.1.0.6
	pkgsrc-2004Q2-base:1.1.1.1
	pkgsrc-2004Q1:1.1.1.1.0.4
	pkgsrc-2004Q1-base:1.1.1.1
	pkgsrc-2003Q4:1.1.1.1.0.2
	pkgsrc-2003Q4-base:1.1.1.1
	pkgsrc-devel:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.5
date	2007.12.06.21.43.23;	author cjep;	state dead;
branches;
next	1.4;

1.4
date	2005.12.18.14.27.01;	author joerg;	state Exp;
branches;
next	1.3;

1.3
date	2005.12.08.17.24.32;	author joerg;	state Exp;
branches;
next	1.2;

1.2
date	2004.12.21.16.09.44;	author agc;	state Exp;
branches;
next	1.1;

1.1
date	2003.08.31.09.37.51;	author cjep;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2003.08.31.09.37.51;	author cjep;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Update to 20071201.
* Sync with src/usr.bin/grep
@
text
@$NetBSD: patch-ae,v 1.4 2005/12/18 14:27:01 joerg Exp $

--- util.c.orig	2004-01-02 15:00:34.000000000 +0000
+++ util.c
@@@@ -36,6 +36,7 @@@@
 #include <sys/stat.h>
 
 #include <ctype.h>
+#include <zlib.h>
 #include <err.h>
 #include <errno.h>
 #include <fts.h>
@@@@ -44,7 +45,6 @@@@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <zlib.h>
 
 #include "grep.h"
 
@@@@ -99,7 +99,7 @@@@ grep_tree(char **argv)
 }
 
 int
-procfile(char *fn)
+procfile(const char *fn)
 {
 	str_t ln;
 	file_t *f;
@@@@ -228,8 +228,8 @@@@ procline(str_t *l, int nottext)
 				continue;
 			if (r == 0) {
 				if (wflag) {
-					if ((pmatch.rm_so != 0 && isword(l->dat[pmatch.rm_so - 1]))
-					    || (pmatch.rm_eo != l->len && isword(l->dat[pmatch.rm_eo])))
+					if ((pmatch.rm_so != 0 && isword((unsigned char)l->dat[pmatch.rm_so - 1]))
+					    || (pmatch.rm_eo != l->len && isword((unsigned char)l->dat[pmatch.rm_eo])))
 						r = REG_NOMATCH;
 				}
 				if (xflag) {
@


1.4
log
@Remove CVS ids in context, otherwise the patch checksum is incomplete.
@
text
@d1 1
a1 1
$NetBSD: patch-ae,v 1.3 2005/12/08 17:24:32 joerg Exp $
@


1.3
log
@Since this is compiled with -Werror and GCC 3.4 doesn't like
the string const cast-away, pass down the constness.
@
text
@d1 1
a1 1
$NetBSD$
d5 1
a5 1
@@@@ -36,6 +36,7 @@@@ __RCSID("$NetBSD: util.c,v 1.1.1.2 2004/
d13 1
a13 1
@@@@ -44,7 +45,6 @@@@ __RCSID("$NetBSD: util.c,v 1.1.1.2 2004/
@


1.2
log
@Cast arguments to ctype macros to "unsigned char" - fixes -current build
problem pointed out in bulk builds.
@
text
@d1 1
a1 1
$NetBSD: patch-ae,v 1.1.1.1 2003/08/31 09:37:51 cjep Exp $
d3 3
a5 3
--- util.c.orig	Wed Aug 27 13:01:54 2003
+++ util.c	Wed Aug 27 13:02:02 2003
@@@@ -36,6 +36,7 @@@@
d13 1
a13 1
@@@@ -44,7 +45,6 @@@@
d21 10
a30 1
@@@@ -228,8 +228,8 @@@@
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD: patch-ae,v 1.1 2003/08/27 18:32:49 jmc Exp $
d21 11
@


1.1.1.1
log
@After discussion with grant, reimport bgrep as bsdgrep-devel.
@
text
@@