Move to gawk 3.1.5.

9 files changed, 142 insertions, 14 deletions

diff --git a/extension/ChangeLog b/extension/ChangeLog
index 60805ec4..d62a561b 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,13 @@
+Tue Jul 26 21:46:16 2005  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* Release 3.1.5: Release tar file made.
+
+Sun Jun 26 09:03:32 2005   Arnold D. Robbins    <arnold@skeeve.com>
+
+	* filefuncs.c (do_stat): Check return value from readlink()
+	for error. Pass in `sizeof(buf) - 1' to leave room for trailing
+	zero byte. From: Glenn Zazulia <gnu@t1.zazu.com>.
+
 Mon Aug  2 12:18:15 2004   Arnold D. Robbins    <arnold@skeeve.com>
 
 	* Release 3.1.4: Release tar file made.
diff --git a/extension/arrayparm.c b/extension/arrayparm.c
index d2e18d5b..732bf4d3 100644
--- a/extension/arrayparm.c
+++ b/extension/arrayparm.c
@@ -27,7 +27,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
 #include "awk.h"
diff --git a/extension/dl.c b/extension/dl.c
index 0f1e1c5c..8737420f 100644
--- a/extension/dl.c
+++ b/extension/dl.c
@@ -23,7 +23,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
 #include "awk.h"
diff --git a/extension/filefuncs.c b/extension/filefuncs.c
index ed86875a..f719f32d 100644
--- a/extension/filefuncs.c
+++ b/extension/filefuncs.c
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2001, 2004 the Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2004, 2005 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
@@ -24,7 +24,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
 #include "awk.h"
@@ -260,14 +260,16 @@ NODE *tree;
 		char buf[BUFSIZ*2];
 		int linksize;
 
-		linksize = readlink(file->stptr, buf, sizeof buf);
-		/* should make this smarter */
-		if (linksize == sizeof(buf))
-			fatal("size of symbolic link too big");
-		buf[linksize] = '\0';
+		linksize = readlink(file->stptr, buf, sizeof(buf) - 1);
+		if (linksize >= 0) {
+			/* should make this smarter */
+			if (linksize >= sizeof(buf) - 1)
+				fatal("size of symbolic link too big");
+			buf[linksize] = '\0';
 
-		aptr = assoc_lookup(array, tmp_string("linkval", 7), FALSE);
-		*aptr = make_string(buf, linksize);
+			aptr = assoc_lookup(array, tmp_string("linkval", 7), FALSE);
+			*aptr = make_string(buf, linksize);
+		}
 	}
 
 	/* add a type field */
diff --git a/extension/fork.c b/extension/fork.c
index 8ba7d0d6..7438ba2f 100644
--- a/extension/fork.c
+++ b/extension/fork.c
@@ -22,7 +22,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
 #include "awk.h"
diff --git a/extension/ordchr.c b/extension/ordchr.c
index 4849ede8..76cddb82 100644
--- a/extension/ordchr.c
+++ b/extension/ordchr.c
@@ -25,7 +25,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
 #include "awk.h"
diff --git a/extension/readfile.c b/extension/readfile.c
index d9a01ffd..d5db8302 100644
--- a/extension/readfile.c
+++ b/extension/readfile.c
@@ -27,7 +27,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
 #include "awk.h"
diff --git a/extension/xreadlink.c b/extension/xreadlink.c
new file mode 100644
index 00000000..d56d2a6a
--- /dev/null
+++ b/extension/xreadlink.c
@@ -0,0 +1,93 @@
+/* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage
+
+   Copyright (C) 2001, 2003, 2004, 2005 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Jim Meyering <jim@meyering.net>  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "xreadlink.h"
+
+#include <stdio.h>
+#include <errno.h>
+#include <limits.h>
+#include <sys/types.h>
+#include <stdlib.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifndef SIZE_MAX
+# define SIZE_MAX ((size_t) -1)
+#endif
+#ifndef SSIZE_MAX
+# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
+#endif
+
+#define MAXSIZE (SIZE_MAX < SSIZE_MAX ? SIZE_MAX : SSIZE_MAX)
+
+#include "xalloc.h"
+
+/* Call readlink to get the symbolic link value of FILE.
+   SIZE is a hint as to how long the link is expected to be;
+   typically it is taken from st_size.  It need not be correct.
+   Return a pointer to that NUL-terminated string in malloc'd storage.
+   If readlink fails, return NULL (caller may use errno to diagnose).
+   If malloc fails, or if the link value is longer than SSIZE_MAX :-),
+   give a diagnostic and exit.  */
+
+char *
+xreadlink (char const *file, size_t size)
+{
+  /* The initial buffer size for the link value.  A power of 2
+     detects arithmetic overflow earlier, but is not required.  */
+  size_t buf_size = size < MAXSIZE ? size + 1 : MAXSIZE;
+
+  while (1)
+    {
+      char *buffer = xmalloc (buf_size);
+      ssize_t r = readlink (file, buffer, buf_size);
+      size_t link_length = r;
+
+      /* On AIX 5L v5.3 and HP-UX 11i v2 04/09, readlink returns -1
+	 with errno == ERANGE if the buffer is too small.  */
+      if (r < 0 && errno != ERANGE)
+	{
+	  int saved_errno = errno;
+	  free (buffer);
+	  errno = saved_errno;
+	  return NULL;
+	}
+
+      if (link_length < buf_size)
+	{
+	  buffer[link_length] = 0;
+	  return buffer;
+	}
+
+      free (buffer);
+      if (buf_size <= MAXSIZE / 2)
+	buf_size *= 2;
+      else if (buf_size < MAXSIZE)
+	buf_size = MAXSIZE;
+      else
+	xalloc_die ();
+    }
+}
diff --git a/extension/xreadlink.h b/extension/xreadlink.h
new file mode 100644
index 00000000..9fcf836a
--- /dev/null
+++ b/extension/xreadlink.h
@@ -0,0 +1,23 @@
+/* readlink wrapper to return the link name in malloc'd storage
+
+   Copyright (C) 2001, 2003, 2004 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Jim Meyering <jim@meyering.net>  */
+
+#include <stddef.h>
+char *xreadlink (char const *, size_t);