[gawk-diffs] [SCM] gawk branch, master, updated. cafbb82185c4a5fc2608975c048d66017456a038

[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  cafbb82185c4a5fc2608975c048d66017456a038 (commit)
       via  3b0ec209b9630bd4f8689a4ecc5544c419ebd259 (commit)
       via  efddae1261ed612c21efcbfabb2cabe7c16021f1 (commit)
      from  81c2e977b7bc19068440f7df766c4a9dc316de01 (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=cafbb82185c4a5fc2608975c048d66017456a038

commit cafbb82185c4a5fc2608975c048d66017456a038
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Nov 12 23:13:16 2012 +0200

    Initial changes for VMS building.

diff --git a/io.c b/io.c
index 5f4365c..2607b6c 100644
--- a/io.c
+++ b/io.c
@@ -2567,9 +2567,6 @@ find_source(const char *src, struct stat *stb, int 
*errcode, int is_extlib)
                size_t src_len;
                size_t suffix_len;
 
-#ifndef SHLIBEXT       /* for vms, for now */
-#define SHLIBEXT       "awk"
-#endif
 #define EXTLIB_SUFFIX  "." SHLIBEXT
                src_len = strlen(src);
                suffix_len = strlen(EXTLIB_SUFFIX);
diff --git a/vms/ChangeLog b/vms/ChangeLog
index 725a223..7689527 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,6 +1,19 @@
+2012-11-12         Arnold D. Robbins     <address@hidden>
+
+       * gawkmisc.vms (os_isreadable): Change first argument type to
+       awk_input_buf_t.
+       * vms-conf.h (HAVE_STDINT_H): Define.
+       (SHLIBEXT, DEFLIBPATH): Add definitions.
+       * vms_fwrite.c (tty_fwrite): Check do_debug instead of no-longer-
+       extant which_gawk variable.
+       * vms_gawk.c (vms_gawk): Check do_debug and do_profiling instead
+       of which_gawk.
+
+       Thanks to Anders Wallin.
+
 2012-08-08         Arnold D. Robbins     <address@hidden>
 
-       * gawkmisc.pc (os_isreadable): Take IOBUF_PUBLIC instead of fd and
+       * gawkmisc.vms (os_isreadable): Take IOBUF_PUBLIC instead of fd and
        use passed in info.
 
 2012-07-29         Arnold D. Robbins     <address@hidden>
diff --git a/vms/gawkmisc.vms b/vms/gawkmisc.vms
index 0ca3e0b..08c8fb5 100644
--- a/vms/gawkmisc.vms
+++ b/vms/gawkmisc.vms
@@ -147,7 +147,7 @@ int fd;
 /* os_isreadable --- fd can be read from */
 
 int
-os_isreadable(const IOBUF_PUBLIC *iobuf, bool *isdir)
+os_isreadable(const awk_input_buf_t *iobuf, bool *isdir)
 {
        *isdir = false;
 
diff --git a/vms/vms-conf.h b/vms/vms-conf.h
index 59abd5d..3aee5ca 100644
--- a/vms/vms-conf.h
+++ b/vms/vms-conf.h
@@ -233,7 +233,7 @@
 #define HAVE_STDDEF_H 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
+#define HAVE_STDINT_H  1
 
 /* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
    uintmax_t. */
@@ -545,6 +545,10 @@
 /* Whether `time_t' is an unsigned type. */
 #define TIME_T_UNSIGNED 1
 
+/* Extension for shared libraries */
+#define SHLIBEXT       "exe"
+
+
 /*******************************/
 /* Gawk configuration options. */
 /*******************************/
@@ -561,6 +565,7 @@
  */
 
 #define DEFPATH        ".,/AWK_LIBRARY"
+#define DEFLIBPATH ".,/AWK_LIBRARY"
 #define ENVSEP ','
 
 /*
diff --git a/vms/vms_fwrite.c b/vms/vms_fwrite.c
index 921ac2d..1a16f58 100644
--- a/vms/vms_fwrite.c
+++ b/vms/vms_fwrite.c
@@ -77,7 +77,7 @@ tty_fwrite( const void *buf, size_t size, size_t number, FILE 
*file )
     chan = file_num < _NFILE ? channel[file_num] : -1;
     if (chan == 0) {   /* if not initialized, need to assign a channel */
        if (isatty(file_num) > 0        /* isatty: 1=yes, 0=no, -1=problem */
-           && which_gawk != exe_debugging) {
+           && ! do_debug) {
            Dsc  device;
            char devnam[255+1];
 
diff --git a/vms/vms_gawk.c b/vms/vms_gawk.c
index 222d803..8b20c37 100644
--- a/vms/vms_gawk.c
+++ b/vms/vms_gawk.c
@@ -80,8 +80,8 @@ vms_gawk()
     int native_dcl = 1,        /* assume true until we know otherwise */
        short_circ;     /* some options make P1, /commands, /input superfluous 
*/
 
-    CmdName = (which_gawk == exe_profiling) ? "PGAWK"
-             : (which_gawk == exe_debugging) ? "DGAWK"
+    CmdName = do_profile ? "PGAWK"
+             : do_debug ? "DGAWK"
              : "GAWK";
 
     /* check "GAWK_P1"--it's required; its presence will tip us off */

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

commit 3b0ec209b9630bd4f8689a4ecc5544c419ebd259
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Nov 12 23:02:50 2012 +0200

    Fix pc os_isreadable.

diff --git a/pc/ChangeLog b/pc/ChangeLog
index 0defb81..77159fe 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-12         Arnold D. Robbins     <address@hidden>
+
+       * gawkmisc.pc (os_isreadable): Use correct type for first parameter.
+
 2012-11-04   Scott Deifik  <address@hidden>
 
        * Makefile.tst (jarebug, charasbytes): Update.
diff --git a/pc/gawkmisc.pc b/pc/gawkmisc.pc
index e2f114e..e44191c 100644
--- a/pc/gawkmisc.pc
+++ b/pc/gawkmisc.pc
@@ -235,7 +235,7 @@ int fd;
 /* os_isreadable --- fd can be read from */
 
 int
-os_isreadable(const IOBUF_PUBLIC *iobuf, bool *isdir)
+os_isreadable(const awk_input_buf_t *iobuf, bool *isdir)
 {
        *isdir = false;
 

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

commit efddae1261ed612c21efcbfabb2cabe7c16021f1
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Nov 12 23:00:20 2012 +0200

    Adjust symtab6 test.

diff --git a/test/ChangeLog b/test/ChangeLog
index 55c6494..3c571f8 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-12         Arnold D. Robbins     <address@hidden>
+
+       * symtab6.ok: Remove PROCINFO.
+       * Makefile.am (symtab6): Adjust recipe.
+
 2012-11-10         Arnold D. Robbins     <address@hidden>
 
        * symtab4.awk, symtab4.in, symtab4.ok, symtab5.awk, symtab5.in,
diff --git a/test/Makefile.am b/test/Makefile.am
index f3b21e4..bb25f8a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1700,7 +1700,7 @@ charasbytes:
 symtab6:
        @echo $@
        @$(AWK) -d__$@ -f $(srcdir)/address@hidden
-       @grep -v '^ENVIRON' __$@ > _$@ ; rm __$@
+       @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' > _$@ ; rm __$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 # Targets generated for other tests:
diff --git a/test/Makefile.in b/test/Makefile.in
index c49280c..c115d9c 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2081,7 +2081,7 @@ charasbytes:
 symtab6:
        @echo $@
        @$(AWK) -d__$@ -f $(srcdir)/address@hidden
-       @grep -v '^ENVIRON' __$@ > _$@ ; rm __$@
+       @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' > _$@ ; rm __$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
diff --git a/test/symtab6.ok b/test/symtab6.ok
index ac5484d..91f27e7 100644
--- a/test/symtab6.ok
+++ b/test/symtab6.ok
@@ -17,7 +17,6 @@ OFMT: "%.6g"
 OFS: " "
 ORS: "\n"
 PREC: 53
-PROCINFO: array, 23 elements
 RLENGTH: 0
 ROUNDMODE: "N"
 RS: "\n"

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

Summary of changes:
 io.c             |    3 ---
 pc/ChangeLog     |    4 ++++
 pc/gawkmisc.pc   |    2 +-
 test/ChangeLog   |    5 +++++
 test/Makefile.am |    2 +-
 test/Makefile.in |    2 +-
 test/symtab6.ok  |    1 -
 vms/ChangeLog    |   15 ++++++++++++++-
 vms/gawkmisc.vms |    2 +-
 vms/vms-conf.h   |    7 ++++++-
 vms/vms_fwrite.c |    2 +-
 vms/vms_gawk.c   |    4 ++--
 12 files changed, 36 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
gawk