From 21c8b6d547b12942775d675ead2994992285c04c Mon Sep 17 00:00:00 2001
From: "Arnold D. Robbins" <arnold@skeeve.com>
Date: Mon, 10 Jun 2013 21:30:19 +0300
Subject: Solaris config and included fixes. See ChangeLog.

---
 extension/filefuncs.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'extension/filefuncs.c')

diff --git a/extension/filefuncs.c b/extension/filefuncs.c
index 5ef0e61b..ad6a991d 100644
--- a/extension/filefuncs.c
+++ b/extension/filefuncs.c
@@ -45,10 +45,17 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif /* HAVE_SYS_PARAM_H */
 
+#ifdef MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+#elif defined(MAJOR_IN_SYSMACROS)
+#include <sys/sysmacros.h>
+#endif
+
 #include "gawkapi.h"
 
 #include "gettext.h"
-- 
cgit v1.2.3


From 3f60b6ccc298f1eddac0ce917712d84212e015d0 Mon Sep 17 00:00:00 2001
From: "Arnold D. Robbins" <arnold@skeeve.com>
Date: Fri, 2 Aug 2013 17:48:59 -0400
Subject: Minor improvement for Windows in filefuncs.c.

---
 extension/filefuncs.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'extension/filefuncs.c')

diff --git a/extension/filefuncs.c b/extension/filefuncs.c
index ad6a991d..0ffddedd 100644
--- a/extension/filefuncs.c
+++ b/extension/filefuncs.c
@@ -511,7 +511,24 @@ init_filefuncs(void)
 	return errors == 0;
 }
 
-#ifndef _WIN32
+#ifdef _WIN32
+/*  do_fts --- walk a heirarchy and fill in an array */
+
+/*
+ * Usage from awk:
+ *	flags = or(FTS_PHYSICAL, ...)
+ *	result = fts(pathlist, flags, filedata)
+ */
+
+static awk_value_t *
+do_fts(int nargs, awk_value_t *result)
+{
+	fatal(ext_id, _("fts is not supported on this system"));
+
+	return NULL;	/* for the compiler */
+}
+
+#else /* _WIN32 */
 
 static int fts_errors = 0;
 
-- 
cgit v1.2.3


From f0c2c7a6a614995911c1030048325d402f29574c Mon Sep 17 00:00:00 2001
From: "Arnold D. Robbins" <arnold@skeeve.com>
Date: Tue, 6 Aug 2013 20:56:02 -0700
Subject: Fix for MinGW in extension/filefuncs.c.

---
 extension/filefuncs.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'extension/filefuncs.c')

diff --git a/extension/filefuncs.c b/extension/filefuncs.c
index 0ffddedd..61cadfec 100644
--- a/extension/filefuncs.c
+++ b/extension/filefuncs.c
@@ -71,7 +71,7 @@
 #define readlink(f,b,bs) (-1)
 #endif
 
-#ifdef _WIN32
+#ifdef __MINGW32__
 #define S_IRGRP S_IRUSR
 #define S_IWGRP S_IWUSR
 #define S_IXGRP S_IXUSR
@@ -361,7 +361,7 @@ fill_stat_array(const char *name, awk_array_t array, struct stat *sbuf)
 	/* fill in the array */
 	array_set(array, "name", make_const_string(name, strlen(name), & tmp));
 	array_set_numeric(array, "dev", sbuf->st_dev);
-#ifdef _WIN32
+#ifdef __MINGW32__
 	array_set_numeric(array, "ino", (double)get_inode (name));
 #else
 	array_set_numeric(array, "ino", sbuf->st_ino);
@@ -371,7 +371,7 @@ fill_stat_array(const char *name, awk_array_t array, struct stat *sbuf)
 	array_set_numeric(array, "uid", sbuf->st_uid);
 	array_set_numeric(array, "gid", sbuf->st_gid);
 	array_set_numeric(array, "size", sbuf->st_size);
-#ifdef _WIN32
+#ifdef __MINGW32__
 	array_set_numeric(array, "blocks", (sbuf->st_size + 4095) / 4096);
 #else
 	array_set_numeric(array, "blocks", sbuf->st_blocks);
@@ -389,7 +389,7 @@ fill_stat_array(const char *name, awk_array_t array, struct stat *sbuf)
 
 #ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
 	array_set_numeric(array, "blksize", sbuf->st_blksize);
-#elif defined(_WIN32)
+#elif defined(__MINGW32__)
 	array_set_numeric(array, "blksize", 4096);
 #endif /* HAVE_STRUCT_STAT_ST_BLKSIZE */
 
@@ -483,7 +483,7 @@ init_filefuncs(void)
 	int i;
 	awk_value_t value;
 
-#ifndef _WIN32
+#ifndef __MINGW32__
 	/* at least right now, only FTS needs initializing */
 	static struct flagtab {
 		const char *name;
@@ -511,7 +511,7 @@ init_filefuncs(void)
 	return errors == 0;
 }
 
-#ifdef _WIN32
+#ifdef __MINGW32__
 /*  do_fts --- walk a heirarchy and fill in an array */
 
 /*
@@ -528,7 +528,7 @@ do_fts(int nargs, awk_value_t *result)
 	return NULL;	/* for the compiler */
 }
 
-#else /* _WIN32 */
+#else /* __MINGW32__ */
 
 static int fts_errors = 0;
 
@@ -832,12 +832,12 @@ out:
 
 	return make_number(ret, result);
 }
-#endif	/* !_WIN32 */
+#endif	/* ! __MINGW32__ */
 
 static awk_ext_func_t func_table[] = {
 	{ "chdir",	do_chdir, 1 },
 	{ "stat",	do_stat, 2 },
-#ifndef _WIN32
+#ifndef __MINGW32__
 	{ "fts",	do_fts, 3 },
 #endif
 };
-- 
cgit v1.2.3