This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.13-198-ga4b89fd
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 May 2011 14:29:27 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.13-198-ga4b89fd
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via a4b89fd84698009f45d44f22bd93718acb87bb02 (commit)
from ea389b12b3b65c4a7fa91fa76f8c99867eb37865 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a4b89fd84698009f45d44f22bd93718acb87bb02
commit a4b89fd84698009f45d44f22bd93718acb87bb02
Author: Aharon Robbins <arnold@skeeve.com>
Date: Mon May 16 10:28:44 2011 -0400
Update RE_SYNTAX*_AWK constants in regex.h
diff --git a/ChangeLog b/ChangeLog
index 70937c2..89b49d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2011-05-16 Ulrich Drepper <drepper@gmail.com>
+ * posix/regex.h (RE_SYNTAX_AWK, RE_SYNTAX_GNU_AWK,
+ RE_SYNTAX_POSIX_AWK): Update to match recent development.
+ Patch by Aharon Robbins <arnold@skeeve.com>.
+
[BZ #11892]
* stdlib/putenv.c (putenv): Don't always create copy of the variable
on the stack.
diff --git a/posix/regex.h b/posix/regex.h
index 2132772..21fa3cf 100644
--- a/posix/regex.h
+++ b/posix/regex.h
@@ -1,6 +1,6 @@
/* Definitions for data structures and routines for the regular
expression library.
- Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003,2005,2006,2008
+ Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003,2005,2006,2008,2011
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -62,10 +62,10 @@ typedef unsigned long int reg_syntax_t;
/* If this bit is set, then ^ and $ are always anchors (outside bracket
expressions, of course).
If this bit is not set, then it depends:
- ^ is an anchor if it is at the beginning of a regular
- expression or after an open-group or an alternation operator;
- $ is an anchor if it is at the end of a regular expression, or
- before a close-group or an alternation operator.
+ ^ is an anchor if it is at the beginning of a regular
+ expression or after an open-group or an alternation operator;
+ $ is an anchor if it is at the end of a regular expression, or
+ before a close-group or an alternation operator.
This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
POSIX draft 11.2 says that * etc. in leading positions is undefined.
@@ -194,16 +194,19 @@ extern reg_syntax_t re_syntax_options;
| RE_NO_BK_PARENS | RE_NO_BK_REFS \
| RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \
| RE_DOT_NEWLINE | RE_CONTEXT_INDEP_ANCHORS \
+ | RE_CHAR_CLASSES \
| RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS)
#define RE_SYNTAX_GNU_AWK \
- ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG) \
- & ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS \
- | RE_CONTEXT_INVALID_OPS ))
+ ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS \
+ | RE_INVALID_INTERVAL_ORD) \
+ & ~(RE_DOT_NOT_NULL | RE_CONTEXT_INDEP_OPS \
+ | RE_CONTEXT_INVALID_OPS ))
#define RE_SYNTAX_POSIX_AWK \
(RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS \
- | RE_INTERVALS | RE_NO_GNU_OPS)
+ | RE_INTERVALS | RE_NO_GNU_OPS \
+ | RE_INVALID_INTERVAL_ORD)
#define RE_SYNTAX_GREP \
(RE_BK_PLUS_QM | RE_CHAR_CLASSES \
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
posix/regex.h | 21 ++++++++++++---------
2 files changed, 16 insertions(+), 9 deletions(-)
hooks/post-receive
--
GNU C Library master sources