2007-04-27 Jonathan Chambers <joncham@gmail.com>

	
	Combined patch from Michael Jerris <mike@jerris.com> and me.
	* winconfig.h: Config file for msvc builds.
	* configure.ac: Add AC_CHECK_HEADERS for getopt.h,  sys/time.h,
	sys/wait.h, and pwd.h.
	
	* src/gspawn.c: Include config.h and use HAVE_* macros.
	* src/eglib-config.h.in: Add inclusion guards.
	* src/ghashtable.c: Fix warnings.
	* src/gmisc.c: Windows implementation of g_getenv, g_setenv,
	and g_unsetenv.
	* src/gpath.c: Include config.h and use HAVE_* macros.
	* src/gmarkup.c: Fix warnings.
	* src/gptrarray.c: Fix warnings.
	* src/gstr.c: Fix warnings and use HAVE_* macros.
	* src/glib.h: Move macros to eglib-config.h and include it.
	* src/gdate.c: Implement g_get_current_time on windows.
	* src/gpattern.c: Fix warnings.
	* src/gdir.c: Implement g_dir on windows.
	* src/gfile.c: Implement mkstemp and g_file_test on windows.
	* src/gtimer.c: Implement g_timer on windows.
	* src/gmodule.c: Fix warnings.
	* src/gunicode.c: Fix warnings.
	* src/gutf8.c: Fix warnings.
	
	* test/ptrarray.c: Fix warnings.
	* test/string.c: Fix warnings.
	* test/list.c: Fix warnings.
	* test/pattern.c: Use HAVE_* macros.
	* test/dir.c: Use HAVE_* macros.
	* test/file.c: Use HAVE_* macros and use system specific files for tests.
	* test/test.c: Fix warnings and use HAVE_* macros.
	* test/timer.c: Use HAVE_* macros.
	* test/string-util.c: Fix warnings.
	* test/test.h: Supress warnings on msvc.
	* test/module.c: Use HAVE_* macros.
	* test/utf8.c: Fix warnings.
	* test/spawn.c: Use HAVE_* macros.
	* test/driver.c: Fix warnings and use HAVE_* macros.
	* test/path.c: Use HAVE_* macros and use system specific files for tests.
	* test/sizes.c: Fix warnings.

2007-04-27  Jonathan Chambers <joncham@gmail.com>
	
	Combined patch from Michael Jerris <mike@jerris.com> and me.
	* getopt.c: Added public domain implementation for Windows.
	* getopt.h: Added public domain implementation for Windows.
	* getopt_long.c: Added public domain implementation for Windows.
	* test_eglib.vcproj: Update project.
	* eglib.vcproj: Update project. Add pre-build step to copy
	winconfig.h to config.h for msvc build.


svn path=/trunk/mono/; revision=76406

1 files changed, 198 insertions, 0 deletions

diff --git a/msvc/getopt_long.c b/msvc/getopt_long.c
new file mode 100644
index 00000000000..0065a3d6b26
--- /dev/null
+++ b/msvc/getopt_long.c
@@ -0,0 +1,198 @@
+/*
+ * getopt_long() -- long options parser
+ *
+ * Portions Copyright (c) 1987, 1993, 1994
+ * The Regents of the University of California.  All rights reserved.
+ *
+ * Portions Copyright (c) 2003
+ * PostgreSQL Global Development Group
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *	  notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *	  notice, this list of conditions and the following disclaimer in the
+ *	  documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *	  may be used to endorse or promote products derived from this software
+ *	  without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.	IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $PostgreSQL: pgsql/src/port/getopt_long.c,v 1.6 2007/03/26 21:44:11 momjian Exp $
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "getopt_long.h"
+
+#ifndef HAVE_INT_OPTRESET
+int			optreset;
+#endif
+
+#define BADCH	'?'
+#define BADARG	':'
+#define EMSG	""
+
+
+int
+getopt_long(int argc, char *const argv[],
+			const char *optstring,
+			const struct option * longopts, int *longindex)
+{
+	static char *place = EMSG;	/* option letter processing */
+	char	   *oli;			/* option letter list index */
+
+	if (optreset || !*place)
+	{							/* update scanning pointer */
+		optreset = 0;
+
+		if (optind >= argc)
+		{
+			place = EMSG;
+			return -1;
+		}
+
+		place = argv[optind];
+
+		if (place[0] != '-')
+		{
+			place = EMSG;
+			return -1;
+		}
+
+		place++;
+
+		if (place[0] && place[0] == '-' && place[1] == '\0')
+		{						/* found "--" */
+			++optind;
+			place = EMSG;
+			return -1;
+		}
+
+		if (place[0] && place[0] == '-' && place[1])
+		{
+			/* long option */
+			size_t		namelen;
+			int			i;
+
+			place++;
+
+			namelen = strcspn(place, "=");
+			for (i = 0; longopts[i].name != NULL; i++)
+			{
+				if (strlen(longopts[i].name) == namelen
+					&& strncmp(place, longopts[i].name, namelen) == 0)
+				{
+					if (longopts[i].has_arg)
+					{
+						if (place[namelen] == '=')
+							optarg = place + namelen + 1;
+						else if (optind < argc - 1)
+						{
+							optind++;
+							optarg = argv[optind];
+						}
+						else
+						{
+							if (optstring[0] == ':')
+								return BADARG;
+							if (opterr)
+								fprintf(stderr,
+								   "%s: option requires an argument -- %s\n",
+										argv[0], place);
+							place = EMSG;
+							optind++;
+							return BADCH;
+						}
+					}
+					else
+					{
+						optarg = NULL;
+						if (place[namelen] != 0)
+						{
+							/* XXX error? */
+						}
+					}
+
+					optind++;
+
+					if (longindex)
+						*longindex = i;
+
+					place = EMSG;
+
+					if (longopts[i].flag == NULL)
+						return longopts[i].val;
+					else
+					{
+						*longopts[i].flag = longopts[i].val;
+						return 0;
+					}
+				}
+			}
+
+			if (opterr && optstring[0] != ':')
+				fprintf(stderr,
+						"%s: illegal option -- %s\n", argv[0], place);
+			place = EMSG;
+			optind++;
+			return BADCH;
+		}
+	}
+
+	/* short option */
+	optopt = (int) *place++;
+
+	oli = strchr(optstring, optopt);
+	if (!oli)
+	{
+		if (!*place)
+			++optind;
+		if (opterr && *optstring != ':')
+			fprintf(stderr,
+					"%s: illegal option -- %c\n", argv[0], optopt);
+		return BADCH;
+	}
+
+	if (oli[1] != ':')
+	{							/* don't need argument */
+		optarg = NULL;
+		if (!*place)
+			++optind;
+	}
+	else
+	{							/* need an argument */
+		if (*place)				/* no white space */
+			optarg = place;
+		else if (argc <= ++optind)
+		{						/* no arg */
+			place = EMSG;
+			if (*optstring == ':')
+				return BADARG;
+			if (opterr)
+				fprintf(stderr,
+						"%s: option requires an argument -- %c\n",
+						argv[0], optopt);
+			return BADCH;
+		}
+		else
+			/* white space */
+			optarg = argv[optind];
+		place = EMSG;
+		++optind;
+	}
+	return optopt;
+}