diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2020-02-09 21:35:51 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2020-02-09 21:35:51 +0200 |
| commit | 4be99b75c7cf84c7b21d3bcb4011f3870a926c4c (patch) | |
| tree | 6be368c9a4d424d2ac7091bf2b37afb128100792 | |
| parent | ec041138efb27d105b391d022300a782552efdd2 (diff) | |
| parent | 02cea1f5bcaff4eaea5ed2db9f9d5cb7d8ab682b (diff) | |
| download | egawk-4be99b75c7cf84c7b21d3bcb4011f3870a926c4c.tar.gz egawk-4be99b75c7cf84c7b21d3bcb4011f3870a926c4c.tar.bz2 egawk-4be99b75c7cf84c7b21d3bcb4011f3870a926c4c.zip | |
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gawk
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | custom.h | 2 | ||||
| -rw-r--r-- | support/ChangeLog | 5 | ||||
| -rw-r--r-- | support/dfa.c | 5 | ||||
| -rw-r--r-- | vms/ChangeLog | 10 | ||||
| -rwxr-xr-x[-rw-r--r--] | vms/generate_config_vms_h_gawk.com | 8 | ||||
| -rw-r--r-- | vms/vmstest.com | 18 |
7 files changed, 41 insertions, 11 deletions
@@ -7,6 +7,10 @@ was a syntax error in the statement being evaluated. Thanks again to Jannick, for the report. +2020-02-04 John E. Malmberg <wb8tyw@qsl.net> + + * custom.h: Fix OpenVMS SIZE_MAX value. + 2020-02-01 Arnold D. Robbins <arnold@skeeve.com> * awk.h, dfa.c: Move include of mbsupport.h to ... @@ -48,7 +48,7 @@ #define _GNU_SOURCE 1 #endif /* _GNU_SOURCE */ #ifndef SIZE_MAX -#define SIZE_MAX __INT32_MAX +#define SIZE_MAX (__UINT32_MAX) #endif /* SIZE_MAX */ #define ULONG_WIDTH 32 #ifndef __VAX diff --git a/support/ChangeLog b/support/ChangeLog index 202f9f02..96da5cb4 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,8 @@ +2020-02-01 John E. Malmberg <wb8tyw@qsl.net> + + * dfa.c: Remove OpenVMS specific code. OpenVMS build + will generate a stdint.h if needed. + 2020-02-01 Arnold D. Robbins <arnold@skeeve.com> * dfa.c: Update from GNULIB. Should help Vax/VMS. diff --git a/support/dfa.c b/support/dfa.c index d112443f..9939d228 100644 --- a/support/dfa.c +++ b/support/dfa.c @@ -28,12 +28,7 @@ #include <assert.h> #include <ctype.h> -#ifndef VMS #include <stdint.h> -#else -#define SIZE_MAX __INT32_MAX -#define PTRDIFF_MAX __INT32_MAX -#endif #include <stdio.h> #include <stdlib.h> #include <limits.h> diff --git a/vms/ChangeLog b/vms/ChangeLog index 3f632fe1..33270171 100644 --- a/vms/ChangeLog +++ b/vms/ChangeLog @@ -1,3 +1,13 @@ +2020-02-04 John E. Malmberg <wb8tyw@qsl.net> + + * vmstest.com: Fix manyfile test cleanup to handle a search list. + +2020-02-04 John E. Malmberg <wb8tyw@qsl.net> + + * generate_config_vms_h_gawk.com: + Create stdint.h if not supplied by OpenVMS and + add in the definitions required by support/dfa.h + 2020-02-03 John E. Malmberg <wb8tyw@qsl.net> * vmstest.com: Fix some issues where a test failure would stop the diff --git a/vms/generate_config_vms_h_gawk.com b/vms/generate_config_vms_h_gawk.com index b0d1ed1b..681a73b1 100644..100755 --- a/vms/generate_config_vms_h_gawk.com +++ b/vms/generate_config_vms_h_gawk.com @@ -67,6 +67,14 @@ $ then $ create sys$disk:[]stdint.h $ open/append stdint_h sys$disk:[]stdint.h $ write stdint_h "/* Fake stdint.h for gnulib */" +$ write stdint_h "#ifndef FAKE_STDINT" +$ write stdint_h "#define FAKE_STDINT" +$ write stdint_h "#include <fake_vms_path/limits.h>" +$ write stdint_h "#define PTRDIFF_MAX (__INT32_MAX)" +$ write stdint_h "#ifndef SIZE_MAX" +$ write stdint_h "#define SIZE_MAX (__UINT32_MAX)" +$ write stdint_h "#endif /* __VAX */" +$ write stdint_h "#endif /* FAKE_STDINT */" $ close stdint_h $ endif $! diff --git a/vms/vmstest.com b/vms/vmstest.com index 5c9108de..952d9f0d 100644 --- a/vms/vmstest.com +++ b/vms/vmstest.com @@ -1192,15 +1192,22 @@ $ chnlc = f$getsyi("CHANNELCNT") $ fillm = f$getjpi("","FILLM") $ if fillm.ge.chnlc then fillm = chnlc - 1 $ if fillm.ge.f_cnt then f_cnt = fillm + 10 -$ if f$search("[.junk]*.*").nes."" then rm [.junk]*.*;* -$ if f$parse("[.junk]").eqs."" then create/Dir/Prot=(O:rwed) [.junk] -$ gawk -- "BEGIN {for (i = 1; i <= ''f_cnt'; i++) print i, i}" >_manyfiles.dat +$ if f$search("sys$disk:[.junk]*.*").nes."" +$ then +$ rm sys$disk:[.junk]*.*;* +$ endif +$ if f$parse("sys$disk:[.junk]") .eqs. "" +$ then +$ create/Dir/Prot=(O:rwed) sys$disk:[.junk] +$ endif +$ gawk -- "BEGIN {for (i = 1; i <= ''f_cnt'; i++) print i, i}" - + >_manyfiles.dat $ echo "(processing ''f_cnt' files; this may take quite a while)" $ set noOn ! continue even if gawk fails $ gawk -f manyfiles.awk _manyfiles.dat _manyfiles.dat $ define/User sys$error _NL: $ define/User sys$output _manyfiles.tmp -$ search/Match=Nor/Output=_NL:/Log [.junk]*.* "" +$ search/Match=Nor/Output=_NL:/Log sys$disk:[.junk]*.* "" $!/Log output: "%SEARCH-S-NOMATCH, <filename> - <#> records" plus 1 line summary $ gawk -v "F_CNT=''f_cnt'" -f - _manyfiles.tmp $deck !some input begins with "$" @@ -1210,7 +1217,8 @@ $eod $ set On $ skip_reason = "Test detection not implemented yet" $ gosub junit_report_skip -$ rm _manyfiles.tmp;,_manyfiles.dat;,[.junk]*.*;*,[]junk.dir; +$ rm sys$disk:_manyfiles.tmp;,sys$disk:_manyfiles.dat; +$ rm sys$disk:[.junk]*.*;*,sys$disk:[]junk.dir; $ return $ $compare: echo "compare" |