svn commit: r302833 - head/gnu/usr.bin/grep
Andrey A. Chernov
ache at FreeBSD.org
Thu Jul 14 09:47:51 UTC 2016
Author: ache
Date: Thu Jul 14 09:47:49 2016
New Revision: 302833
URL: https://svnweb.freebsd.org/changeset/base/302833
Log:
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.
Modified:
head/gnu/usr.bin/grep/dfa.c
Modified: head/gnu/usr.bin/grep/dfa.c
==============================================================================
--- head/gnu/usr.bin/grep/dfa.c Thu Jul 14 09:45:07 2016 (r302832)
+++ head/gnu/usr.bin/grep/dfa.c Thu Jul 14 09:47:49 2016 (r302833)
@@ -2547,13 +2547,8 @@ match_mb_charset (struct dfa *d, int s,
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;
}
More information about the svn-src-all
mailing list