diff --git a/ChangeLog b/ChangeLog index 31838a1..85da7d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-08-21 Paolo Bonzini + + * sed/regexp.c: Accept NUL bytes for `.'. Accept 'a\(b' in + POSIXLY_CORRECT/POSIXLY_BASIC posixicity. + 2006-08-03 Paolo Bonzini Revert this part of the previous change: diff --git a/NEWS b/NEWS index 233ffef..deec214 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +Sed 4.1.6 + +* sed can be much faster in UTF-8 locales + +* sed will now accept NUL bytes for `.' + +---------------------------------------------------------------------------- Sed 4.1.5 * fix parsing of a negative character class not including a closed bracket, diff --git a/sed/regexp.c b/sed/regexp.c index d4e7437..1297c5e 100644 --- a/sed/regexp.c +++ b/sed/regexp.c @@ -1,5 +1,6 @@ /* GNU SED, a batch stream editor. - Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -64,7 +65,12 @@ compile_regex_1 (new_regex, needed_sub) int syntax = ((extended_regexp_flags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED : RE_SYNTAX_POSIX_BASIC) - & ~RE_UNMATCHED_RIGHT_PAREN_ORD; + & ~RE_DOT_NOT_NULL; + + if (posixicity == POSIXLY_EXTENDED) + syntax &= ~RE_UNMATCHED_RIGHT_PAREN_ORD; + else + syntax |= RE_UNMATCHED_RIGHT_PAREN_ORD; syntax |= RE_NO_POSIX_BACKTRACKING; #ifdef RE_ICASE