[gawk-diffs] [SCM] gawk branch, master, updated. 2c126c4972966714e2c3af8826c4161c30570041

[Arnold Robbins]

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, master has been updated
       via  2c126c4972966714e2c3af8826c4161c30570041 (commit)
       via  c790700eb617f5267102d8743d3021e2cb6ae088 (commit)
       via  d4636a0032274fa7750f5e6c36a16c715ea5681a (commit)
      from  04a2bff46700c20ed75a0c624b98d6e55853de02 (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=2c126c4972966714e2c3af8826c4161c30570041

commit 2c126c4972966714e2c3af8826c4161c30570041
Author: Arnold D. Robbins <address@hidden>
Date:   Sun May 29 22:51:44 2011 +0300

    Fixes in expand_range.

diff --git a/ChangeLog b/ChangeLog
index 5ca01f2..d3ae5eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun May 29 22:48:41 2011  Arnold D. Robbins  <address@hidden>
+
+       * re.c (expand_range): Handle cases where expanded range
+       includes '\\' (and ']'). Thanks to Juergen Daubert <address@hidden>.
+       Fatal error if end point is below start point ([z-a]),
+       thanks to John Haque.  Don't repeat the last character in
+       the expansion. Thanks to Arnold Robbins.
+
 Fri May 27 10:01:17 2011  Arnold D. Robbins  <address@hidden>
 
        * Release 3.1.84: Third beta test tar ball for 4.0.
diff --git a/re.c b/re.c
index 691955f..b317b09 100644
--- a/re.c
+++ b/re.c
@@ -643,6 +643,7 @@ add_char(char **bufp, size_t *lenp, char ch, char **ptr)
        erealloc(*bufp, char *, newlen + 2, "add_char");
        *ptr = *bufp + offset;
        **ptr = ch;
+       *lenp = newlen + 2;
        (*ptr)++;
 }
 
@@ -714,7 +715,7 @@ again:
                        /* inside [...] but not inside [[:...:]] */
                        if (*sp == '-') {
                                int start, end;
-                               char i;
+                               int i;
 
                                if (sp[1] == ']') {     /* also literal */
                                        copy();
@@ -728,8 +729,18 @@ again:
                                        len--;
                                }
                                end = sp[1];
-                               for (i = start + 1; i <= end; i++)
+                               if (end < start)
+                                       fatal(_("Invalid range end: /%.*s/"),
+                                                               *lenp, s);
+                               for (i = start + 1; i < end; i++) {
+                                       /*
+                                        * Will the special cases never end?
+                                        */
+                                       if (i == '\\' || i == ']') {
+                                               copych('\\');
+                                       }
                                        copych(i);
+                               }
                                sp++;
                                len--;
                                continue;

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

commit c790700eb617f5267102d8743d3021e2cb6ae088
Author: Arnold D. Robbins <address@hidden>
Date:   Sun May 29 22:48:14 2011 +0300

    Bump version after tar ball.

diff --git a/configure b/configure
index 384f85d..57bfacb 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for GNU Awk 3.1.84.
+# Generated by GNU Autoconf 2.68 for GNU Awk 3.1.85.
 #
 # Report bugs to <address@hidden>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNU Awk'
 PACKAGE_TARNAME='gawk'
-PACKAGE_VERSION='3.1.84'
-PACKAGE_STRING='GNU Awk 3.1.84'
+PACKAGE_VERSION='3.1.85'
+PACKAGE_STRING='GNU Awk 3.1.85'
 PACKAGE_BUGREPORT='address@hidden'
 PACKAGE_URL='http://www.gnu.org/software/gawk/'
 
@@ -1292,7 +1292,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Awk 3.1.84 to adapt to many kinds of systems.
+\`configure' configures GNU Awk 3.1.85 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1362,7 +1362,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Awk 3.1.84:";;
+     short | recursive ) echo "Configuration of GNU Awk 3.1.85:";;
    esac
   cat <<\_ACEOF
 
@@ -1474,7 +1474,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Awk configure 3.1.84
+GNU Awk configure 3.1.85
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2178,7 +2178,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU Awk $as_me 3.1.84, which was
+It was created by GNU Awk $as_me 3.1.85, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3013,7 +3013,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gawk'
- VERSION='3.1.84'
+ VERSION='3.1.85'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11260,7 +11260,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU Awk $as_me 3.1.84, which was
+This file was extended by GNU Awk $as_me 3.1.85, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11328,7 +11328,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GNU Awk config.status 3.1.84
+GNU Awk config.status 3.1.85
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 3fdbc82..5d4842b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([GNU Awk], 3.1.84, address@hidden, gawk)
+AC_INIT([GNU Awk], 3.1.85, address@hidden, gawk)
 
 # This is a hack. Different versions of install on different systems
 # are just too different. Chuck it and use install-sh.
diff --git a/version.c b/version.c
index 684279e..db6de80 100644
--- a/version.c
+++ b/version.c
@@ -1,3 +1,3 @@
 #include "config.h"
 
-const char *version_string = "GNU Awk 3.1.84";
+const char *version_string = "GNU Awk 3.1.85";

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

commit d4636a0032274fa7750f5e6c36a16c715ea5681a
Author: Arnold D. Robbins <address@hidden>
Date:   Sun May 29 22:47:48 2011 +0300

    Minor edits.

diff --git a/doc/gawk.1 b/doc/gawk.1
index b36063b..96abac7 100644
--- a/doc/gawk.1
+++ b/doc/gawk.1
@@ -14,7 +14,7 @@
 .              if \w'\(rq' .ds rq "\(rq
 .      \}
 .\}
-.TH GAWK 1 "May 27 2011" "Free Software Foundation" "Utility Commands"
+.TH GAWK 1 "May 29 2011" "Free Software Foundation" "Utility Commands"
 .SH NAME
 gawk \- pattern scanning and processing language
 .SH SYNOPSIS
@@ -3286,10 +3286,10 @@ built-in functions (from the Bell Laboratories 
version); and the \*(AN C convers
 .B printf
 (done first in the Bell Laboratories version).
 .SH HISTORICAL FEATURES
-There are two features of historical \*(AK implementations that
+There is one feature of historical \*(AK implementations that
 .I gawk
-supports.
-First, it is possible to call the
+supports:
+It is possible to call the
 .B length()
 built-in function not only with no argument, but even without parentheses!
 Thus,
@@ -3420,6 +3420,13 @@ The special file names available for I/O redirection are 
not recognized.
 The
 .B |&
 operator for creating co-processes.
+.TP
+\(bu
+The
+.B BEGINFILE
+and
+.B ENDFILE
+special patterns are not available.
 .\" Changes to standard awk functions
 .TP
 \(bu

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

Summary of changes:
 ChangeLog    |    8 ++++++++
 configure    |   20 ++++++++++----------
 configure.ac |    2 +-
 doc/gawk.1   |   15 +++++++++++----
 re.c         |   15 +++++++++++++--
 version.c    |    2 +-
 6 files changed, 44 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
gawk