Properly exit ODBC with 'X', allow linking on BSD/OS.

bmomjian · bmomjian · commit fd40942fd8f9 · 2001-02-10T05:50:29.000Z
diff --git a/src/interfaces/odbc/GNUmakefile b/src/interfaces/odbc/GNUmakefile
@@ -2,7 +2,7 @@
 #
 # GNUMakefile for psqlodbc (Postgres ODBC driver)
 #
-# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.8 2000/12/16 18:14:25 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.9 2001/02/10 05:50:27 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -24,7 +24,6 @@ OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \
         gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX)
 
 SHLIB_LINK = $(filter -lm, $(LIBS))
-
 all: all-lib
 
 # Shared library stuff
@@ -33,7 +32,13 @@ include $(top_srcdir)/src/Makefile.shlib
 # Symbols must be resolved to the version in the shared library because
 # the driver manager (e.g., iodbc) provides some symbols with the same
 # names and we don't want those.  (This issue is probably ELF specific.)
+#
+# BSD/OS fails with libc and crt1.o undefined symbols without this.
+# bjm 2001-02-09
+#
+ifneq ($(PORTNAME), bsdi)
 LINK.shared += $(shlib_symbolic)
+endif
 
 odbc_headers = isql.h isqlext.h iodbc.h
 odbc_includedir = $(includedir)/iodbc
diff --git a/src/interfaces/odbc/bind.c b/src/interfaces/odbc/bind.c
@@ -1,4 +1,3 @@
-
 /* Module:          bind.c
  *
  * Description:     This module contains routines related to binding 
diff --git a/src/interfaces/odbc/columninfo.c b/src/interfaces/odbc/columninfo.c
@@ -1,4 +1,3 @@
-
 /* Module:          columninfo.c
  *
  * Description:     This module contains routines related to 
diff --git a/src/interfaces/odbc/connection.c b/src/interfaces/odbc/connection.c
@@ -1,4 +1,3 @@
-
 /* Module:          connection.c
  *
  * Description:     This module contains routines related to 
diff --git a/src/interfaces/odbc/convert.c b/src/interfaces/odbc/convert.c
@@ -1,4 +1,3 @@
-
 /* Module:         convert.c
  *
  * Description:	   This module contains routines related to 
diff --git a/src/interfaces/odbc/dlg_specific.c b/src/interfaces/odbc/dlg_specific.c
@@ -1,4 +1,3 @@
-
 /* Module:          dlg_specific.c
  *
  * Description:     This module contains any specific code for handling
diff --git a/src/interfaces/odbc/drvconn.c b/src/interfaces/odbc/drvconn.c
@@ -1,4 +1,3 @@
-
 /* Module:          drvconn.c
  *
  * Description:     This module contains only routines related to 
diff --git a/src/interfaces/odbc/environ.c b/src/interfaces/odbc/environ.c
@@ -1,4 +1,3 @@
-
 /* Module:          environ.c
  *
  * Description:     This module contains routines related to 
diff --git a/src/interfaces/odbc/execute.c b/src/interfaces/odbc/execute.c
@@ -1,4 +1,3 @@
-
 /* Module:          execute.c
  *
  * Description:     This module contains routines related to 
diff --git a/src/interfaces/odbc/info.c b/src/interfaces/odbc/info.c
@@ -1,4 +1,3 @@
-
 /* Module:          info.c
  *
  * Description:     This module contains routines related to
diff --git a/src/interfaces/odbc/lobj.c b/src/interfaces/odbc/lobj.c
@@ -1,4 +1,3 @@
-
 /* Module:          lobj.c
  *
  * Description:     This module contains routines related to manipulating
diff --git a/src/interfaces/odbc/misc.c b/src/interfaces/odbc/misc.c
@@ -1,4 +1,3 @@
-
 /* Module:          misc.c
  *
  * Description:     This module contains miscellaneous routines
diff --git a/src/interfaces/odbc/options.c b/src/interfaces/odbc/options.c
@@ -1,4 +1,3 @@
-
 /* Module:          options.c
  *
  * Description:     This module contains routines for getting/setting
diff --git a/src/interfaces/odbc/parse.c b/src/interfaces/odbc/parse.c
@@ -1,4 +1,3 @@
-
 /* Module:          parse.c
  *
  * Description:     This module contains routines related to parsing SQL statements.
diff --git a/src/interfaces/odbc/pgtypes.c b/src/interfaces/odbc/pgtypes.c
@@ -1,4 +1,3 @@
-
 /* Module:          pgtypes.c
  *
  * Description:     This module contains routines for getting information
diff --git a/src/interfaces/odbc/psqlodbc.c b/src/interfaces/odbc/psqlodbc.c
@@ -1,4 +1,3 @@
-
 /* Module:          psqlodbc.c
  *
  * Description:     This module contains the main entry point (DllMain) for the library.
diff --git a/src/interfaces/odbc/qresult.c b/src/interfaces/odbc/qresult.c
@@ -1,4 +1,3 @@
-
 /* Module:          qresult.c
  *
  * Description:     This module contains functions related to 
diff --git a/src/interfaces/odbc/results.c b/src/interfaces/odbc/results.c
@@ -1,4 +1,3 @@
-
 /* Module:          results.c
  *
  * Description:     This module contains functions related to 
diff --git a/src/interfaces/odbc/setup.c b/src/interfaces/odbc/setup.c
@@ -1,4 +1,3 @@
-
 /* Module:          setup.c
  *
  * Description:     This module contains the setup functions for 
diff --git a/src/interfaces/odbc/socket.c b/src/interfaces/odbc/socket.c
@@ -1,4 +1,3 @@
-
 /* Module:          socket.c
  *
  * Description:     This module contains functions for low level socket
@@ -78,7 +77,11 @@ SOCK_Destructor(SocketClass *self)
 {
 	if (self->socket != -1) {
 		if ( ! shutdown(self->socket, 2)) /* no sends or receives */
+		{
+			SOCK_put_char(self, 'X');
+			SOCK_flush_output(self);
 			closesocket(self->socket);
+		}
 	}
 
 	if (self->buffer_in)
diff --git a/src/interfaces/odbc/statement.c b/src/interfaces/odbc/statement.c
@@ -1,4 +1,3 @@
-
 /* Module:          statement.c
  *
  * Description:     This module contains functions related to creating
diff --git a/src/interfaces/odbc/tuple.c b/src/interfaces/odbc/tuple.c
@@ -1,4 +1,3 @@
-
 /* Module:          tuple.c
  *
  * Description:     This module contains functions for setting the data for individual
diff --git a/src/interfaces/odbc/tuplelist.c b/src/interfaces/odbc/tuplelist.c
@@ -1,4 +1,3 @@
-
 /* Module:          tuplelist.c
  *
  * Description:     This module contains functions for creating a manual result set

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`/* Module: bind.c`
`3`	`2`	`*`
`4`	`3`	`* Description: This module contains routines related to binding`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`/* Module: columninfo.c`
`3`	`2`	`*`
`4`	`3`	`* Description: This module contains routines related to`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`/* Module: connection.c`
`3`	`2`	`*`
`4`	`3`	`* Description: This module contains routines related to`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`/* Module: convert.c`
`3`	`2`	`*`
`4`	`3`	`* Description: This module contains routines related to`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`/* Module: dlg_specific.c`
`3`	`2`	`*`
`4`	`3`	`* Description: This module contains any specific code for handling`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`/* Module: drvconn.c`
`3`	`2`	`*`
`4`	`3`	`* Description: This module contains only routines related to`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`/* Module: environ.c`
`3`	`2`	`*`
`4`	`3`	`* Description: This module contains routines related to`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`/* Module: execute.c`
`3`	`2`	`*`
`4`	`3`	`* Description: This module contains routines related to`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`/* Module: info.c`
`3`	`2`	`*`
`4`	`3`	`* Description: This module contains routines related to`