diff options
| -rw-r--r-- | pc/ChangeLog | 4 | ||||
| -rw-r--r-- | pc/Makefile.tst | 12 | ||||
| -rw-r--r-- | vms/ChangeLog | 13 | ||||
| -rw-r--r-- | vms/vms-conf.h | 16 | ||||
| -rw-r--r-- | vms/vms_args.c | 9 | ||||
| -rw-r--r-- | vms/vmstest.com | 8 |
6 files changed, 41 insertions, 21 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index 33b4239f..7218176f 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,7 @@ +Thu Jan 27 21:31:23 2011 Scott Deifik <scottd.mail@sbcglobal.net> + + * Makefile.tst: Fixes for dumpvars and mv, cp, et. al. + Mon Jan 17 22:21:07 2011 Scott Deifik <scottd.mail@sbcglobal.net> * Makefile.tst: Sync with mainline version. diff --git a/pc/Makefile.tst b/pc/Makefile.tst index 40cfff7e..63b6fa8a 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -66,6 +66,9 @@ AWK = ../gawk.exe AWK2 = '..\gawk.exe' AWKPROG = ../gawk.exe +# Define PGAWK +PGAWK = ../pgawk.exe + # Set your cmp command here (you can use most versions of diff instead of cmp # if you don't want to convert the .ok files to the DOS CR/LF format). # This is also an issue for the "mmap8k" test. If it fails, make sure that @@ -87,12 +90,14 @@ CMP = diff #CMP = diff -c #CMP = gcmp -# Set your "cp" and "mkdir" commands here. Note: DOS's copy must take forward -# slashes. +# Set your "cp," "mv," and "mkdir" commands here. Note: DOS's copy must take +# forward slashes. #CP = cp #CP = : && command -c copy CP = command.com /c copy +MV = cmd.exe /c ren + #MKDIR = mkdir #MKDIR = gmkdir #MKDIR = : && command -c mkdir @@ -705,7 +710,8 @@ beginfile1:: dumpvars:: @echo $@ @AWKPATH=$(srcdir) $(AWK) --dump-variables 1 < $(srcdir)/$@.in >/dev/null 2>&1 || echo EXIT CODE: $$? >>_$@ - @mv awkvars.out _$@ +# @mv awkvars.out _$@ + @$(MV) awkvars.out _$@ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ profile1: diff --git a/vms/ChangeLog b/vms/ChangeLog index 52f450b6..0dbb3eea 100644 --- a/vms/ChangeLog +++ b/vms/ChangeLog @@ -1,6 +1,15 @@ -Wed Jan 12 21:45:55 2011 Arnold Robbins <arnold@skeeve.com> +Tue Jan 18 17:51:07 2011 Pat Rankin <rankin@pactechdata.com> - * vms_conf.h: Add define for HAVE_STRCOLL. + * vms_args.c (vms_arg_fixup): If AWK_LIBRARY lacks a value, define + it as "SYS$LIBRARY:" so that the default value of AWKPATH ends + with a valid directory. Needed so that gawk -f no-such-file + will report "file not found" or "no such file or directory" + instead of "file specification syntax error". + + * vms-conf.h: Sync with configh.in; define HAVE_STRCOLL as 1. + + * vmstest.com (fnarray, funsmnam, paramres, parseme): Change these + tests to expect EXIT_CODE 1 rather than EXIT_CODE 2. Sat Nov 6 16:33:01 2010 Pat Rankin <rankin@pactechdata.com> diff --git a/vms/vms-conf.h b/vms/vms-conf.h index 2a890760..705323ad 100644 --- a/vms/vms-conf.h +++ b/vms/vms-conf.h @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 1991-1992, 1995-1996, 1999, 2001-2003, 2005, 2009, 2010 + * Copyright (C) 1991-1992, 1995-1996, 1999, 2001-2003, 2005, 2009, 2010, 2011 * the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the @@ -145,7 +145,7 @@ /* Define to 1 if you have the <libintl.h> header file. */ #undef HAVE_LIBINTL_H -/* Define if you have the sigsegv library. */ +/* Define if you have the libsigsegv library. */ #undef HAVE_LIBSIGSEGV /* Define to 1 if you have the `m' library (-lm). */ @@ -208,9 +208,6 @@ /* Define to 1 if you have the <netinet/in.h> header file. */ #undef HAVE_NETINET_IN_H -/* we have portals on /p on this system */ -#undef HAVE_PORTALS - /* we'll use the one in [.missing_d] */ #undef HAVE_SETENV @@ -245,6 +242,9 @@ /* Define to 1 if you have the `strchr' function. */ #define HAVE_STRCHR 1 +/* Define to 1 if you have the `strcoll' function. */ +#define HAVE_STRCOLL 1 + /* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 @@ -419,9 +419,6 @@ /* The size of a `unsigned long', as computed by sizeof. */ #define SIZEOF_UNSIGNED_LONG 4 -/* return type of sprintf */ -#define SPRINTF_RET int - /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -564,9 +561,6 @@ */ #define PIPES_SIMULATED 1 -/* Define to 1 if you have the `strcoll' function. */ -#define HAVE_STRCOLL 1 - /* * VAXCRTL is pre-ANSI and does some variations of numeric formatting * differently than gawk expects. diff --git a/vms/vms_args.c b/vms/vms_args.c index e349925c..0a296105 100644 --- a/vms/vms_args.c +++ b/vms/vms_args.c @@ -1,7 +1,7 @@ /* vms_args.c -- command line parsing, to emulate shell i/o redirection. [ Escape sequence parsing now suppressed. ] - Copyright (C) 1991-1996, 1997 the Free Software Foundation, Inc. + Copyright (C) 1991-1996, 1997, 2011 the Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -76,6 +76,10 @@ * Add '>+' to force binary mode output, to enable better control * for the user when the output destination is a mailbox or socket. * (ORS = "\r\n" for tcp/ip.) Contributed by Per Steinar Iversen. + * + * Jan'11, gawk 4.0.0 [pr] + * If AWK_LIBRARY is undefined, define it to be SYS$LIBRARY: so + * that the default value of AWKPATH ends with a valid directory. */ #include "awk.h" /* really "../awk.h" */ @@ -103,6 +107,9 @@ vms_arg_fixup( int *pargc, char ***pargv ) int i, argc = *pargc; int err_to_out_redirect = 0, out_to_err_redirect = 0; + /* make sure AWK_LIBRARY has a value */ + if (!getenv("AWK_LIBRARY")) + vms_define("AWK_LIBRARY", "SYS$LIBRARY:"); #ifdef CHECK_DECSHELL /* don't define this if linking with DECC$SHR */ if (shell$is_shell()) return; /* don't do anything if we're running DEC/Shell */ diff --git a/vms/vmstest.com b/vms/vmstest.com index c6c03e4e..40c832eb 100644 --- a/vms/vmstest.com +++ b/vms/vmstest.com @@ -755,14 +755,10 @@ $ set On $ return $ $arrayparm: -$fnarray: $fnaryscl: -$funsmnam: $match2: $opasnslf: $opasnidx: -$paramres: -$parseme: $printfbad1: $prmarscl: $subslash: @@ -990,6 +986,10 @@ $ if $status then rm _rstest5.tmp; $ return $ $fcall_exit: +$fnarray: +$funsmnam: +$paramres: +$parseme: $synerr1: $synerr2: $ echo "''test'" |