gawk-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gawk-diffs] [SCM] gawk branch, gawk-4.0-stable, updated. 422a9f84f8bc91


From: Arnold Robbins
Subject: [gawk-diffs] [SCM] gawk branch, gawk-4.0-stable, updated. 422a9f84f8bc91f267a176e737dfc2d7670d540b
Date: Wed, 06 Feb 2013 04:22:11 +0000

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 "gawk".

The branch, gawk-4.0-stable has been updated
       via  422a9f84f8bc91f267a176e737dfc2d7670d540b (commit)
       via  b4997014ca38482c242d84148787ab4211ed6897 (commit)
      from  c50b8be023841c6cd44f90b064c36703465e76f9 (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://git.sv.gnu.org/cgit/gawk.git/commit/?id=422a9f84f8bc91f267a176e737dfc2d7670d540b

commit 422a9f84f8bc91f267a176e737dfc2d7670d540b
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Feb 6 06:21:57 2013 +0200

    Fix include order, mainly for VMS.
    (cherry picked from commit 20cf1ff2b10b7b43d30a9213c63b8e92a12b9a90)

diff --git a/ChangeLog b/ChangeLog
index 3ff28c9..5b40a50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2013-02-04         Arnold D. Robbins     <address@hidden>
+2013-01-31         Arnold D. Robbins     <address@hidden>
 
        * regcomp.c, regex.c, regex_internal.c, regexec.c: Update
        copyright years to sync with GLIBC.
@@ -13,6 +13,12 @@
 
 2013-01-31         Arnold D. Robbins     <address@hidden>
 
+       * dfa.c: Include "dfa.h" which includes regex.h after limits.h
+       so that RE_DUP_MAX gets the correct value. Especially needed on
+       OpenVMS. Thanks to Anders Wallin.
+
+2013-01-31         Arnold D. Robbins     <address@hidden>
+
        * PROBLEMS: Removed. It is no longer needed.
        * Makefile.am (EXTRA_DIST): Remove PROBLEMS from list.
 
diff --git a/dfa.c b/dfa.c
index a7f6938..4559adb 100644
--- a/dfa.c
+++ b/dfa.c
@@ -22,8 +22,6 @@
 
 #include <config.h>
 
-#include "dfa.h"
-
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -45,6 +43,8 @@
 #include "missing_d/gawkbool.h"
 #endif /* HAVE_STDBOOL_H */
 
+#include "dfa.h"
+
 
 #define STREQ(a, b) (strcmp (a, b) == 0)
 

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=b4997014ca38482c242d84148787ab4211ed6897

commit b4997014ca38482c242d84148787ab4211ed6897
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Feb 6 06:16:17 2013 +0200

    Pull in some regex fixes.
    (cherry picked from commit e8cbbd49aa49195de2cff403cf0e6b4da0971717)

diff --git a/ChangeLog b/ChangeLog
index a62b8db..3ff28c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-02-04         Arnold D. Robbins     <address@hidden>
+
+       * regcomp.c, regex.c, regex_internal.c, regexec.c: Update
+       copyright years to sync with GLIBC.
+
+       From: http://www.sourceware.org/ml/libc-alpha/2013-01/msg00967.html,
+       by Andreas Schwab <address@hidden>:
+
+       * regexec.c (extend_buffers): Add parameter min_len.
+       (check_matching): Pass minimum needed length.
+       (clean_state_log_if_needed): Likewise.
+       (get_subexp): Likewise.`
+
 2013-01-31         Arnold D. Robbins     <address@hidden>
 
        * PROBLEMS: Removed. It is no longer needed.
diff --git a/regcomp.c b/regcomp.c
index f83e454..ae0f85c 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2007,2009,2010,2011,2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <address@hidden>.
 
diff --git a/regex.c b/regex.c
index 3abc758..629d028 100644
--- a/regex.c
+++ b/regex.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <address@hidden>.
 
diff --git a/regex_internal.c b/regex_internal.c
index 8099161..5f77bcb 100644
--- a/regex_internal.c
+++ b/regex_internal.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2006, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <address@hidden>.
 
diff --git a/regexec.c b/regexec.c
index 7d594d2..3bcb695 100644
--- a/regexec.c
+++ b/regexec.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2005,2007,2009,2010,2011 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <address@hidden>.
 
@@ -197,7 +197,7 @@ static int group_nodes_into_DFAstates (const re_dfa_t *dfa,
 static int check_node_accept (const re_match_context_t *mctx,
                              const re_token_t *node, int idx)
      internal_function;
-static reg_errcode_t extend_buffers (re_match_context_t *mctx)
+static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len)
      internal_function;
 
 #ifdef GAWK
@@ -1169,7 +1169,7 @@ check_matching (re_match_context_t *mctx, int 
fl_longest_match,
          || (BE (next_char_idx >= mctx->input.valid_len, 0)
              && mctx->input.valid_len < mctx->input.len))
        {
-         err = extend_buffers (mctx);
+         err = extend_buffers (mctx, next_char_idx + 1);
          if (BE (err != REG_NOERROR, 0))
            {
              assert (err == REG_ESPACE);
@@ -1749,7 +1749,7 @@ clean_state_log_if_needed (re_match_context_t *mctx, int 
next_state_log_idx)
          && mctx->input.valid_len < mctx->input.len))
     {
       reg_errcode_t err;
-      err = extend_buffers (mctx);
+      err = extend_buffers (mctx, next_state_log_idx + 1);
       if (BE (err != REG_NOERROR, 0))
        return err;
     }
@@ -2803,7 +2803,7 @@ get_subexp (re_match_context_t *mctx, int bkref_node, int 
bkref_str_idx)
                  if (bkref_str_off >= mctx->input.len)
                    break;
 
-                 err = extend_buffers (mctx);
+                 err = extend_buffers (mctx, bkref_str_off + 1);
                  if (BE (err != REG_NOERROR, 0))
                    return err;
 
@@ -4113,7 +4113,7 @@ check_node_accept (const re_match_context_t *mctx, const 
re_token_t *node,
 
 static reg_errcode_t
 internal_function __attribute_warn_unused_result__
-extend_buffers (re_match_context_t *mctx)
+extend_buffers (re_match_context_t *mctx, int min_len)
 {
   reg_errcode_t ret;
   re_string_t *pstr = &mctx->input;
@@ -4122,8 +4122,10 @@ extend_buffers (re_match_context_t *mctx)
   if (BE (INT_MAX / 2 / sizeof (re_dfastate_t *) <= pstr->bufs_len, 0))
     return REG_ESPACE;
 
-  /* Double the lengthes of the buffers.  */
-  ret = re_string_realloc_buffers (pstr, MIN (pstr->len, pstr->bufs_len * 2));
+  /* Double the lengthes of the buffers, but allocate at least MIN_LEN.  */
+  ret = re_string_realloc_buffers (pstr,
+                                  MAX (min_len,
+                                       MIN (pstr->len, pstr->bufs_len * 2)));
   if (BE (ret != REG_NOERROR, 0))
     return ret;
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |   19 +++++++++++++++++++
 dfa.c            |    4 ++--
 regcomp.c        |    2 +-
 regex.c          |    2 +-
 regex_internal.c |    2 +-
 regexec.c        |   18 ++++++++++--------
 6 files changed, 34 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

[Prev in Thread] Current Thread [Next in Thread]