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

bmomjian · bmomjian · commit 4ea0275f182c · 2002-07-15T22:48:54.000Z
warnings, and we now look for getopt_long in libgetopt.a.
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.60 2002/06/20 20:29:42 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.61 2002/07/15 22:48:54 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`
`@@ -548,6 +548,7 @@ parse_psql_options(int argc, char argv[], struct adhoc_opts options)`
`548`	`548`	`}`
`549`	`549`	`break;`
`550`	`550`	`#ifndef HAVE_GETOPT_LONG`
	`551`	`+ /* FreeBSD has a broken getopt that causes this test to fail. */`
`551`	`552`	`case '-':`
`552`	`553`	`fprintf(stderr,`
`553`	`554`	`gettext("%s was compiled without support for long options.\n"`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# Makefile for utils`
`4`	`4`	`#`
`5`		`-# $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.10 2002/07/15 21:34:05 momjian Exp $`
	`5`	`+# $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.11 2002/07/15 22:48:54 momjian Exp $`
`6`	`6`	`#`
`7`	`7`	`# About strdup: Some systems have strdup in their standard library, others`
`8`	`8`	`# don't. Ones that don't will use this make file to compile the strdup.c`
`@@ -11,8 +11,6 @@`
`11`	`11`	`# because the strdup.c in this directory may conflict with the strdup()`
`12`	`12`	`# prototype from the system library and cause a compile error.`
`13`	`13`	`#`
`14`		`-# getopt.o is likewise built only on request.`
`15`		`-#`
`16`	`14`	`# dllinit.o is only built on Win32 platform.`
`17`	`15`	`#`
`18`	`16`	`#-------------------------------------------------------------------------`
`@@ -26,7 +24,7 @@ all:`
`26`	`24`	`# directories as needed.`
`27`	`25`
`28`	`26`	`clean distclean maintainer-clean:`
`29`		`- rm -f dllinit.o getopt.o strdup.o`
	`27`	`+ rm -f dllinit.o strdup.o`
`30`	`28`
`31`	`29`	`depend dep:`
`32`	`30`	`$(CC) $(CFLAGS) -MM *.c >depend`