diff options
| author | agc <agc@pkgsrc.org> | 2004-12-21 16:09:44 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2004-12-21 16:09:44 +0000 |
| commit | e498cbfa64d021adf1f1d100e86d036f8db3acf4 (patch) | |
| tree | e9cada71d615bc8a710721062e5be65d0611dcbc /textproc/bsdgrep-devel | |
| parent | 0da524c30509fbaf56c690ea9b2d36c82c3de174 (diff) | |
| download | pkgsrc-e498cbfa64d021adf1f1d100e86d036f8db3acf4.tar.gz | |
Cast arguments to ctype macros to "unsigned char" - fixes -current build
problem pointed out in bulk builds.
Diffstat (limited to 'textproc/bsdgrep-devel')
| -rw-r--r-- | textproc/bsdgrep-devel/distinfo | 5 | ||||
| -rw-r--r-- | textproc/bsdgrep-devel/patches/patch-ae | 13 | ||||
| -rw-r--r-- | textproc/bsdgrep-devel/patches/patch-af | 31 |
3 files changed, 46 insertions, 3 deletions
diff --git a/textproc/bsdgrep-devel/distinfo b/textproc/bsdgrep-devel/distinfo index 3986909dfaa..4e3c91b7ca9 100644 --- a/textproc/bsdgrep-devel/distinfo +++ b/textproc/bsdgrep-devel/distinfo @@ -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-aa) = c147bb05387e01b6f7e0ec8a918b09e77da2103c 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 --git a/textproc/bsdgrep-devel/patches/patch-ae b/textproc/bsdgrep-devel/patches/patch-ae index 12271f5c786..efe0a6bc2d9 100644 --- a/textproc/bsdgrep-devel/patches/patch-ae +++ b/textproc/bsdgrep-devel/patches/patch-ae @@ -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 @@ $NetBSD: patch-ae,v 1.1.1.1 2003/08/31 09:37:51 cjep Exp $ #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 --git a/textproc/bsdgrep-devel/patches/patch-af b/textproc/bsdgrep-devel/patches/patch-af new file mode 100644 index 00000000000..b80301ecfc0 --- /dev/null +++ b/textproc/bsdgrep-devel/patches/patch-af @@ -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); |