[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4243-gf6cc813
|
From: |
Arnold Robbins |
|
Subject: |
[SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4243-gf6cc813 |
|
Date: |
Mon, 10 May 2021 14:34:12 -0400 (EDT) |
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-5.1-stable has been updated
via f6cc8139dba1adbfa90773c9db8003e5db817d7b (commit)
via 38cd5733bf39211352af6dc54c7a6e08e2796228 (commit)
via b4fe35ca5bec12ac96522963b1922ac1303b86c9 (commit)
from 056cf0f36f054e41f61f86ca4c37046da218d8d9 (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=f6cc8139dba1adbfa90773c9db8003e5db817d7b
commit f6cc8139dba1adbfa90773c9db8003e5db817d7b
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Mon May 10 21:32:11 2021 +0300
Bump test version.
diff --git a/configure b/configure
index 55df77f..7d6873f 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.69 for GNU Awk 5.1.1b.
+# Generated by GNU Autoconf 2.69 for GNU Awk 5.1.1c.
#
# Report bugs to <bug-gawk@gnu.org>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GNU Awk'
PACKAGE_TARNAME='gawk'
-PACKAGE_VERSION='5.1.1b'
-PACKAGE_STRING='GNU Awk 5.1.1b'
+PACKAGE_VERSION='5.1.1c'
+PACKAGE_STRING='GNU Awk 5.1.1c'
PACKAGE_BUGREPORT='bug-gawk@gnu.org'
PACKAGE_URL='http://www.gnu.org/software/gawk/'
@@ -1344,7 +1344,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 5.1.1b to adapt to many kinds of systems.
+\`configure' configures GNU Awk 5.1.1c to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1415,7 +1415,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNU Awk 5.1.1b:";;
+ short | recursive ) echo "Configuration of GNU Awk 5.1.1c:";;
esac
cat <<\_ACEOF
@@ -1537,7 +1537,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNU Awk configure 5.1.1b
+GNU Awk configure 5.1.1c
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2246,7 +2246,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 5.1.1b, which was
+It was created by GNU Awk $as_me 5.1.1c, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3127,7 +3127,7 @@ fi
# Define the identity of the package.
PACKAGE='gawk'
- VERSION='5.1.1b'
+ VERSION='5.1.1c'
cat >>confdefs.h <<_ACEOF
@@ -12372,7 +12372,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 5.1.1b, which was
+This file was extended by GNU Awk $as_me 5.1.1c, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12440,7 +12440,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 5.1.1b
+GNU Awk config.status 5.1.1c
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 80ca7d0..4be40fa 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],[5.1.1b],[bug-gawk@gnu.org],[gawk])
+AC_INIT([GNU Awk],[5.1.1c],[bug-gawk@gnu.org],[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/pc/config.h b/pc/config.h
index a31f3b8..19f6fca 100644
--- a/pc/config.h
+++ b/pc/config.h
@@ -464,7 +464,7 @@
#define PACKAGE_NAME "GNU Awk"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU Awk 5.1.1b"
+#define PACKAGE_STRING "GNU Awk 5.1.1c"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gawk"
@@ -473,7 +473,7 @@
#define PACKAGE_URL "http://www.gnu.org/software/gawk/";
/* Define to the version of this package. */
-#define PACKAGE_VERSION "5.1.1b"
+#define PACKAGE_VERSION "5.1.1c"
/* Define to 1 if *printf supports %a format */
#define PRINTF_HAS_A_FORMAT 1
@@ -534,7 +534,7 @@
/* Version number of package */
-#define VERSION "5.1.1b"
+#define VERSION "5.1.1c"
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=38cd5733bf39211352af6dc54c7a6e08e2796228
commit 38cd5733bf39211352af6dc54c7a6e08e2796228
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Mon May 10 21:28:26 2021 +0300
Add the rest of the dynarray_* junk. Sigh.
diff --git a/helpers/ChangeLog b/helpers/ChangeLog
index 4f448b9..752e280 100644
--- a/helpers/ChangeLog
+++ b/helpers/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-10 Arnold D. Robbins <arnold@skeeve.com>
+
+ * update-support.sh: Update list of files to copy over.
+
2021-05-07 Arnold D. Robbins <arnold@skeeve.com>
* update-support.sh: Change to work from top level directory.
diff --git a/helpers/update-support.sh b/helpers/update-support.sh
index 06ed102..90de973 100755
--- a/helpers/update-support.sh
+++ b/helpers/update-support.sh
@@ -29,9 +29,12 @@ regex_internal.h
verify.h
malloc/dynarray-skeleton.c
malloc/dynarray.h
+malloc/dynarray_at_failure.c
malloc/dynarray_emplace_enlarge.c
+malloc/dynarray_emplace_enlarge.c
malloc/dynarray_finalize.c
-malloc/dynarray_resize.c"
+malloc/dynarray_resize.c
+malloc/dynarray_resize_clear.c"
for i in $FILE_LIST
do
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 0530e52..e71ef98 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -4,6 +4,8 @@
gets things more right. Thanks to Manuel Collado for the
suggestion.
* Makefile.tst: Regenerated.
+ * Makefile (DYNOBJS): Add dynarray_at_failure$O and
+ dynarray_resize_clear$O.
2021-05-09 Eli Zaretskii <eliz@gnu.org>
diff --git a/pc/Makefile b/pc/Makefile
index b2ca315..0dc8bb4 100644
--- a/pc/Makefile
+++ b/pc/Makefile
@@ -241,7 +241,9 @@ ALLOBJS = $(AWKOBJS) awkgram$O getid$O $(OBJ)
# LIBOBJS
# GNU and other stuff that gawk uses as library routines.
-DYNOBJS= dynarray_resize$O dynarray_emplace_enlarge$O dynarray_finalize$O
+DYNOBJS= dynarray_resize$O dynarray_emplace_enlarge$O dynarray_finalize$O \
+ dynarray_at_failure$O dynarray_resize_clear$O
+
LIBOBJS= getopt$O getopt1$O dfa$O random$O localeinfo$O regex$O $(DYNOBJS)
GAWKOBJS = $(ALLOBJS) $(LIBOBJS)
diff --git a/support/ChangeLog b/support/ChangeLog
index af1695d..f7a52b0 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,9 @@
+2021-05-10 Arnold D. Robbins <arnold@skeeve.com>
+
+ * support/dynarray_at_failure.c, support/dynarray_resize_clear.c:
+ New files.
+ * Makefile.am (libsupport_a_SOURCES): Add them.
+
2021-05-07 Arnold D. Robbins <arnold@skeeve.com>
* cdefs.h, libc-config.h, malloc/dynarray-skeleton.c,
diff --git a/support/Makefile.am b/support/Makefile.am
index 6a7ef61..18e5020 100644
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -62,9 +62,11 @@ libsupport_a_SOURCES = \
verify.h \
xalloc.h \
malloc/dynarray.h \
- malloc/dynarray_resize.c \
+ malloc/dynarray_at_failure.c \
malloc/dynarray_emplace_enlarge.c \
- malloc/dynarray_finalize.c
+ malloc/dynarray_finalize.c \
+ malloc/dynarray_resize.c \
+ malloc/dynarray_resize_clear.c
# For some make's, e.g. OpenBSD, that don't define this
RM = rm -f
diff --git a/support/Makefile.in b/support/Makefile.in
index 719a38e..2253488 100644
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -143,9 +143,11 @@ libsupport_a_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
am_libsupport_a_OBJECTS = dfa.$(OBJEXT) getopt.$(OBJEXT) \
getopt1.$(OBJEXT) localeinfo.$(OBJEXT) random.$(OBJEXT) \
- regex.$(OBJEXT) malloc/dynarray_resize.$(OBJEXT) \
+ regex.$(OBJEXT) malloc/dynarray_at_failure.$(OBJEXT) \
malloc/dynarray_emplace_enlarge.$(OBJEXT) \
- malloc/dynarray_finalize.$(OBJEXT)
+ malloc/dynarray_finalize.$(OBJEXT) \
+ malloc/dynarray_resize.$(OBJEXT) \
+ malloc/dynarray_resize_clear.$(OBJEXT)
libsupport_a_OBJECTS = $(am_libsupport_a_OBJECTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -165,9 +167,11 @@ am__maybe_remake_depfiles = depfiles
am__depfiles_remade = ./$(DEPDIR)/dfa.Po ./$(DEPDIR)/getopt.Po \
./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/localeinfo.Po \
./$(DEPDIR)/random.Po ./$(DEPDIR)/regex.Po \
+ malloc/$(DEPDIR)/dynarray_at_failure.Po \
malloc/$(DEPDIR)/dynarray_emplace_enlarge.Po \
malloc/$(DEPDIR)/dynarray_finalize.Po \
- malloc/$(DEPDIR)/dynarray_resize.Po
+ malloc/$(DEPDIR)/dynarray_resize.Po \
+ malloc/$(DEPDIR)/dynarray_resize_clear.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -382,9 +386,11 @@ libsupport_a_SOURCES = \
verify.h \
xalloc.h \
malloc/dynarray.h \
- malloc/dynarray_resize.c \
+ malloc/dynarray_at_failure.c \
malloc/dynarray_emplace_enlarge.c \
- malloc/dynarray_finalize.c
+ malloc/dynarray_finalize.c \
+ malloc/dynarray_resize.c \
+ malloc/dynarray_resize_clear.c
# For some make's, e.g. OpenBSD, that don't define this
@@ -431,12 +437,16 @@ malloc/$(am__dirstamp):
malloc/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) malloc/$(DEPDIR)
@: > malloc/$(DEPDIR)/$(am__dirstamp)
-malloc/dynarray_resize.$(OBJEXT): malloc/$(am__dirstamp) \
+malloc/dynarray_at_failure.$(OBJEXT): malloc/$(am__dirstamp) \
malloc/$(DEPDIR)/$(am__dirstamp)
malloc/dynarray_emplace_enlarge.$(OBJEXT): malloc/$(am__dirstamp) \
malloc/$(DEPDIR)/$(am__dirstamp)
malloc/dynarray_finalize.$(OBJEXT): malloc/$(am__dirstamp) \
malloc/$(DEPDIR)/$(am__dirstamp)
+malloc/dynarray_resize.$(OBJEXT): malloc/$(am__dirstamp) \
+ malloc/$(DEPDIR)/$(am__dirstamp)
+malloc/dynarray_resize_clear.$(OBJEXT): malloc/$(am__dirstamp) \
+ malloc/$(DEPDIR)/$(am__dirstamp)
libsupport.a: $(libsupport_a_OBJECTS) $(libsupport_a_DEPENDENCIES)
$(EXTRA_libsupport_a_DEPENDENCIES)
$(AM_V_at)-rm -f libsupport.a
@@ -456,9 +466,11 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localeinfo.Po@am__quote@ #
am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random.Po@am__quote@ #
am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Po@am__quote@ #
am--include-marker
+@AMDEP_TRUE@@am__include@
@am__quote@malloc/$(DEPDIR)/dynarray_at_failure.Po@am__quote@ #
am--include-marker
@AMDEP_TRUE@@am__include@
@am__quote@malloc/$(DEPDIR)/dynarray_emplace_enlarge.Po@am__quote@ #
am--include-marker
@AMDEP_TRUE@@am__include@
@am__quote@malloc/$(DEPDIR)/dynarray_finalize.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@
@am__quote@malloc/$(DEPDIR)/dynarray_resize.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@
@am__quote@malloc/$(DEPDIR)/dynarray_resize_clear.Po@am__quote@ #
am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@@ -614,9 +626,11 @@ distclean: distclean-am
-rm -f ./$(DEPDIR)/localeinfo.Po
-rm -f ./$(DEPDIR)/random.Po
-rm -f ./$(DEPDIR)/regex.Po
+ -rm -f malloc/$(DEPDIR)/dynarray_at_failure.Po
-rm -f malloc/$(DEPDIR)/dynarray_emplace_enlarge.Po
-rm -f malloc/$(DEPDIR)/dynarray_finalize.Po
-rm -f malloc/$(DEPDIR)/dynarray_resize.Po
+ -rm -f malloc/$(DEPDIR)/dynarray_resize_clear.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-local distclean-tags
@@ -668,9 +682,11 @@ maintainer-clean: maintainer-clean-am
-rm -f ./$(DEPDIR)/localeinfo.Po
-rm -f ./$(DEPDIR)/random.Po
-rm -f ./$(DEPDIR)/regex.Po
+ -rm -f malloc/$(DEPDIR)/dynarray_at_failure.Po
-rm -f malloc/$(DEPDIR)/dynarray_emplace_enlarge.Po
-rm -f malloc/$(DEPDIR)/dynarray_finalize.Po
-rm -f malloc/$(DEPDIR)/dynarray_resize.Po
+ -rm -f malloc/$(DEPDIR)/dynarray_resize_clear.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/support/malloc/dynarray_at_failure.c
b/support/malloc/dynarray_at_failure.c
new file mode 100644
index 0000000..4f840db
--- /dev/null
+++ b/support/malloc/dynarray_at_failure.c
@@ -0,0 +1,39 @@
+/* Report an dynamic array index out of bounds condition.
+ Copyright (C) 2017-2021 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _LIBC
+# include <libc-config.h>
+#endif
+
+#include <dynarray.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+void
+__libc_dynarray_at_failure (size_t size, size_t index)
+{
+#ifdef _LIBC
+ char buf[200];
+ __snprintf (buf, sizeof (buf), "Fatal glibc error: "
+ "array index %zu not less than array length %zu\n",
+ index, size);
+#else
+ abort ();
+#endif
+}
+libc_hidden_def (__libc_dynarray_at_failure)
diff --git a/support/malloc/dynarray_resize_clear.c
b/support/malloc/dynarray_resize_clear.c
new file mode 100644
index 0000000..9c43b00
--- /dev/null
+++ b/support/malloc/dynarray_resize_clear.c
@@ -0,0 +1,39 @@
+/* Increase the size of a dynamic array and clear the new part.
+ Copyright (C) 2017-2021 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _LIBC
+# include <libc-config.h>
+#endif
+
+#include <dynarray.h>
+#include <string.h>
+
+bool
+__libc_dynarray_resize_clear (struct dynarray_header *list, size_t size,
+ void *scratch, size_t element_size)
+{
+ size_t old_size = list->used;
+ if (!__libc_dynarray_resize (list, size, scratch, element_size))
+ return false;
+ /* __libc_dynarray_resize already checked for overflow. */
+ char *array = list->array;
+ memset (array + (old_size * element_size), 0,
+ (size - old_size) * element_size);
+ return true;
+}
+libc_hidden_def (__libc_dynarray_resize_clear)
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=b4fe35ca5bec12ac96522963b1922ac1303b86c9
commit b4fe35ca5bec12ac96522963b1922ac1303b86c9
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Mon May 10 21:27:44 2021 +0300
Fix iolint.ok.
diff --git a/test/ChangeLog b/test/ChangeLog
index cf133b5..b179fa9 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -9,6 +9,7 @@
* iolint.awk: Change order so can use plain 'cat' instead of
'exec cat'. Makes it available for MinGW.
+ * iolint.ok: Update after code changes.
* Makefile.am (iolint): Update shell recipe.
2021-05-09 Eli Zaretskii <eliz@gnu.org>
diff --git a/test/iolint.ok b/test/iolint.ok
index 98743f9..0008b0a 100644
--- a/test/iolint.ok
+++ b/test/iolint.ok
@@ -23,11 +23,11 @@ gawk: iolint.awk:42: warning: `cksum' used for output file
and output pipe
gawk: iolint.awk:49: warning: `echo hello' used for input pipe and output file
0
0
-gawk: iolint.awk:73: warning: `cat' used for output file and output pipe
+gawk: iolint.awk:60: warning: `cat' used for output file and output pipe
0
hello
0
-gawk: iolint.awk:82: warning: `echo hello' used for input pipe and output pipe
+gawk: iolint.awk:67: warning: `echo hello' used for input pipe and output pipe
hello
0
0
-----------------------------------------------------------------------
Summary of changes:
configure | 20 ++++++++---------
configure.ac | 2 +-
helpers/ChangeLog | 4 ++++
helpers/update-support.sh | 5 ++++-
pc/ChangeLog | 2 ++
pc/Makefile | 4 +++-
pc/config.h | 6 +++---
support/ChangeLog | 6 ++++++
support/Makefile.am | 6 ++++--
support/Makefile.in | 28 ++++++++++++++++++------
support/malloc/dynarray_at_failure.c | 39 ++++++++++++++++++++++++++++++++++
support/malloc/dynarray_resize_clear.c | 39 ++++++++++++++++++++++++++++++++++
test/ChangeLog | 1 +
test/iolint.ok | 4 ++--
14 files changed, 140 insertions(+), 26 deletions(-)
create mode 100644 support/malloc/dynarray_at_failure.c
create mode 100644 support/malloc/dynarray_resize_clear.c
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4243-gf6cc813,
Arnold Robbins <=