[gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-2942-g28b143c

[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, gawk-4.2-stable has been updated
       via  28b143c3a489e2699834812214eeaa6347ac1c01 (commit)
       via  97773a0db9bcbafa16afcd1461ed6eead7f192a8 (commit)
       via  28e37a0dc466d96478c3e6a8f087b7be097ed318 (commit)
      from  9f3ab0384b99ab4f0002339908127baa9d06c859 (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=28b143c3a489e2699834812214eeaa6347ac1c01

commit 28b143c3a489e2699834812214eeaa6347ac1c01
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Mar 5 19:38:44 2018 +0200

    Make nlstringtest work if gawk was compiled without gettext.

diff --git a/test/ChangeLog b/test/ChangeLog
index 65f01e6..cd3813c 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2018-03-05         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (EXTRA_DIST): Add nlstringtest-nogettext.ok.
+       * (nlstringtest): Compare to nlstringtest-nogettext.ok first,
+       in case gawk was built without GNU gettext.
+       * nlstringtest-nogettext.ok: New file.
+
 2018-02-25         Arnold D. Robbins     <address@hidden>
 
        * 4.2.1: Release tar ball made.
diff --git a/test/Makefile.am b/test/Makefile.am
index bf1dbd3..f0cd20d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -720,6 +720,7 @@ EXTRA_DIST = \
        nlstringtest.awk \
        nlstringtest.ok \
        nlstringtest.po \
+       nlstringtest-nogettext.ok \
        fr \
        noeffect.awk \
        noeffect.ok \
@@ -2477,7 +2478,12 @@ nlstringtest::
        @echo $@
        @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; \
        AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)" >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+       @-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ ; \
+       then \
+               rm -f _$@ ; \
+       else \
+               $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
+       fi
 
 
 # Targets generated for other tests:
diff --git a/test/Makefile.in b/test/Makefile.in
index f96151b..927544f 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -978,6 +978,7 @@ EXTRA_DIST = \
        nlstringtest.awk \
        nlstringtest.ok \
        nlstringtest.po \
+       nlstringtest-nogettext.ok \
        fr \
        noeffect.awk \
        noeffect.ok \
@@ -2914,7 +2915,12 @@ nlstringtest::
        @echo $@
        @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; \
        AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)" >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+       @-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ ; \
+       then \
+               rm -f _$@ ; \
+       else \
+               $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
+       fi
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
diff --git a/test/nlstringtest-nogettext.ok b/test/nlstringtest-nogettext.ok
new file mode 100644
index 0000000..3834800
--- /dev/null
+++ b/test/nlstringtest-nogettext.ok
@@ -0,0 +1,5 @@
+2 pieces of cake
+%s is replaced by %s.
+%s is replaced by %s.
+
+FF is replaced by EUR.

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

commit 97773a0db9bcbafa16afcd1461ed6eead7f192a8
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Mar 5 19:29:54 2018 +0200

    Minor cleanups (bool to int, move a macro).

diff --git a/ChangeLog b/ChangeLog
index b31740b..388a9eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-03-05         Arnold D. Robbins     <address@hidden>
+
+       * awk.h [PUSH_BINDING, POP_BINDING]: Moved to ...
+       * debug.c: here.
+       * awkgram.y (yylex): Make do_etoa_init into a boolean.
+       * io.c (rs1scan): Make found into a boolean.
+
 2018-02-25         Arnold D. Robbins     <address@hidden>
 
        * 4.2.1: Release tar ball made.
diff --git a/awk.h b/awk.h
index 3b351c2..1e334bf 100644
--- a/awk.h
+++ b/awk.h
@@ -1349,13 +1349,6 @@ DEREF(NODE *r)
 extern jmp_buf fatal_tag;
 extern int fatal_tag_valid;
 
-#define PUSH_BINDING(stack, tag, val)  \
-if (val++) \
-       memcpy((char *) (stack), (const char *) tag, sizeof(jmp_buf))
-#define POP_BINDING(stack, tag, val)   \
-if (--val) \
-       memcpy((char *) tag, (const char *) (stack), sizeof(jmp_buf))
-
 #define assoc_length(a)        ((*((a)->alength(a, NULL)))->table_size)
 #define assoc_empty(a) (assoc_length(a) == 0)
 #define assoc_lookup(a, s)     ((a)->alookup(a, s))
diff --git a/awkgram.c b/awkgram.c
index 52821ea..c1a5ead 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -6706,7 +6706,7 @@ static int
 yylex(void)
 {
        static char etoa_xlate[256];
-       static int do_etoa_init = 1;
+       static bool do_etoa_init = true;
        int tok;
 
        if (do_etoa_init)
@@ -6719,7 +6719,7 @@ yylex(void)
 #else
 # error "An EBCDIC-to-ASCII translation function is needed for this system"
 #endif
-               do_etoa_init = 0;
+               do_etoa_init = false;
        }
 
        tok = yylex_ebcdic();
diff --git a/awkgram.y b/awkgram.y
index ad830a5..be1e495 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -4286,7 +4286,7 @@ static int
 yylex(void)
 {
        static char etoa_xlate[256];
-       static int do_etoa_init = 1;
+       static bool do_etoa_init = true;
        int tok;
 
        if (do_etoa_init)
@@ -4299,7 +4299,7 @@ yylex(void)
 #else
 # error "An EBCDIC-to-ASCII translation function is needed for this system"
 #endif
-               do_etoa_init = 0;
+               do_etoa_init = false;
        }
 
        tok = yylex_ebcdic();
diff --git a/debug.c b/debug.c
index 3e76ae6..7a5ad21 100644
--- a/debug.c
+++ b/debug.c
@@ -338,6 +338,13 @@ struct command_source
 
 static struct command_source *cmd_src = NULL;
 
+#define PUSH_BINDING(stack, tag, val)  \
+if (val++) \
+       memcpy((char *) (stack), (const char *) tag, sizeof(jmp_buf))
+#define POP_BINDING(stack, tag, val)   \
+if (--val) \
+       memcpy((char *) tag, (const char *) (stack), sizeof(jmp_buf))
+
 
 #define CHECK_PROG_RUNNING() \
        do { \
diff --git a/io.c b/io.c
index 1a1d8cc..9ca29da 100644
--- a/io.c
+++ b/io.c
@@ -3535,12 +3535,12 @@ rs1scan(IOBUF *iop, struct recmatch *recm, SCANSTATE 
*state)
        /* Thus, the check for \n here; big speedup ! */
        if (rs != '\n' && gawk_mb_cur_max > 1) {
                int len = iop->dataend - bp;
-               int found = 0;
+               bool found = false;
 
                memset(& mbs, 0, sizeof(mbstate_t));
                do {
                        if (*bp == rs)
-                               found = 1;
+                               found = true;
                        if (is_valid_character(*bp))
                                mbclen = 1;
                        else

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

commit 28e37a0dc466d96478c3e6a8f087b7be097ed318
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Mar 5 19:24:17 2018 +0200

    Restore text mode default processing for MSYS.

diff --git a/posix/ChangeLog b/posix/ChangeLog
index f04902f..9ec9907 100644
--- a/posix/ChangeLog
+++ b/posix/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-05         Arnold D. Robbins     <address@hidden>
+
+       * gawkmisc.c (cygwin_premain0, cygwin_premain2): Restored for
+       use in MSYS environment only.
+
 2018-02-25         Arnold D. Robbins     <address@hidden>
 
        * 4.2.1: Release tar ball made.
diff --git a/posix/gawkmisc.c b/posix/gawkmisc.c
index ecf5aff..16cfeb0 100644
--- a/posix/gawkmisc.c
+++ b/posix/gawkmisc.c
@@ -289,3 +289,23 @@ void
 init_sockets(void)
 {
 }
+
+// For MSYS, restore behavior of working in text mode.
+#ifdef __MSYS__
+void
+cygwin_premain0(int argc, char **argv, struct per_process *myself)
+{
+       static struct __cygwin_perfile pf[] = {
+               { "", O_RDONLY | O_TEXT },
+               /*{ "", O_WRONLY | O_BINARY },*/
+               { NULL, 0 }
+       };
+       cygwin_internal(CW_PERFILE, pf);
+}
+
+void
+cygwin_premain2(int argc, char **argv, struct per_process *myself)
+{
+       setmode(fileno (stdin), O_TEXT);
+}
+#endif

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

Summary of changes:
 ChangeLog                      |  7 +++++++
 awk.h                          |  7 -------
 awkgram.c                      |  4 ++--
 awkgram.y                      |  4 ++--
 debug.c                        |  7 +++++++
 io.c                           |  4 ++--
 posix/ChangeLog                |  5 +++++
 posix/gawkmisc.c               | 20 ++++++++++++++++++++
 test/ChangeLog                 |  7 +++++++
 test/Makefile.am               |  8 +++++++-
 test/Makefile.in               |  8 +++++++-
 test/nlstringtest-nogettext.ok |  5 +++++
 12 files changed, 71 insertions(+), 15 deletions(-)
 create mode 100644 test/nlstringtest-nogettext.ok


hooks/post-receive
-- 
gawk