aboutsummaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>2016-07-14 09:47:49 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>2016-07-14 09:47:49 +0000
commitc66f176a6e29b5e0b85e54c368a294ff0bc82b9a (patch)
tree7491979044586abb2460345a5782d19a11d99d5a /gnu/usr.bin
parent2fb2dbe8c09bf8ca8311b200dccbfbc00eb48a69 (diff)
downloadsrc-c66f176a6e29b5e0b85e54c368a294ff0bc82b9a.tar.gz
src-c66f176a6e29b5e0b85e54c368a294ff0bc82b9a.zip
Back out non-collating [a-z] ranges.
Instead of changing the whole course to another POSIX-permitted way for consistency and uniformity I decide to completely ignore missing regex fucntionality and focus on fixing bugs in what we have now, too many small obstacles we have choicing other way, counting ports. Corresponding libc changes are backed out in r302824.
Notes
Notes: svn path=/head/; revision=302833
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/grep/dfa.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/gnu/usr.bin/grep/dfa.c b/gnu/usr.bin/grep/dfa.c
index 81e8c7854ba0..faf4f0b008a1 100644
--- a/gnu/usr.bin/grep/dfa.c
+++ b/gnu/usr.bin/grep/dfa.c
@@ -2547,13 +2547,8 @@ match_mb_charset (struct dfa *d, int s, position pos, int index)
wcbuf[2] = work_mbc->range_sts[i];
wcbuf[4] = work_mbc->range_ends[i];
-#ifdef __FreeBSD__
- if (wcscmp(wcbuf, wcbuf+2) >= 0 &&
- wcscmp(wcbuf+4, wcbuf) >= 0)
-#else
if (wcscoll(wcbuf, wcbuf+2) >= 0 &&
wcscoll(wcbuf+4, wcbuf) >= 0)
-#endif
goto charset_matched;
}