Remove utils/getopt.c file, not needed, it only allowed "--flag"

warnings, and we now look for getopt_long in libgetopt.a.

3 files changed, 4 insertions, 130 deletions

diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index e19db7a7ae3..5f6447c79fe 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.60 2002/06/20 20:29:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.61 2002/07/15 22:48:54 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -548,6 +548,7 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
 				}
 				break;
 #ifndef HAVE_GETOPT_LONG
+			/* FreeBSD has a broken getopt that causes this test to fail. */
 			case '-':
 				fprintf(stderr,
 						gettext("%s was compiled without support for long options.\n"
diff --git a/src/utils/Makefile b/src/utils/Makefile
index 95a0fc11c61..636f8eacbd9 100644
--- a/src/utils/Makefile
+++ b/src/utils/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for utils
 #
-# $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.10 2002/07/15 21:34:05 momjian Exp $
+# $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.11 2002/07/15 22:48:54 momjian Exp $
 #
 # About strdup:  Some systems have strdup in their standard library, others
 # don't.  Ones that don't will use this make file to compile the strdup.c
@@ -11,8 +11,6 @@
 # because the strdup.c in this directory may conflict with the strdup()
 # prototype from the system library and cause a compile error.
 #
-# getopt.o is likewise built only on request.
-#
 # dllinit.o is only built on Win32 platform.
 #
 #-------------------------------------------------------------------------
@@ -26,7 +24,7 @@ all:
 	# directories as needed.
 
 clean distclean maintainer-clean:
-	rm -f dllinit.o getopt.o strdup.o
+	rm -f dllinit.o strdup.o
 
 depend dep:
 	$(CC) $(CFLAGS) -MM *.c >depend
diff --git a/src/utils/getopt.c b/src/utils/getopt.c
deleted file mode 100644
index bbe81c16990..00000000000
--- a/src/utils/getopt.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 1987, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * 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. All advertising materials mentioning features or use of this software
- *	  must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
-#endif   /* LIBC_SCCS and not lint */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int			opterr = 1,			/* if error message should be printed */
-			optind = 1,			/* index into parent argv vector */
-			optopt,				/* character checked for validity */
-			optreset;			/* reset getopt */
-char	   *optarg;				/* argument associated with option */
-
-#define BADCH	(int)'?'
-#define BADARG	(int)':'
-#define EMSG	""
-
-/*
- * getopt
- *	Parse argc/argv argument vector.
- */
-int
-getopt(nargc, nargv, ostr)
-int			nargc;
-char	   *const * nargv;
-const char *ostr;
-{
-	extern char *__progname;
-	static char *place = EMSG;	/* option letter processing */
-	char	   *oli;			/* option letter list index */
-
-	if (optreset || !*place)
-	{							/* update scanning pointer */
-		optreset = 0;
-		if (optind >= nargc || *(place = nargv[optind]) != '-')
-		{
-			place = EMSG;
-			return -1;
-		}
-		if (place[1] && *++place == '-' && place[1] == '\0')
-		{						/* found "--" */
-			++optind;
-			place = EMSG;
-			return -1;
-		}
-	}							/* option letter okay? */
-	if ((optopt = (int) *place++) == (int) ':' ||
-		!(oli = strchr(ostr, optopt)))
-	{
-		/*
-		 * if the user didn't specify '-' as an option, assume it means
-		 * -1.
-		 */
-		if (optopt == (int) '-')
-			return -1;
-		if (!*place)
-			++optind;
-		if (opterr && *ostr != ':')
-			(void) fprintf(stderr,
-					   "%s: illegal option -- %c\n", __progname, optopt);
-		return BADCH;
-	}
-	if (*++oli != ':')
-	{							/* don't need argument */
-		optarg = NULL;
-		if (!*place)
-			++optind;
-	}
-	else
-	{							/* need an argument */
-		if (*place)				/* no white space */
-			optarg = place;
-		else if (nargc <= ++optind)
-		{						/* no arg */
-			place = EMSG;
-			if (*ostr == ':')
-				return BADARG;
-			if (opterr)
-				(void) fprintf(stderr,
-							   "%s: option requires an argument -- %c\n",
-							   __progname, optopt);
-			return BADCH;
-		}
-		else
-/* white space */
-			optarg = nargv[optind];
-		place = EMSG;
-		++optind;
-	}
-	return optopt;				/* dump back option letter */
-}