Move to gawk-3.0.2.

4 files changed, 65 insertions, 8 deletions

diff --git a/vms/ChangeLog b/vms/ChangeLog
index 4d5a0918..d8992bb4 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,31 @@
+Wed Dec 25 11:25:22 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
+
+	* Release 3.0.2: Release tar file made.
+
+Mon Dec 23 20:51:27 1996  Pat Rankin  <rankin@eql.caltech.edu>
+
+	* vms_misc.c (vms_bcopy):  `bcopy' is defined as this in redirect.h.
+
+Thu Dec 19 17:49:31 1996  Pat Rankin  <rankin@eql.caltech.edu>
+
+	* redirect.h (strcasecmp, strncasecmp, tzset, tzname,
+	  daylight, timezone, altzone, bcopy, popen, pclose, unlink):
+	  New macros to avoid conflict with VMS V7.x DECC$SHR symbols.
+	  (close, dup, dup2, read):  Declare with full prototypes.
+	  (fstat, stat):  Ditto, and guard against conflicting DEC C
+	  declarations (which might have trailing elipsis).
+	* vms_misc.c (tzset, tzname, daylight, timezone, altzone):
+	  Suppress these if compiled with VMS_V7 defined [not supported].
+
+Mon Dec 16 14:32:08 1996  Pat Rankin  <rankin@eql.caltech.edu>
+
+	* vms_popen (popen):  Delete unprototyped declaration of strcmp()
+	  to avoid conflict with a strcmp macro in DEC C V5.0 header files.
+
+Tue Dec 10 23:09:26 1996  Arnold D. Robbins  <arnold@skeeve.atl.ga.us>
+
+	* Release 3.0.1: Release tar file made.
+
 Fri Dec  6 20:55:57 1996  Pat Rankin  <rankin@eql.caltech.edu>
 
 	* redirect.h, vms-conf.h:  Refine Sep 20th change:  include
diff --git a/vms/redirect.h b/vms/redirect.h
index ce58901d..18659b5e 100644
--- a/vms/redirect.h
+++ b/vms/redirect.h
@@ -42,6 +42,15 @@
 #define regerror	gnu_regerror
 #ifndef VMS_POSIX
 #define strftime	gnu_strftime	/* always use missing/strftime.c */
+#define strcasecmp	gnu_strcasecmp
+#define strncasecmp	gnu_strncasecmp
+#ifndef VMS_V7
+#define tzset		fake_tzset
+#define tzname		fake_tzname
+#define daylight	fake_daylight
+#define timezone	fake_timezone
+#define altzone		fake_altzone
+#endif
 #endif
 
 #ifdef STDC_HEADERS
@@ -54,10 +63,16 @@
 #else	/* awk.h, not POSIX */
 
 /* some macros to redirect to code in vms/vms_misc.c */
+#ifndef bcopy
+#define bcopy		vms_bcopy
+#endif
 #define exit		vms_exit
 #define open		vms_open
+#define popen		vms_popen
+#define pclose		vms_pclose
 #define strerror	vms_strerror
 #define strdup		vms_strdup
+#define unlink		vms_unlink
 extern void  exit P((int));
 extern int   open P((const char *,int,...));
 extern char *strerror P((int));
@@ -80,7 +95,15 @@ extern int isatty P((int));
 #ifndef fileno
 extern int fileno P((FILE *));
 #endif
-extern int close(), dup(), dup2(), fstat(), read(), stat();
+extern int close P((int));
+extern int dup P((int));
+extern int dup2 P((int, int));
+extern int read P((int, void *, int));
+#if defined(__DECC) && !defined(__CAN_USE_EXTERN_PREFIX)
+struct stat;
+extern int fstat P((int, struct stat *));
+extern int stat P((const char *, struct stat *));
+#endif
 extern int getpgrp P((void));
 
 #endif	/* not VMS_POSIX and not IN_CONFIG_H */
diff --git a/vms/vms_misc.c b/vms/vms_misc.c
index d876534c..8e12c154 100644
--- a/vms/vms_misc.c
+++ b/vms/vms_misc.c
@@ -169,6 +169,8 @@ vms_devopen( const char *name, int mode )
     return (file && *file && *name == '\0') ? fileno(file) : -1;
 }
 
+
+#ifndef VMS_V7
     /*
      * VMS prior to V7.x has no timezone support unless DECnet/OSI is used.
      */
@@ -181,6 +183,8 @@ void tzset(void)
 {
     return;
 }
+#endif	/*VMS_V7*/
+
 
 /* getpgrp() -- there's no such thing as process group under VMS;
  *		job tree might be close enough to be useful though.
@@ -191,10 +195,7 @@ int getpgrp(void)
 }
 
 #ifndef __GNUC__
-# ifdef bcopy
-#  undef bcopy
-# endif
-void bcopy( const char *src, char *dst, int len )
+void vms_bcopy( const char *src, char *dst, int len )
 {
     (void) memcpy(dst, src, len);
 }
diff --git a/vms/vms_popen.c b/vms/vms_popen.c
index d92dca90..e5829442 100644
--- a/vms/vms_popen.c
+++ b/vms/vms_popen.c
@@ -47,7 +47,7 @@ pclose( FILE *current )
 }
 
 int
-fork()
+fork( void )
 {
     fatal(" Internal error ('fork' not implemented)");
     /* NOT REACHED */
@@ -70,6 +70,11 @@ fork()
 #include <errno.h>
 #include <lnmdef.h>	/* logical name definitions */
 
+#ifndef STDC_HEADERS
+extern int strcmp P((const char*, const char *));
+#endif
+extern char *mktemp P((char *));
+
 static void push_logicals P((void));
 static void pop_logicals P((void));
 static Itm *save_translation P((const Dsc *));
@@ -97,8 +102,8 @@ FILE *
 popen( const char *command, const char *mode )
 {
     FILE *current;
-    char *name, *mktemp();
-    int   cur, strcmp();
+    char *name;
+    int   cur;
     pipemode curmode;
 
     if (strcmp(mode, "r") == 0)