[pkgsrc/trunk]: pkgsrc/textproc/bsdgrep-devel Cast arguments to ctype macros ...

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/60d00b198c91
branches:  trunk
changeset: 486038:60d00b198c91
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Dec 21 16:09:44 2004 +0000

description:
Cast arguments to ctype macros to "unsigned char" - fixes -current build
problem pointed out in bulk builds.

diffstat:

 textproc/bsdgrep-devel/distinfo         |   5 +++--
 textproc/bsdgrep-devel/patches/patch-ae |  13 ++++++++++++-
 textproc/bsdgrep-devel/patches/patch-af |  31 +++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 3 deletions(-)

diffs (75 lines):

diff -r 94561f2b8ab2 -r 60d00b198c91 textproc/bsdgrep-devel/distinfo
--- a/textproc/bsdgrep-devel/distinfo   Tue Dec 21 15:41:29 2004 +0000
+++ b/textproc/bsdgrep-devel/distinfo   Tue Dec 21 16:09:44 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2004/05/05 15:10:26 cjep Exp $
+$NetBSD: distinfo,v 1.6 2004/12/21 16:09:44 agc Exp $
 
 SHA1 (bsdgrep-200405051607.tar.gz) = 0a50caa04dab9ee576bb30f4abf62e03378d4f0e
 Size (bsdgrep-200405051607.tar.gz) = 12972 bytes
@@ -6,4 +6,5 @@
 SHA1 (patch-ab) = c7fa54dedb0925d342549cbc56197bf2d8e4e47b
 SHA1 (patch-ac) = e5b3d3a2bc069f123a7f568f72ded291f3ac49ea
 SHA1 (patch-ad) = 8080d6fa8f5faa40055ad1f067c1669d682956d2
-SHA1 (patch-ae) = 360972fb9c9a759cce1ad726ad14647b8b140a4e
+SHA1 (patch-ae) = 2907cd5e82f6c6721afd470099ccf9f2b2f392c4
+SHA1 (patch-af) = 64e270f9c8d3df2994af83044de7ab3e47dc6415
diff -r 94561f2b8ab2 -r 60d00b198c91 textproc/bsdgrep-devel/patches/patch-ae
--- a/textproc/bsdgrep-devel/patches/patch-ae   Tue Dec 21 15:41:29 2004 +0000
+++ b/textproc/bsdgrep-devel/patches/patch-ae   Tue Dec 21 16:09:44 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2003/08/31 09:37:51 cjep Exp $
+$NetBSD: patch-ae,v 1.2 2004/12/21 16:09:44 agc Exp $
 
 --- util.c.orig        Wed Aug 27 13:01:54 2003
 +++ util.c     Wed Aug 27 13:02:02 2003
@@ -18,3 +18,14 @@
  
  #include "grep.h"
  
+@@ -228,8 +228,8 @@
+                               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) {
diff -r 94561f2b8ab2 -r 60d00b198c91 textproc/bsdgrep-devel/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/bsdgrep-devel/patches/patch-af   Tue Dec 21 16:09:44 2004 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-af,v 1.1 2004/12/21 16:09:44 agc Exp $
+
+--- binary.c   2004/12/21 15:58:52     1.1
++++ binary.c   2004/12/21 15:59:58
+@@ -53,7 +53,7 @@
+               return 0;
+ 
+       for (i = 0; i < m; i++)
+-              if (!isprint(buf[i]) && !isspace(buf[i]) && 
++              if (!isprint((unsigned char)buf[i]) && !isspace((unsigned char)buf[i]) && 
+                   buf[i] != line_endchar)
+                       return 1; 
+       
+@@ -74,7 +74,7 @@
+               return 0;
+ 
+       for (i = 0; i < m; i++)
+-              if (!isprint(buf[i]) && !isspace(buf[i]) &&
++              if (!isprint((unsigned char)buf[i]) && !isspace((unsigned char)buf[i]) &&
+                   buf[i] != line_endchar)
+                       return 1;
+ 
+@@ -88,7 +88,7 @@
+       int i;
+       /* XXX knows too much about mmf internals */
+       for (i = 0; i < BUFFER_SIZE && i < f->len - 1; i++)
+-              if (!isprint(f->base[i]) && !isspace(f->base[i]) &&
++              if (!isprint((unsigned char)f->base[i]) && !isspace((unsigned char)f->base[i]) &&
+                   f->base[i] != line_endchar) 
+                       return 1;
+       mmrewind(f);