[gawk-diffs] [SCM] gawk branch, gawk-4.0-stable, updated. 1c931f6f51c050ee9ad0b837dd2d0233f1dc3221

[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.0-stable has been updated
       via  1c931f6f51c050ee9ad0b837dd2d0233f1dc3221 (commit)
       via  982aa5c89f762f2385f5fe4e7f7faf4b3fed2b1b (commit)
      from  0ae96bfbc93e44099abb5e3b59719236b5045087 (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=1c931f6f51c050ee9ad0b837dd2d0233f1dc3221

commit 1c931f6f51c050ee9ad0b837dd2d0233f1dc3221
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Mar 14 11:17:48 2012 +0200

    Fix compile warnings on DJGPP.

diff --git a/ChangeLog b/ChangeLog
index 044c9e3..84e069a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-14         Eli Zaretskii  <address@hidden>
+
+       * mbsupport.h (btowc): Change for non-DJGPP.
+       * re.c (dfaerror): Add call to exit for DJGPP.
+
 2012-03-14         Arnold D. Robbins     <address@hidden>
 
        * regex_internal.c (re_string_skip_chars): Fix calculation of
diff --git a/mbsupport.h b/mbsupport.h
index f647d78..80821c6 100644
--- a/mbsupport.h
+++ b/mbsupport.h
@@ -81,7 +81,9 @@
 #define WEOF           EOF
 #define towupper       toupper
 #define towlower       tolower
-#define btowc(x)       (x)
+#ifndef DJGPP
+#define btowc(x)       ((int)x)
+#endif
 #define iswalnum       isalnum
 #define iswalpha       isalpha
 #define iswupper       isupper
diff --git a/pc/ChangeLog b/pc/ChangeLog
index fef06ac..e921875 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-14         Eli Zaretskii  <address@hidden>
+
+       * gawkmisc.pc (btowc): New version for DJGPP.
+
 2012-03-01   Scott Deifik  <address@hidden>
 
        * Makefile.tst: Sync with mainline version.
diff --git a/pc/gawkmisc.pc b/pc/gawkmisc.pc
index 6e5b8bb..b2a67a5 100644
--- a/pc/gawkmisc.pc
+++ b/pc/gawkmisc.pc
@@ -595,4 +595,12 @@ unsetenv (const char *name)
   return putenv (name);
 }
 
+/* This is needed to defeat too-clever GCC warnings in dfa.c about
+   comparison being always false due to limited range of data type.  */
+wint_t
+btowc (int c)
+{
+  return c;
+}
+
 #endif /* __DJGPP__ */
diff --git a/re.c b/re.c
index cec95da..24522d7 100644
--- a/re.c
+++ b/re.c
@@ -322,6 +322,7 @@ void
 dfaerror(const char *s)
 {
        fatal("%s", s);
+       exit(EXIT_FATAL);       /* for DJGPP */
 }
 
 /* re_update --- recompile a dynamic regexp */

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

commit 982aa5c89f762f2385f5fe4e7f7faf4b3fed2b1b
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Mar 14 11:16:37 2012 +0200

    Fix to regex_internal.c from sed list.

diff --git a/ChangeLog b/ChangeLog
index f72977c..044c9e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-14         Arnold D. Robbins     <address@hidden>
+
+       * regex_internal.c (re_string_skip_chars): Fix calculation of
+       remain_len with m.b. chars. Thanks to Stanislav Brabec
+       <address@hidden>.
+
 2012-02-28         Arnold D. Robbins     <address@hidden>
 
        * main.c (init_groupset): Make `getgroups' failing a non-fatal
diff --git a/regex_internal.c b/regex_internal.c
index d76cae2..4551670 100644
--- a/regex_internal.c
+++ b/regex_internal.c
@@ -505,7 +505,7 @@ re_string_skip_chars (re_string_t *pstr, int new_raw_idx, 
wint_t *last_wc)
        rawbuf_idx < new_raw_idx;)
     {
       wchar_t wc2;
-      int remain_len = pstr->len - rawbuf_idx;
+      int remain_len = pstr->raw_len - rawbuf_idx;
       prev_st = pstr->cur_state;
       mbclen = __mbrtowc (&wc2, (const char *) pstr->raw_mbs + rawbuf_idx,
                          remain_len, &pstr->cur_state);

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

Summary of changes:
 ChangeLog        |   11 +++++++++++
 mbsupport.h      |    4 +++-
 pc/ChangeLog     |    4 ++++
 pc/gawkmisc.pc   |    8 ++++++++
 re.c             |    1 +
 regex_internal.c |    2 +-
 6 files changed, 28 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
gawk